UnknownFieldSet tests, and a fix to repeated extension elements.

csharp/ProtocolBuffers.Test/MessageTest.cs

@@ -58,8 +58,11 @@ namespace Google.ProtocolBuffers {
       Assert.AreEqual(MergeResultText, result.ToString());
     }
 
-    /** Test merging two DynamicMessages. */
-    public void testDynamicMergeFrom() {
+    /// <summary>
+    /// Test merging two DynamicMessages.
+    /// </summary>
+    [Test]
+    public void DynamicMergeFrom() {
       DynamicMessage result = (DynamicMessage) DynamicMessage.CreateBuilder(MergeDest)
           .MergeFrom((DynamicMessage) DynamicMessage.CreateBuilder(MergeSource).Build())
           .Build();

csharp/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj

@@ -54,6 +54,7 @@
     <Compile Include="MessageTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ReflectionTester.cs" />
+    <Compile Include="ServiceTest.cs" />
     <Compile Include="TestProtos\EnumWithNoOuter.cs" />
     <Compile Include="TestProtos\MessageWithNoOuter.cs" />
     <Compile Include="TestProtos\MultiFileProto.cs" />
@@ -64,6 +65,8 @@
     <Compile Include="TestProtos\UnitTestOptimizeForProtoFile.cs" />
     <Compile Include="TestProtos\UnitTestProtoFile.cs" />
     <Compile Include="TestUtil.cs" />
+    <Compile Include="TextFormatTest.cs" />
+    <Compile Include="UnknownFieldSetTest.cs" />
     <Compile Include="WireFormatTest.cs" />
   </ItemGroup>
   <ItemGroup>

csharp/ProtocolBuffers.Test/ServiceTest.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+
+namespace Google.ProtocolBuffers {
+  [TestFixture]
+  public class ServiceTest {
+  }
+}

csharp/ProtocolBuffers.Test/TextFormatTest.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+
+namespace Google.ProtocolBuffers {
+  [TestFixture]
+  public class TextFormatTest {
+  }
+}

csharp/ProtocolBuffers/AbstractBuilder.cs

@@ -84,6 +84,11 @@ namespace Google.ProtocolBuffers {
     }
     #endregion
 
+    public TBuilder SetUnknownFields(UnknownFieldSet fields) {
+      UnknownFields = fields;
+      return ThisBuilder;
+    }
+
     public virtual TBuilder Clear() {
       foreach(FieldDescriptor field in AllFields.Keys) {
         ClearField(field);

csharp/ProtocolBuffers/GeneratedExtensionBase.cs

@@ -78,7 +78,8 @@ namespace Google.ProtocolBuffers {
           }
         case MappedType.Enum:
           // Just return a boxed int - that can be unboxed to the enum
-          return ((EnumValueDescriptor) value).Number;
+          EnumValueDescriptor enumValue = (EnumValueDescriptor) value;
+          return enumValue.Number;
         default:
           return value;
       }

csharp/ProtocolBuffers/GeneratedRepeatException.cs

@@ -31,7 +31,7 @@ namespace Google.ProtocolBuffers {
         // Must convert the whole list.
         List<TExtensionElement> result = new List<TExtensionElement>();
         foreach (object element in (IEnumerable) value) {
-          ((IList) result).Add(SingularFromReflectionType(element));
+          result.Add((TExtensionElement) SingularFromReflectionType(element));
         }
         return result;
       } else {

csharp/ProtocolBuffers/IBuilder.cs

@@ -123,6 +123,9 @@ namespace Google.ProtocolBuffers {
   public interface IBuilder<TMessage, TBuilder> : IBuilder
       where TMessage : IMessage<TMessage, TBuilder> 
       where TBuilder : IBuilder<TMessage, TBuilder> {
+
+    TBuilder SetUnknownFields(UnknownFieldSet unknownFields);
+
     /// <summary>
     /// Resets all fields to their default values.
     /// </summary>