From 739d13d5d1f93e8bf8770081d1500372758fffa1 Mon Sep 17 00:00:00 2001
From: Jon Skeet <jonskeet@google.com>
Date: Tue, 14 Jul 2015 14:26:31 +0100
Subject: Generate the well-known types in C#

This involves:
- Specifying a namespace in each proto (including ones we'd previously missed)
- Updating the generation script
- Changing codegen to implement IReflectedMessage.Fields explicitly (a good thing anyway)
- Changing reflection tests to take account of the explicit interface implementation

Non-generated code in this commit; generated code to follow
---
 .../ProtocolBuffers.Test/GeneratedMessageTest.cs   | 22 ++++++++++++----------
 csharp/src/ProtocolBuffers/ProtocolBuffers.csproj  | 10 ++++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'csharp/src')

diff --git a/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs b/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
index 28c2195f..acb20b15 100644
--- a/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
+++ b/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
@@ -604,7 +604,7 @@ namespace Google.Protobuf
         public void Reflection_GetValue()
         {
             var message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Fields;
+            var fields = ((IReflectedMessage) message).Fields;
             Assert.AreEqual(message.SingleBool, fields[TestAllTypes.SingleBoolFieldNumber].GetValue(message));
             Assert.AreEqual(message.SingleBytes, fields[TestAllTypes.SingleBytesFieldNumber].GetValue(message));
             Assert.AreEqual(message.SingleDouble, fields[TestAllTypes.SingleDoubleFieldNumber].GetValue(message));
@@ -639,7 +639,8 @@ namespace Google.Protobuf
 
             // Just a single map field, for the same reason
             var mapMessage = new TestMap { MapStringString = { { "key1", "value1" }, { "key2", "value2" } } };
-            var dictionary = (IDictionary)mapMessage.Fields[TestMap.MapStringStringFieldNumber].GetValue(mapMessage);
+            fields = ((IReflectedMessage) mapMessage).Fields;
+            var dictionary = (IDictionary) fields[TestMap.MapStringStringFieldNumber].GetValue(mapMessage);
             Assert.AreEqual(mapMessage.MapStringString, dictionary);
             Assert.AreEqual("value1", dictionary["key1"]);
         }
@@ -647,7 +648,7 @@ namespace Google.Protobuf
         [Test]
         public void Reflection_Clear()
         {
-            var message = SampleMessages.CreateFullTestAllTypes();
+            IReflectedMessage message = SampleMessages.CreateFullTestAllTypes();
             var fields = message.Fields;
             fields[TestAllTypes.SingleBoolFieldNumber].Clear(message);
             fields[TestAllTypes.SingleInt32FieldNumber].Clear(message);
@@ -672,7 +673,8 @@ namespace Google.Protobuf
 
             // Separately, maps.
             var mapMessage = new TestMap { MapStringString = { { "key1", "value1" }, { "key2", "value2" } } };
-            mapMessage.Fields[TestMap.MapStringStringFieldNumber].Clear(mapMessage);
+            fields = ((IReflectedMessage) mapMessage).Fields;
+            fields[TestMap.MapStringStringFieldNumber].Clear(mapMessage);
             Assert.AreEqual(0, mapMessage.MapStringString.Count);
         }
 
@@ -680,7 +682,7 @@ namespace Google.Protobuf
         public void Reflection_SetValue_SingleFields()
         {
             // Just a sample (primitives, messages, enums, strings, byte strings)
-            var message = SampleMessages.CreateFullTestAllTypes();
+            IReflectedMessage message = SampleMessages.CreateFullTestAllTypes();
             var fields = message.Fields;
             fields[TestAllTypes.SingleBoolFieldNumber].SetValue(message, false);
             fields[TestAllTypes.SingleInt32FieldNumber].SetValue(message, 500);
@@ -707,7 +709,7 @@ namespace Google.Protobuf
         [Test]
         public void Reflection_SetValue_SingleFields_WrongType()
         {
-            var message = SampleMessages.CreateFullTestAllTypes();
+            IReflectedMessage message = SampleMessages.CreateFullTestAllTypes();
             var fields = message.Fields;
             Assert.Throws<InvalidCastException>(() => fields[TestAllTypes.SingleBoolFieldNumber].SetValue(message, "This isn't a bool"));
         }
@@ -715,7 +717,7 @@ namespace Google.Protobuf
         [Test]
         public void Reflection_SetValue_MapFields()
         {
-            var message = new TestMap();
+            IReflectedMessage message = new TestMap();
             var fields = message.Fields;
             Assert.Throws<InvalidOperationException>(() => fields[TestMap.MapStringStringFieldNumber].SetValue(message, new Dictionary<string, string>()));
         }
@@ -723,7 +725,7 @@ namespace Google.Protobuf
         [Test]
         public void Reflection_SetValue_RepeatedFields()
         {
-            var message = SampleMessages.CreateFullTestAllTypes();
+            IReflectedMessage message = SampleMessages.CreateFullTestAllTypes();
             var fields = message.Fields;
             Assert.Throws<InvalidOperationException>(() => fields[TestAllTypes.RepeatedDoubleFieldNumber].SetValue(message, new double[10]));
         }
@@ -731,7 +733,7 @@ namespace Google.Protobuf
         [Test]
         public void Reflection_GetValue_IncorrectType()
         {
-            var message = SampleMessages.CreateFullTestAllTypes();
+            IReflectedMessage message = SampleMessages.CreateFullTestAllTypes();
             Assert.Throws<InvalidCastException>(() => message.Fields[TestAllTypes.SingleBoolFieldNumber].GetValue(new TestMap()));
         }
 
@@ -739,7 +741,7 @@ namespace Google.Protobuf
         public void Reflection_Oneof()
         {
             var message = new TestAllTypes();
-            var fields = message.Fields;
+            var fields = ((IReflectedMessage) message).Fields;
             Assert.AreEqual(1, fields.Oneofs.Count);
             var oneof = fields.Oneofs[0];
             Assert.AreEqual("oneof_field", oneof.Descriptor.Name);
diff --git a/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj b/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
index eef54391..f529c19a 100644
--- a/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
+++ b/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
@@ -96,6 +96,16 @@
     <Compile Include="Reflection\ServiceDescriptor.cs" />
     <Compile Include="Reflection\SingleFieldAccessor.cs" />
     <Compile Include="ThrowHelper.cs" />
+    <Compile Include="WellKnownTypes\Any.cs" />
+    <Compile Include="WellKnownTypes\Api.cs" />
+    <Compile Include="WellKnownTypes\Duration.cs" />
+    <Compile Include="WellKnownTypes\Empty.cs" />
+    <Compile Include="WellKnownTypes\FieldMask.cs" />
+    <Compile Include="WellKnownTypes\SourceContext.cs" />
+    <Compile Include="WellKnownTypes\Struct.cs" />
+    <Compile Include="WellKnownTypes\Timestamp.cs" />
+    <Compile Include="WellKnownTypes\Type.cs" />
+    <Compile Include="WellKnownTypes\Wrappers.cs" />
     <Compile Include="WireFormat.cs" />
   </ItemGroup>
   <ItemGroup>
-- 
cgit v1.2.3