First pass at the big rename from ProtocolBuffers to Google.Protobuf.

We'll see what I've missed when CI fails...

28 files changed, 0 insertions, 16564 deletions

diff --git a/csharp/src/ProtocolBuffers.Test/ByteStringTest.cs b/csharp/src/ProtocolBuffers.Test/ByteStringTest.cs
deleted file mode 100644
index 685e130a..00000000
--- a/csharp/src/ProtocolBuffers.Test/ByteStringTest.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-#region Copyright notice and license

-// Protocol Buffers - Google's data interchange format

-// Copyright 2008 Google Inc.  All rights reserved.

-// https://developers.google.com/protocol-buffers/

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are

-// met:

-//

-//     * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

-//     * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following disclaimer

-// in the documentation and/or other materials provided with the

-// distribution.

-//     * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived from

-// this software without specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#endregion

-

-using System;

-using System.Text;

-using NUnit.Framework;

-

-namespace Google.Protobuf

-{

-    public class ByteStringTest

-    {

-        [Test]

-        public void Equality()

-        {

-            ByteString b1 = ByteString.CopyFrom(1, 2, 3);

-            ByteString b2 = ByteString.CopyFrom(1, 2, 3);

-            ByteString b3 = ByteString.CopyFrom(1, 2, 4);

-            ByteString b4 = ByteString.CopyFrom(1, 2, 3, 4);

-            EqualityTester.AssertEquality(b1, b1);

-            EqualityTester.AssertEquality(b1, b2);

-            EqualityTester.AssertInequality(b1, b3);

-            EqualityTester.AssertInequality(b1, b4);

-            EqualityTester.AssertInequality(b1, null);

-#pragma warning disable 1718 // Deliberately calling ==(b1, b1) and !=(b1, b1)

-            Assert.IsTrue(b1 == b1);

-            Assert.IsTrue(b1 == b2);

-            Assert.IsFalse(b1 == b3);

-            Assert.IsFalse(b1 == b4);

-            Assert.IsFalse(b1 == null);

-            Assert.IsTrue((ByteString) null == null);

-            Assert.IsFalse(b1 != b1);

-            Assert.IsFalse(b1 != b2);

-#pragma warning disable 1718

-            Assert.IsTrue(b1 != b3);

-            Assert.IsTrue(b1 != b4);

-            Assert.IsTrue(b1 != null);

-            Assert.IsFalse((ByteString) null != null);

-        }

-

-        [Test]

-        public void EmptyByteStringHasZeroSize()

-        {

-            Assert.AreEqual(0, ByteString.Empty.Length);

-        }

-

-        [Test]

-        public void CopyFromStringWithExplicitEncoding()

-        {

-            ByteString bs = ByteString.CopyFrom("AB", Encoding.Unicode);

-            Assert.AreEqual(4, bs.Length);

-            Assert.AreEqual(65, bs[0]);

-            Assert.AreEqual(0, bs[1]);

-            Assert.AreEqual(66, bs[2]);

-            Assert.AreEqual(0, bs[3]);

-        }

-

-        [Test]

-        public void IsEmptyWhenEmpty()

-        {

-            Assert.IsTrue(ByteString.CopyFromUtf8("").IsEmpty);

-        }

-

-        [Test]

-        public void IsEmptyWhenNotEmpty()

-        {

-            Assert.IsFalse(ByteString.CopyFromUtf8("X").IsEmpty);

-        }

-

-        [Test]

-        public void CopyFromByteArrayCopiesContents()

-        {

-            byte[] data = new byte[1];

-            data[0] = 10;

-            ByteString bs = ByteString.CopyFrom(data);

-            Assert.AreEqual(10, bs[0]);

-            data[0] = 5;

-            Assert.AreEqual(10, bs[0]);

-        }

-

-        [Test]

-        public void ToByteArrayCopiesContents()

-        {

-            ByteString bs = ByteString.CopyFromUtf8("Hello");

-            byte[] data = bs.ToByteArray();

-            Assert.AreEqual((byte)'H', data[0]);

-            Assert.AreEqual((byte)'H', bs[0]);

-            data[0] = 0;

-            Assert.AreEqual(0, data[0]);

-            Assert.AreEqual((byte)'H', bs[0]);

-        }

-

-        [Test]

-        public void CopyFromUtf8UsesUtf8()

-        {

-            ByteString bs = ByteString.CopyFromUtf8("\u20ac");

-            Assert.AreEqual(3, bs.Length);

-            Assert.AreEqual(0xe2, bs[0]);

-            Assert.AreEqual(0x82, bs[1]);

-            Assert.AreEqual(0xac, bs[2]);

-        }

-

-        [Test]

-        public void CopyFromPortion()

-        {

-            byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6};

-            ByteString bs = ByteString.CopyFrom(data, 2, 3);

-            Assert.AreEqual(3, bs.Length);

-            Assert.AreEqual(2, bs[0]);

-            Assert.AreEqual(3, bs[1]);

-        }

-

-        [Test]

-        public void ToStringUtf8()

-        {

-            ByteString bs = ByteString.CopyFromUtf8("\u20ac");

-            Assert.AreEqual("\u20ac", bs.ToStringUtf8());

-        }

-

-        [Test]

-        public void ToStringWithExplicitEncoding()

-        {

-            ByteString bs = ByteString.CopyFrom("\u20ac", Encoding.Unicode);

-            Assert.AreEqual("\u20ac", bs.ToString(Encoding.Unicode));

-        }

-

-        [Test]

-        public void FromBase64_WithText()

-        {

-            byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6};

-            string base64 = Convert.ToBase64String(data);

-            ByteString bs = ByteString.FromBase64(base64);

-            Assert.AreEqual(data, bs.ToByteArray());

-        }

-

-        [Test]

-        public void FromBase64_Empty()

-        {

-            // Optimization which also fixes issue 61.

-            Assert.AreSame(ByteString.Empty, ByteString.FromBase64(""));

-        }

-    }

-}
\ No newline at end of file
diff --git a/csharp/src/ProtocolBuffers.Test/CodedInputStreamExtensions.cs b/csharp/src/ProtocolBuffers.Test/CodedInputStreamExtensions.cs
deleted file mode 100644
index 408c7cb9..00000000
--- a/csharp/src/ProtocolBuffers.Test/CodedInputStreamExtensions.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    internal static class CodedInputStreamExtensions
-    {
-        public static void AssertNextTag(this CodedInputStream input, uint expectedTag)
-        {
-            uint tag;
-            Assert.IsTrue(input.ReadTag(out tag));
-            Assert.AreEqual(expectedTag, tag);
-        }
-
-        public static T ReadMessage<T>(this CodedInputStream stream, MessageParser<T> parser)
-            where T : IMessage<T>
-        {
-            var message = parser.CreateTemplate();
-            stream.ReadMessage(message);
-            return message;
-        }
-    }
-}
diff --git a/csharp/src/ProtocolBuffers.Test/CodedInputStreamTest.cs b/csharp/src/ProtocolBuffers.Test/CodedInputStreamTest.cs
deleted file mode 100644
index fa88d407..00000000
--- a/csharp/src/ProtocolBuffers.Test/CodedInputStreamTest.cs
+++ /dev/null
@@ -1,444 +0,0 @@
-#region Copyright notice and license

-// Protocol Buffers - Google's data interchange format

-// Copyright 2008 Google Inc.  All rights reserved.

-// https://developers.google.com/protocol-buffers/

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are

-// met:

-//

-//     * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

-//     * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following disclaimer

-// in the documentation and/or other materials provided with the

-// distribution.

-//     * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived from

-// this software without specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#endregion

-

-using System;

-using System.IO;

-using Google.Protobuf.TestProtos;

-using NUnit.Framework;

-

-namespace Google.Protobuf

-{

-    public class CodedInputStreamTest

-    {

-        /// <summary>

-        /// Helper to construct a byte array from a bunch of bytes.  The inputs are

-        /// actually ints so that I can use hex notation and not get stupid errors

-        /// about precision.

-        /// </summary>

-        private static byte[] Bytes(params int[] bytesAsInts)

-        {

-            byte[] bytes = new byte[bytesAsInts.Length];

-            for (int i = 0; i < bytesAsInts.Length; i++)

-            {

-                bytes[i] = (byte) bytesAsInts[i];

-            }

-            return bytes;

-        }

-

-        /// <summary>

-        /// Parses the given bytes using ReadRawVarint32() and ReadRawVarint64()

-        /// </summary>

-        private static void AssertReadVarint(byte[] data, ulong value)

-        {

-            CodedInputStream input = CodedInputStream.CreateInstance(data);

-            Assert.AreEqual((uint) value, input.ReadRawVarint32());

-

-            input = CodedInputStream.CreateInstance(data);

-            Assert.AreEqual(value, input.ReadRawVarint64());

-            Assert.IsTrue(input.IsAtEnd);

-

-            // Try different block sizes.

-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)

-            {

-                input = CodedInputStream.CreateInstance(new SmallBlockInputStream(data, bufferSize));

-                Assert.AreEqual((uint) value, input.ReadRawVarint32());

-

-                input = CodedInputStream.CreateInstance(new SmallBlockInputStream(data, bufferSize));

-                Assert.AreEqual(value, input.ReadRawVarint64());

-                Assert.IsTrue(input.IsAtEnd);

-            }

-

-            // Try reading directly from a MemoryStream. We want to verify that it

-            // doesn't read past the end of the input, so write an extra byte - this

-            // lets us test the position at the end.

-            MemoryStream memoryStream = new MemoryStream();

-            memoryStream.Write(data, 0, data.Length);

-            memoryStream.WriteByte(0);

-            memoryStream.Position = 0;

-            Assert.AreEqual((uint) value, CodedInputStream.ReadRawVarint32(memoryStream));

-            Assert.AreEqual(data.Length, memoryStream.Position);

-        }

-

-        /// <summary>

-        /// Parses the given bytes using ReadRawVarint32() and ReadRawVarint64() and

-        /// expects them to fail with an InvalidProtocolBufferException whose

-        /// description matches the given one.

-        /// </summary>

-        private static void AssertReadVarintFailure(InvalidProtocolBufferException expected, byte[] data)

-        {

-            CodedInputStream input = CodedInputStream.CreateInstance(data);

-            var exception = Assert.Throws<InvalidProtocolBufferException>(() => input.ReadRawVarint32());

-            Assert.AreEqual(expected.Message, exception.Message);

-

-            input = CodedInputStream.CreateInstance(data);

-            exception = Assert.Throws<InvalidProtocolBufferException>(() => input.ReadRawVarint64());

-            Assert.AreEqual(expected.Message, exception.Message);

-

-            // Make sure we get the same error when reading directly from a Stream.

-            exception = Assert.Throws<InvalidProtocolBufferException>(() => CodedInputStream.ReadRawVarint32(new MemoryStream(data)));

-            Assert.AreEqual(expected.Message, exception.Message);

-        }

-

-        [Test]

-        public void ReadVarint()

-        {

-            AssertReadVarint(Bytes(0x00), 0);

-            AssertReadVarint(Bytes(0x01), 1);

-            AssertReadVarint(Bytes(0x7f), 127);

-            // 14882

-            AssertReadVarint(Bytes(0xa2, 0x74), (0x22 << 0) | (0x74 << 7));

-            // 2961488830

-            AssertReadVarint(Bytes(0xbe, 0xf7, 0x92, 0x84, 0x0b),

-                             (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |

-                             (0x0bL << 28));

-

-            // 64-bit

-            // 7256456126

-            AssertReadVarint(Bytes(0xbe, 0xf7, 0x92, 0x84, 0x1b),

-                             (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |

-                             (0x1bL << 28));

-            // 41256202580718336

-            AssertReadVarint(Bytes(0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49),

-                             (0x00 << 0) | (0x66 << 7) | (0x6b << 14) | (0x1c << 21) |

-                             (0x43L << 28) | (0x49L << 35) | (0x24L << 42) | (0x49L << 49));

-            // 11964378330978735131

-            AssertReadVarint(Bytes(0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01),

-                             (0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) |

-                             (0x3bUL << 28) | (0x56UL << 35) | (0x00UL << 42) |

-                             (0x05UL << 49) | (0x26UL << 56) | (0x01UL << 63));

-

-            // Failures

-            AssertReadVarintFailure(

-                InvalidProtocolBufferException.MalformedVarint(),

-                Bytes(0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,

-                      0x00));

-            AssertReadVarintFailure(

-                InvalidProtocolBufferException.TruncatedMessage(),

-                Bytes(0x80));

-        }

-

-        /// <summary>

-        /// Parses the given bytes using ReadRawLittleEndian32() and checks

-        /// that the result matches the given value.

-        /// </summary>

-        private static void AssertReadLittleEndian32(byte[] data, uint value)

-        {

-            CodedInputStream input = CodedInputStream.CreateInstance(data);

-            Assert.AreEqual(value, input.ReadRawLittleEndian32());

-            Assert.IsTrue(input.IsAtEnd);

-

-            // Try different block sizes.

-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)

-            {

-                input = CodedInputStream.CreateInstance(

-                    new SmallBlockInputStream(data, blockSize));

-                Assert.AreEqual(value, input.ReadRawLittleEndian32());

-                Assert.IsTrue(input.IsAtEnd);

-            }

-        }

-

-        /// <summary>

-        /// Parses the given bytes using ReadRawLittleEndian64() and checks

-        /// that the result matches the given value.

-        /// </summary>

-        private static void AssertReadLittleEndian64(byte[] data, ulong value)

-        {

-            CodedInputStream input = CodedInputStream.CreateInstance(data);

-            Assert.AreEqual(value, input.ReadRawLittleEndian64());

-            Assert.IsTrue(input.IsAtEnd);

-

-            // Try different block sizes.

-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)

-            {

-                input = CodedInputStream.CreateInstance(

-                    new SmallBlockInputStream(data, blockSize));

-                Assert.AreEqual(value, input.ReadRawLittleEndian64());

-                Assert.IsTrue(input.IsAtEnd);

-            }

-        }

-

-        [Test]

-        public void ReadLittleEndian()

-        {

-            AssertReadLittleEndian32(Bytes(0x78, 0x56, 0x34, 0x12), 0x12345678);

-            AssertReadLittleEndian32(Bytes(0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef0);

-

-            AssertReadLittleEndian64(Bytes(0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12),

-                                     0x123456789abcdef0L);

-            AssertReadLittleEndian64(

-                Bytes(0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef012345678UL);

-        }

-

-        [Test]

-        public void DecodeZigZag32()

-        {

-            Assert.AreEqual(0, CodedInputStream.DecodeZigZag32(0));

-            Assert.AreEqual(-1, CodedInputStream.DecodeZigZag32(1));

-            Assert.AreEqual(1, CodedInputStream.DecodeZigZag32(2));

-            Assert.AreEqual(-2, CodedInputStream.DecodeZigZag32(3));

-            Assert.AreEqual(0x3FFFFFFF, CodedInputStream.DecodeZigZag32(0x7FFFFFFE));

-            Assert.AreEqual(unchecked((int) 0xC0000000), CodedInputStream.DecodeZigZag32(0x7FFFFFFF));

-            Assert.AreEqual(0x7FFFFFFF, CodedInputStream.DecodeZigZag32(0xFFFFFFFE));

-            Assert.AreEqual(unchecked((int) 0x80000000), CodedInputStream.DecodeZigZag32(0xFFFFFFFF));

-        }

-

-        [Test]

-        public void DecodeZigZag64()

-        {

-            Assert.AreEqual(0, CodedInputStream.DecodeZigZag64(0));

-            Assert.AreEqual(-1, CodedInputStream.DecodeZigZag64(1));

-            Assert.AreEqual(1, CodedInputStream.DecodeZigZag64(2));

-            Assert.AreEqual(-2, CodedInputStream.DecodeZigZag64(3));

-            Assert.AreEqual(0x000000003FFFFFFFL, CodedInputStream.DecodeZigZag64(0x000000007FFFFFFEL));

-            Assert.AreEqual(unchecked((long) 0xFFFFFFFFC0000000L), CodedInputStream.DecodeZigZag64(0x000000007FFFFFFFL));

-            Assert.AreEqual(0x000000007FFFFFFFL, CodedInputStream.DecodeZigZag64(0x00000000FFFFFFFEL));

-            Assert.AreEqual(unchecked((long) 0xFFFFFFFF80000000L), CodedInputStream.DecodeZigZag64(0x00000000FFFFFFFFL));

-            Assert.AreEqual(0x7FFFFFFFFFFFFFFFL, CodedInputStream.DecodeZigZag64(0xFFFFFFFFFFFFFFFEL));

-            Assert.AreEqual(unchecked((long) 0x8000000000000000L), CodedInputStream.DecodeZigZag64(0xFFFFFFFFFFFFFFFFL));

-        }

-        

-        [Test]

-        public void ReadWholeMessage_VaryingBlockSizes()

-        {

-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();

-

-            byte[] rawBytes = message.ToByteArray();

-            Assert.AreEqual(rawBytes.Length, message.CalculateSize());

-            TestAllTypes message2 = TestAllTypes.Parser.ParseFrom(rawBytes);

-            Assert.AreEqual(message, message2);

-

-            // Try different block sizes.

-            for (int blockSize = 1; blockSize < 256; blockSize *= 2)

-            {

-                message2 = TestAllTypes.Parser.ParseFrom(new SmallBlockInputStream(rawBytes, blockSize));

-                Assert.AreEqual(message, message2);

-            }

-        }

-                

-        [Test]

-        public void ReadHugeBlob()

-        {

-            // Allocate and initialize a 1MB blob.

-            byte[] blob = new byte[1 << 20];

-            for (int i = 0; i < blob.Length; i++)

-            {

-                blob[i] = (byte) i;

-            }

-

-            // Make a message containing it.

-            var message = new TestAllTypes { SingleBytes = ByteString.CopyFrom(blob) };

-

-            // Serialize and parse it.  Make sure to parse from an InputStream, not

-            // directly from a ByteString, so that CodedInputStream uses buffered

-            // reading.

-            TestAllTypes message2 = TestAllTypes.Parser.ParseFrom(message.ToByteString());

-

-            Assert.AreEqual(message, message2);

-        }

-

-        [Test]

-        public void ReadMaliciouslyLargeBlob()

-        {

-            MemoryStream ms = new MemoryStream();

-            CodedOutputStream output = CodedOutputStream.CreateInstance(ms);

-

-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);

-            output.WriteRawVarint32(tag);

-            output.WriteRawVarint32(0x7FFFFFFF);

-            output.WriteRawBytes(new byte[32]); // Pad with a few random bytes.

-            output.Flush();

-            ms.Position = 0;

-

-            CodedInputStream input = CodedInputStream.CreateInstance(ms);

-            uint testtag;

-            Assert.IsTrue(input.ReadTag(out testtag));

-            Assert.AreEqual(tag, testtag);

-

-            // TODO(jonskeet): Should this be ArgumentNullException instead?

-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadBytes());

-        }

-

-        private static TestRecursiveMessage MakeRecursiveMessage(int depth)

-        {

-            if (depth == 0)

-            {

-                return new TestRecursiveMessage { I = 5 };

-            }

-            else

-            {

-                return new TestRecursiveMessage { A = MakeRecursiveMessage(depth - 1) };

-            }

-        }

-

-        private static void AssertMessageDepth(TestRecursiveMessage message, int depth)

-        {

-            if (depth == 0)

-            {

-                Assert.IsNull(message.A);

-                Assert.AreEqual(5, message.I);

-            }

-            else

-            {

-                Assert.IsNotNull(message.A);

-                AssertMessageDepth(message.A, depth - 1);

-            }

-        }

-

-        [Test]

-        public void MaliciousRecursion()

-        {

-            ByteString data64 = MakeRecursiveMessage(64).ToByteString();

-            ByteString data65 = MakeRecursiveMessage(65).ToByteString();

-

-            AssertMessageDepth(TestRecursiveMessage.Parser.ParseFrom(data64), 64);

-

-            Assert.Throws<InvalidProtocolBufferException>(() => TestRecursiveMessage.Parser.ParseFrom(data65));

-

-            CodedInputStream input = data64.CreateCodedInput();

-            input.SetRecursionLimit(8);

-            Assert.Throws<InvalidProtocolBufferException>(() => TestRecursiveMessage.Parser.ParseFrom(input));

-        }

-

-        /*

-        [Test]

-        public void SizeLimit()

-        {

-            // Have to use a Stream rather than ByteString.CreateCodedInput as SizeLimit doesn't

-            // apply to the latter case.

-            MemoryStream ms = new MemoryStream(TestUtil.GetAllSet().ToByteString().ToByteArray());

-            CodedInputStream input = CodedInputStream.CreateInstance(ms);

-            input.SetSizeLimit(16);

-

-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.ParseFrom(input));

-        }*/

-

-        [Test]

-        public void ResetSizeCounter()

-        {

-            CodedInputStream input = CodedInputStream.CreateInstance(

-                new SmallBlockInputStream(new byte[256], 8));

-            input.SetSizeLimit(16);

-            input.ReadRawBytes(16);

-

-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadRawByte());

-

-            input.ResetSizeCounter();

-            input.ReadRawByte(); // No exception thrown.

-

-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadRawBytes(16));

-        }

-

-        /// <summary>

-        /// Tests that if we read an string that contains invalid UTF-8, no exception

-        /// is thrown.  Instead, the invalid bytes are replaced with the Unicode

-        /// "replacement character" U+FFFD.

-        /// </summary>

-        [Test]

-        public void ReadInvalidUtf8()

-        {

-            MemoryStream ms = new MemoryStream();

-            CodedOutputStream output = CodedOutputStream.CreateInstance(ms);

-

-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);

-            output.WriteRawVarint32(tag);

-            output.WriteRawVarint32(1);

-            output.WriteRawBytes(new byte[] {0x80});

-            output.Flush();

-            ms.Position = 0;

-

-            CodedInputStream input = CodedInputStream.CreateInstance(ms);

-

-            uint actualTag;

-            Assert.IsTrue(input.ReadTag(out actualTag));

-            Assert.AreEqual(tag, actualTag);

-            string text = input.ReadString();

-            Assert.AreEqual('\ufffd', text[0]);

-        }

-

-        /// <summary>

-        /// A stream which limits the number of bytes it reads at a time.

-        /// We use this to make sure that CodedInputStream doesn't screw up when

-        /// reading in small blocks.

-        /// </summary>

-        private sealed class SmallBlockInputStream : MemoryStream

-        {

-            private readonly int blockSize;

-

-            public SmallBlockInputStream(byte[] data, int blockSize)

-                : base(data)

-            {

-                this.blockSize = blockSize;

-            }

-

-            public override int Read(byte[] buffer, int offset, int count)

-            {

-                return base.Read(buffer, offset, Math.Min(count, blockSize));

-            }

-        }

-

-        [Test]

-        public void TestNegativeEnum()

-        {

-            byte[] bytes = { 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01 };

-            CodedInputStream input = CodedInputStream.CreateInstance(bytes);

-            Assert.AreEqual((int)SampleEnum.NegativeValue, input.ReadEnum());

-            Assert.IsTrue(input.IsAtEnd);

-        }

-

-        //Issue 71:	CodedInputStream.ReadBytes go to slow path unnecessarily

-        [Test]

-        public void TestSlowPathAvoidance()

-        {

-            using (var ms = new MemoryStream())

-            {

-                CodedOutputStream output = CodedOutputStream.CreateInstance(ms);

-                output.WriteTag(1, WireFormat.WireType.LengthDelimited);

-                output.WriteBytes(ByteString.CopyFrom(new byte[100]));

-                output.WriteTag(2, WireFormat.WireType.LengthDelimited);

-                output.WriteBytes(ByteString.CopyFrom(new byte[100]));

-                output.Flush();

-

-                ms.Position = 0;

-                CodedInputStream input = CodedInputStream.CreateInstance(ms, new byte[ms.Length / 2]);

-

-                uint tag;

-                Assert.IsTrue(input.ReadTag(out tag));

-                Assert.AreEqual(1, WireFormat.GetTagFieldNumber(tag));

-                Assert.AreEqual(100, input.ReadBytes().Length);

-

-                Assert.IsTrue(input.ReadTag(out tag));

-                Assert.AreEqual(2, WireFormat.GetTagFieldNumber(tag));

-                Assert.AreEqual(100, input.ReadBytes().Length);

-            }

-        }

-    }

-}
\ No newline at end of file
diff --git a/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs b/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs
deleted file mode 100644
index c3d92a66..00000000
--- a/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs
+++ /dev/null
@@ -1,386 +0,0 @@
-#region Copyright notice and license

-// Protocol Buffers - Google's data interchange format

-// Copyright 2008 Google Inc.  All rights reserved.

-// https://developers.google.com/protocol-buffers/

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are

-// met:

-//

-//     * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

-//     * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following disclaimer

-// in the documentation and/or other materials provided with the

-// distribution.

-//     * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived from

-// this software without specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#endregion

-

-using System;

-using System.IO;

-using Google.Protobuf.TestProtos;

-using NUnit.Framework;

-

-namespace Google.Protobuf

-{

-    public class CodedOutputStreamTest

-    {

-        /// <summary>

-        /// Writes the given value using WriteRawVarint32() and WriteRawVarint64() and

-        /// checks that the result matches the given bytes

-        /// </summary>

-        private static void AssertWriteVarint(byte[] data, ulong value)

-        {

-            // Only do 32-bit write if the value fits in 32 bits.

-            if ((value >> 32) == 0)

-            {

-                MemoryStream rawOutput = new MemoryStream();

-                CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput);

-                output.WriteRawVarint32((uint) value);

-                output.Flush();

-                Assert.AreEqual(data, rawOutput.ToArray());

-                // Also try computing size.

-                Assert.AreEqual(data.Length, CodedOutputStream.ComputeRawVarint32Size((uint) value));

-            }

-

-            {

-                MemoryStream rawOutput = new MemoryStream();

-                CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput);

-                output.WriteRawVarint64(value);

-                output.Flush();

-                Assert.AreEqual(data, rawOutput.ToArray());

-

-                // Also try computing size.

-                Assert.AreEqual(data.Length, CodedOutputStream.ComputeRawVarint64Size(value));

-            }

-

-            // Try different buffer sizes.

-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)

-            {

-                // Only do 32-bit write if the value fits in 32 bits.

-                if ((value >> 32) == 0)

-                {

-                    MemoryStream rawOutput = new MemoryStream();

-                    CodedOutputStream output =

-                        CodedOutputStream.CreateInstance(rawOutput, bufferSize);

-                    output.WriteRawVarint32((uint) value);

-                    output.Flush();

-                    Assert.AreEqual(data, rawOutput.ToArray());

-                }

-

-                {

-                    MemoryStream rawOutput = new MemoryStream();

-                    CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput, bufferSize);

-                    output.WriteRawVarint64(value);

-                    output.Flush();

-                    Assert.AreEqual(data, rawOutput.ToArray());

-                }

-            }

-        }

-

-        /// <summary>

-        /// Tests WriteRawVarint32() and WriteRawVarint64()

-        /// </summary>

-        [Test]

-        public void WriteVarint()

-        {

-            AssertWriteVarint(new byte[] {0x00}, 0);

-            AssertWriteVarint(new byte[] {0x01}, 1);

-            AssertWriteVarint(new byte[] {0x7f}, 127);

-            // 14882

-            AssertWriteVarint(new byte[] {0xa2, 0x74}, (0x22 << 0) | (0x74 << 7));

-            // 2961488830

-            AssertWriteVarint(new byte[] {0xbe, 0xf7, 0x92, 0x84, 0x0b},

-                              (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |

-                              (0x0bL << 28));

-

-            // 64-bit

-            // 7256456126

-            AssertWriteVarint(new byte[] {0xbe, 0xf7, 0x92, 0x84, 0x1b},

-                              (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |

-                              (0x1bL << 28));

-            // 41256202580718336

-            AssertWriteVarint(

-                new byte[] {0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49},

-                (0x00 << 0) | (0x66 << 7) | (0x6b << 14) | (0x1c << 21) |

-                (0x43UL << 28) | (0x49L << 35) | (0x24UL << 42) | (0x49UL << 49));

-            // 11964378330978735131

-            AssertWriteVarint(

-                new byte[] {0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01},

-                unchecked((ulong)

-                          ((0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) |

-                           (0x3bL << 28) | (0x56L << 35) | (0x00L << 42) |

-                           (0x05L << 49) | (0x26L << 56) | (0x01L << 63))));

-        }

-

-        /// <summary>

-        /// Parses the given bytes using WriteRawLittleEndian32() and checks

-        /// that the result matches the given value.

-        /// </summary>

-        private static void AssertWriteLittleEndian32(byte[] data, uint value)

-        {

-            MemoryStream rawOutput = new MemoryStream();

-            CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput);

-            output.WriteRawLittleEndian32(value);

-            output.Flush();

-            Assert.AreEqual(data, rawOutput.ToArray());

-

-            // Try different buffer sizes.

-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)

-            {

-                rawOutput = new MemoryStream();

-                output = CodedOutputStream.CreateInstance(rawOutput, bufferSize);

-                output.WriteRawLittleEndian32(value);

-                output.Flush();

-                Assert.AreEqual(data, rawOutput.ToArray());

-            }

-        }

-

-        /// <summary>

-        /// Parses the given bytes using WriteRawLittleEndian64() and checks

-        /// that the result matches the given value.

-        /// </summary>

-        private static void AssertWriteLittleEndian64(byte[] data, ulong value)

-        {

-            MemoryStream rawOutput = new MemoryStream();

-            CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput);

-            output.WriteRawLittleEndian64(value);

-            output.Flush();

-            Assert.AreEqual(data, rawOutput.ToArray());

-

-            // Try different block sizes.

-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)

-            {

-                rawOutput = new MemoryStream();

-                output = CodedOutputStream.CreateInstance(rawOutput, blockSize);

-                output.WriteRawLittleEndian64(value);

-                output.Flush();

-                Assert.AreEqual(data, rawOutput.ToArray());

-            }

-        }

-

-        /// <summary>

-        /// Tests writeRawLittleEndian32() and writeRawLittleEndian64().

-        /// </summary>

-        [Test]

-        public void WriteLittleEndian()

-        {

-            AssertWriteLittleEndian32(new byte[] {0x78, 0x56, 0x34, 0x12}, 0x12345678);

-            AssertWriteLittleEndian32(new byte[] {0xf0, 0xde, 0xbc, 0x9a}, 0x9abcdef0);

-

-            AssertWriteLittleEndian64(

-                new byte[] {0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12},

-                0x123456789abcdef0L);

-            AssertWriteLittleEndian64(

-                new byte[] {0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a},

-                0x9abcdef012345678UL);

-        }

-

-        [Test]

-        public void WriteWholeMessage_VaryingBlockSizes()

-        {

-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();

-

-            byte[] rawBytes = message.ToByteArray();

-

-            // Try different block sizes.

-            for (int blockSize = 1; blockSize < 256; blockSize *= 2)

-            {

-                MemoryStream rawOutput = new MemoryStream();

-                CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput, blockSize);

-                message.WriteTo(output);

-                output.Flush();

-                Assert.AreEqual(rawBytes, rawOutput.ToArray());

-            }

-        }

-        

-        [Test]

-        public void EncodeZigZag32()

-        {

-            Assert.AreEqual(0u, CodedOutputStream.EncodeZigZag32(0));

-            Assert.AreEqual(1u, CodedOutputStream.EncodeZigZag32(-1));

-            Assert.AreEqual(2u, CodedOutputStream.EncodeZigZag32(1));

-            Assert.AreEqual(3u, CodedOutputStream.EncodeZigZag32(-2));

-            Assert.AreEqual(0x7FFFFFFEu, CodedOutputStream.EncodeZigZag32(0x3FFFFFFF));

-            Assert.AreEqual(0x7FFFFFFFu, CodedOutputStream.EncodeZigZag32(unchecked((int) 0xC0000000)));

-            Assert.AreEqual(0xFFFFFFFEu, CodedOutputStream.EncodeZigZag32(0x7FFFFFFF));

-            Assert.AreEqual(0xFFFFFFFFu, CodedOutputStream.EncodeZigZag32(unchecked((int) 0x80000000)));

-        }

-

-        [Test]

-        public void EncodeZigZag64()

-        {

-            Assert.AreEqual(0u, CodedOutputStream.EncodeZigZag64(0));

-            Assert.AreEqual(1u, CodedOutputStream.EncodeZigZag64(-1));

-            Assert.AreEqual(2u, CodedOutputStream.EncodeZigZag64(1));

-            Assert.AreEqual(3u, CodedOutputStream.EncodeZigZag64(-2));

-            Assert.AreEqual(0x000000007FFFFFFEuL,

-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0x000000003FFFFFFFUL)));

-            Assert.AreEqual(0x000000007FFFFFFFuL,

-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0xFFFFFFFFC0000000UL)));

-            Assert.AreEqual(0x00000000FFFFFFFEuL,

-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0x000000007FFFFFFFUL)));

-            Assert.AreEqual(0x00000000FFFFFFFFuL,

-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0xFFFFFFFF80000000UL)));

-            Assert.AreEqual(0xFFFFFFFFFFFFFFFEL,

-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0x7FFFFFFFFFFFFFFFUL)));

-            Assert.AreEqual(0xFFFFFFFFFFFFFFFFL,

-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0x8000000000000000UL)));

-        }

-

-        [Test]

-        public void RoundTripZigZag32()

-        {

-            // Some easier-to-verify round-trip tests.  The inputs (other than 0, 1, -1)

-            // were chosen semi-randomly via keyboard bashing.

-            Assert.AreEqual(0, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(0)));

-            Assert.AreEqual(1, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(1)));

-            Assert.AreEqual(-1, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(-1)));

-            Assert.AreEqual(14927, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(14927)));

-            Assert.AreEqual(-3612, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(-3612)));

-        }

-

-        [Test]

-        public void RoundTripZigZag64()

-        {

-            Assert.AreEqual(0, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(0)));

-            Assert.AreEqual(1, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(1)));

-            Assert.AreEqual(-1, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-1)));

-            Assert.AreEqual(14927, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(14927)));

-            Assert.AreEqual(-3612, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-3612)));

-

-            Assert.AreEqual(856912304801416L,

-                            CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(856912304801416L)));

-            Assert.AreEqual(-75123905439571256L,

-                            CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-75123905439571256L)));

-        }

-

-        [Test]

-        public void TestNegativeEnumNoTag()

-        {

-            Assert.AreEqual(10, CodedOutputStream.ComputeInt32Size(-2));

-            Assert.AreEqual(10, CodedOutputStream.ComputeEnumSize((int) SampleEnum.NegativeValue));

-

-            byte[] bytes = new byte[10];

-            CodedOutputStream output = CodedOutputStream.CreateInstance(bytes);

-            output.WriteEnum((int) SampleEnum.NegativeValue);

-

-            Assert.AreEqual(0, output.SpaceLeft);

-            Assert.AreEqual("FE-FF-FF-FF-FF-FF-FF-FF-FF-01", BitConverter.ToString(bytes));

-        }

-

-        [Test]

-        public void TestCodedInputOutputPosition()

-        {

-            byte[] content = new byte[110];

-            for (int i = 0; i < content.Length; i++)

-                content[i] = (byte)i;

-

-            byte[] child = new byte[120];

-            {

-                MemoryStream ms = new MemoryStream(child);

-                CodedOutputStream cout = CodedOutputStream.CreateInstance(ms, 20);

-                // Field 11: numeric value: 500

-                cout.WriteTag(11, WireFormat.WireType.Varint);

-                Assert.AreEqual(1, cout.Position);

-                cout.WriteInt32(500);

-                Assert.AreEqual(3, cout.Position);

-                //Field 12: length delimited 120 bytes

-                cout.WriteTag(12, WireFormat.WireType.LengthDelimited);

-                Assert.AreEqual(4, cout.Position);

-                cout.WriteBytes(ByteString.CopyFrom(content));

-                Assert.AreEqual(115, cout.Position);

-                // Field 13: fixed numeric value: 501

-                cout.WriteTag(13, WireFormat.WireType.Fixed32);

-                Assert.AreEqual(116, cout.Position);

-                cout.WriteSFixed32(501);

-                Assert.AreEqual(120, cout.Position);

-                cout.Flush();

-            }

-

-            byte[] bytes = new byte[130];

-            {

-                CodedOutputStream cout = CodedOutputStream.CreateInstance(bytes);

-                // Field 1: numeric value: 500

-                cout.WriteTag(1, WireFormat.WireType.Varint);

-                Assert.AreEqual(1, cout.Position);

-                cout.WriteInt32(500);

-                Assert.AreEqual(3, cout.Position);

-                //Field 2: length delimited 120 bytes

-                cout.WriteTag(2, WireFormat.WireType.LengthDelimited);

-                Assert.AreEqual(4, cout.Position);

-                cout.WriteBytes(ByteString.CopyFrom(child));

-                Assert.AreEqual(125, cout.Position);

-                // Field 3: fixed numeric value: 500

-                cout.WriteTag(3, WireFormat.WireType.Fixed32);

-                Assert.AreEqual(126, cout.Position);

-                cout.WriteSFixed32(501);

-                Assert.AreEqual(130, cout.Position);

-                cout.Flush();

-            }

-            // Now test Input stream:

-            {

-                CodedInputStream cin = CodedInputStream.CreateInstance(new MemoryStream(bytes), new byte[50]);

-                uint tag;

-                Assert.AreEqual(0, cin.Position);

-                // Field 1:

-                Assert.IsTrue(cin.ReadTag(out tag) && tag >> 3 == 1);

-                Assert.AreEqual(1, cin.Position);

-                Assert.AreEqual(500, cin.ReadInt32());

-                Assert.AreEqual(3, cin.Position);

-                //Field 2:

-                Assert.IsTrue(cin.ReadTag(out tag) && tag >> 3 == 2);

-                Assert.AreEqual(4, cin.Position);

-                int childlen = cin.ReadLength();

-                Assert.AreEqual(120, childlen);

-                Assert.AreEqual(5, cin.Position);

-                int oldlimit = cin.PushLimit((int)childlen);

-                Assert.AreEqual(5, cin.Position);

-                // Now we are reading child message

-                {

-                    // Field 11: numeric value: 500

-                    Assert.IsTrue(cin.ReadTag(out tag) && tag >> 3 == 11);

-                    Assert.AreEqual(6, cin.Position);

-                    Assert.AreEqual(500, cin.ReadInt32());

-                    Assert.AreEqual(8, cin.Position);

-                    //Field 12: length delimited 120 bytes

-                    Assert.IsTrue(cin.ReadTag(out tag) && tag >> 3 == 12);

-                    Assert.AreEqual(9, cin.Position);

-                    ByteString bstr = cin.ReadBytes();

-                    Assert.AreEqual(110, bstr.Length);

-                    Assert.AreEqual((byte) 109, bstr[109]);

-                    Assert.AreEqual(120, cin.Position);

-                    // Field 13: fixed numeric value: 501

-                    Assert.IsTrue(cin.ReadTag(out tag) && tag >> 3 == 13);

-                    // ROK - Previously broken here, this returned 126 failing to account for bufferSizeAfterLimit

-                    Assert.AreEqual(121, cin.Position);

-                    Assert.AreEqual(501, cin.ReadSFixed32());

-                    Assert.AreEqual(125, cin.Position);

-                    Assert.IsTrue(cin.IsAtEnd);

-                }

-                cin.PopLimit(oldlimit);

-                Assert.AreEqual(125, cin.Position);

-                // Field 3: fixed numeric value: 501

-                Assert.IsTrue(cin.ReadTag(out tag) && tag >> 3 == 3);

-                Assert.AreEqual(126, cin.Position);

-                Assert.AreEqual(501, cin.ReadSFixed32());

-                Assert.AreEqual(130, cin.Position);

-                Assert.IsTrue(cin.IsAtEnd);

-            }

-        }

-    }

-}
\ No newline at end of file
diff --git a/csharp/src/ProtocolBuffers.Test/Collections/MapFieldTest.cs b/csharp/src/ProtocolBuffers.Test/Collections/MapFieldTest.cs
deleted file mode 100644
index 46d3bd9a..00000000
--- a/csharp/src/ProtocolBuffers.Test/Collections/MapFieldTest.cs
+++ /dev/null
@@ -1,541 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System.Collections;
-using System.Linq;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// Tests for MapField which aren't reliant on the encoded format -
-    /// tests for serialization/deserialization are part of GeneratedMessageTest.
-    /// </summary>
-    public class MapFieldTest
-    {
-        // Protobuf-specific tests
-        [Test]
-        public void Freeze_FreezesMessages()
-        {
-            var message = new ForeignMessage { C = 20 };
-            var map = new MapField<string, ForeignMessage> { { "x", message } };
-            map.Freeze();
-            Assert.IsTrue(message.IsFrozen);
-        }
-
-        [Test]
-        public void Freeze_Idempotent()
-        {
-            var message = new ForeignMessage { C = 20 };
-            var map = new MapField<string, ForeignMessage> { { "x", message } };
-            Assert.IsFalse(map.IsFrozen);
-            map.Freeze();
-            Assert.IsTrue(message.IsFrozen);
-            map.Freeze();
-            Assert.IsTrue(message.IsFrozen);
-        }
-
-        [Test]
-        public void Freeze_PreventsMutation()
-        {
-            var map = new MapField<string, string>();
-            map.Freeze();
-            Assert.IsTrue(map.IsFrozen);
-            Assert.IsTrue(map.IsReadOnly);
-            ICollection<KeyValuePair<string, string>> collection = map;
-            Assert.Throws<InvalidOperationException>(() => map["x"] = "y");
-            Assert.Throws<InvalidOperationException>(() => map.Add("x", "y"));
-            Assert.Throws<InvalidOperationException>(() => map.Remove("x"));
-            Assert.Throws<InvalidOperationException>(() => map.Clear());
-            Assert.Throws<InvalidOperationException>(() => collection.Add(NewKeyValuePair("x", "y")));
-            Assert.Throws<InvalidOperationException>(() => collection.Remove(NewKeyValuePair("x", "y")));
-        }
-
-        [Test]
-        public void Clone_ReturnsNonFrozen()
-        {
-            var map = new MapField<string, string>();
-            map.Freeze();
-            var clone = map.Clone();
-            clone.Add("x", "y");
-        }
-
-        [Test]
-        public void Clone_ClonesMessages()
-        {
-            var message = new ForeignMessage { C = 20 };
-            var map = new MapField<string, ForeignMessage> { { "x", message } };
-            var clone = map.Clone();
-            map["x"].C = 30;
-            Assert.AreEqual(20, clone["x"].C);
-        }
-
-        [Test]
-        public void NullValues()
-        {
-            TestNullValues<int?>(0);
-            TestNullValues("");
-            TestNullValues(new TestAllTypes());
-        }
-
-        private void TestNullValues<T>(T nonNullValue)
-        {
-            var map = new MapField<int, T>(false);
-            var nullValue = (T) (object) null;
-            Assert.Throws<ArgumentNullException>(() => map.Add(0, nullValue));
-            Assert.Throws<ArgumentNullException>(() => map[0] = nullValue);
-            map.Add(1, nonNullValue);
-            map[1] = nonNullValue;
-
-            // Doesn't throw...
-            map = new MapField<int, T>(true);
-            map.Add(0, nullValue);
-            map[0] = nullValue;
-            map.Add(1, nonNullValue);
-            map[1] = nonNullValue;
-        }
-
-        [Test]
-        public void Add_ForbidsNullKeys()
-        {
-            var map = new MapField<string, ForeignMessage>();
-            Assert.Throws<ArgumentNullException>(() => map.Add(null, new ForeignMessage()));
-        }
-
-        [Test]
-        public void Indexer_ForbidsNullKeys()
-        {
-            var map = new MapField<string, ForeignMessage>();
-            Assert.Throws<ArgumentNullException>(() => map[null] = new ForeignMessage());
-        }
-        
-        [Test]
-        public void AddPreservesInsertionOrder()
-        {
-            var map = new MapField<string, string>();
-            map.Add("a", "v1");
-            map.Add("b", "v2");
-            map.Add("c", "v3");
-            map.Remove("b");
-            map.Add("d", "v4");
-            CollectionAssert.AreEqual(new[] { "a", "c", "d" }, map.Keys);
-            CollectionAssert.AreEqual(new[] { "v1", "v3", "v4" }, map.Values);
-        }
-
-        [Test]
-        public void EqualityIsOrderInsensitive()
-        {
-            var map1 = new MapField<string, string>();
-            map1.Add("a", "v1");
-            map1.Add("b", "v2");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("b", "v2");
-            map2.Add("a", "v1");
-
-            EqualityTester.AssertEquality(map1, map2);
-        }
-
-        [Test]
-        public void EqualityIsKeySensitive()
-        {
-            var map1 = new MapField<string, string>();
-            map1.Add("first key", "v1");
-            map1.Add("second key", "v2");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("third key", "v1");
-            map2.Add("fourth key", "v2");
-
-            EqualityTester.AssertInequality(map1, map2);
-        }
-
-        [Test]
-        public void Equality_Simple()
-        {
-            var map = new MapField<string, string>();
-            EqualityTester.AssertEquality(map, map);
-            EqualityTester.AssertInequality(map, null);
-            Assert.IsFalse(map.Equals(new object()));
-        }
-
-        [Test]
-        public void EqualityIsValueSensitive()
-        {
-            // Note: Without some care, it's a little easier than one might
-            // hope to see hash collisions, but only in some environments...
-            var map1 = new MapField<string, string>();
-            map1.Add("a", "first value");
-            map1.Add("b", "second value");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("a", "third value");
-            map2.Add("b", "fourth value");
-
-            EqualityTester.AssertInequality(map1, map2);
-        }
-
-        [Test]
-        public void EqualityHandlesNullValues()
-        {
-            var map1 = new MapField<string, ForeignMessage>();
-            map1.Add("a", new ForeignMessage { C = 10 });
-            map1.Add("b", null);
-
-            var map2 = new MapField<string, ForeignMessage>();
-            map2.Add("a", new ForeignMessage { C = 10 });
-            map2.Add("b", null);
-
-            EqualityTester.AssertEquality(map1, map2);
-            // Check the null value isn't ignored entirely...
-            Assert.IsTrue(map1.Remove("b"));
-            EqualityTester.AssertInequality(map1, map2);
-            map1.Add("b", new ForeignMessage());
-            EqualityTester.AssertInequality(map1, map2);
-            map1["b"] = null;
-            EqualityTester.AssertEquality(map1, map2);
-        }
-
-        [Test]
-        public void Add_Dictionary()
-        {
-            var map1 = new MapField<string, string>
-            {
-                { "x", "y" },
-                { "a", "b" }
-            };
-            var map2 = new MapField<string, string>
-            {
-                { "before", "" },
-                map1,
-                { "after", "" }
-            };
-            var expected = new MapField<string, string>
-            {
-                { "before", "" },
-                { "x", "y" },
-                { "a", "b" },
-                { "after", "" }
-            };
-            Assert.AreEqual(expected, map2);
-            CollectionAssert.AreEqual(new[] { "before", "x", "a", "after" }, map2.Keys);
-        }
-
-        // General IDictionary<TKey, TValue> behavior tests
-        [Test]
-        public void Add_KeyAlreadyExists()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            Assert.Throws<ArgumentException>(() => map.Add("foo", "baz"));
-        }
-
-        [Test]
-        public void Add_Pair()
-        {
-            var map = new MapField<string, string>();
-            ICollection<KeyValuePair<string, string>> collection = map;
-            collection.Add(NewKeyValuePair("x", "y"));
-            Assert.AreEqual("y", map["x"]);
-            Assert.Throws<ArgumentException>(() => collection.Add(NewKeyValuePair("x", "z")));
-        }
-
-        [Test]
-        public void Contains_Pair()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            ICollection<KeyValuePair<string, string>> collection = map;
-            Assert.IsTrue(collection.Contains(NewKeyValuePair("x", "y")));
-            Assert.IsFalse(collection.Contains(NewKeyValuePair("x", "z")));
-            Assert.IsFalse(collection.Contains(NewKeyValuePair("z", "y")));
-        }
-
-        [Test]
-        public void Remove_Key()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(map.Remove("missing"));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsTrue(map.Remove("foo"));
-            Assert.AreEqual(0, map.Count);
-            Assert.Throws<ArgumentNullException>(() => map.Remove(null));
-        }
-
-        [Test]
-        public void Remove_Pair()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            ICollection<KeyValuePair<string, string>> collection = map;
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(collection.Remove(NewKeyValuePair("wrong key", "bar")));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(collection.Remove(NewKeyValuePair("foo", "wrong value")));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsTrue(collection.Remove(NewKeyValuePair("foo", "bar")));
-            Assert.AreEqual(0, map.Count);
-            Assert.Throws<ArgumentException>(() => collection.Remove(new KeyValuePair<string, string>(null, "")));
-        }
-
-        [Test]
-        public void CopyTo_Pair()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            ICollection<KeyValuePair<string, string>> collection = map;
-            KeyValuePair<string, string>[] array = new KeyValuePair<string, string>[3];
-            collection.CopyTo(array, 1);
-            Assert.AreEqual(NewKeyValuePair("foo", "bar"), array[1]);
-        }
-
-        [Test]
-        public void Clear()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual(1, map.Count);
-            map.Clear();
-            Assert.AreEqual(0, map.Count);
-            map.Add("x", "y");
-            Assert.AreEqual(1, map.Count);
-        }
-
-        [Test]
-        public void Indexer_Get()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual("y", map["x"]);
-            Assert.Throws<KeyNotFoundException>(() => { var ignored = map["z"]; });
-        }
-
-        [Test]
-        public void Indexer_Set()
-        {
-            var map = new MapField<string, string>();
-            map["x"] = "y";
-            Assert.AreEqual("y", map["x"]);
-            map["x"] = "z"; // This won't throw, unlike Add.
-            Assert.AreEqual("z", map["x"]);
-        }
-
-        [Test]
-        public void GetEnumerator_NonGeneric()
-        {
-            IEnumerable map = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { new KeyValuePair<string, string>("x", "y") },
-                map.Cast<object>().ToList());
-        }
-
-        // Test for the explicitly-implemented non-generic IDictionary interface
-        [Test]
-        public void IDictionary_GetEnumerator()
-        {
-            IDictionary map = new MapField<string, string> { { "x", "y" } };
-            var enumerator = map.GetEnumerator();
-
-            // Commented assertions show an ideal situation - it looks like
-            // the LinkedList enumerator doesn't throw when you ask for the current entry
-            // at an inappropriate time; fixing this would be more work than it's worth.
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            Assert.IsTrue(enumerator.MoveNext());
-            Assert.AreEqual("x", enumerator.Key);
-            Assert.AreEqual("y", enumerator.Value);
-            Assert.AreEqual(new DictionaryEntry("x", "y"), enumerator.Current);
-            Assert.AreEqual(new DictionaryEntry("x", "y"), enumerator.Entry);
-            Assert.IsFalse(enumerator.MoveNext());
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            enumerator.Reset();
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            Assert.IsTrue(enumerator.MoveNext());
-            Assert.AreEqual("x", enumerator.Key); // Assume the rest are okay
-        }
-
-        [Test]
-        public void IDictionary_Add()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            dictionary.Add("a", "b");
-            Assert.AreEqual("b", map["a"]);
-            Assert.Throws<ArgumentException>(() => dictionary.Add("a", "duplicate"));
-            Assert.Throws<InvalidCastException>(() => dictionary.Add(new object(), "key is bad"));
-            Assert.Throws<InvalidCastException>(() => dictionary.Add("value is bad", new object()));
-        }
-
-        [Test]
-        public void IDictionary_Contains()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-
-            Assert.IsFalse(dictionary.Contains("a"));
-            Assert.IsFalse(dictionary.Contains(5));
-            // Surprising, but IDictionary.Contains is only about keys.
-            Assert.IsFalse(dictionary.Contains(new DictionaryEntry("x", "y")));
-            Assert.IsTrue(dictionary.Contains("x"));
-        }
-
-        [Test]
-        public void IDictionary_Remove()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            dictionary.Remove("a");
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove(5);
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove(new DictionaryEntry("x", "y"));
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove("x");
-            Assert.AreEqual(0, dictionary.Count);
-            Assert.Throws<ArgumentNullException>(() => dictionary.Remove(null));
-
-            map.Freeze();
-            // Call should fail even though it clearly doesn't contain 5 as a key.
-            Assert.Throws<InvalidOperationException>(() => dictionary.Remove(5));
-        }
-
-        [Test]
-        public void IDictionary_CopyTo()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            var array = new DictionaryEntry[3];
-            dictionary.CopyTo(array, 1);
-            CollectionAssert.AreEqual(new[] { default(DictionaryEntry), new DictionaryEntry("x", "y"), default(DictionaryEntry) },
-                array);
-            var objectArray = new object[3];
-            dictionary.CopyTo(objectArray, 1);
-            CollectionAssert.AreEqual(new object[] { null, new DictionaryEntry("x", "y"), null },
-                objectArray);
-        }
-
-        [Test]
-        public void IDictionary_IsFixedSize()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            Assert.IsFalse(dictionary.IsFixedSize);
-            map.Freeze();
-            Assert.IsTrue(dictionary.IsFixedSize);
-        }
-
-        [Test]
-        public void IDictionary_Keys()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { "x" }, dictionary.Keys);
-        }
-
-        [Test]
-        public void IDictionary_Values()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { "y" }, dictionary.Values);
-        }
-
-        [Test]
-        public void IDictionary_IsSynchronized()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.IsFalse(dictionary.IsSynchronized);
-        }
-
-        [Test]
-        public void IDictionary_SyncRoot()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.AreSame(dictionary, dictionary.SyncRoot);
-        }
-
-        [Test]
-        public void IDictionary_Indexer_Get()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual("y", dictionary["x"]);
-            Assert.IsNull(dictionary["a"]);
-            Assert.IsNull(dictionary[5]);
-            Assert.Throws<ArgumentNullException>(() => dictionary[null].GetHashCode());
-        }
-
-        [Test]
-        public void IDictionary_Indexer_Set()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            map["a"] = "b";
-            Assert.AreEqual("b", map["a"]);
-            map["a"] = "c";
-            Assert.AreEqual("c", map["a"]);
-            Assert.Throws<InvalidCastException>(() => dictionary[5] = "x");
-            Assert.Throws<InvalidCastException>(() => dictionary["x"] = 5);
-            Assert.Throws<ArgumentNullException>(() => dictionary[null] = "z");
-            Assert.Throws<ArgumentNullException>(() => dictionary["x"] = null);
-            map.Freeze();
-            // Note: Not InvalidOperationException.
-            Assert.Throws<NotSupportedException>(() => dictionary["a"] = "c");
-        }
-
-        [Test]
-        public void AllowNullValues_Property()
-        {
-            // Non-message reference type values are non-nullable by default, but can be overridden
-            Assert.IsFalse(new MapField<int, string>().AllowsNullValues);
-            Assert.IsFalse(new MapField<int, string>(false).AllowsNullValues);
-            Assert.IsTrue(new MapField<int, string>(true).AllowsNullValues);
-
-            // Non-nullable value type values are never nullable
-            Assert.IsFalse(new MapField<int, int>().AllowsNullValues);
-            Assert.IsFalse(new MapField<int, int>(false).AllowsNullValues);
-            Assert.Throws<ArgumentException>(() => new MapField<int, int>(true));
-
-            // Message type values are nullable by default, but can be overridden
-            Assert.IsTrue(new MapField<int, TestAllTypes>().AllowsNullValues);
-            Assert.IsFalse(new MapField<int, TestAllTypes>(false).AllowsNullValues);
-            Assert.IsTrue(new MapField<int, TestAllTypes>(true).AllowsNullValues);
-
-            // Nullable value type values are nullable by default, but can be overridden
-            Assert.IsTrue(new MapField<int, int?>().AllowsNullValues);
-            Assert.IsFalse(new MapField<int, int?>(false).AllowsNullValues);
-            Assert.IsTrue(new MapField<int, int?>(true).AllowsNullValues);
-        }
-
-        private static KeyValuePair<TKey, TValue> NewKeyValuePair<TKey, TValue>(TKey key, TValue value)
-        {
-            return new KeyValuePair<TKey, TValue>(key, value);
-        }
-    }
-}
diff --git a/csharp/src/ProtocolBuffers.Test/Collections/RepeatedFieldTest.cs b/csharp/src/ProtocolBuffers.Test/Collections/RepeatedFieldTest.cs
deleted file mode 100644
index 25be7731..00000000
--- a/csharp/src/ProtocolBuffers.Test/Collections/RepeatedFieldTest.cs
+++ /dev/null
@@ -1,639 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf.Collections
-{
-    public class RepeatedFieldTest
-    {
-        [Test]
-        public void NullValuesRejected()
-        {
-            var list = new RepeatedField<string>();
-            Assert.Throws<ArgumentNullException>(() => list.Add((string)null));
-            Assert.Throws<ArgumentNullException>(() => list.Add((IEnumerable<string>)null));
-            Assert.Throws<ArgumentNullException>(() => list.Add((RepeatedField<string>)null));
-            Assert.Throws<ArgumentNullException>(() => list.Contains(null));
-            Assert.Throws<ArgumentNullException>(() => list.IndexOf(null));
-        }
-
-        [Test]
-        public void Add_SingleItem()
-        {
-            var list = new RepeatedField<string>();
-            list.Add("foo");
-            Assert.AreEqual(1, list.Count);
-            Assert.AreEqual("foo", list[0]);
-        }
-
-        [Test]
-        public void Add_Sequence()
-        {
-            var list = new RepeatedField<string>();
-            list.Add(new[] { "foo", "bar" });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual("foo", list[0]);
-            Assert.AreEqual("bar", list[1]);
-        }
-
-        [Test]
-        public void Add_RepeatedField()
-        {
-            var list = new RepeatedField<string> { "original" };
-            list.Add(new RepeatedField<string> { "foo", "bar" });
-            Assert.AreEqual(3, list.Count);
-            Assert.AreEqual("original", list[0]);
-            Assert.AreEqual("foo", list[1]);
-            Assert.AreEqual("bar", list[2]);
-        }
-
-        [Test]
-        public void RemoveAt_Valid()
-        {
-            var list = new RepeatedField<string> { "first", "second", "third" };
-            list.RemoveAt(1);
-            CollectionAssert.AreEqual(new[] { "first", "third" }, list);
-            // Just check that these don't throw...
-            list.RemoveAt(list.Count - 1); // Now the count will be 1...
-            list.RemoveAt(0);
-            Assert.AreEqual(0, list.Count);
-        }
-
-        [Test]
-        public void RemoveAt_Invalid()
-        {
-            var list = new RepeatedField<string> { "first", "second", "third" };
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.RemoveAt(-1));
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.RemoveAt(3));
-        }
-
-        [Test]
-        public void Insert_Valid()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            list.Insert(1, "middle");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second" }, list);
-            list.Insert(3, "end");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second", "end" }, list);
-            list.Insert(0, "start");
-            CollectionAssert.AreEqual(new[] { "start", "first", "middle", "second", "end" }, list);
-        }
-
-        [Test]
-        public void Insert_Invalid()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Insert(-1, "foo"));
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Insert(3, "foo"));
-            Assert.Throws<ArgumentNullException>(() => list.Insert(0, null));
-        }
-
-        [Test]
-        public void Equals_RepeatedField()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.Equals((RepeatedField<string>) null));
-            Assert.IsTrue(list.Equals(list));
-            Assert.IsFalse(list.Equals(new RepeatedField<string> { "first", "third" }));
-            Assert.IsFalse(list.Equals(new RepeatedField<string> { "first" }));
-            Assert.IsTrue(list.Equals(new RepeatedField<string> { "first", "second" }));
-        }
-
-        [Test]
-        public void Equals_Object()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.Equals((object) null));
-            Assert.IsTrue(list.Equals((object) list));
-            Assert.IsFalse(list.Equals((object) new RepeatedField<string> { "first", "third" }));
-            Assert.IsFalse(list.Equals((object) new RepeatedField<string> { "first" }));
-            Assert.IsTrue(list.Equals((object) new RepeatedField<string> { "first", "second" }));
-            Assert.IsFalse(list.Equals(new object()));
-        }
-
-        [Test]
-        public void GetEnumerator_GenericInterface()
-        {
-            IEnumerable<string> list = new RepeatedField<string> { "first", "second" };
-            // Select gets rid of the optimizations in ToList...
-            CollectionAssert.AreEqual(new[] { "first", "second" }, list.Select(x => x).ToList());
-        }
-
-        [Test]
-        public void GetEnumerator_NonGenericInterface()
-        {
-            IEnumerable list = new RepeatedField<string> { "first", "second" };
-            CollectionAssert.AreEqual(new[] { "first", "second" }, list.Cast<object>().ToList());
-        }
-
-        [Test]
-        public void CopyTo()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            string[] stringArray = new string[4];
-            list.CopyTo(stringArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first", "second", null }, stringArray);
-        }
-
-        [Test]
-        public void Indexer_Get()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.AreEqual("first", list[0]);
-            Assert.AreEqual("second", list[1]);
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[-1].GetHashCode());
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[2].GetHashCode());
-        }
-
-        [Test]
-        public void Indexer_Set()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            list[0] = "changed";
-            Assert.AreEqual("changed", list[0]);
-            Assert.Throws<ArgumentNullException>(() => list[0] = null);
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[-1] = "bad");
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[2] = "bad");
-        }
-
-        [Test]
-        public void Freeze_FreezesElements()
-        {
-            var list = new RepeatedField<TestAllTypes> { new TestAllTypes() };
-            Assert.IsFalse(list[0].IsFrozen);
-            list.Freeze();
-            Assert.IsTrue(list[0].IsFrozen);
-        }
-
-        [Test]
-        public void Freeze_PreventsMutations()
-        {
-            var list = new RepeatedField<int> { 0 };
-            list.Freeze();
-            Assert.Throws<InvalidOperationException>(() => list.Add(1));
-            Assert.Throws<InvalidOperationException>(() => list[0] = 1);
-            Assert.Throws<InvalidOperationException>(() => list.Clear());
-            Assert.Throws<InvalidOperationException>(() => list.RemoveAt(0));
-            Assert.Throws<InvalidOperationException>(() => list.Remove(0));
-            Assert.Throws<InvalidOperationException>(() => list.Insert(0, 0));
-        }
-
-        [Test]
-        public void Freeze_ReportsFrozen()
-        {
-            var list = new RepeatedField<int> { 0 };
-            Assert.IsFalse(list.IsFrozen);
-            Assert.IsFalse(list.IsReadOnly);
-            list.Freeze();
-            Assert.IsTrue(list.IsFrozen);
-            Assert.IsTrue(list.IsReadOnly);
-        }
-
-        [Test]
-        public void Clone_ReturnsMutable()
-        {
-            var list = new RepeatedField<int> { 0 };
-            list.Freeze();
-            var clone = list.Clone();
-            clone[0] = 1;
-        }
-
-        [Test]
-        public void Enumerator()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            using (var enumerator = list.GetEnumerator())
-            {
-                Assert.IsTrue(enumerator.MoveNext());
-                Assert.AreEqual("first", enumerator.Current);
-                Assert.IsTrue(enumerator.MoveNext());
-                Assert.AreEqual("second", enumerator.Current);
-                Assert.IsFalse(enumerator.MoveNext());
-                Assert.IsFalse(enumerator.MoveNext());
-            }
-        }
-
-        [Test]
-        public void AddEntriesFrom_PackedInt32()
-        {
-            uint packedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = CodedOutputStream.CreateInstance(stream);
-            var length = CodedOutputStream.ComputeInt32Size(10)
-                + CodedOutputStream.ComputeInt32Size(999)
-                + CodedOutputStream.ComputeInt32Size(-1000);
-            output.WriteTag(packedTag);
-            output.WriteRawVarint32((uint) length);
-            output.WriteInt32(10);
-            output.WriteInt32(999);
-            output.WriteInt32(-1000);
-            output.Flush();
-            stream.Position = 0;
-
-            // Deliberately "expecting" a non-packed tag, but we detect that the data is
-            // actually packed.
-            uint nonPackedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int>();
-            var input = CodedInputStream.CreateInstance(stream);
-            input.AssertNextTag(packedTag);
-            field.AddEntriesFrom(input, FieldCodec.ForInt32(nonPackedTag));
-            CollectionAssert.AreEqual(new[] { 10, 999, -1000 }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_NonPackedInt32()
-        {
-            uint nonPackedTag = WireFormat.MakeTag(10, WireFormat.WireType.Varint);
-            var stream = new MemoryStream();
-            var output = CodedOutputStream.CreateInstance(stream);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(10);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(999);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(-1000); // Just for variety...
-            output.Flush();
-            stream.Position = 0;
-
-            // Deliberately "expecting" a packed tag, but we detect that the data is
-            // actually not packed.
-            uint packedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int>();
-            var input = CodedInputStream.CreateInstance(stream);
-            input.AssertNextTag(nonPackedTag);
-            field.AddEntriesFrom(input, FieldCodec.ForInt32(packedTag));
-            CollectionAssert.AreEqual(new[] { 10, 999, -1000 }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_String()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = CodedOutputStream.CreateInstance(stream);
-            output.WriteTag(tag);
-            output.WriteString("Foo");
-            output.WriteTag(tag);
-            output.WriteString("");
-            output.WriteTag(tag);
-            output.WriteString("Bar");
-            output.Flush();
-            stream.Position = 0;
-
-            var field = new RepeatedField<string>();
-            var input = CodedInputStream.CreateInstance(stream);
-            input.AssertNextTag(tag);
-            field.AddEntriesFrom(input, FieldCodec.ForString(tag));
-            CollectionAssert.AreEqual(new[] { "Foo", "", "Bar" }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_Message()
-        {
-            var message1 = new ForeignMessage { C = 2000 };
-            var message2 = new ForeignMessage { C = -250 };
-
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = CodedOutputStream.CreateInstance(stream);
-            output.WriteTag(tag);
-            output.WriteMessage(message1);
-            output.WriteTag(tag);
-            output.WriteMessage(message2);
-            output.Flush();
-            stream.Position = 0;
-
-            var field = new RepeatedField<ForeignMessage>();
-            var input = CodedInputStream.CreateInstance(stream);
-            input.AssertNextTag(tag);
-            field.AddEntriesFrom(input, FieldCodec.ForMessage(tag, ForeignMessage.Parser));
-            CollectionAssert.AreEqual(new[] { message1, message2}, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_PackedInt32()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int> { 10, 1000, 1000000 };
-            var stream = new MemoryStream();
-            var output = CodedOutputStream.CreateInstance(stream);
-            field.WriteTo(output, FieldCodec.ForInt32(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = CodedInputStream.CreateInstance(stream);
-            input.AssertNextTag(tag);
-            var length = input.ReadLength();
-            Assert.AreEqual(10, input.ReadInt32());
-            Assert.AreEqual(1000, input.ReadInt32());
-            Assert.AreEqual(1000000, input.ReadInt32());
-            Assert.IsTrue(input.IsAtEnd);
-            Assert.AreEqual(1 + CodedOutputStream.ComputeLengthSize(length) + length, stream.Length);
-        }
-
-        [Test]
-        public void WriteTo_NonPackedInt32()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.Varint);
-            var field = new RepeatedField<int> { 10, 1000, 1000000};
-            var stream = new MemoryStream();
-            var output = CodedOutputStream.CreateInstance(stream);
-            field.WriteTo(output, FieldCodec.ForInt32(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = CodedInputStream.CreateInstance(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual(10, input.ReadInt32());
-            input.AssertNextTag(tag);
-            Assert.AreEqual(1000, input.ReadInt32());
-            input.AssertNextTag(tag);
-            Assert.AreEqual(1000000, input.ReadInt32());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_String()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<string> { "Foo", "", "Bar" };
-            var stream = new MemoryStream();
-            var output = CodedOutputStream.CreateInstance(stream);
-            field.WriteTo(output, FieldCodec.ForString(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = CodedInputStream.CreateInstance(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual("Foo", input.ReadString());
-            input.AssertNextTag(tag);
-            Assert.AreEqual("", input.ReadString());
-            input.AssertNextTag(tag);
-            Assert.AreEqual("Bar", input.ReadString());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_Message()
-        {
-            var message1 = new ForeignMessage { C = 20 };
-            var message2 = new ForeignMessage { C = 25 };
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<ForeignMessage> { message1, message2 };
-            var stream = new MemoryStream();
-            var output = CodedOutputStream.CreateInstance(stream);
-            field.WriteTo(output, FieldCodec.ForMessage(tag, ForeignMessage.Parser));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = CodedInputStream.CreateInstance(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual(message1, input.ReadMessage(ForeignMessage.Parser));
-            input.AssertNextTag(tag);
-            Assert.AreEqual(message2, input.ReadMessage(ForeignMessage.Parser));
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void CalculateSize_VariableSizeNonPacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.Varint);
-            // 2 bytes for the first entry, 3 bytes for the second, 2 bytes for the third
-            Assert.AreEqual(7, list.CalculateSize(FieldCodec.ForInt32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_FixedSizeNonPacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.Fixed32);
-            // 5 bytes for the each entry
-            Assert.AreEqual(15, list.CalculateSize(FieldCodec.ForSFixed32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_VariableSizePacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1};
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            // 1 byte for the tag, 1 byte for the length,
-            // 1 byte for the first entry, 2 bytes for the second, 1 byte for the third
-            Assert.AreEqual(6, list.CalculateSize(FieldCodec.ForInt32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_FixedSizePacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            // 1 byte for the tag, 1 byte for the length, 4 bytes per entry
-            Assert.AreEqual(14, list.CalculateSize(FieldCodec.ForSFixed32(tag)));
-        }
-
-        [Test]
-        public void TestNegativeEnumArray()
-        {
-            int arraySize = 1 + 1 + (11 * 5);
-            int msgSize = arraySize;
-            byte[] bytes = new byte[msgSize];
-            CodedOutputStream output = CodedOutputStream.CreateInstance(bytes);
-            uint tag = WireFormat.MakeTag(8, WireFormat.WireType.Varint);
-            for (int i = 0; i >= -5; i--)
-            {
-                output.WriteTag(tag);
-                output.WriteEnum(i);
-            }
-
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            CodedInputStream input = CodedInputStream.CreateInstance(bytes);
-            Assert.IsTrue(input.ReadTag(out tag));
-
-            RepeatedField<SampleEnum> values = new RepeatedField<SampleEnum>();
-            values.AddEntriesFrom(input, FieldCodec.ForEnum(tag, x => (int)x, x => (SampleEnum)x));
-
-            Assert.AreEqual(6, values.Count);
-            Assert.AreEqual(SampleEnum.None, values[0]);
-            Assert.AreEqual(((SampleEnum)(-1)), values[1]);
-            Assert.AreEqual(SampleEnum.NegativeValue, values[2]);
-            Assert.AreEqual(((SampleEnum)(-3)), values[3]);
-            Assert.AreEqual(((SampleEnum)(-4)), values[4]);
-            Assert.AreEqual(((SampleEnum)(-5)), values[5]);
-        }
-
-
-        [Test]
-        public void TestNegativeEnumPackedArray()
-        {
-            int arraySize = 1 + (10 * 5);
-            int msgSize = 1 + 1 + arraySize;
-            byte[] bytes = new byte[msgSize];
-            CodedOutputStream output = CodedOutputStream.CreateInstance(bytes);
-            // Length-delimited to show we want the packed representation
-            uint tag = WireFormat.MakeTag(8, WireFormat.WireType.LengthDelimited);
-            output.WriteTag(tag);
-            int size = 0;
-            for (int i = 0; i >= -5; i--)
-            {
-                size += CodedOutputStream.ComputeEnumSize(i);
-            }
-            output.WriteRawVarint32((uint)size);
-            for (int i = 0; i >= -5; i--)
-            {
-                output.WriteEnum(i);
-            }
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            CodedInputStream input = CodedInputStream.CreateInstance(bytes);
-            Assert.IsTrue(input.ReadTag(out tag));
-
-            RepeatedField<SampleEnum> values = new RepeatedField<SampleEnum>();
-            values.AddEntriesFrom(input, FieldCodec.ForEnum(tag, x => (int)x, x => (SampleEnum)x));
-
-            Assert.AreEqual(6, values.Count);
-            Assert.AreEqual(SampleEnum.None, values[0]);
-            Assert.AreEqual(((SampleEnum)(-1)), values[1]);
-            Assert.AreEqual(SampleEnum.NegativeValue, values[2]);
-            Assert.AreEqual(((SampleEnum)(-3)), values[3]);
-            Assert.AreEqual(((SampleEnum)(-4)), values[4]);
-            Assert.AreEqual(((SampleEnum)(-5)), values[5]);
-        }
-
-        // Fairly perfunctory tests for the non-generic IList implementation
-        [Test]
-        public void IList_Indexer()
-        {
-            var field = new RepeatedField<string> { "first", "second" };
-            IList list = field;
-            Assert.AreEqual("first", list[0]);
-            list[1] = "changed";
-            Assert.AreEqual("changed", field[1]);
-        }
-
-        [Test]
-        public void IList_Contains()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.IsTrue(list.Contains("second"));
-            Assert.IsFalse(list.Contains("third"));
-            Assert.IsFalse(list.Contains(new object()));
-        }
-
-        [Test]
-        public void IList_Add()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Add("third");
-            CollectionAssert.AreEqual(new[] { "first", "second", "third" }, list);
-        }
-
-        [Test]
-        public void IList_Remove()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Remove("third"); // No-op, no exception
-            list.Remove(new object()); // No-op, no exception
-            list.Remove("first");
-            CollectionAssert.AreEqual(new[] { "second" }, list);
-        }
-
-        [Test]
-        public void IList_IsFixedSize()
-        {
-            var field = new RepeatedField<string> { "first", "second" };
-            IList list = field;
-            Assert.IsFalse(list.IsFixedSize);
-            field.Freeze();
-            Assert.IsTrue(list.IsFixedSize);
-        }
-
-        [Test]
-        public void IList_IndexOf()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.AreEqual(1, list.IndexOf("second"));
-            Assert.AreEqual(-1, list.IndexOf("third"));
-            Assert.AreEqual(-1, list.IndexOf(new object()));
-        }
-
-        [Test]
-        public void IList_SyncRoot()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.AreSame(list, list.SyncRoot);
-        }
-
-        [Test]
-        public void IList_CopyTo()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            string[] stringArray = new string[4];
-            list.CopyTo(stringArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first",  "second", null }, stringArray);
-
-            object[] objectArray = new object[4];
-            list.CopyTo(objectArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first", "second", null }, objectArray);
-
-            Assert.Throws<ArrayTypeMismatchException>(() => list.CopyTo(new StringBuilder[4], 1));
-            Assert.Throws<ArrayTypeMismatchException>(() => list.CopyTo(new int[4], 1));
-        }
-
-        [Test]
-        public void IList_IsSynchronized()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.IsSynchronized);
-        }
-
-        [Test]
-        public void IList_Insert()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Insert(1, "middle");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second" }, list);
-        }
-    }
-}
diff --git a/csharp/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs b/csharp/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs
deleted file mode 100644
index 34d5b9f9..00000000
--- a/csharp/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#region Copyright notice and license

-// Protocol Buffers - Google's data interchange format

-// Copyright 2015 Google Inc.  All rights reserved.

-// https://developers.google.com/protocol-buffers/

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are

-// met:

-//

-//     * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

-//     * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following disclaimer

-// in the documentation and/or other materials provided with the

-// distribution.

-//     * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived from

-// this software without specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#endregion

-    

-using System;

-using System.Reflection;

-using Google.Protobuf.TestProtos;

-using NUnit.Framework;

-

-namespace Google.Protobuf

-{

-    public class DeprecatedMemberTest

-    {

-        private static void AssertIsDeprecated(MemberInfo member)

-        {

-            Assert.NotNull(member);

-            Assert.IsTrue(member.IsDefined(typeof(ObsoleteAttribute), false), "Member not obsolete: " + member);

-        }

-

-        [Test]

-        public void TestDepreatedPrimitiveValue()

-        {

-            AssertIsDeprecated(typeof(TestDeprecatedFields).GetProperty("DeprecatedInt32"));

-        }

-

-    }

-}

diff --git a/csharp/src/ProtocolBuffers.Test/EqualityTester.cs b/csharp/src/ProtocolBuffers.Test/EqualityTester.cs
deleted file mode 100644
index a669baba..00000000
--- a/csharp/src/ProtocolBuffers.Test/EqualityTester.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Helper methods when testing equality. NUnit's Assert.AreEqual and
-    /// Assert.AreNotEqual methods try to be clever with collections, which can
-    /// be annoying...
-    /// </summary>
-    internal static class EqualityTester
-    {
-        public static void AssertEquality<T>(T first, T second) where T : IEquatable<T>
-        {
-            Assert.IsTrue(first.Equals(second));
-            Assert.IsTrue(first.Equals((object) second));
-            Assert.AreEqual(first.GetHashCode(), second.GetHashCode());
-        }
-
-        public static void AssertInequality<T>(T first, T second) where T : IEquatable<T>
-        {
-            Assert.IsFalse(first.Equals(second));
-            Assert.IsFalse(first.Equals((object) second));
-            // While this isn't a requirement, the chances of this test failing due to
-            // coincidence rather than a bug are very small.
-            if (first != null && second != null)
-            {
-                Assert.AreNotEqual(first.GetHashCode(), second.GetHashCode());
-            }
-        }
-    }
-}
diff --git a/csharp/src/ProtocolBuffers.Test/FieldCodecTest.cs b/csharp/src/ProtocolBuffers.Test/FieldCodecTest.cs
deleted file mode 100644
index c6ed2a21..00000000
--- a/csharp/src/ProtocolBuffers.Test/FieldCodecTest.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class FieldCodecTest
-    {
-        private static readonly List<ICodecTestData> Codecs = new List<ICodecTestData>
-        {
-            new FieldCodecTestData<bool>(FieldCodec.ForBool(100), true, "Bool"),
-            new FieldCodecTestData<string>(FieldCodec.ForString(100), "sample", "String"),
-            new FieldCodecTestData<ByteString>(FieldCodec.ForBytes(100), ByteString.CopyFrom(1, 2, 3), "Bytes"),
-            new FieldCodecTestData<int>(FieldCodec.ForInt32(100), -1000, "Int32"),
-            new FieldCodecTestData<int>(FieldCodec.ForSInt32(100), -1000, "SInt32"),
-            new FieldCodecTestData<int>(FieldCodec.ForSFixed32(100), -1000, "SFixed32"),
-            new FieldCodecTestData<uint>(FieldCodec.ForUInt32(100), 1234, "UInt32"),
-            new FieldCodecTestData<uint>(FieldCodec.ForFixed32(100), 1234, "Fixed32"),
-            new FieldCodecTestData<long>(FieldCodec.ForInt64(100), -1000, "Int64"),
-            new FieldCodecTestData<long>(FieldCodec.ForSInt64(100), -1000, "SInt64"),
-            new FieldCodecTestData<long>(FieldCodec.ForSFixed64(100), -1000, "SFixed64"),
-            new FieldCodecTestData<ulong>(FieldCodec.ForUInt64(100), 1234, "UInt64"),
-            new FieldCodecTestData<ulong>(FieldCodec.ForFixed64(100), 1234, "Fixed64"),
-            new FieldCodecTestData<float>(FieldCodec.ForFloat(100), 1234.5f, "Float"),
-            new FieldCodecTestData<double>(FieldCodec.ForDouble(100), 1234567890.5d, "Double"),
-            new FieldCodecTestData<ForeignEnum>(
-                FieldCodec.ForEnum(100, t => (int) t, t => (ForeignEnum) t), ForeignEnum.FOREIGN_BAZ, "Enum"),
-            new FieldCodecTestData<ForeignMessage>(
-                FieldCodec.ForMessage(100, ForeignMessage.Parser), new ForeignMessage { C = 10 }, "Message"),
-        };
-
-        [Test, TestCaseSource("Codecs")]
-        public void RoundTripWithTag(ICodecTestData codec)
-        {
-            codec.TestRoundTripWithTag();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void RoundTripRaw(ICodecTestData codec)
-        {
-            codec.TestRoundTripRaw();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void CalculateSize(ICodecTestData codec)
-        {
-            codec.TestCalculateSizeWithTag();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void DefaultValue(ICodecTestData codec)
-        {
-            codec.TestDefaultValue();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void FixedSize(ICodecTestData codec)
-        {
-            codec.TestFixedSize();
-        }
-
-        // This is ugly, but it means we can have a non-generic interface.
-        // It feels like NUnit should support this better, but I don't know
-        // of any better ways right now.
-        public interface ICodecTestData
-        {
-            void TestRoundTripRaw();
-            void TestRoundTripWithTag();
-            void TestCalculateSizeWithTag();
-            void TestDefaultValue();
-            void TestFixedSize();
-        }
-
-        public class FieldCodecTestData<T> : ICodecTestData
-        {
-            private readonly FieldCodec<T> codec;
-            private readonly T sampleValue;
-            private readonly string name;
-
-            public FieldCodecTestData(FieldCodec<T> codec, T sampleValue, string name)
-            {
-                this.codec = codec;
-                this.sampleValue = sampleValue;
-                this.name = name;
-            }
-
-            public void TestRoundTripRaw()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = CodedOutputStream.CreateInstance(stream);
-                codec.ValueWriter(codedOutput, sampleValue);
-                codedOutput.Flush();
-                stream.Position = 0;
-                var codedInput = CodedInputStream.CreateInstance(stream);
-                Assert.AreEqual(sampleValue, codec.ValueReader(codedInput));
-                Assert.IsTrue(codedInput.IsAtEnd);
-            }
-
-            public void TestRoundTripWithTag()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = CodedOutputStream.CreateInstance(stream);
-                codec.WriteTagAndValue(codedOutput, sampleValue);
-                codedOutput.Flush();
-                stream.Position = 0;
-                var codedInput = CodedInputStream.CreateInstance(stream);
-                codedInput.AssertNextTag(codec.Tag);
-                Assert.AreEqual(sampleValue, codec.Read(codedInput));
-                Assert.IsTrue(codedInput.IsAtEnd);
-            }
-
-            public void TestCalculateSizeWithTag()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = CodedOutputStream.CreateInstance(stream);
-                codec.WriteTagAndValue(codedOutput, sampleValue);
-                codedOutput.Flush();
-                Assert.AreEqual(stream.Position, codec.CalculateSizeWithTag(sampleValue));
-            }
-
-            public void TestDefaultValue()
-            {
-                // WriteTagAndValue ignores default values
-                var stream = new MemoryStream();
-                var codedOutput = CodedOutputStream.CreateInstance(stream);
-                codec.WriteTagAndValue(codedOutput, codec.DefaultValue);
-                codedOutput.Flush();
-                Assert.AreEqual(0, stream.Position);
-                Assert.AreEqual(0, codec.CalculateSizeWithTag(codec.DefaultValue));
-                if (typeof(T).IsValueType)
-                {
-                    Assert.AreEqual(default(T), codec.DefaultValue);
-                }
-
-                // The plain ValueWriter/ValueReader delegates don't.
-                if (codec.DefaultValue != null) // This part isn't appropriate for message types.
-                {
-                    codedOutput = CodedOutputStream.CreateInstance(stream);
-                    codec.ValueWriter(codedOutput, codec.DefaultValue);
-                    codedOutput.Flush();
-                    Assert.AreNotEqual(0, stream.Position);
-                    Assert.AreEqual(stream.Position, codec.ValueSizeCalculator(codec.DefaultValue));
-                    stream.Position = 0;
-                    var codedInput = CodedInputStream.CreateInstance(stream);
-                    Assert.AreEqual(codec.DefaultValue, codec.ValueReader(codedInput));
-                }
-            }
-
-            public void TestFixedSize()
-            {
-                Assert.AreEqual(name.Contains("Fixed"), codec.FixedSize != 0);
-            }
-
-            public override string ToString()
-            {
-                return name;
-            }
-        }
-    }
-}
diff --git a/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs b/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
deleted file mode 100644
index acb20b15..00000000
--- a/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
+++ /dev/null
@@ -1,760 +0,0 @@
-#region Copyright notice and license

-// Protocol Buffers - Google's data interchange format

-// Copyright 2015 Google Inc.  All rights reserved.

-// https://developers.google.com/protocol-buffers/

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are

-// met:

-//

-//     * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

-//     * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following disclaimer

-// in the documentation and/or other materials provided with the

-// distribution.

-//     * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived from

-// this software without specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#endregion

-

-using System;

-using System.IO;

-using Google.Protobuf.TestProtos;

-using NUnit.Framework;

-using System.Collections;

-using System.Collections.Generic;

-

-namespace Google.Protobuf

-{

-    /// <summary>

-    /// Tests around the generated TestAllTypes message.

-    /// </summary>

-    public class GeneratedMessageTest

-    {

-        [Test]

-        public void EmptyMessageFieldDistinctFromMissingMessageField()

-        {

-            // This demonstrates what we're really interested in...

-            var message1 = new TestAllTypes { SingleForeignMessage = new ForeignMessage() };

-            var message2 = new TestAllTypes(); // SingleForeignMessage is null

-            EqualityTester.AssertInequality(message1, message2);

-        }

-

-        [Test]

-        public void DefaultValues()

-        {

-            // Single fields

-            var message = new TestAllTypes();

-            Assert.AreEqual(false, message.SingleBool);

-            Assert.AreEqual(ByteString.Empty, message.SingleBytes);

-            Assert.AreEqual(0.0, message.SingleDouble);

-            Assert.AreEqual(0, message.SingleFixed32);

-            Assert.AreEqual(0L, message.SingleFixed64);

-            Assert.AreEqual(0.0f, message.SingleFloat);

-            Assert.AreEqual(ForeignEnum.FOREIGN_UNSPECIFIED, message.SingleForeignEnum);

-            Assert.IsNull(message.SingleForeignMessage);

-            Assert.AreEqual(ImportEnum.IMPORT_ENUM_UNSPECIFIED, message.SingleImportEnum);

-            Assert.IsNull(message.SingleImportMessage);

-            Assert.AreEqual(0, message.SingleInt32);

-            Assert.AreEqual(0L, message.SingleInt64);

-            Assert.AreEqual(TestAllTypes.Types.NestedEnum.NESTED_ENUM_UNSPECIFIED, message.SingleNestedEnum);

-            Assert.IsNull(message.SingleNestedMessage);

-            Assert.IsNull(message.SinglePublicImportMessage);

-            Assert.AreEqual(0, message.SingleSfixed32);

-            Assert.AreEqual(0L, message.SingleSfixed64);

-            Assert.AreEqual(0, message.SingleSint32);

-            Assert.AreEqual(0L, message.SingleSint64);

-            Assert.AreEqual("", message.SingleString);

-            Assert.AreEqual(0U, message.SingleUint32);

-            Assert.AreEqual(0UL, message.SingleUint64);

-

-            // Repeated fields

-            Assert.AreEqual(0, message.RepeatedBool.Count);

-            Assert.AreEqual(0, message.RepeatedBytes.Count);

-            Assert.AreEqual(0, message.RepeatedDouble.Count);

-            Assert.AreEqual(0, message.RepeatedFixed32.Count);

-            Assert.AreEqual(0, message.RepeatedFixed64.Count);

-            Assert.AreEqual(0, message.RepeatedFloat.Count);

-            Assert.AreEqual(0, message.RepeatedForeignEnum.Count);

-            Assert.AreEqual(0, message.RepeatedForeignMessage.Count);

-            Assert.AreEqual(0, message.RepeatedImportEnum.Count);

-            Assert.AreEqual(0, message.RepeatedImportMessage.Count);

-            Assert.AreEqual(0, message.RepeatedNestedEnum.Count);

-            Assert.AreEqual(0, message.RepeatedNestedMessage.Count);

-            Assert.AreEqual(0, message.RepeatedPublicImportMessage.Count);

-            Assert.AreEqual(0, message.RepeatedSfixed32.Count);

-            Assert.AreEqual(0, message.RepeatedSfixed64.Count);

-            Assert.AreEqual(0, message.RepeatedSint32.Count);

-            Assert.AreEqual(0, message.RepeatedSint64.Count);

-            Assert.AreEqual(0, message.RepeatedString.Count);

-            Assert.AreEqual(0, message.RepeatedUint32.Count);

-            Assert.AreEqual(0, message.RepeatedUint64.Count);

-

-            // Oneof fields

-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);

-            Assert.AreEqual(0, message.OneofUint32);

-            Assert.AreEqual("", message.OneofString);

-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);

-            Assert.IsNull(message.OneofNestedMessage);

-        }

-

-        [Test]

-        public void RoundTrip_Empty()

-        {

-            var message = new TestAllTypes();

-            // Without setting any values, there's nothing to write.

-            byte[] bytes = message.ToByteArray();

-            Assert.AreEqual(0, bytes.Length);

-            TestAllTypes parsed = TestAllTypes.Parser.ParseFrom(bytes);

-            Assert.AreEqual(message, parsed);

-        }

-

-        [Test]

-        public void RoundTrip_SingleValues()

-        {

-            var message = new TestAllTypes

-            {

-                SingleBool = true,

-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),

-                SingleDouble = 23.5,

-                SingleFixed32 = 23,

-                SingleFixed64 = 1234567890123,

-                SingleFloat = 12.25f,

-                SingleForeignEnum = ForeignEnum.FOREIGN_BAR,

-                SingleForeignMessage = new ForeignMessage { C = 10 },

-                SingleImportEnum = ImportEnum.IMPORT_BAZ,

-                SingleImportMessage = new ImportMessage { D = 20 },

-                SingleInt32 = 100,

-                SingleInt64 = 3210987654321,

-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.FOO,

-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },

-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },

-                SingleSfixed32 = -123,

-                SingleSfixed64 = -12345678901234,

-                SingleSint32 = -456,

-                SingleSint64 = -12345678901235,

-                SingleString = "test",

-                SingleUint32 = uint.MaxValue,

-                SingleUint64 = ulong.MaxValue

-            };

-

-            byte[] bytes = message.ToByteArray();

-            TestAllTypes parsed = TestAllTypes.Parser.ParseFrom(bytes);

-            Assert.AreEqual(message, parsed);

-        }

-

-        [Test]

-        public void RoundTrip_RepeatedValues()

-        {

-            var message = new TestAllTypes

-            {

-                RepeatedBool = { true, false },

-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6) },

-                RepeatedDouble = { -12.25, 23.5 },

-                RepeatedFixed32 = { uint.MaxValue, 23 },

-                RepeatedFixed64 = { ulong.MaxValue, 1234567890123 },

-                RepeatedFloat = { 100f, 12.25f },

-                RepeatedForeignEnum = { ForeignEnum.FOREIGN_FOO, ForeignEnum.FOREIGN_BAR },

-                RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } },

-                RepeatedImportEnum = { ImportEnum.IMPORT_BAZ, ImportEnum.IMPORT_ENUM_UNSPECIFIED },

-                RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } },

-                RepeatedInt32 = { 100, 200 },

-                RepeatedInt64 = { 3210987654321, long.MaxValue },

-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.FOO, TestAllTypes.Types.NestedEnum.NEG },

-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } },

-                RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } },

-                RepeatedSfixed32 = { -123, 123 },

-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },

-                RepeatedSint32 = { -456, 100 },

-                RepeatedSint64 = { -12345678901235, 123 },

-                RepeatedString = { "foo", "bar" },

-                RepeatedUint32 = { uint.MaxValue, uint.MinValue },

-                RepeatedUint64 = { ulong.MaxValue, uint.MinValue }

-            };

-

-            byte[] bytes = message.ToByteArray();

-            TestAllTypes parsed = TestAllTypes.Parser.ParseFrom(bytes);

-            Assert.AreEqual(message, parsed);

-        }

-

-        // Note that not every map within map_unittest_proto3 is used. They all go through very

-        // similar code paths. The fact that all maps are present is validation that we have codecs

-        // for every type.

-        [Test]

-        public void RoundTrip_Maps()

-        {

-            var message = new TestMap

-            {

-                MapBoolBool = {

-                    { false, true },

-                    { true, false }

-                },

-                MapInt32Bytes = {

-                    { 5, ByteString.CopyFrom(6, 7, 8) },

-                    { 25, ByteString.CopyFrom(1, 2, 3, 4, 5) },

-                    { 10, ByteString.Empty }

-                },

-                MapInt32ForeignMessage = {

-                    { 0, new ForeignMessage { C = 10 } },

-                    { 5, null },

-                },

-                MapInt32Enum = {

-                    { 1, MapEnum.MAP_ENUM_BAR },

-                    { 2000, MapEnum.MAP_ENUM_FOO }

-                }

-            };

-

-            byte[] bytes = message.ToByteArray();

-            TestMap parsed = TestMap.Parser.ParseFrom(bytes);

-            Assert.AreEqual(message, parsed);

-        }

-

-        [Test]

-        public void MapWithEmptyEntry()

-        {

-            var message = new TestMap

-            {

-                MapInt32Bytes = { { 0, ByteString.Empty } }

-            };

-

-            byte[] bytes = message.ToByteArray();

-            Assert.AreEqual(2, bytes.Length); // Tag for field entry (1 byte), length of entry (0; 1 byte)

-

-            var parsed = TestMap.Parser.ParseFrom(bytes);

-            Assert.AreEqual(1, parsed.MapInt32Bytes.Count);

-            Assert.AreEqual(ByteString.Empty, parsed.MapInt32Bytes[0]);

-        }

-        

-        [Test]

-        public void MapWithOnlyValue()

-        {

-            // Hand-craft the stream to contain a single entry with just a value.

-            var memoryStream = new MemoryStream();

-            var output = CodedOutputStream.CreateInstance(memoryStream);

-            output.WriteTag(TestMap.MapInt32ForeignMessageFieldNumber, WireFormat.WireType.LengthDelimited);

-            var nestedMessage = new ForeignMessage { C = 20 };

-            // Size of the entry (tag, size written by WriteMessage, data written by WriteMessage)

-            output.WriteRawVarint32((uint)(nestedMessage.CalculateSize() + 3));

-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);

-            output.WriteMessage(nestedMessage);

-            output.Flush();

-

-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());

-            Assert.AreEqual(nestedMessage, parsed.MapInt32ForeignMessage[0]);

-        }

-

-        [Test]

-        public void MapIgnoresExtraFieldsWithinEntryMessages()

-        {

-            // Hand-craft the stream to contain a single entry with three fields

-            var memoryStream = new MemoryStream();

-            var output = CodedOutputStream.CreateInstance(memoryStream);

-

-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);

-

-            var key = 10; // Field 1 

-            var value = 20; // Field 2

-            var extra = 30; // Field 3

-

-            // Each field can be represented in a single byte, with a single byte tag.

-            // Total message size: 6 bytes.

-            output.WriteRawVarint32(6);

-            output.WriteTag(1, WireFormat.WireType.Varint);

-            output.WriteInt32(key);

-            output.WriteTag(2, WireFormat.WireType.Varint);

-            output.WriteInt32(value);

-            output.WriteTag(3, WireFormat.WireType.Varint);

-            output.WriteInt32(extra);

-            output.Flush();

-

-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());

-            Assert.AreEqual(value, parsed.MapInt32Int32[key]);

-        }

-

-        [Test]

-        public void MapFieldOrderIsIrrelevant()

-        {

-            var memoryStream = new MemoryStream();

-            var output = CodedOutputStream.CreateInstance(memoryStream);

-

-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);

-

-            var key = 10;

-            var value = 20;

-

-            // Each field can be represented in a single byte, with a single byte tag.

-            // Total message size: 4 bytes.

-            output.WriteRawVarint32(4);

-            output.WriteTag(2, WireFormat.WireType.Varint);

-            output.WriteInt32(value);

-            output.WriteTag(1, WireFormat.WireType.Varint);

-            output.WriteInt32(key);

-            output.Flush();

-

-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());

-            Assert.AreEqual(value, parsed.MapInt32Int32[key]);

-        }

-

-        [Test]

-        public void MapNonContiguousEntries()

-        {

-            var memoryStream = new MemoryStream();

-            var output = CodedOutputStream.CreateInstance(memoryStream);

-

-            // Message structure:

-            // Entry for MapInt32Int32

-            // Entry for MapStringString

-            // Entry for MapInt32Int32

-

-            // First entry

-            var key1 = 10;

-            var value1 = 20;

-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);

-            output.WriteRawVarint32(4);

-            output.WriteTag(1, WireFormat.WireType.Varint);

-            output.WriteInt32(key1);

-            output.WriteTag(2, WireFormat.WireType.Varint);

-            output.WriteInt32(value1);

-

-            // Second entry

-            var key2 = "a";

-            var value2 = "b";

-            output.WriteTag(TestMap.MapStringStringFieldNumber, WireFormat.WireType.LengthDelimited);

-            output.WriteRawVarint32(6); // 3 bytes per entry: tag, size, character

-            output.WriteTag(1, WireFormat.WireType.LengthDelimited);

-            output.WriteString(key2);

-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);

-            output.WriteString(value2);

-

-            // Third entry

-            var key3 = 15;

-            var value3 = 25;

-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);

-            output.WriteRawVarint32(4);

-            output.WriteTag(1, WireFormat.WireType.Varint);

-            output.WriteInt32(key3);

-            output.WriteTag(2, WireFormat.WireType.Varint);

-            output.WriteInt32(value3);

-

-            output.Flush();

-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());

-            var expected = new TestMap

-            {

-                MapInt32Int32 = { { key1, value1 }, { key3, value3 } },

-                MapStringString = { { key2, value2 } }

-            };

-            Assert.AreEqual(expected, parsed);

-        }

-

-        [Test]

-        public void DuplicateKeys_LastEntryWins()

-        {

-            var memoryStream = new MemoryStream();

-            var output = CodedOutputStream.CreateInstance(memoryStream);

-

-            var key = 10;

-            var value1 = 20;

-            var value2 = 30;

-

-            // First entry

-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);

-            output.WriteRawVarint32(4);

-            output.WriteTag(1, WireFormat.WireType.Varint);

-            output.WriteInt32(key);

-            output.WriteTag(2, WireFormat.WireType.Varint);

-            output.WriteInt32(value1);

-

-            // Second entry - same key, different value

-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);

-            output.WriteRawVarint32(4);

-            output.WriteTag(1, WireFormat.WireType.Varint);

-            output.WriteInt32(key);

-            output.WriteTag(2, WireFormat.WireType.Varint);

-            output.WriteInt32(value2);

-            output.Flush();

-

-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());

-            Assert.AreEqual(value2, parsed.MapInt32Int32[key]);

-        }

-

-        [Test]

-        public void CloneSingleNonMessageValues()

-        {

-            var original = new TestAllTypes

-            {

-                SingleBool = true,

-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),

-                SingleDouble = 23.5,

-                SingleFixed32 = 23,

-                SingleFixed64 = 1234567890123,

-                SingleFloat = 12.25f,

-                SingleInt32 = 100,

-                SingleInt64 = 3210987654321,

-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.FOO,

-                SingleSfixed32 = -123,

-                SingleSfixed64 = -12345678901234,

-                SingleSint32 = -456,

-                SingleSint64 = -12345678901235,

-                SingleString = "test",

-                SingleUint32 = uint.MaxValue,

-                SingleUint64 = ulong.MaxValue

-            };

-            var clone = original.Clone();

-            Assert.AreNotSame(original, clone);

-            Assert.AreEqual(original, clone);

-            // Just as a single example

-            clone.SingleInt32 = 150;

-            Assert.AreNotEqual(original, clone);

-        }

-

-        [Test]

-        public void CloneRepeatedNonMessageValues()

-        {

-            var original = new TestAllTypes

-            {

-                RepeatedBool = { true, false },

-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6) },

-                RepeatedDouble = { -12.25, 23.5 },

-                RepeatedFixed32 = { uint.MaxValue, 23 },

-                RepeatedFixed64 = { ulong.MaxValue, 1234567890123 },

-                RepeatedFloat = { 100f, 12.25f },

-                RepeatedInt32 = { 100, 200 },

-                RepeatedInt64 = { 3210987654321, long.MaxValue },

-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.FOO, TestAllTypes.Types.NestedEnum.NEG },

-                RepeatedSfixed32 = { -123, 123 },

-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },

-                RepeatedSint32 = { -456, 100 },

-                RepeatedSint64 = { -12345678901235, 123 },

-                RepeatedString = { "foo", "bar" },

-                RepeatedUint32 = { uint.MaxValue, uint.MinValue },

-                RepeatedUint64 = { ulong.MaxValue, uint.MinValue }

-            };

-

-            var clone = original.Clone();

-            Assert.AreNotSame(original, clone);

-            Assert.AreEqual(original, clone);

-            // Just as a single example

-            clone.RepeatedDouble.Add(25.5);

-            Assert.AreNotEqual(original, clone);

-        }

-

-        [Test]

-        public void CloneSingleMessageField()

-        {

-            var original = new TestAllTypes

-            {

-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 }

-            };

-

-            var clone = original.Clone();

-            Assert.AreNotSame(original, clone);

-            Assert.AreNotSame(original.SingleNestedMessage, clone.SingleNestedMessage);

-            Assert.AreEqual(original, clone);

-

-            clone.SingleNestedMessage.Bb = 30;

-            Assert.AreNotEqual(original, clone);

-        }

-

-        [Test]

-        public void CloneRepeatedMessageField()

-        {

-            var original = new TestAllTypes

-            {

-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 20 } }

-            };

-

-            var clone = original.Clone();

-            Assert.AreNotSame(original, clone);

-            Assert.AreNotSame(original.RepeatedNestedMessage, clone.RepeatedNestedMessage);

-            Assert.AreNotSame(original.RepeatedNestedMessage[0], clone.RepeatedNestedMessage[0]);

-            Assert.AreEqual(original, clone);

-

-            clone.RepeatedNestedMessage[0].Bb = 30;

-            Assert.AreNotEqual(original, clone);

-        }

-

-        [Test]

-        public void CloneOneofField()

-        {

-            var original = new TestAllTypes

-            {

-                OneofNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 }

-            };

-

-            var clone = original.Clone();

-            Assert.AreNotSame(original, clone);

-            Assert.AreEqual(original, clone);

-

-            // We should have cloned the message

-            original.OneofNestedMessage.Bb = 30;

-            Assert.AreNotEqual(original, clone);

-        }

-

-        [Test]

-        public void Freeze()

-        {

-            var frozen = new TestAllTypes();

-            frozen.Freeze();

-            Assert.IsTrue(frozen.IsFrozen);

-

-            Assert.Throws<InvalidOperationException>(() => frozen.ClearOneofField());

-            Assert.Throws<InvalidOperationException>(() => frozen.SingleInt32 = 0);

-            Assert.Throws<InvalidOperationException>(() => frozen.SingleNestedMessage = null);

-            Assert.Throws<InvalidOperationException>(() => frozen.SingleNestedEnum = 0);

-            Assert.Throws<InvalidOperationException>(() => frozen.OneofString = null);

-            Assert.Throws<InvalidOperationException>(() => frozen.OneofUint32 = 0U);

-            Assert.Throws<InvalidOperationException>(() => frozen.RepeatedDouble.Add(0.0));

-            Assert.Throws<InvalidOperationException>(() => frozen.RepeatedNestedMessage.Add(new TestAllTypes.Types.NestedMessage()));

-        }

-

-        [Test]

-        public void OneofProperties()

-        {

-            // Switch the oneof case between each of the different options, and check everything behaves

-            // as expected in each case.

-            var message = new TestAllTypes();

-            Assert.AreEqual("", message.OneofString);

-            Assert.AreEqual(0, message.OneofUint32);

-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);

-            Assert.IsNull(message.OneofNestedMessage);

-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);

-

-            message.OneofString = "sample";

-            Assert.AreEqual("sample", message.OneofString);

-            Assert.AreEqual(0, message.OneofUint32);

-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);

-            Assert.IsNull(message.OneofNestedMessage);

-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofString, message.OneofFieldCase);

-

-            var bytes = ByteString.CopyFrom(1, 2, 3);

-            message.OneofBytes = bytes;

-            Assert.AreEqual("", message.OneofString);

-            Assert.AreEqual(0, message.OneofUint32);

-            Assert.AreEqual(bytes, message.OneofBytes);

-            Assert.IsNull(message.OneofNestedMessage);

-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofBytes, message.OneofFieldCase);

-

-            message.OneofUint32 = 20;

-            Assert.AreEqual("", message.OneofString);

-            Assert.AreEqual(20, message.OneofUint32);

-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);

-            Assert.IsNull(message.OneofNestedMessage);

-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message.OneofFieldCase);

-

-            var nestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 25 };

-            message.OneofNestedMessage = nestedMessage;

-            Assert.AreEqual("", message.OneofString);

-            Assert.AreEqual(0, message.OneofUint32);

-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);

-            Assert.AreEqual(nestedMessage, message.OneofNestedMessage);

-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofNestedMessage, message.OneofFieldCase);

-

-            message.ClearOneofField();

-            Assert.AreEqual("", message.OneofString);

-            Assert.AreEqual(0, message.OneofUint32);

-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);

-            Assert.IsNull(message.OneofNestedMessage);

-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);

-        }

-

-        [Test]

-        public void OneofSerialization_NonDefaultValue()

-        {

-            var message = new TestAllTypes();

-            message.OneofString = "this would take a bit of space";

-            message.OneofUint32 = 10;

-            var bytes = message.ToByteArray();

-            Assert.AreEqual(3, bytes.Length); // 2 bytes for the tag + 1 for the value - no string!

-

-            var message2 = TestAllTypes.Parser.ParseFrom(bytes);

-            Assert.AreEqual(message, message2);

-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message2.OneofFieldCase);

-        }

-

-        [Test]

-        public void OneofSerialization_DefaultValue()

-        {

-            var message = new TestAllTypes();

-            message.OneofString = "this would take a bit of space";

-            message.OneofUint32 = 0; // This is the default value for UInt32; normally wouldn't be serialized

-            var bytes = message.ToByteArray();

-            Assert.AreEqual(3, bytes.Length); // 2 bytes for the tag + 1 for the value - it's still serialized

-

-            var message2 = TestAllTypes.Parser.ParseFrom(bytes);

-            Assert.AreEqual(message, message2);

-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message2.OneofFieldCase);

-        }

-

-        // TODO: Consider moving these tests to a separate reflection test - although they do require generated messages.

-

-        [Test]

-        public void Reflection_GetValue()

-        {

-            var message = SampleMessages.CreateFullTestAllTypes();

-            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));

-            Assert.AreEqual(message.SingleFixed32, fields[TestAllTypes.SingleFixed32FieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleFixed64, fields[TestAllTypes.SingleFixed64FieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleFloat, fields[TestAllTypes.SingleFloatFieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleForeignEnum, fields[TestAllTypes.SingleForeignEnumFieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleForeignMessage, fields[TestAllTypes.SingleForeignMessageFieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleImportEnum, fields[TestAllTypes.SingleImportEnumFieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleImportMessage, fields[TestAllTypes.SingleImportMessageFieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleInt32, fields[TestAllTypes.SingleInt32FieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleInt64, fields[TestAllTypes.SingleInt64FieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleNestedEnum, fields[TestAllTypes.SingleNestedEnumFieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleNestedMessage, fields[TestAllTypes.SingleNestedMessageFieldNumber].GetValue(message));

-            Assert.AreEqual(message.SinglePublicImportMessage, fields[TestAllTypes.SinglePublicImportMessageFieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleSint32, fields[TestAllTypes.SingleSint32FieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleSint64, fields[TestAllTypes.SingleSint64FieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleString, fields[TestAllTypes.SingleStringFieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleSfixed32, fields[TestAllTypes.SingleSfixed32FieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleSfixed64, fields[TestAllTypes.SingleSfixed64FieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleUint32, fields[TestAllTypes.SingleUint32FieldNumber].GetValue(message));

-            Assert.AreEqual(message.SingleUint64, fields[TestAllTypes.SingleUint64FieldNumber].GetValue(message));

-            Assert.AreEqual(message.OneofBytes, fields[TestAllTypes.OneofBytesFieldNumber].GetValue(message));

-            Assert.AreEqual(message.OneofString, fields[TestAllTypes.OneofStringFieldNumber].GetValue(message));

-            Assert.AreEqual(message.OneofNestedMessage, fields[TestAllTypes.OneofNestedMessageFieldNumber].GetValue(message));

-            Assert.AreEqual(message.OneofUint32, fields[TestAllTypes.OneofUint32FieldNumber].GetValue(message));

-

-            // Just one example for repeated fields - they're all just returning the list

-            var list = (IList)fields[TestAllTypes.RepeatedInt32FieldNumber].GetValue(message);

-            Assert.AreEqual(message.RepeatedInt32, list);

-            Assert.AreEqual(message.RepeatedInt32[0], list[0]); // Just in case there was any doubt...

-

-            // Just a single map field, for the same reason

-            var mapMessage = new TestMap { MapStringString = { { "key1", "value1" }, { "key2", "value2" } } };

-            fields = ((IReflectedMessage) mapMessage).Fields;

-            var dictionary = (IDictionary) fields[TestMap.MapStringStringFieldNumber].GetValue(mapMessage);

-            Assert.AreEqual(mapMessage.MapStringString, dictionary);

-            Assert.AreEqual("value1", dictionary["key1"]);

-        }

-

-        [Test]

-        public void Reflection_Clear()

-        {

-            IReflectedMessage message = SampleMessages.CreateFullTestAllTypes();

-            var fields = message.Fields;

-            fields[TestAllTypes.SingleBoolFieldNumber].Clear(message);

-            fields[TestAllTypes.SingleInt32FieldNumber].Clear(message);

-            fields[TestAllTypes.SingleStringFieldNumber].Clear(message);

-            fields[TestAllTypes.SingleBytesFieldNumber].Clear(message);

-            fields[TestAllTypes.SingleForeignEnumFieldNumber].Clear(message);

-            fields[TestAllTypes.SingleForeignMessageFieldNumber].Clear(message);

-            fields[TestAllTypes.RepeatedDoubleFieldNumber].Clear(message);

-

-            var expected = new TestAllTypes(SampleMessages.CreateFullTestAllTypes())

-            {

-                SingleBool = false,

-                SingleInt32 = 0,

-                SingleString = "",

-                SingleBytes = ByteString.Empty,

-                SingleForeignEnum = 0,

-                SingleForeignMessage = null,

-            };

-            expected.RepeatedDouble.Clear();

-

-            Assert.AreEqual(expected, message);

-

-            // Separately, maps.

-            var mapMessage = new TestMap { MapStringString = { { "key1", "value1" }, { "key2", "value2" } } };

-            fields = ((IReflectedMessage) mapMessage).Fields;

-            fields[TestMap.MapStringStringFieldNumber].Clear(mapMessage);

-            Assert.AreEqual(0, mapMessage.MapStringString.Count);

-        }

-

-        [Test]

-        public void Reflection_SetValue_SingleFields()

-        {

-            // Just a sample (primitives, messages, enums, strings, byte strings)

-            IReflectedMessage message = SampleMessages.CreateFullTestAllTypes();

-            var fields = message.Fields;

-            fields[TestAllTypes.SingleBoolFieldNumber].SetValue(message, false);

-            fields[TestAllTypes.SingleInt32FieldNumber].SetValue(message, 500);

-            fields[TestAllTypes.SingleStringFieldNumber].SetValue(message, "It's a string");

-            fields[TestAllTypes.SingleBytesFieldNumber].SetValue(message, ByteString.CopyFrom(99, 98, 97));

-            fields[TestAllTypes.SingleForeignEnumFieldNumber].SetValue(message, ForeignEnum.FOREIGN_FOO);

-            fields[TestAllTypes.SingleForeignMessageFieldNumber].SetValue(message, new ForeignMessage { C = 12345 });

-            fields[TestAllTypes.SingleDoubleFieldNumber].SetValue(message, 20150701.5);

-

-            var expected = new TestAllTypes(SampleMessages.CreateFullTestAllTypes())

-            {

-                SingleBool = false,

-                SingleInt32 = 500,

-                SingleString = "It's a string",

-                SingleBytes = ByteString.CopyFrom(99, 98, 97),

-                SingleForeignEnum = ForeignEnum.FOREIGN_FOO,

-                SingleForeignMessage = new ForeignMessage { C = 12345 },

-                SingleDouble = 20150701.5

-            };

-

-            Assert.AreEqual(expected, message);

-        }

-

-        [Test]

-        public void Reflection_SetValue_SingleFields_WrongType()

-        {

-            IReflectedMessage message = SampleMessages.CreateFullTestAllTypes();

-            var fields = message.Fields;

-            Assert.Throws<InvalidCastException>(() => fields[TestAllTypes.SingleBoolFieldNumber].SetValue(message, "This isn't a bool"));

-        }

-

-        [Test]

-        public void Reflection_SetValue_MapFields()

-        {

-            IReflectedMessage message = new TestMap();

-            var fields = message.Fields;

-            Assert.Throws<InvalidOperationException>(() => fields[TestMap.MapStringStringFieldNumber].SetValue(message, new Dictionary<string, string>()));

-        }

-

-        [Test]

-        public void Reflection_SetValue_RepeatedFields()

-        {

-            IReflectedMessage message = SampleMessages.CreateFullTestAllTypes();

-            var fields = message.Fields;

-            Assert.Throws<InvalidOperationException>(() => fields[TestAllTypes.RepeatedDoubleFieldNumber].SetValue(message, new double[10]));

-        }

-

-        [Test]

-        public void Reflection_GetValue_IncorrectType()

-        {

-            IReflectedMessage message = SampleMessages.CreateFullTestAllTypes();

-            Assert.Throws<InvalidCastException>(() => message.Fields[TestAllTypes.SingleBoolFieldNumber].GetValue(new TestMap()));

-        }

-

-        [Test]

-        public void Reflection_Oneof()

-        {

-            var message = new TestAllTypes();

-            var fields = ((IReflectedMessage) message).Fields;

-            Assert.AreEqual(1, fields.Oneofs.Count);

-            var oneof = fields.Oneofs[0];

-            Assert.AreEqual("oneof_field", oneof.Descriptor.Name);

-            Assert.IsNull(oneof.GetCaseFieldDescriptor(message));

-

-            message.OneofString = "foo";

-            Assert.AreSame(fields[TestAllTypes.OneofStringFieldNumber].Descriptor, oneof.GetCaseFieldDescriptor(message));

-

-            message.OneofUint32 = 10;

-            Assert.AreSame(fields[TestAllTypes.OneofUint32FieldNumber].Descriptor, oneof.GetCaseFieldDescriptor(message));

-

-            oneof.Clear(message);

-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);

-        }

-    }

-}

diff --git a/csharp/src/ProtocolBuffers.Test/IssuesTest.cs b/csharp/src/ProtocolBuffers.Test/IssuesTest.cs
deleted file mode 100644
index b5ad34ae..00000000
--- a/csharp/src/ProtocolBuffers.Test/IssuesTest.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-#region Copyright notice and license

-// Protocol Buffers - Google's data interchange format

-// Copyright 2008 Google Inc.  All rights reserved.

-// https://developers.google.com/protocol-buffers/

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are

-// met:

-//

-//     * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

-//     * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following disclaimer

-// in the documentation and/or other materials provided with the

-// distribution.

-//     * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived from

-// this software without specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#endregion

-

-using Google.Protobuf.Reflection;

-using UnitTest.Issues.TestProtos;

-using NUnit.Framework;

-

-

-namespace Google.Protobuf

-{

-    /// <summary>

-    /// Tests for issues which aren't easily compartmentalized into other unit tests.

-    /// </summary>

-    public class IssuesTest

-    {

-        // Issue 45

-        [Test]

-        public void FieldCalledItem()

-        {

-            ItemField message = new ItemField { Item = 3 };

-            FieldDescriptor field = ItemField.Descriptor.FindFieldByName("item");

-            Assert.NotNull(field);

-            // TODO(jonskeet): Reflection...

-            // Assert.AreEqual(3, (int)message[field]);

-        }

-    }

-}

diff --git a/csharp/src/ProtocolBuffers.Test/JsonFormatterTest.cs b/csharp/src/ProtocolBuffers.Test/JsonFormatterTest.cs
deleted file mode 100644
index 5441bf47..00000000
--- a/csharp/src/ProtocolBuffers.Test/JsonFormatterTest.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class JsonFormatterTest
-    {
-        [Test]
-        public void DefaultValues_WhenOmitted()
-        {
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(formatDefaultValues: false));
-
-            Assert.AreEqual("{ }", formatter.Format(new ForeignMessage()));
-            Assert.AreEqual("{ }", formatter.Format(new TestAllTypes()));
-            Assert.AreEqual("{ }", formatter.Format(new TestMap()));
-        }
-
-        [Test]
-        public void DefaultValues_WhenIncluded()
-        {
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(formatDefaultValues: true));
-            Assert.AreEqual("{ \"c\": 0 }", formatter.Format(new ForeignMessage()));
-        }
-
-        [Test]
-        public void AllSingleFields()
-        {
-            var message = new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleForeignEnum = ForeignEnum.FOREIGN_BAR,
-                SingleForeignMessage = new ForeignMessage { C = 10 },
-                SingleImportEnum = ImportEnum.IMPORT_BAZ,
-                SingleImportMessage = new ImportMessage { D = 20 },
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.FOO,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test\twith\ttabs",
-                SingleUint32 = uint.MaxValue,
-                SingleUint64 = ulong.MaxValue,
-            };
-            var actualText = JsonFormatter.Default.Format(message);
-
-            // Fields in declaration order, which matches numeric order.
-            var expectedText = "{ " +
-                "\"singleInt32\": 100, " +
-                "\"singleInt64\": \"3210987654321\", " +
-                "\"singleUint32\": 4294967295, " +
-                "\"singleUint64\": \"18446744073709551615\", " +
-                "\"singleSint32\": -456, " +
-                "\"singleSint64\": \"-12345678901235\", " +
-                "\"singleFixed32\": 23, " +
-                "\"singleFixed64\": \"1234567890123\", " +
-                "\"singleSfixed32\": -123, " +
-                "\"singleSfixed64\": \"-12345678901234\", " +
-                "\"singleFloat\": 12.25, " +
-                "\"singleDouble\": 23.5, " +
-                "\"singleBool\": true, " +
-                "\"singleString\": \"test\\twith\\ttabs\", " +
-                "\"singleBytes\": \"AQIDBA==\", " +
-                "\"singleNestedMessage\": { \"bb\": 35 }, " +
-                "\"singleForeignMessage\": { \"c\": 10 }, " +
-                "\"singleImportMessage\": { \"d\": 20 }, " +
-                "\"singleNestedEnum\": \"FOO\", " +
-                "\"singleForeignEnum\": \"FOREIGN_BAR\", " +
-                "\"singleImportEnum\": \"IMPORT_BAZ\", " +
-                "\"singlePublicImportMessage\": { \"e\": 54 }" +
-                " }";
-            Assert.AreEqual(expectedText, actualText);
-        }
-
-        [Test]
-        public void RepeatedField()
-        {
-            Assert.AreEqual("{ \"repeatedInt32\": [ 1, 2, 3, 4, 5 ] }",
-                JsonFormatter.Default.Format(new TestAllTypes { RepeatedInt32 = { 1, 2, 3, 4, 5 } }));
-        }
-
-        [Test]
-        public void MapField_StringString()
-        {
-            Assert.AreEqual("{ \"mapStringString\": { \"with spaces\": \"bar\", \"a\": \"b\" } }",
-                JsonFormatter.Default.Format(new TestMap { MapStringString = { { "with spaces", "bar" }, { "a", "b" } } }));
-        }
-
-        [Test]
-        public void MapField_Int32Int32()
-        {
-            // The keys are quoted, but the values aren't.
-            Assert.AreEqual("{ \"mapInt32Int32\": { \"0\": 1, \"2\": 3 } }",
-                JsonFormatter.Default.Format(new TestMap { MapInt32Int32 = { { 0, 1 }, { 2, 3 } } }));
-        }
-
-        [Test]
-        public void MapField_BoolBool()
-        {
-            // The keys are quoted, but the values aren't.
-            Assert.AreEqual("{ \"mapBoolBool\": { \"false\": true, \"true\": false } }",
-                JsonFormatter.Default.Format(new TestMap { MapBoolBool = { { false, true }, { true, false } } }));
-        }
-
-        [TestCase(1.0, "1")]
-        [TestCase(double.NaN, "\"NaN\"")]
-        [TestCase(double.PositiveInfinity, "\"Infinity\"")]
-        [TestCase(double.NegativeInfinity, "\"-Infinity\"")]
-        public void DoubleRepresentations(double value, string expectedValueText)
-        {
-            var message = new TestAllTypes { SingleDouble = value };
-            string actualText = JsonFormatter.Default.Format(message);
-            string expectedText = "{ \"singleDouble\": " + expectedValueText + " }";
-            Assert.AreEqual(expectedText, actualText);
-        }
-
-        [Test]
-        public void UnknownEnumValueOmitted_SingleField()
-        {
-            var message = new TestAllTypes { SingleForeignEnum = (ForeignEnum) 100 };
-            Assert.AreEqual("{ }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void UnknownEnumValueOmitted_RepeatedField()
-        {
-            var message = new TestAllTypes { RepeatedForeignEnum = { ForeignEnum.FOREIGN_BAZ, (ForeignEnum) 100, ForeignEnum.FOREIGN_FOO } };
-            Assert.AreEqual("{ \"repeatedForeignEnum\": [ \"FOREIGN_BAZ\", \"FOREIGN_FOO\" ] }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void UnknownEnumValueOmitted_MapField()
-        {
-            // This matches the C++ behaviour.
-            var message = new TestMap { MapInt32Enum = { { 1, MapEnum.MAP_ENUM_FOO }, { 2, (MapEnum) 100 }, { 3, MapEnum.MAP_ENUM_BAR } } };
-            Assert.AreEqual("{ \"mapInt32Enum\": { \"1\": \"MAP_ENUM_FOO\", \"3\": \"MAP_ENUM_BAR\" } }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void UnknownEnumValueOmitted_RepeatedField_AllEntriesUnknown()
-        {
-            // *Maybe* we should hold off on writing the "[" until we find that we've got at least one value to write...
-            // but this is what happens at the moment, and it doesn't seem too awful.
-            var message = new TestAllTypes { RepeatedForeignEnum = { (ForeignEnum) 200, (ForeignEnum) 100 } };
-            Assert.AreEqual("{ \"repeatedForeignEnum\": [ ] }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void NullValueForMessage()
-        {
-            var message = new TestMap { MapInt32ForeignMessage = { { 10, null } } };
-            Assert.AreEqual("{ \"mapInt32ForeignMessage\": { \"10\": null } }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        [TestCase("a\u17b4b", "a\\u17b4b")] // Explicit
-        [TestCase("a\u0601b", "a\\u0601b")] // Ranged
-        [TestCase("a\u0605b", "a\u0605b")] // Passthrough (note lack of double backslash...)
-        public void SimpleNonAscii(string text, string encoded)
-        {
-            var message = new TestAllTypes { SingleString = text };
-            Assert.AreEqual("{ \"singleString\": \"" + encoded + "\" }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void SurrogatePairEscaping()
-        {
-            var message = new TestAllTypes { SingleString = "a\uD801\uDC01b" };
-            Assert.AreEqual("{ \"singleString\": \"a\\ud801\\udc01b\" }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void InvalidSurrogatePairsFail()
-        {
-            // Note: don't use TestCase for these, as the strings can't be reliably represented 
-            // See http://codeblog.jonskeet.uk/2014/11/07/when-is-a-string-not-a-string/
-
-            // Lone low surrogate
-            var message = new TestAllTypes { SingleString = "a\uDC01b" };
-            Assert.Throws<ArgumentException>(() => JsonFormatter.Default.Format(message));
-
-            // Lone high surrogate
-            message = new TestAllTypes { SingleString = "a\uD801b" };
-            Assert.Throws<ArgumentException>(() => JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        [TestCase("foo_bar", "fooBar")]
-        [TestCase("bananaBanana", "bananaBanana")]
-        [TestCase("BANANABanana", "bananaBanana")]
-        public void ToCamelCase(string original, string expected)
-        {
-            Assert.AreEqual(expected, JsonFormatter.ToCamelCase(original));
-        }
-
-        [Test]
-        [TestCase(null, "{ }")]
-        [TestCase("x", "{ \"fooString\": \"x\" }")]
-        [TestCase("", "{ \"fooString\": \"\" }")]
-        [TestCase(null, "{ }")]
-        public void Oneof(string fooStringValue, string expectedJson)
-        {
-            var message = new TestOneof();
-            if (fooStringValue != null)
-            {
-                message.FooString = fooStringValue;
-            }
-
-            // We should get the same result both with and without "format default values".
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false));
-            Assert.AreEqual(expectedJson, formatter.Format(message));
-            formatter = new JsonFormatter(new JsonFormatter.Settings(true));
-            Assert.AreEqual(expectedJson, formatter.Format(message));
-        }
-    }
-}
diff --git a/csharp/src/ProtocolBuffers.Test/Properties/AppManifest.xml b/csharp/src/ProtocolBuffers.Test/Properties/AppManifest.xml
deleted file mode 100644
index a9552327..00000000
--- a/csharp/src/ProtocolBuffers.Test/Properties/AppManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"

-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

->

-    <Deployment.Parts>

-    </Deployment.Parts>

-</Deployment>

diff --git a/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs b/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs
deleted file mode 100644
index bfa1f05e..00000000
--- a/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-

-[assembly: AssemblyTitle("ProtocolBuffers.Test")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("ProtocolBuffers.Test")]

-[assembly: AssemblyCopyright("Copyright �  2008")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("2.4.1.555")]

-

-[assembly: AssemblyVersion("2.4.1.555")]

diff --git a/csharp/src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml b/csharp/src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml
deleted file mode 100644
index 634f44bf..00000000
--- a/csharp/src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<OutOfBrowserSettings ShortName="ProtocolBuffers.Test" EnableGPUAcceleration="False" ShowInstallMenuItem="False">

-  <OutOfBrowserSettings.Blurb>ProtocolBuffers.Test</OutOfBrowserSettings.Blurb>

-  <OutOfBrowserSettings.WindowSettings>

-    <WindowSettings Title="ProtocolBuffers.Test" />

-  </OutOfBrowserSettings.WindowSettings>

-  <OutOfBrowserSettings.Icons />

-</OutOfBrowserSettings>
\ No newline at end of file
diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
deleted file mode 100644
index a425ad84..00000000
--- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>9.0.30729</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{DD01ED24-3750-4567-9A23-1DB676A15610}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Google.Protobuf</RootNamespace>

-    <AssemblyName>Google.Protobuf.Test</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-    <SignAssembly>true</SignAssembly>

-    <AssemblyOriginatorKeyFile>..\..\keys\Google.ProtocolBuffers.snk</AssemblyOriginatorKeyFile>

-    <OldToolsVersion>3.5</OldToolsVersion>

-    <TargetFrameworkProfile>

-    </TargetFrameworkProfile>

-    <NuGetPackageImportStamp>

-    </NuGetPackageImportStamp>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug</OutputPath>

-    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>

-    <DefineConstants>DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate)</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <NoStdLib>true</NoStdLib>

-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>

-    <Prefer32Bit>false</Prefer32Bit>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release</OutputPath>

-    <IntermediateOutputPath>obj\Release\</IntermediateOutputPath>

-    <DefineConstants>TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate)</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <NoStdLib>true</NoStdLib>

-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>

-    <Prefer32Bit>false</Prefer32Bit>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="mscorlib" />

-    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

-      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>

-      <Private>True</Private>

-    </Reference>

-    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

-      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>

-      <Private>True</Private>

-    </Reference>

-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>

-      <Private>True</Private>

-    </Reference>

-    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

-      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>

-      <Private>True</Private>

-    </Reference>

-    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">

-      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>

-      <Private>True</Private>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="ByteStringTest.cs" />

-    <Compile Include="CodedInputStreamExtensions.cs" />

-    <Compile Include="CodedInputStreamTest.cs" />

-    <Compile Include="CodedOutputStreamTest.cs" />

-    <Compile Include="EqualityTester.cs" />

-    <Compile Include="FieldCodecTest.cs" />

-    <Compile Include="GeneratedMessageTest.cs" />

-    <Compile Include="Collections\MapFieldTest.cs" />

-    <Compile Include="Collections\RepeatedFieldTest.cs" />

-    <Compile Include="JsonFormatterTest.cs" />

-    <Compile Include="Reflection\DescriptorsTest.cs" />

-    <Compile Include="SampleEnum.cs" />

-    <Compile Include="SampleMessages.cs" />

-    <Compile Include="TestProtos\MapUnittestProto3.cs" />

-    <Compile Include="TestProtos\UnittestImportProto3.cs" />

-    <Compile Include="TestProtos\UnittestImportPublicProto3.cs" />

-    <Compile Include="TestProtos\UnittestIssues.cs" />

-    <Compile Include="TestProtos\UnittestProto3.cs" />

-    <Compile Include="DeprecatedMemberTest.cs" />

-    <Compile Include="IssuesTest.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="TestCornerCases.cs" />

-    <Compile Include="TestProtos\UnittestWellKnownTypes.cs" />

-    <Compile Include="WellKnownTypes\WrappersTest.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffers.csproj">

-      <Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>

-      <Name>ProtocolBuffers</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="packages.config" />

-  </ItemGroup>

-  <ItemGroup>

-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

-  </ItemGroup>

-  <ItemGroup />

-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/csharp/src/ProtocolBuffers.Test/Reflection/DescriptorsTest.cs b/csharp/src/ProtocolBuffers.Test/Reflection/DescriptorsTest.cs
deleted file mode 100644
index 0db01a5e..00000000
--- a/csharp/src/ProtocolBuffers.Test/Reflection/DescriptorsTest.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Linq;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Tests for descriptors. (Not in its own namespace or broken up into individual classes as the
-    /// size doesn't warrant it. On the other hand, this makes me feel a bit dirty...)
-    /// </summary>
-    public class DescriptorsTest
-    {
-        [Test]
-        public void FileDescriptor()
-        {
-            FileDescriptor file = UnittestProto3.Descriptor;
-
-            Assert.AreEqual("google/protobuf/unittest_proto3.proto", file.Name);
-            Assert.AreEqual("protobuf_unittest", file.Package);
-
-            Assert.AreEqual("UnittestProto", file.Proto.Options.JavaOuterClassname);
-            Assert.AreEqual("google/protobuf/unittest_proto3.proto", file.Proto.Name);
-
-            // unittest.proto doesn't have any public imports, but unittest_import.proto does.
-            Assert.AreEqual(0, file.PublicDependencies.Count);
-            Assert.AreEqual(1, UnittestImportProto3.Descriptor.PublicDependencies.Count);
-            Assert.AreEqual(UnittestImportPublicProto3.Descriptor, UnittestImportProto3.Descriptor.PublicDependencies[0]);
-
-            Assert.AreEqual(1, file.Dependencies.Count);
-            Assert.AreEqual(UnittestImportProto3.Descriptor, file.Dependencies[0]);
-
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            Assert.AreEqual(messageType, file.MessageTypes[0]);
-            Assert.AreEqual(messageType, file.FindTypeByName<MessageDescriptor>("TestAllTypes"));
-            Assert.Null(file.FindTypeByName<MessageDescriptor>("NoSuchType"));
-            Assert.Null(file.FindTypeByName<MessageDescriptor>("protobuf_unittest.TestAllTypes"));
-            for (int i = 0; i < file.MessageTypes.Count; i++)
-            {
-                Assert.AreEqual(i, file.MessageTypes[i].Index);
-            }
-
-            Assert.AreEqual(file.EnumTypes[0], file.FindTypeByName<EnumDescriptor>("ForeignEnum"));
-            Assert.Null(file.FindTypeByName<EnumDescriptor>("NoSuchType"));
-            Assert.Null(file.FindTypeByName<EnumDescriptor>("protobuf_unittest.ForeignEnum"));
-            Assert.AreEqual(1, UnittestImportProto3.Descriptor.EnumTypes.Count);
-            Assert.AreEqual("ImportEnum", UnittestImportProto3.Descriptor.EnumTypes[0].Name);
-            for (int i = 0; i < file.EnumTypes.Count; i++)
-            {
-                Assert.AreEqual(i, file.EnumTypes[i].Index);
-            }
-        }
-
-        [Test]
-        public void MessageDescriptor()
-        {
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            MessageDescriptor nestedType = TestAllTypes.Types.NestedMessage.Descriptor;
-
-            Assert.AreEqual("TestAllTypes", messageType.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes", messageType.FullName);
-            Assert.AreEqual(UnittestProto3.Descriptor, messageType.File);
-            Assert.IsNull(messageType.ContainingType);
-            Assert.IsNull(messageType.Proto.Options);
-
-            Assert.AreEqual("TestAllTypes", messageType.Name);
-
-            Assert.AreEqual("NestedMessage", nestedType.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.NestedMessage", nestedType.FullName);
-            Assert.AreEqual(UnittestProto3.Descriptor, nestedType.File);
-            Assert.AreEqual(messageType, nestedType.ContainingType);
-
-            FieldDescriptor field = messageType.Fields[0];
-            Assert.AreEqual("single_int32", field.Name);
-            Assert.AreEqual(field, messageType.FindDescriptor<FieldDescriptor>("single_int32"));
-            Assert.Null(messageType.FindDescriptor<FieldDescriptor>("no_such_field"));
-            Assert.AreEqual(field, messageType.FindFieldByNumber(1));
-            Assert.Null(messageType.FindFieldByNumber(571283));
-            for (int i = 0; i < messageType.Fields.Count; i++)
-            {
-                Assert.AreEqual(i, messageType.Fields[i].Index);
-            }
-
-            Assert.AreEqual(nestedType, messageType.NestedTypes[0]);
-            Assert.AreEqual(nestedType, messageType.FindDescriptor<MessageDescriptor>("NestedMessage"));
-            Assert.Null(messageType.FindDescriptor<MessageDescriptor>("NoSuchType"));
-            for (int i = 0; i < messageType.NestedTypes.Count; i++)
-            {
-                Assert.AreEqual(i, messageType.NestedTypes[i].Index);
-            }
-
-            Assert.AreEqual(messageType.EnumTypes[0], messageType.FindDescriptor<EnumDescriptor>("NestedEnum"));
-            Assert.Null(messageType.FindDescriptor<EnumDescriptor>("NoSuchType"));
-            for (int i = 0; i < messageType.EnumTypes.Count; i++)
-            {
-                Assert.AreEqual(i, messageType.EnumTypes[i].Index);
-            }
-        }
-
-        [Test]
-        public void FieldDescriptor()
-        {
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            FieldDescriptor primitiveField = messageType.FindDescriptor<FieldDescriptor>("single_int32");
-            FieldDescriptor enumField = messageType.FindDescriptor<FieldDescriptor>("single_nested_enum");
-            FieldDescriptor messageField = messageType.FindDescriptor<FieldDescriptor>("single_foreign_message");
-
-            Assert.AreEqual("single_int32", primitiveField.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.single_int32",
-                            primitiveField.FullName);
-            Assert.AreEqual(1, primitiveField.FieldNumber);
-            Assert.AreEqual(messageType, primitiveField.ContainingType);
-            Assert.AreEqual(UnittestProto3.Descriptor, primitiveField.File);
-            Assert.AreEqual(FieldType.Int32, primitiveField.FieldType);
-            Assert.IsNull(primitiveField.Proto.Options);
-            
-            Assert.AreEqual("single_nested_enum", enumField.Name);
-            Assert.AreEqual(FieldType.Enum, enumField.FieldType);
-            // Assert.AreEqual(TestAllTypes.Types.NestedEnum.DescriptorProtoFile, enumField.EnumType);
-
-            Assert.AreEqual("single_foreign_message", messageField.Name);
-            Assert.AreEqual(FieldType.Message, messageField.FieldType);
-            Assert.AreEqual(ForeignMessage.Descriptor, messageField.MessageType);
-        }
-
-        [Test]
-        public void FieldDescriptorLabel()
-        {
-            FieldDescriptor singleField =
-                TestAllTypes.Descriptor.FindDescriptor<FieldDescriptor>("single_int32");
-            FieldDescriptor repeatedField =
-                TestAllTypes.Descriptor.FindDescriptor<FieldDescriptor>("repeated_int32");
-
-            Assert.IsFalse(singleField.IsRepeated);
-            Assert.IsTrue(repeatedField.IsRepeated);
-        }
-
-        [Test]
-        public void EnumDescriptor()
-        {
-            // Note: this test is a bit different to the Java version because there's no static way of getting to the descriptor
-            EnumDescriptor enumType = UnittestProto3.Descriptor.FindTypeByName<EnumDescriptor>("ForeignEnum");
-            EnumDescriptor nestedType = TestAllTypes.Descriptor.FindDescriptor<EnumDescriptor>("NestedEnum");
-
-            Assert.AreEqual("ForeignEnum", enumType.Name);
-            Assert.AreEqual("protobuf_unittest.ForeignEnum", enumType.FullName);
-            Assert.AreEqual(UnittestProto3.Descriptor, enumType.File);
-            Assert.Null(enumType.ContainingType);
-            Assert.Null(enumType.Proto.Options);
-
-            Assert.AreEqual("NestedEnum", nestedType.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.NestedEnum",
-                            nestedType.FullName);
-            Assert.AreEqual(UnittestProto3.Descriptor, nestedType.File);
-            Assert.AreEqual(TestAllTypes.Descriptor, nestedType.ContainingType);
-
-            EnumValueDescriptor value = enumType.FindValueByName("FOREIGN_FOO");
-            Assert.AreEqual(value, enumType.Values[1]);
-            Assert.AreEqual("FOREIGN_FOO", value.Name);
-            Assert.AreEqual(4, value.Number);
-            Assert.AreEqual((int) ForeignEnum.FOREIGN_FOO, value.Number);
-            Assert.AreEqual(value, enumType.FindValueByNumber(4));
-            Assert.Null(enumType.FindValueByName("NO_SUCH_VALUE"));
-            for (int i = 0; i < enumType.Values.Count; i++)
-            {
-                Assert.AreEqual(i, enumType.Values[i].Index);
-            }
-        }
-
-        [Test]
-        public void OneofDescriptor()
-        {
-            OneofDescriptor descriptor = TestAllTypes.Descriptor.FindDescriptor<OneofDescriptor>("oneof_field");
-            Assert.AreEqual("oneof_field", descriptor.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.oneof_field", descriptor.FullName);
-
-            var expectedFields = new[] {
-                TestAllTypes.OneofBytesFieldNumber,
-                TestAllTypes.OneofNestedMessageFieldNumber,
-                TestAllTypes.OneofStringFieldNumber,
-                TestAllTypes.OneofUint32FieldNumber }
-                .Select(fieldNumber => TestAllTypes.Descriptor.FindFieldByNumber(fieldNumber))
-                .ToList();
-            foreach (var field in expectedFields)
-            {
-                Assert.AreSame(descriptor, field.ContainingOneof);
-            }
-
-            CollectionAssert.AreEquivalent(expectedFields, descriptor.Fields);
-        }
-    }
-}
\ No newline at end of file
diff --git a/csharp/src/ProtocolBuffers.Test/SampleEnum.cs b/csharp/src/ProtocolBuffers.Test/SampleEnum.cs
deleted file mode 100644
index 77447afa..00000000
--- a/csharp/src/ProtocolBuffers.Test/SampleEnum.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-namespace Google.Protobuf
-{
-    // Just a sample enum with positive and negative values to be used in tests.
-    internal enum SampleEnum
-    {
-        NegativeValue = -2,
-        None = 0,
-        PositiveValue = 3
-    }
-}
diff --git a/csharp/src/ProtocolBuffers.Test/SampleMessages.cs b/csharp/src/ProtocolBuffers.Test/SampleMessages.cs
deleted file mode 100644
index 8a9c7f86..00000000
--- a/csharp/src/ProtocolBuffers.Test/SampleMessages.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Helper methods to create sample instances of types generated from unit test messages.
-    /// </summary>
-    public class SampleMessages
-    {
-        /// <summary>
-        /// Creates a new sample TestAllTypes message with all fields populated.
-        /// The "oneof" field is populated with the string property (OneofString).
-        /// </summary>
-        public static TestAllTypes CreateFullTestAllTypes()
-        {
-            return new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleForeignEnum = ForeignEnum.FOREIGN_BAR,
-                SingleForeignMessage = new ForeignMessage { C = 10 },
-                SingleImportEnum = ImportEnum.IMPORT_BAZ,
-                SingleImportMessage = new ImportMessage { D = 20 },
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.FOO,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test",
-                SingleUint32 = UInt32.MaxValue,
-                SingleUint64 = UInt64.MaxValue,
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6), ByteString.CopyFrom(new byte[1000]) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { UInt32.MaxValue, 23 },
-                RepeatedFixed64 = { UInt64.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedForeignEnum = { ForeignEnum.FOREIGN_FOO, ForeignEnum.FOREIGN_BAR },
-                RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } },
-                RepeatedImportEnum = { ImportEnum.IMPORT_BAZ, ImportEnum.IMPORT_ENUM_UNSPECIFIED },
-                RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, Int64.MaxValue },
-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.FOO, TestAllTypes.Types.NestedEnum.NEG },
-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } },
-                RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { UInt32.MaxValue, UInt32.MinValue },
-                RepeatedUint64 = { UInt64.MaxValue, UInt32.MinValue },
-                OneofString = "Oneof string"                
-            };
-        }
-    }
-}
diff --git a/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs b/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs
deleted file mode 100644
index b270a6f9..00000000
--- a/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-#region Copyright notice and license

-// Protocol Buffers - Google's data interchange format

-// Copyright 2008 Google Inc.  All rights reserved.

-// https://developers.google.com/protocol-buffers/

-//

-// Redistribution and use in source and binary forms, with or without

-// modification, are permitted provided that the following conditions are

-// met:

-//

-//     * Redistributions of source code must retain the above copyright

-// notice, this list of conditions and the following disclaimer.

-//     * Redistributions in binary form must reproduce the above

-// copyright notice, this list of conditions and the following disclaimer

-// in the documentation and/or other materials provided with the

-// distribution.

-//     * Neither the name of Google Inc. nor the names of its

-// contributors may be used to endorse or promote products derived from

-// this software without specific prior written permission.

-//

-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#endregion

-    

-using UnitTest.Issues.TestProtos;

-using NUnit.Framework;

-

-namespace Google.Protobuf

-{

-    public class TestCornerCases

-    {

-        [Test]

-        public void TestRoundTripNegativeEnums()

-        {

-            NegativeEnumMessage msg = new NegativeEnumMessage

-            {

-                Value = NegativeEnum.MinusOne,

-                Values = { NegativeEnum.NEGATIVE_ENUM_ZERO, NegativeEnum.MinusOne, NegativeEnum.FiveBelow },

-                PackedValues = { NegativeEnum.NEGATIVE_ENUM_ZERO, NegativeEnum.MinusOne, NegativeEnum.FiveBelow }

-            };

-

-            Assert.AreEqual(58, msg.CalculateSize());

-

-            byte[] bytes = new byte[58];

-            CodedOutputStream output = CodedOutputStream.CreateInstance(bytes);

-

-            msg.WriteTo(output);

-            Assert.AreEqual(0, output.SpaceLeft);

-

-            NegativeEnumMessage copy = NegativeEnumMessage.Parser.ParseFrom(bytes);

-            Assert.AreEqual(msg, copy);

-        }

-    }

-}

diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs
deleted file mode 100644
index 5f6eae0c..00000000
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs
+++ /dev/null
@@ -1,1591 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/map_unittest_proto3.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public static partial class MapUnittestProto3 {
-
-    #region Static variables
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMapSubmessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMessageMap__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestSameTypeMap__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MessageContainingEnumCalledType__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MessageContainingMapCalledEntry__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static MapUnittestProto3() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Cilnb29nbGUvcHJvdG9idWYvbWFwX3VuaXR0ZXN0X3Byb3RvMy5wcm90bxIR", 
-            "cHJvdG9idWZfdW5pdHRlc3QaJWdvb2dsZS9wcm90b2J1Zi91bml0dGVzdF9w", 
-            "cm90bzMucHJvdG8ilhIKB1Rlc3RNYXASRgoPbWFwX2ludDMyX2ludDMyGAEg", 
-            "AygLMi0ucHJvdG9idWZfdW5pdHRlc3QuVGVzdE1hcC5NYXBJbnQzMkludDMy", 
-            "RW50cnkSRgoPbWFwX2ludDY0X2ludDY0GAIgAygLMi0ucHJvdG9idWZfdW5p", 
-            "dHRlc3QuVGVzdE1hcC5NYXBJbnQ2NEludDY0RW50cnkSSgoRbWFwX3VpbnQz", 
-            "Ml91aW50MzIYAyADKAsyLy5wcm90b2J1Zl91bml0dGVzdC5UZXN0TWFwLk1h", 
-            "cFVpbnQzMlVpbnQzMkVudHJ5EkoKEW1hcF91aW50NjRfdWludDY0GAQgAygL", 
-            "Mi8ucHJvdG9idWZfdW5pdHRlc3QuVGVzdE1hcC5NYXBVaW50NjRVaW50NjRF", 
-            "bnRyeRJKChFtYXBfc2ludDMyX3NpbnQzMhgFIAMoCzIvLnByb3RvYnVmX3Vu", 
-            "aXR0ZXN0LlRlc3RNYXAuTWFwU2ludDMyU2ludDMyRW50cnkSSgoRbWFwX3Np", 
-            "bnQ2NF9zaW50NjQYBiADKAsyLy5wcm90b2J1Zl91bml0dGVzdC5UZXN0TWFw", 
-            "Lk1hcFNpbnQ2NFNpbnQ2NEVudHJ5Ek4KE21hcF9maXhlZDMyX2ZpeGVkMzIY", 
-            "ByADKAsyMS5wcm90b2J1Zl91bml0dGVzdC5UZXN0TWFwLk1hcEZpeGVkMzJG", 
-            "aXhlZDMyRW50cnkSTgoTbWFwX2ZpeGVkNjRfZml4ZWQ2NBgIIAMoCzIxLnBy", 
-            "b3RvYnVmX3VuaXR0ZXN0LlRlc3RNYXAuTWFwRml4ZWQ2NEZpeGVkNjRFbnRy", 
-            "eRJSChVtYXBfc2ZpeGVkMzJfc2ZpeGVkMzIYCSADKAsyMy5wcm90b2J1Zl91", 
-            "bml0dGVzdC5UZXN0TWFwLk1hcFNmaXhlZDMyU2ZpeGVkMzJFbnRyeRJSChVt", 
-            "YXBfc2ZpeGVkNjRfc2ZpeGVkNjQYCiADKAsyMy5wcm90b2J1Zl91bml0dGVz", 
-            "dC5UZXN0TWFwLk1hcFNmaXhlZDY0U2ZpeGVkNjRFbnRyeRJGCg9tYXBfaW50", 
-            "MzJfZmxvYXQYCyADKAsyLS5wcm90b2J1Zl91bml0dGVzdC5UZXN0TWFwLk1h", 
-            "cEludDMyRmxvYXRFbnRyeRJIChBtYXBfaW50MzJfZG91YmxlGAwgAygLMi4u", 
-            "cHJvdG9idWZfdW5pdHRlc3QuVGVzdE1hcC5NYXBJbnQzMkRvdWJsZUVudHJ5", 
-            "EkIKDW1hcF9ib29sX2Jvb2wYDSADKAsyKy5wcm90b2J1Zl91bml0dGVzdC5U", 
-            "ZXN0TWFwLk1hcEJvb2xCb29sRW50cnkSSgoRbWFwX3N0cmluZ19zdHJpbmcY", 
-            "DiADKAsyLy5wcm90b2J1Zl91bml0dGVzdC5UZXN0TWFwLk1hcFN0cmluZ1N0", 
-            "cmluZ0VudHJ5EkYKD21hcF9pbnQzMl9ieXRlcxgPIAMoCzItLnByb3RvYnVm", 
-            "X3VuaXR0ZXN0LlRlc3RNYXAuTWFwSW50MzJCeXRlc0VudHJ5EkQKDm1hcF9p", 
-            "bnQzMl9lbnVtGBAgAygLMiwucHJvdG9idWZfdW5pdHRlc3QuVGVzdE1hcC5N", 
-            "YXBJbnQzMkVudW1FbnRyeRJZChltYXBfaW50MzJfZm9yZWlnbl9tZXNzYWdl", 
-            "GBEgAygLMjYucHJvdG9idWZfdW5pdHRlc3QuVGVzdE1hcC5NYXBJbnQzMkZv", 
-            "cmVpZ25NZXNzYWdlRW50cnkaNAoSTWFwSW50MzJJbnQzMkVudHJ5EgsKA2tl", 
-            "eRgBIAEoBRINCgV2YWx1ZRgCIAEoBToCOAEaNAoSTWFwSW50NjRJbnQ2NEVu", 
-            "dHJ5EgsKA2tleRgBIAEoAxINCgV2YWx1ZRgCIAEoAzoCOAEaNgoUTWFwVWlu", 
-            "dDMyVWludDMyRW50cnkSCwoDa2V5GAEgASgNEg0KBXZhbHVlGAIgASgNOgI4", 
-            "ARo2ChRNYXBVaW50NjRVaW50NjRFbnRyeRILCgNrZXkYASABKAQSDQoFdmFs", 
-            "dWUYAiABKAQ6AjgBGjYKFE1hcFNpbnQzMlNpbnQzMkVudHJ5EgsKA2tleRgB", 
-            "IAEoERINCgV2YWx1ZRgCIAEoEToCOAEaNgoUTWFwU2ludDY0U2ludDY0RW50", 
-            "cnkSCwoDa2V5GAEgASgSEg0KBXZhbHVlGAIgASgSOgI4ARo4ChZNYXBGaXhl", 
-            "ZDMyRml4ZWQzMkVudHJ5EgsKA2tleRgBIAEoBxINCgV2YWx1ZRgCIAEoBzoC", 
-            "OAEaOAoWTWFwRml4ZWQ2NEZpeGVkNjRFbnRyeRILCgNrZXkYASABKAYSDQoF", 
-            "dmFsdWUYAiABKAY6AjgBGjoKGE1hcFNmaXhlZDMyU2ZpeGVkMzJFbnRyeRIL", 
-            "CgNrZXkYASABKA8SDQoFdmFsdWUYAiABKA86AjgBGjoKGE1hcFNmaXhlZDY0", 
-            "U2ZpeGVkNjRFbnRyeRILCgNrZXkYASABKBASDQoFdmFsdWUYAiABKBA6AjgB", 
-            "GjQKEk1hcEludDMyRmxvYXRFbnRyeRILCgNrZXkYASABKAUSDQoFdmFsdWUY", 
-            "AiABKAI6AjgBGjUKE01hcEludDMyRG91YmxlRW50cnkSCwoDa2V5GAEgASgF", 
-            "Eg0KBXZhbHVlGAIgASgBOgI4ARoyChBNYXBCb29sQm9vbEVudHJ5EgsKA2tl", 
-            "eRgBIAEoCBINCgV2YWx1ZRgCIAEoCDoCOAEaNgoUTWFwU3RyaW5nU3RyaW5n", 
-            "RW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ARo0ChJNYXBJ", 
-            "bnQzMkJ5dGVzRW50cnkSCwoDa2V5GAEgASgFEg0KBXZhbHVlGAIgASgMOgI4", 
-            "ARpPChFNYXBJbnQzMkVudW1FbnRyeRILCgNrZXkYASABKAUSKQoFdmFsdWUY", 
-            "AiABKA4yGi5wcm90b2J1Zl91bml0dGVzdC5NYXBFbnVtOgI4ARpgChtNYXBJ", 
-            "bnQzMkZvcmVpZ25NZXNzYWdlRW50cnkSCwoDa2V5GAEgASgFEjAKBXZhbHVl", 
-            "GAIgASgLMiEucHJvdG9idWZfdW5pdHRlc3QuRm9yZWlnbk1lc3NhZ2U6AjgB", 
-            "IkEKEVRlc3RNYXBTdWJtZXNzYWdlEiwKCHRlc3RfbWFwGAEgASgLMhoucHJv", 
-            "dG9idWZfdW5pdHRlc3QuVGVzdE1hcCK8AQoOVGVzdE1lc3NhZ2VNYXASUQoR", 
-            "bWFwX2ludDMyX21lc3NhZ2UYASADKAsyNi5wcm90b2J1Zl91bml0dGVzdC5U", 
-            "ZXN0TWVzc2FnZU1hcC5NYXBJbnQzMk1lc3NhZ2VFbnRyeRpXChRNYXBJbnQz", 
-            "Mk1lc3NhZ2VFbnRyeRILCgNrZXkYASABKAUSLgoFdmFsdWUYAiABKAsyHy5w", 
-            "cm90b2J1Zl91bml0dGVzdC5UZXN0QWxsVHlwZXM6AjgBIuMBCg9UZXN0U2Ft", 
-            "ZVR5cGVNYXASOgoEbWFwMRgBIAMoCzIsLnByb3RvYnVmX3VuaXR0ZXN0LlRl", 
-            "c3RTYW1lVHlwZU1hcC5NYXAxRW50cnkSOgoEbWFwMhgCIAMoCzIsLnByb3Rv", 
-            "YnVmX3VuaXR0ZXN0LlRlc3RTYW1lVHlwZU1hcC5NYXAyRW50cnkaKwoJTWFw", 
-            "MUVudHJ5EgsKA2tleRgBIAEoBRINCgV2YWx1ZRgCIAEoBToCOAEaKwoJTWFw", 
-            "MkVudHJ5EgsKA2tleRgBIAEoBRINCgV2YWx1ZRgCIAEoBToCOAEi5BAKDFRl", 
-            "c3RBcmVuYU1hcBJLCg9tYXBfaW50MzJfaW50MzIYASADKAsyMi5wcm90b2J1", 
-            "Zl91bml0dGVzdC5UZXN0QXJlbmFNYXAuTWFwSW50MzJJbnQzMkVudHJ5EksK", 
-            "D21hcF9pbnQ2NF9pbnQ2NBgCIAMoCzIyLnByb3RvYnVmX3VuaXR0ZXN0LlRl", 
-            "c3RBcmVuYU1hcC5NYXBJbnQ2NEludDY0RW50cnkSTwoRbWFwX3VpbnQzMl91", 
-            "aW50MzIYAyADKAsyNC5wcm90b2J1Zl91bml0dGVzdC5UZXN0QXJlbmFNYXAu", 
-            "TWFwVWludDMyVWludDMyRW50cnkSTwoRbWFwX3VpbnQ2NF91aW50NjQYBCAD", 
-            "KAsyNC5wcm90b2J1Zl91bml0dGVzdC5UZXN0QXJlbmFNYXAuTWFwVWludDY0", 
-            "VWludDY0RW50cnkSTwoRbWFwX3NpbnQzMl9zaW50MzIYBSADKAsyNC5wcm90", 
-            "b2J1Zl91bml0dGVzdC5UZXN0QXJlbmFNYXAuTWFwU2ludDMyU2ludDMyRW50", 
-            "cnkSTwoRbWFwX3NpbnQ2NF9zaW50NjQYBiADKAsyNC5wcm90b2J1Zl91bml0", 
-            "dGVzdC5UZXN0QXJlbmFNYXAuTWFwU2ludDY0U2ludDY0RW50cnkSUwoTbWFw", 
-            "X2ZpeGVkMzJfZml4ZWQzMhgHIAMoCzI2LnByb3RvYnVmX3VuaXR0ZXN0LlRl", 
-            "c3RBcmVuYU1hcC5NYXBGaXhlZDMyRml4ZWQzMkVudHJ5ElMKE21hcF9maXhl", 
-            "ZDY0X2ZpeGVkNjQYCCADKAsyNi5wcm90b2J1Zl91bml0dGVzdC5UZXN0QXJl", 
-            "bmFNYXAuTWFwRml4ZWQ2NEZpeGVkNjRFbnRyeRJXChVtYXBfc2ZpeGVkMzJf", 
-            "c2ZpeGVkMzIYCSADKAsyOC5wcm90b2J1Zl91bml0dGVzdC5UZXN0QXJlbmFN", 
-            "YXAuTWFwU2ZpeGVkMzJTZml4ZWQzMkVudHJ5ElcKFW1hcF9zZml4ZWQ2NF9z", 
-            "Zml4ZWQ2NBgKIAMoCzI4LnByb3RvYnVmX3VuaXR0ZXN0LlRlc3RBcmVuYU1h", 
-            "cC5NYXBTZml4ZWQ2NFNmaXhlZDY0RW50cnkSSwoPbWFwX2ludDMyX2Zsb2F0", 
-            "GAsgAygLMjIucHJvdG9idWZfdW5pdHRlc3QuVGVzdEFyZW5hTWFwLk1hcElu", 
-            "dDMyRmxvYXRFbnRyeRJNChBtYXBfaW50MzJfZG91YmxlGAwgAygLMjMucHJv", 
-            "dG9idWZfdW5pdHRlc3QuVGVzdEFyZW5hTWFwLk1hcEludDMyRG91YmxlRW50", 
-            "cnkSRwoNbWFwX2Jvb2xfYm9vbBgNIAMoCzIwLnByb3RvYnVmX3VuaXR0ZXN0", 
-            "LlRlc3RBcmVuYU1hcC5NYXBCb29sQm9vbEVudHJ5EkkKDm1hcF9pbnQzMl9l", 
-            "bnVtGA4gAygLMjEucHJvdG9idWZfdW5pdHRlc3QuVGVzdEFyZW5hTWFwLk1h", 
-            "cEludDMyRW51bUVudHJ5El4KGW1hcF9pbnQzMl9mb3JlaWduX21lc3NhZ2UY", 
-            "DyADKAsyOy5wcm90b2J1Zl91bml0dGVzdC5UZXN0QXJlbmFNYXAuTWFwSW50", 
-            "MzJGb3JlaWduTWVzc2FnZUVudHJ5GjQKEk1hcEludDMySW50MzJFbnRyeRIL", 
-            "CgNrZXkYASABKAUSDQoFdmFsdWUYAiABKAU6AjgBGjQKEk1hcEludDY0SW50", 
-            "NjRFbnRyeRILCgNrZXkYASABKAMSDQoFdmFsdWUYAiABKAM6AjgBGjYKFE1h", 
-            "cFVpbnQzMlVpbnQzMkVudHJ5EgsKA2tleRgBIAEoDRINCgV2YWx1ZRgCIAEo", 
-            "DToCOAEaNgoUTWFwVWludDY0VWludDY0RW50cnkSCwoDa2V5GAEgASgEEg0K", 
-            "BXZhbHVlGAIgASgEOgI4ARo2ChRNYXBTaW50MzJTaW50MzJFbnRyeRILCgNr", 
-            "ZXkYASABKBESDQoFdmFsdWUYAiABKBE6AjgBGjYKFE1hcFNpbnQ2NFNpbnQ2", 
-            "NEVudHJ5EgsKA2tleRgBIAEoEhINCgV2YWx1ZRgCIAEoEjoCOAEaOAoWTWFw", 
-            "Rml4ZWQzMkZpeGVkMzJFbnRyeRILCgNrZXkYASABKAcSDQoFdmFsdWUYAiAB", 
-            "KAc6AjgBGjgKFk1hcEZpeGVkNjRGaXhlZDY0RW50cnkSCwoDa2V5GAEgASgG", 
-            "Eg0KBXZhbHVlGAIgASgGOgI4ARo6ChhNYXBTZml4ZWQzMlNmaXhlZDMyRW50", 
-            "cnkSCwoDa2V5GAEgASgPEg0KBXZhbHVlGAIgASgPOgI4ARo6ChhNYXBTZml4", 
-            "ZWQ2NFNmaXhlZDY0RW50cnkSCwoDa2V5GAEgASgQEg0KBXZhbHVlGAIgASgQ", 
-            "OgI4ARo0ChJNYXBJbnQzMkZsb2F0RW50cnkSCwoDa2V5GAEgASgFEg0KBXZh", 
-            "bHVlGAIgASgCOgI4ARo1ChNNYXBJbnQzMkRvdWJsZUVudHJ5EgsKA2tleRgB", 
-            "IAEoBRINCgV2YWx1ZRgCIAEoAToCOAEaMgoQTWFwQm9vbEJvb2xFbnRyeRIL", 
-            "CgNrZXkYASABKAgSDQoFdmFsdWUYAiABKAg6AjgBGk8KEU1hcEludDMyRW51", 
-            "bUVudHJ5EgsKA2tleRgBIAEoBRIpCgV2YWx1ZRgCIAEoDjIaLnByb3RvYnVm", 
-            "X3VuaXR0ZXN0Lk1hcEVudW06AjgBGmAKG01hcEludDMyRm9yZWlnbk1lc3Nh", 
-            "Z2VFbnRyeRILCgNrZXkYASABKAUSMAoFdmFsdWUYAiABKAsyIS5wcm90b2J1", 
-            "Zl91bml0dGVzdC5Gb3JlaWduTWVzc2FnZToCOAEi5AEKH01lc3NhZ2VDb250", 
-            "YWluaW5nRW51bUNhbGxlZFR5cGUSSgoEdHlwZRgBIAMoCzI8LnByb3RvYnVm", 
-            "X3VuaXR0ZXN0Lk1lc3NhZ2VDb250YWluaW5nRW51bUNhbGxlZFR5cGUuVHlw", 
-            "ZUVudHJ5Gl8KCVR5cGVFbnRyeRILCgNrZXkYASABKAUSQQoFdmFsdWUYAiAB", 
-            "KAsyMi5wcm90b2J1Zl91bml0dGVzdC5NZXNzYWdlQ29udGFpbmluZ0VudW1D", 
-            "YWxsZWRUeXBlOgI4ASIUCgRUeXBlEgwKCFRZUEVfRk9PEAAinQEKH01lc3Nh", 
-            "Z2VDb250YWluaW5nTWFwQ2FsbGVkRW50cnkSTAoFZW50cnkYASADKAsyPS5w", 
-            "cm90b2J1Zl91bml0dGVzdC5NZXNzYWdlQ29udGFpbmluZ01hcENhbGxlZEVu", 
-            "dHJ5LkVudHJ5RW50cnkaLAoKRW50cnlFbnRyeRILCgNrZXkYASABKAUSDQoF", 
-            "dmFsdWUYAiABKAU6AjgBKj8KB01hcEVudW0SEAoMTUFQX0VOVU1fRk9PEAAS", 
-            "EAoMTUFQX0VOVU1fQkFSEAESEAoMTUFQX0VOVU1fQkFaEAJCIPgBAaoCGkdv", 
-          "b2dsZS5Qcm90b2J1Zi5UZXN0UHJvdG9zYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-          new pbr::FileDescriptor[] {
-          global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor, 
-          });
-      internal__static_protobuf_unittest_TestMap__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap), descriptor.MessageTypes[0],
-              new string[] { "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapInt32Bytes", "MapInt32Enum", "MapInt32ForeignMessage", }, new string[] { });
-      internal__static_protobuf_unittest_TestMapSubmessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMapSubmessage), descriptor.MessageTypes[1],
-              new string[] { "TestMap", }, new string[] { });
-      internal__static_protobuf_unittest_TestMessageMap__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMessageMap), descriptor.MessageTypes[2],
-              new string[] { "MapInt32Message", }, new string[] { });
-      internal__static_protobuf_unittest_TestSameTypeMap__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestSameTypeMap), descriptor.MessageTypes[3],
-              new string[] { "Map1", "Map2", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap), descriptor.MessageTypes[4],
-              new string[] { "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapInt32Enum", "MapInt32ForeignMessage", }, new string[] { });
-      internal__static_protobuf_unittest_MessageContainingEnumCalledType__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType), descriptor.MessageTypes[5],
-              new string[] { "Type", }, new string[] { });
-      internal__static_protobuf_unittest_MessageContainingMapCalledEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MessageContainingMapCalledEntry), descriptor.MessageTypes[6],
-              new string[] { "Entry", }, new string[] { });
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum MapEnum {
-    MAP_ENUM_FOO = 0,
-    MAP_ENUM_BAR = 1,
-    MAP_ENUM_BAZ = 2,
-  }
-
-  #endregion
-
-  #region Messages
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestMap : pb::IMessage<TestMap> {
-    private static readonly pb::MessageParser<TestMap> _parser = new pb::MessageParser<TestMap>(() => new TestMap());
-    public static pb::MessageParser<TestMap> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "map_bool_bool", "map_fixed32_fixed32", "map_fixed64_fixed64", "map_int32_bytes", "map_int32_double", "map_int32_enum", "map_int32_float", "map_int32_foreign_message", "map_int32_int32", "map_int64_int64", "map_sfixed32_sfixed32", "map_sfixed64_sfixed64", "map_sint32_sint32", "map_sint64_sint64", "map_string_string", "map_uint32_uint32", "map_uint64_uint64" };
-    private static readonly uint[] _fieldTags = new uint[] { 106, 58, 66, 122, 98, 130, 90, 138, 10, 18, 74, 82, 42, 50, 114, 26, 34 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[0]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestMap() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestMap(TestMap other) : this() {
-      mapInt32Int32_ = other.mapInt32Int32_.Clone();
-      mapInt64Int64_ = other.mapInt64Int64_.Clone();
-      mapUint32Uint32_ = other.mapUint32Uint32_.Clone();
-      mapUint64Uint64_ = other.mapUint64Uint64_.Clone();
-      mapSint32Sint32_ = other.mapSint32Sint32_.Clone();
-      mapSint64Sint64_ = other.mapSint64Sint64_.Clone();
-      mapFixed32Fixed32_ = other.mapFixed32Fixed32_.Clone();
-      mapFixed64Fixed64_ = other.mapFixed64Fixed64_.Clone();
-      mapSfixed32Sfixed32_ = other.mapSfixed32Sfixed32_.Clone();
-      mapSfixed64Sfixed64_ = other.mapSfixed64Sfixed64_.Clone();
-      mapInt32Float_ = other.mapInt32Float_.Clone();
-      mapInt32Double_ = other.mapInt32Double_.Clone();
-      mapBoolBool_ = other.mapBoolBool_.Clone();
-      mapStringString_ = other.mapStringString_.Clone();
-      mapInt32Bytes_ = other.mapInt32Bytes_.Clone();
-      mapInt32Enum_ = other.mapInt32Enum_.Clone();
-      mapInt32ForeignMessage_ = other.mapInt32ForeignMessage_.Clone();
-    }
-
-    public TestMap Clone() {
-      return new TestMap(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      mapInt32Int32_.Freeze();
-      mapInt64Int64_.Freeze();
-      mapUint32Uint32_.Freeze();
-      mapUint64Uint64_.Freeze();
-      mapSint32Sint32_.Freeze();
-      mapSint64Sint64_.Freeze();
-      mapFixed32Fixed32_.Freeze();
-      mapFixed64Fixed64_.Freeze();
-      mapSfixed32Sfixed32_.Freeze();
-      mapSfixed64Sfixed64_.Freeze();
-      mapInt32Float_.Freeze();
-      mapInt32Double_.Freeze();
-      mapBoolBool_.Freeze();
-      mapStringString_.Freeze();
-      mapInt32Bytes_.Freeze();
-      mapInt32Enum_.Freeze();
-      mapInt32ForeignMessage_.Freeze();
-    }
-
-    public const int MapInt32Int32FieldNumber = 1;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapInt32Int32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForInt32(16), 10);
-    private readonly pbc::MapField<int, int> mapInt32Int32_ = new pbc::MapField<int, int>();
-    public pbc::MapField<int, int> MapInt32Int32 {
-      get { return mapInt32Int32_; }
-    }
-
-    public const int MapInt64Int64FieldNumber = 2;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapInt64Int64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForInt64(8), pb::FieldCodec.ForInt64(16), 18);
-    private readonly pbc::MapField<long, long> mapInt64Int64_ = new pbc::MapField<long, long>();
-    public pbc::MapField<long, long> MapInt64Int64 {
-      get { return mapInt64Int64_; }
-    }
-
-    public const int MapUint32Uint32FieldNumber = 3;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapUint32Uint32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForUInt32(8), pb::FieldCodec.ForUInt32(16), 26);
-    private readonly pbc::MapField<uint, uint> mapUint32Uint32_ = new pbc::MapField<uint, uint>();
-    public pbc::MapField<uint, uint> MapUint32Uint32 {
-      get { return mapUint32Uint32_; }
-    }
-
-    public const int MapUint64Uint64FieldNumber = 4;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapUint64Uint64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForUInt64(8), pb::FieldCodec.ForUInt64(16), 34);
-    private readonly pbc::MapField<ulong, ulong> mapUint64Uint64_ = new pbc::MapField<ulong, ulong>();
-    public pbc::MapField<ulong, ulong> MapUint64Uint64 {
-      get { return mapUint64Uint64_; }
-    }
-
-    public const int MapSint32Sint32FieldNumber = 5;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSint32Sint32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSInt32(8), pb::FieldCodec.ForSInt32(16), 42);
-    private readonly pbc::MapField<int, int> mapSint32Sint32_ = new pbc::MapField<int, int>();
-    public pbc::MapField<int, int> MapSint32Sint32 {
-      get { return mapSint32Sint32_; }
-    }
-
-    public const int MapSint64Sint64FieldNumber = 6;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSint64Sint64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSInt64(8), pb::FieldCodec.ForSInt64(16), 50);
-    private readonly pbc::MapField<long, long> mapSint64Sint64_ = new pbc::MapField<long, long>();
-    public pbc::MapField<long, long> MapSint64Sint64 {
-      get { return mapSint64Sint64_; }
-    }
-
-    public const int MapFixed32Fixed32FieldNumber = 7;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapFixed32Fixed32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForFixed32(13), pb::FieldCodec.ForFixed32(21), 58);
-    private readonly pbc::MapField<uint, uint> mapFixed32Fixed32_ = new pbc::MapField<uint, uint>();
-    public pbc::MapField<uint, uint> MapFixed32Fixed32 {
-      get { return mapFixed32Fixed32_; }
-    }
-
-    public const int MapFixed64Fixed64FieldNumber = 8;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapFixed64Fixed64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForFixed64(9), pb::FieldCodec.ForFixed64(17), 66);
-    private readonly pbc::MapField<ulong, ulong> mapFixed64Fixed64_ = new pbc::MapField<ulong, ulong>();
-    public pbc::MapField<ulong, ulong> MapFixed64Fixed64 {
-      get { return mapFixed64Fixed64_; }
-    }
-
-    public const int MapSfixed32Sfixed32FieldNumber = 9;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSfixed32Sfixed32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSFixed32(13), pb::FieldCodec.ForSFixed32(21), 74);
-    private readonly pbc::MapField<int, int> mapSfixed32Sfixed32_ = new pbc::MapField<int, int>();
-    public pbc::MapField<int, int> MapSfixed32Sfixed32 {
-      get { return mapSfixed32Sfixed32_; }
-    }
-
-    public const int MapSfixed64Sfixed64FieldNumber = 10;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSfixed64Sfixed64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSFixed64(9), pb::FieldCodec.ForSFixed64(17), 82);
-    private readonly pbc::MapField<long, long> mapSfixed64Sfixed64_ = new pbc::MapField<long, long>();
-    public pbc::MapField<long, long> MapSfixed64Sfixed64 {
-      get { return mapSfixed64Sfixed64_; }
-    }
-
-    public const int MapInt32FloatFieldNumber = 11;
-    private static readonly pbc::MapField<int, float>.Codec _map_mapInt32Float_codec
-        = new pbc::MapField<int, float>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForFloat(21), 90);
-    private readonly pbc::MapField<int, float> mapInt32Float_ = new pbc::MapField<int, float>();
-    public pbc::MapField<int, float> MapInt32Float {
-      get { return mapInt32Float_; }
-    }
-
-    public const int MapInt32DoubleFieldNumber = 12;
-    private static readonly pbc::MapField<int, double>.Codec _map_mapInt32Double_codec
-        = new pbc::MapField<int, double>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForDouble(17), 98);
-    private readonly pbc::MapField<int, double> mapInt32Double_ = new pbc::MapField<int, double>();
-    public pbc::MapField<int, double> MapInt32Double {
-      get { return mapInt32Double_; }
-    }
-
-    public const int MapBoolBoolFieldNumber = 13;
-    private static readonly pbc::MapField<bool, bool>.Codec _map_mapBoolBool_codec
-        = new pbc::MapField<bool, bool>.Codec(pb::FieldCodec.ForBool(8), pb::FieldCodec.ForBool(16), 106);
-    private readonly pbc::MapField<bool, bool> mapBoolBool_ = new pbc::MapField<bool, bool>();
-    public pbc::MapField<bool, bool> MapBoolBool {
-      get { return mapBoolBool_; }
-    }
-
-    public const int MapStringStringFieldNumber = 14;
-    private static readonly pbc::MapField<string, string>.Codec _map_mapStringString_codec
-        = new pbc::MapField<string, string>.Codec(pb::FieldCodec.ForString(10), pb::FieldCodec.ForString(18), 114);
-    private readonly pbc::MapField<string, string> mapStringString_ = new pbc::MapField<string, string>();
-    public pbc::MapField<string, string> MapStringString {
-      get { return mapStringString_; }
-    }
-
-    public const int MapInt32BytesFieldNumber = 15;
-    private static readonly pbc::MapField<int, pb::ByteString>.Codec _map_mapInt32Bytes_codec
-        = new pbc::MapField<int, pb::ByteString>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForBytes(18), 122);
-    private readonly pbc::MapField<int, pb::ByteString> mapInt32Bytes_ = new pbc::MapField<int, pb::ByteString>();
-    public pbc::MapField<int, pb::ByteString> MapInt32Bytes {
-      get { return mapInt32Bytes_; }
-    }
-
-    public const int MapInt32EnumFieldNumber = 16;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec _map_mapInt32Enum_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::Google.Protobuf.TestProtos.MapEnum) x), 130);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> mapInt32Enum_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>();
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> MapInt32Enum {
-      get { return mapInt32Enum_; }
-    }
-
-    public const int MapInt32ForeignMessageFieldNumber = 17;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec _map_mapInt32ForeignMessage_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.ForeignMessage.Parser), 138);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> mapInt32ForeignMessage_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>();
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> MapInt32ForeignMessage {
-      get { return mapInt32ForeignMessage_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestMap);
-    }
-
-    public bool Equals(TestMap other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!MapInt32Int32.Equals(other.MapInt32Int32)) return false;
-      if (!MapInt64Int64.Equals(other.MapInt64Int64)) return false;
-      if (!MapUint32Uint32.Equals(other.MapUint32Uint32)) return false;
-      if (!MapUint64Uint64.Equals(other.MapUint64Uint64)) return false;
-      if (!MapSint32Sint32.Equals(other.MapSint32Sint32)) return false;
-      if (!MapSint64Sint64.Equals(other.MapSint64Sint64)) return false;
-      if (!MapFixed32Fixed32.Equals(other.MapFixed32Fixed32)) return false;
-      if (!MapFixed64Fixed64.Equals(other.MapFixed64Fixed64)) return false;
-      if (!MapSfixed32Sfixed32.Equals(other.MapSfixed32Sfixed32)) return false;
-      if (!MapSfixed64Sfixed64.Equals(other.MapSfixed64Sfixed64)) return false;
-      if (!MapInt32Float.Equals(other.MapInt32Float)) return false;
-      if (!MapInt32Double.Equals(other.MapInt32Double)) return false;
-      if (!MapBoolBool.Equals(other.MapBoolBool)) return false;
-      if (!MapStringString.Equals(other.MapStringString)) return false;
-      if (!MapInt32Bytes.Equals(other.MapInt32Bytes)) return false;
-      if (!MapInt32Enum.Equals(other.MapInt32Enum)) return false;
-      if (!MapInt32ForeignMessage.Equals(other.MapInt32ForeignMessage)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= MapInt32Int32.GetHashCode();
-      hash ^= MapInt64Int64.GetHashCode();
-      hash ^= MapUint32Uint32.GetHashCode();
-      hash ^= MapUint64Uint64.GetHashCode();
-      hash ^= MapSint32Sint32.GetHashCode();
-      hash ^= MapSint64Sint64.GetHashCode();
-      hash ^= MapFixed32Fixed32.GetHashCode();
-      hash ^= MapFixed64Fixed64.GetHashCode();
-      hash ^= MapSfixed32Sfixed32.GetHashCode();
-      hash ^= MapSfixed64Sfixed64.GetHashCode();
-      hash ^= MapInt32Float.GetHashCode();
-      hash ^= MapInt32Double.GetHashCode();
-      hash ^= MapBoolBool.GetHashCode();
-      hash ^= MapStringString.GetHashCode();
-      hash ^= MapInt32Bytes.GetHashCode();
-      hash ^= MapInt32Enum.GetHashCode();
-      hash ^= MapInt32ForeignMessage.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      mapInt32Int32_.WriteTo(output, _map_mapInt32Int32_codec);
-      mapInt64Int64_.WriteTo(output, _map_mapInt64Int64_codec);
-      mapUint32Uint32_.WriteTo(output, _map_mapUint32Uint32_codec);
-      mapUint64Uint64_.WriteTo(output, _map_mapUint64Uint64_codec);
-      mapSint32Sint32_.WriteTo(output, _map_mapSint32Sint32_codec);
-      mapSint64Sint64_.WriteTo(output, _map_mapSint64Sint64_codec);
-      mapFixed32Fixed32_.WriteTo(output, _map_mapFixed32Fixed32_codec);
-      mapFixed64Fixed64_.WriteTo(output, _map_mapFixed64Fixed64_codec);
-      mapSfixed32Sfixed32_.WriteTo(output, _map_mapSfixed32Sfixed32_codec);
-      mapSfixed64Sfixed64_.WriteTo(output, _map_mapSfixed64Sfixed64_codec);
-      mapInt32Float_.WriteTo(output, _map_mapInt32Float_codec);
-      mapInt32Double_.WriteTo(output, _map_mapInt32Double_codec);
-      mapBoolBool_.WriteTo(output, _map_mapBoolBool_codec);
-      mapStringString_.WriteTo(output, _map_mapStringString_codec);
-      mapInt32Bytes_.WriteTo(output, _map_mapInt32Bytes_codec);
-      mapInt32Enum_.WriteTo(output, _map_mapInt32Enum_codec);
-      mapInt32ForeignMessage_.WriteTo(output, _map_mapInt32ForeignMessage_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += mapInt32Int32_.CalculateSize(_map_mapInt32Int32_codec);
-      size += mapInt64Int64_.CalculateSize(_map_mapInt64Int64_codec);
-      size += mapUint32Uint32_.CalculateSize(_map_mapUint32Uint32_codec);
-      size += mapUint64Uint64_.CalculateSize(_map_mapUint64Uint64_codec);
-      size += mapSint32Sint32_.CalculateSize(_map_mapSint32Sint32_codec);
-      size += mapSint64Sint64_.CalculateSize(_map_mapSint64Sint64_codec);
-      size += mapFixed32Fixed32_.CalculateSize(_map_mapFixed32Fixed32_codec);
-      size += mapFixed64Fixed64_.CalculateSize(_map_mapFixed64Fixed64_codec);
-      size += mapSfixed32Sfixed32_.CalculateSize(_map_mapSfixed32Sfixed32_codec);
-      size += mapSfixed64Sfixed64_.CalculateSize(_map_mapSfixed64Sfixed64_codec);
-      size += mapInt32Float_.CalculateSize(_map_mapInt32Float_codec);
-      size += mapInt32Double_.CalculateSize(_map_mapInt32Double_codec);
-      size += mapBoolBool_.CalculateSize(_map_mapBoolBool_codec);
-      size += mapStringString_.CalculateSize(_map_mapStringString_codec);
-      size += mapInt32Bytes_.CalculateSize(_map_mapInt32Bytes_codec);
-      size += mapInt32Enum_.CalculateSize(_map_mapInt32Enum_codec);
-      size += mapInt32ForeignMessage_.CalculateSize(_map_mapInt32ForeignMessage_codec);
-      return size;
-    }
-
-    public void MergeFrom(TestMap other) {
-      if (other == null) {
-        return;
-      }
-      mapInt32Int32_.Add(other.mapInt32Int32_);
-      mapInt64Int64_.Add(other.mapInt64Int64_);
-      mapUint32Uint32_.Add(other.mapUint32Uint32_);
-      mapUint64Uint64_.Add(other.mapUint64Uint64_);
-      mapSint32Sint32_.Add(other.mapSint32Sint32_);
-      mapSint64Sint64_.Add(other.mapSint64Sint64_);
-      mapFixed32Fixed32_.Add(other.mapFixed32Fixed32_);
-      mapFixed64Fixed64_.Add(other.mapFixed64Fixed64_);
-      mapSfixed32Sfixed32_.Add(other.mapSfixed32Sfixed32_);
-      mapSfixed64Sfixed64_.Add(other.mapSfixed64Sfixed64_);
-      mapInt32Float_.Add(other.mapInt32Float_);
-      mapInt32Double_.Add(other.mapInt32Double_);
-      mapBoolBool_.Add(other.mapBoolBool_);
-      mapStringString_.Add(other.mapStringString_);
-      mapInt32Bytes_.Add(other.mapInt32Bytes_);
-      mapInt32Enum_.Add(other.mapInt32Enum_);
-      mapInt32ForeignMessage_.Add(other.mapInt32ForeignMessage_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec);
-            break;
-          }
-          case 18: {
-            mapInt64Int64_.AddEntriesFrom(input, _map_mapInt64Int64_codec);
-            break;
-          }
-          case 26: {
-            mapUint32Uint32_.AddEntriesFrom(input, _map_mapUint32Uint32_codec);
-            break;
-          }
-          case 34: {
-            mapUint64Uint64_.AddEntriesFrom(input, _map_mapUint64Uint64_codec);
-            break;
-          }
-          case 42: {
-            mapSint32Sint32_.AddEntriesFrom(input, _map_mapSint32Sint32_codec);
-            break;
-          }
-          case 50: {
-            mapSint64Sint64_.AddEntriesFrom(input, _map_mapSint64Sint64_codec);
-            break;
-          }
-          case 58: {
-            mapFixed32Fixed32_.AddEntriesFrom(input, _map_mapFixed32Fixed32_codec);
-            break;
-          }
-          case 66: {
-            mapFixed64Fixed64_.AddEntriesFrom(input, _map_mapFixed64Fixed64_codec);
-            break;
-          }
-          case 74: {
-            mapSfixed32Sfixed32_.AddEntriesFrom(input, _map_mapSfixed32Sfixed32_codec);
-            break;
-          }
-          case 82: {
-            mapSfixed64Sfixed64_.AddEntriesFrom(input, _map_mapSfixed64Sfixed64_codec);
-            break;
-          }
-          case 90: {
-            mapInt32Float_.AddEntriesFrom(input, _map_mapInt32Float_codec);
-            break;
-          }
-          case 98: {
-            mapInt32Double_.AddEntriesFrom(input, _map_mapInt32Double_codec);
-            break;
-          }
-          case 106: {
-            mapBoolBool_.AddEntriesFrom(input, _map_mapBoolBool_codec);
-            break;
-          }
-          case 114: {
-            mapStringString_.AddEntriesFrom(input, _map_mapStringString_codec);
-            break;
-          }
-          case 122: {
-            mapInt32Bytes_.AddEntriesFrom(input, _map_mapInt32Bytes_codec);
-            break;
-          }
-          case 130: {
-            mapInt32Enum_.AddEntriesFrom(input, _map_mapInt32Enum_codec);
-            break;
-          }
-          case 138: {
-            mapInt32ForeignMessage_.AddEntriesFrom(input, _map_mapInt32ForeignMessage_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestMapSubmessage : pb::IMessage<TestMapSubmessage> {
-    private static readonly pb::MessageParser<TestMapSubmessage> _parser = new pb::MessageParser<TestMapSubmessage>(() => new TestMapSubmessage());
-    public static pb::MessageParser<TestMapSubmessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "test_map" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[1]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMapSubmessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestMapSubmessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestMapSubmessage(TestMapSubmessage other) : this() {
-      TestMap = other.testMap_ != null ? other.TestMap.Clone() : null;
-    }
-
-    public TestMapSubmessage Clone() {
-      return new TestMapSubmessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (testMap_ != null) TestMap.Freeze();
-    }
-
-    public const int TestMapFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestMap testMap_;
-    public global::Google.Protobuf.TestProtos.TestMap TestMap {
-      get { return testMap_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        testMap_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestMapSubmessage);
-    }
-
-    public bool Equals(TestMapSubmessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(TestMap, other.TestMap)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (testMap_ != null) hash ^= TestMap.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (testMap_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(TestMap);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (testMap_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(TestMap);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestMapSubmessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.testMap_ != null) {
-        if (testMap_ == null) {
-          testMap_ = new global::Google.Protobuf.TestProtos.TestMap();
-        }
-        TestMap.MergeFrom(other.TestMap);
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            if (testMap_ == null) {
-              testMap_ = new global::Google.Protobuf.TestProtos.TestMap();
-            }
-            input.ReadMessage(testMap_);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestMessageMap : pb::IMessage<TestMessageMap> {
-    private static readonly pb::MessageParser<TestMessageMap> _parser = new pb::MessageParser<TestMessageMap>(() => new TestMessageMap());
-    public static pb::MessageParser<TestMessageMap> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "map_int32_message" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[2]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMessageMap__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestMessageMap() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestMessageMap(TestMessageMap other) : this() {
-      mapInt32Message_ = other.mapInt32Message_.Clone();
-    }
-
-    public TestMessageMap Clone() {
-      return new TestMessageMap(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      mapInt32Message_.Freeze();
-    }
-
-    public const int MapInt32MessageFieldNumber = 1;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes>.Codec _map_mapInt32Message_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.TestAllTypes.Parser), 10);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes> mapInt32Message_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes>();
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes> MapInt32Message {
-      get { return mapInt32Message_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestMessageMap);
-    }
-
-    public bool Equals(TestMessageMap other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!MapInt32Message.Equals(other.MapInt32Message)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= MapInt32Message.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      mapInt32Message_.WriteTo(output, _map_mapInt32Message_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += mapInt32Message_.CalculateSize(_map_mapInt32Message_codec);
-      return size;
-    }
-
-    public void MergeFrom(TestMessageMap other) {
-      if (other == null) {
-        return;
-      }
-      mapInt32Message_.Add(other.mapInt32Message_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            mapInt32Message_.AddEntriesFrom(input, _map_mapInt32Message_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestSameTypeMap : pb::IMessage<TestSameTypeMap> {
-    private static readonly pb::MessageParser<TestSameTypeMap> _parser = new pb::MessageParser<TestSameTypeMap>(() => new TestSameTypeMap());
-    public static pb::MessageParser<TestSameTypeMap> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "map1", "map2" };
-    private static readonly uint[] _fieldTags = new uint[] { 10, 18 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[3]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestSameTypeMap__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestSameTypeMap() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestSameTypeMap(TestSameTypeMap other) : this() {
-      map1_ = other.map1_.Clone();
-      map2_ = other.map2_.Clone();
-    }
-
-    public TestSameTypeMap Clone() {
-      return new TestSameTypeMap(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      map1_.Freeze();
-      map2_.Freeze();
-    }
-
-    public const int Map1FieldNumber = 1;
-    private static readonly pbc::MapField<int, int>.Codec _map_map1_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForInt32(16), 10);
-    private readonly pbc::MapField<int, int> map1_ = new pbc::MapField<int, int>();
-    public pbc::MapField<int, int> Map1 {
-      get { return map1_; }
-    }
-
-    public const int Map2FieldNumber = 2;
-    private static readonly pbc::MapField<int, int>.Codec _map_map2_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForInt32(16), 18);
-    private readonly pbc::MapField<int, int> map2_ = new pbc::MapField<int, int>();
-    public pbc::MapField<int, int> Map2 {
-      get { return map2_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestSameTypeMap);
-    }
-
-    public bool Equals(TestSameTypeMap other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Map1.Equals(other.Map1)) return false;
-      if (!Map2.Equals(other.Map2)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= Map1.GetHashCode();
-      hash ^= Map2.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      map1_.WriteTo(output, _map_map1_codec);
-      map2_.WriteTo(output, _map_map2_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += map1_.CalculateSize(_map_map1_codec);
-      size += map2_.CalculateSize(_map_map2_codec);
-      return size;
-    }
-
-    public void MergeFrom(TestSameTypeMap other) {
-      if (other == null) {
-        return;
-      }
-      map1_.Add(other.map1_);
-      map2_.Add(other.map2_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            map1_.AddEntriesFrom(input, _map_map1_codec);
-            break;
-          }
-          case 18: {
-            map2_.AddEntriesFrom(input, _map_map2_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestArenaMap : pb::IMessage<TestArenaMap> {
-    private static readonly pb::MessageParser<TestArenaMap> _parser = new pb::MessageParser<TestArenaMap>(() => new TestArenaMap());
-    public static pb::MessageParser<TestArenaMap> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "map_bool_bool", "map_fixed32_fixed32", "map_fixed64_fixed64", "map_int32_double", "map_int32_enum", "map_int32_float", "map_int32_foreign_message", "map_int32_int32", "map_int64_int64", "map_sfixed32_sfixed32", "map_sfixed64_sfixed64", "map_sint32_sint32", "map_sint64_sint64", "map_uint32_uint32", "map_uint64_uint64" };
-    private static readonly uint[] _fieldTags = new uint[] { 106, 58, 66, 98, 114, 90, 122, 10, 18, 74, 82, 42, 50, 26, 34 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[4]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestArenaMap() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestArenaMap(TestArenaMap other) : this() {
-      mapInt32Int32_ = other.mapInt32Int32_.Clone();
-      mapInt64Int64_ = other.mapInt64Int64_.Clone();
-      mapUint32Uint32_ = other.mapUint32Uint32_.Clone();
-      mapUint64Uint64_ = other.mapUint64Uint64_.Clone();
-      mapSint32Sint32_ = other.mapSint32Sint32_.Clone();
-      mapSint64Sint64_ = other.mapSint64Sint64_.Clone();
-      mapFixed32Fixed32_ = other.mapFixed32Fixed32_.Clone();
-      mapFixed64Fixed64_ = other.mapFixed64Fixed64_.Clone();
-      mapSfixed32Sfixed32_ = other.mapSfixed32Sfixed32_.Clone();
-      mapSfixed64Sfixed64_ = other.mapSfixed64Sfixed64_.Clone();
-      mapInt32Float_ = other.mapInt32Float_.Clone();
-      mapInt32Double_ = other.mapInt32Double_.Clone();
-      mapBoolBool_ = other.mapBoolBool_.Clone();
-      mapInt32Enum_ = other.mapInt32Enum_.Clone();
-      mapInt32ForeignMessage_ = other.mapInt32ForeignMessage_.Clone();
-    }
-
-    public TestArenaMap Clone() {
-      return new TestArenaMap(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      mapInt32Int32_.Freeze();
-      mapInt64Int64_.Freeze();
-      mapUint32Uint32_.Freeze();
-      mapUint64Uint64_.Freeze();
-      mapSint32Sint32_.Freeze();
-      mapSint64Sint64_.Freeze();
-      mapFixed32Fixed32_.Freeze();
-      mapFixed64Fixed64_.Freeze();
-      mapSfixed32Sfixed32_.Freeze();
-      mapSfixed64Sfixed64_.Freeze();
-      mapInt32Float_.Freeze();
-      mapInt32Double_.Freeze();
-      mapBoolBool_.Freeze();
-      mapInt32Enum_.Freeze();
-      mapInt32ForeignMessage_.Freeze();
-    }
-
-    public const int MapInt32Int32FieldNumber = 1;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapInt32Int32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForInt32(16), 10);
-    private readonly pbc::MapField<int, int> mapInt32Int32_ = new pbc::MapField<int, int>();
-    public pbc::MapField<int, int> MapInt32Int32 {
-      get { return mapInt32Int32_; }
-    }
-
-    public const int MapInt64Int64FieldNumber = 2;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapInt64Int64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForInt64(8), pb::FieldCodec.ForInt64(16), 18);
-    private readonly pbc::MapField<long, long> mapInt64Int64_ = new pbc::MapField<long, long>();
-    public pbc::MapField<long, long> MapInt64Int64 {
-      get { return mapInt64Int64_; }
-    }
-
-    public const int MapUint32Uint32FieldNumber = 3;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapUint32Uint32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForUInt32(8), pb::FieldCodec.ForUInt32(16), 26);
-    private readonly pbc::MapField<uint, uint> mapUint32Uint32_ = new pbc::MapField<uint, uint>();
-    public pbc::MapField<uint, uint> MapUint32Uint32 {
-      get { return mapUint32Uint32_; }
-    }
-
-    public const int MapUint64Uint64FieldNumber = 4;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapUint64Uint64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForUInt64(8), pb::FieldCodec.ForUInt64(16), 34);
-    private readonly pbc::MapField<ulong, ulong> mapUint64Uint64_ = new pbc::MapField<ulong, ulong>();
-    public pbc::MapField<ulong, ulong> MapUint64Uint64 {
-      get { return mapUint64Uint64_; }
-    }
-
-    public const int MapSint32Sint32FieldNumber = 5;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSint32Sint32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSInt32(8), pb::FieldCodec.ForSInt32(16), 42);
-    private readonly pbc::MapField<int, int> mapSint32Sint32_ = new pbc::MapField<int, int>();
-    public pbc::MapField<int, int> MapSint32Sint32 {
-      get { return mapSint32Sint32_; }
-    }
-
-    public const int MapSint64Sint64FieldNumber = 6;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSint64Sint64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSInt64(8), pb::FieldCodec.ForSInt64(16), 50);
-    private readonly pbc::MapField<long, long> mapSint64Sint64_ = new pbc::MapField<long, long>();
-    public pbc::MapField<long, long> MapSint64Sint64 {
-      get { return mapSint64Sint64_; }
-    }
-
-    public const int MapFixed32Fixed32FieldNumber = 7;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapFixed32Fixed32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForFixed32(13), pb::FieldCodec.ForFixed32(21), 58);
-    private readonly pbc::MapField<uint, uint> mapFixed32Fixed32_ = new pbc::MapField<uint, uint>();
-    public pbc::MapField<uint, uint> MapFixed32Fixed32 {
-      get { return mapFixed32Fixed32_; }
-    }
-
-    public const int MapFixed64Fixed64FieldNumber = 8;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapFixed64Fixed64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForFixed64(9), pb::FieldCodec.ForFixed64(17), 66);
-    private readonly pbc::MapField<ulong, ulong> mapFixed64Fixed64_ = new pbc::MapField<ulong, ulong>();
-    public pbc::MapField<ulong, ulong> MapFixed64Fixed64 {
-      get { return mapFixed64Fixed64_; }
-    }
-
-    public const int MapSfixed32Sfixed32FieldNumber = 9;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSfixed32Sfixed32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSFixed32(13), pb::FieldCodec.ForSFixed32(21), 74);
-    private readonly pbc::MapField<int, int> mapSfixed32Sfixed32_ = new pbc::MapField<int, int>();
-    public pbc::MapField<int, int> MapSfixed32Sfixed32 {
-      get { return mapSfixed32Sfixed32_; }
-    }
-
-    public const int MapSfixed64Sfixed64FieldNumber = 10;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSfixed64Sfixed64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSFixed64(9), pb::FieldCodec.ForSFixed64(17), 82);
-    private readonly pbc::MapField<long, long> mapSfixed64Sfixed64_ = new pbc::MapField<long, long>();
-    public pbc::MapField<long, long> MapSfixed64Sfixed64 {
-      get { return mapSfixed64Sfixed64_; }
-    }
-
-    public const int MapInt32FloatFieldNumber = 11;
-    private static readonly pbc::MapField<int, float>.Codec _map_mapInt32Float_codec
-        = new pbc::MapField<int, float>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForFloat(21), 90);
-    private readonly pbc::MapField<int, float> mapInt32Float_ = new pbc::MapField<int, float>();
-    public pbc::MapField<int, float> MapInt32Float {
-      get { return mapInt32Float_; }
-    }
-
-    public const int MapInt32DoubleFieldNumber = 12;
-    private static readonly pbc::MapField<int, double>.Codec _map_mapInt32Double_codec
-        = new pbc::MapField<int, double>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForDouble(17), 98);
-    private readonly pbc::MapField<int, double> mapInt32Double_ = new pbc::MapField<int, double>();
-    public pbc::MapField<int, double> MapInt32Double {
-      get { return mapInt32Double_; }
-    }
-
-    public const int MapBoolBoolFieldNumber = 13;
-    private static readonly pbc::MapField<bool, bool>.Codec _map_mapBoolBool_codec
-        = new pbc::MapField<bool, bool>.Codec(pb::FieldCodec.ForBool(8), pb::FieldCodec.ForBool(16), 106);
-    private readonly pbc::MapField<bool, bool> mapBoolBool_ = new pbc::MapField<bool, bool>();
-    public pbc::MapField<bool, bool> MapBoolBool {
-      get { return mapBoolBool_; }
-    }
-
-    public const int MapInt32EnumFieldNumber = 14;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec _map_mapInt32Enum_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::Google.Protobuf.TestProtos.MapEnum) x), 114);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> mapInt32Enum_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>();
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> MapInt32Enum {
-      get { return mapInt32Enum_; }
-    }
-
-    public const int MapInt32ForeignMessageFieldNumber = 15;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec _map_mapInt32ForeignMessage_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.ForeignMessage.Parser), 122);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> mapInt32ForeignMessage_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>();
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> MapInt32ForeignMessage {
-      get { return mapInt32ForeignMessage_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestArenaMap);
-    }
-
-    public bool Equals(TestArenaMap other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!MapInt32Int32.Equals(other.MapInt32Int32)) return false;
-      if (!MapInt64Int64.Equals(other.MapInt64Int64)) return false;
-      if (!MapUint32Uint32.Equals(other.MapUint32Uint32)) return false;
-      if (!MapUint64Uint64.Equals(other.MapUint64Uint64)) return false;
-      if (!MapSint32Sint32.Equals(other.MapSint32Sint32)) return false;
-      if (!MapSint64Sint64.Equals(other.MapSint64Sint64)) return false;
-      if (!MapFixed32Fixed32.Equals(other.MapFixed32Fixed32)) return false;
-      if (!MapFixed64Fixed64.Equals(other.MapFixed64Fixed64)) return false;
-      if (!MapSfixed32Sfixed32.Equals(other.MapSfixed32Sfixed32)) return false;
-      if (!MapSfixed64Sfixed64.Equals(other.MapSfixed64Sfixed64)) return false;
-      if (!MapInt32Float.Equals(other.MapInt32Float)) return false;
-      if (!MapInt32Double.Equals(other.MapInt32Double)) return false;
-      if (!MapBoolBool.Equals(other.MapBoolBool)) return false;
-      if (!MapInt32Enum.Equals(other.MapInt32Enum)) return false;
-      if (!MapInt32ForeignMessage.Equals(other.MapInt32ForeignMessage)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= MapInt32Int32.GetHashCode();
-      hash ^= MapInt64Int64.GetHashCode();
-      hash ^= MapUint32Uint32.GetHashCode();
-      hash ^= MapUint64Uint64.GetHashCode();
-      hash ^= MapSint32Sint32.GetHashCode();
-      hash ^= MapSint64Sint64.GetHashCode();
-      hash ^= MapFixed32Fixed32.GetHashCode();
-      hash ^= MapFixed64Fixed64.GetHashCode();
-      hash ^= MapSfixed32Sfixed32.GetHashCode();
-      hash ^= MapSfixed64Sfixed64.GetHashCode();
-      hash ^= MapInt32Float.GetHashCode();
-      hash ^= MapInt32Double.GetHashCode();
-      hash ^= MapBoolBool.GetHashCode();
-      hash ^= MapInt32Enum.GetHashCode();
-      hash ^= MapInt32ForeignMessage.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      mapInt32Int32_.WriteTo(output, _map_mapInt32Int32_codec);
-      mapInt64Int64_.WriteTo(output, _map_mapInt64Int64_codec);
-      mapUint32Uint32_.WriteTo(output, _map_mapUint32Uint32_codec);
-      mapUint64Uint64_.WriteTo(output, _map_mapUint64Uint64_codec);
-      mapSint32Sint32_.WriteTo(output, _map_mapSint32Sint32_codec);
-      mapSint64Sint64_.WriteTo(output, _map_mapSint64Sint64_codec);
-      mapFixed32Fixed32_.WriteTo(output, _map_mapFixed32Fixed32_codec);
-      mapFixed64Fixed64_.WriteTo(output, _map_mapFixed64Fixed64_codec);
-      mapSfixed32Sfixed32_.WriteTo(output, _map_mapSfixed32Sfixed32_codec);
-      mapSfixed64Sfixed64_.WriteTo(output, _map_mapSfixed64Sfixed64_codec);
-      mapInt32Float_.WriteTo(output, _map_mapInt32Float_codec);
-      mapInt32Double_.WriteTo(output, _map_mapInt32Double_codec);
-      mapBoolBool_.WriteTo(output, _map_mapBoolBool_codec);
-      mapInt32Enum_.WriteTo(output, _map_mapInt32Enum_codec);
-      mapInt32ForeignMessage_.WriteTo(output, _map_mapInt32ForeignMessage_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += mapInt32Int32_.CalculateSize(_map_mapInt32Int32_codec);
-      size += mapInt64Int64_.CalculateSize(_map_mapInt64Int64_codec);
-      size += mapUint32Uint32_.CalculateSize(_map_mapUint32Uint32_codec);
-      size += mapUint64Uint64_.CalculateSize(_map_mapUint64Uint64_codec);
-      size += mapSint32Sint32_.CalculateSize(_map_mapSint32Sint32_codec);
-      size += mapSint64Sint64_.CalculateSize(_map_mapSint64Sint64_codec);
-      size += mapFixed32Fixed32_.CalculateSize(_map_mapFixed32Fixed32_codec);
-      size += mapFixed64Fixed64_.CalculateSize(_map_mapFixed64Fixed64_codec);
-      size += mapSfixed32Sfixed32_.CalculateSize(_map_mapSfixed32Sfixed32_codec);
-      size += mapSfixed64Sfixed64_.CalculateSize(_map_mapSfixed64Sfixed64_codec);
-      size += mapInt32Float_.CalculateSize(_map_mapInt32Float_codec);
-      size += mapInt32Double_.CalculateSize(_map_mapInt32Double_codec);
-      size += mapBoolBool_.CalculateSize(_map_mapBoolBool_codec);
-      size += mapInt32Enum_.CalculateSize(_map_mapInt32Enum_codec);
-      size += mapInt32ForeignMessage_.CalculateSize(_map_mapInt32ForeignMessage_codec);
-      return size;
-    }
-
-    public void MergeFrom(TestArenaMap other) {
-      if (other == null) {
-        return;
-      }
-      mapInt32Int32_.Add(other.mapInt32Int32_);
-      mapInt64Int64_.Add(other.mapInt64Int64_);
-      mapUint32Uint32_.Add(other.mapUint32Uint32_);
-      mapUint64Uint64_.Add(other.mapUint64Uint64_);
-      mapSint32Sint32_.Add(other.mapSint32Sint32_);
-      mapSint64Sint64_.Add(other.mapSint64Sint64_);
-      mapFixed32Fixed32_.Add(other.mapFixed32Fixed32_);
-      mapFixed64Fixed64_.Add(other.mapFixed64Fixed64_);
-      mapSfixed32Sfixed32_.Add(other.mapSfixed32Sfixed32_);
-      mapSfixed64Sfixed64_.Add(other.mapSfixed64Sfixed64_);
-      mapInt32Float_.Add(other.mapInt32Float_);
-      mapInt32Double_.Add(other.mapInt32Double_);
-      mapBoolBool_.Add(other.mapBoolBool_);
-      mapInt32Enum_.Add(other.mapInt32Enum_);
-      mapInt32ForeignMessage_.Add(other.mapInt32ForeignMessage_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec);
-            break;
-          }
-          case 18: {
-            mapInt64Int64_.AddEntriesFrom(input, _map_mapInt64Int64_codec);
-            break;
-          }
-          case 26: {
-            mapUint32Uint32_.AddEntriesFrom(input, _map_mapUint32Uint32_codec);
-            break;
-          }
-          case 34: {
-            mapUint64Uint64_.AddEntriesFrom(input, _map_mapUint64Uint64_codec);
-            break;
-          }
-          case 42: {
-            mapSint32Sint32_.AddEntriesFrom(input, _map_mapSint32Sint32_codec);
-            break;
-          }
-          case 50: {
-            mapSint64Sint64_.AddEntriesFrom(input, _map_mapSint64Sint64_codec);
-            break;
-          }
-          case 58: {
-            mapFixed32Fixed32_.AddEntriesFrom(input, _map_mapFixed32Fixed32_codec);
-            break;
-          }
-          case 66: {
-            mapFixed64Fixed64_.AddEntriesFrom(input, _map_mapFixed64Fixed64_codec);
-            break;
-          }
-          case 74: {
-            mapSfixed32Sfixed32_.AddEntriesFrom(input, _map_mapSfixed32Sfixed32_codec);
-            break;
-          }
-          case 82: {
-            mapSfixed64Sfixed64_.AddEntriesFrom(input, _map_mapSfixed64Sfixed64_codec);
-            break;
-          }
-          case 90: {
-            mapInt32Float_.AddEntriesFrom(input, _map_mapInt32Float_codec);
-            break;
-          }
-          case 98: {
-            mapInt32Double_.AddEntriesFrom(input, _map_mapInt32Double_codec);
-            break;
-          }
-          case 106: {
-            mapBoolBool_.AddEntriesFrom(input, _map_mapBoolBool_codec);
-            break;
-          }
-          case 114: {
-            mapInt32Enum_.AddEntriesFrom(input, _map_mapInt32Enum_codec);
-            break;
-          }
-          case 122: {
-            mapInt32ForeignMessage_.AddEntriesFrom(input, _map_mapInt32ForeignMessage_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class MessageContainingEnumCalledType : pb::IMessage<MessageContainingEnumCalledType> {
-    private static readonly pb::MessageParser<MessageContainingEnumCalledType> _parser = new pb::MessageParser<MessageContainingEnumCalledType>(() => new MessageContainingEnumCalledType());
-    public static pb::MessageParser<MessageContainingEnumCalledType> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "type" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[5]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_MessageContainingEnumCalledType__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public MessageContainingEnumCalledType() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public MessageContainingEnumCalledType(MessageContainingEnumCalledType other) : this() {
-      type_ = other.type_.Clone();
-    }
-
-    public MessageContainingEnumCalledType Clone() {
-      return new MessageContainingEnumCalledType(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      type_.Freeze();
-    }
-
-    public const int TypeFieldNumber = 1;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType>.Codec _map_type_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType.Parser), 10);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType> type_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType>();
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType> Type {
-      get { return type_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as MessageContainingEnumCalledType);
-    }
-
-    public bool Equals(MessageContainingEnumCalledType other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Type.Equals(other.Type)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= Type.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      type_.WriteTo(output, _map_type_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += type_.CalculateSize(_map_type_codec);
-      return size;
-    }
-
-    public void MergeFrom(MessageContainingEnumCalledType other) {
-      if (other == null) {
-        return;
-      }
-      type_.Add(other.type_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            type_.AddEntriesFrom(input, _map_type_codec);
-            break;
-          }
-        }
-      }
-    }
-
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types {
-      public enum Type {
-        TYPE_FOO = 0,
-      }
-
-    }
-    #endregion
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class MessageContainingMapCalledEntry : pb::IMessage<MessageContainingMapCalledEntry> {
-    private static readonly pb::MessageParser<MessageContainingMapCalledEntry> _parser = new pb::MessageParser<MessageContainingMapCalledEntry>(() => new MessageContainingMapCalledEntry());
-    public static pb::MessageParser<MessageContainingMapCalledEntry> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "entry" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.Descriptor.MessageTypes[6]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_MessageContainingMapCalledEntry__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public MessageContainingMapCalledEntry() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public MessageContainingMapCalledEntry(MessageContainingMapCalledEntry other) : this() {
-      entry_ = other.entry_.Clone();
-    }
-
-    public MessageContainingMapCalledEntry Clone() {
-      return new MessageContainingMapCalledEntry(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      entry_.Freeze();
-    }
-
-    public const int EntryFieldNumber = 1;
-    private static readonly pbc::MapField<int, int>.Codec _map_entry_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForInt32(16), 10);
-    private readonly pbc::MapField<int, int> entry_ = new pbc::MapField<int, int>();
-    public pbc::MapField<int, int> Entry {
-      get { return entry_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as MessageContainingMapCalledEntry);
-    }
-
-    public bool Equals(MessageContainingMapCalledEntry other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Entry.Equals(other.Entry)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= Entry.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      entry_.WriteTo(output, _map_entry_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += entry_.CalculateSize(_map_entry_codec);
-      return size;
-    }
-
-    public void MergeFrom(MessageContainingMapCalledEntry other) {
-      if (other == null) {
-        return;
-      }
-      entry_.Add(other.entry_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            entry_.AddEntriesFrom(input, _map_entry_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs
deleted file mode 100644
index 3875a4c3..00000000
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/unittest_import_proto3.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public static partial class UnittestImportProto3 {
-
-    #region Static variables
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_import_ImportMessage__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestImportProto3() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Cixnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfaW1wb3J0X3Byb3RvMy5wcm90", 
-            "bxIYcHJvdG9idWZfdW5pdHRlc3RfaW1wb3J0GjNnb29nbGUvcHJvdG9idWYv", 
-            "dW5pdHRlc3RfaW1wb3J0X3B1YmxpY19wcm90bzMucHJvdG8iGgoNSW1wb3J0", 
-            "TWVzc2FnZRIJCgFkGAEgASgFKlkKCkltcG9ydEVudW0SGwoXSU1QT1JUX0VO", 
-            "VU1fVU5TUEVDSUZJRUQQABIOCgpJTVBPUlRfRk9PEAcSDgoKSU1QT1JUX0JB", 
-            "UhAIEg4KCklNUE9SVF9CQVoQCUI8Chhjb20uZ29vZ2xlLnByb3RvYnVmLnRl", 
-            "c3RIAfgBAaoCGkdvb2dsZS5Qcm90b2J1Zi5UZXN0UHJvdG9zUABiBnByb3Rv", 
-          "Mw=="));
-      descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-          new pbr::FileDescriptor[] {
-          global::Google.Protobuf.TestProtos.UnittestImportPublicProto3.Descriptor, 
-          });
-      internal__static_protobuf_unittest_import_ImportMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.ImportMessage), descriptor.MessageTypes[0],
-              new string[] { "D", }, new string[] { });
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum ImportEnum {
-    IMPORT_ENUM_UNSPECIFIED = 0,
-    IMPORT_FOO = 7,
-    IMPORT_BAR = 8,
-    IMPORT_BAZ = 9,
-  }
-
-  #endregion
-
-  #region Messages
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class ImportMessage : pb::IMessage<ImportMessage> {
-    private static readonly pb::MessageParser<ImportMessage> _parser = new pb::MessageParser<ImportMessage>(() => new ImportMessage());
-    public static pb::MessageParser<ImportMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "d" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestImportProto3.Descriptor.MessageTypes[0]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestImportProto3.internal__static_protobuf_unittest_import_ImportMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public ImportMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public ImportMessage(ImportMessage other) : this() {
-      d_ = other.d_;
-    }
-
-    public ImportMessage Clone() {
-      return new ImportMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int DFieldNumber = 1;
-    private int d_;
-    public int D {
-      get { return d_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        d_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as ImportMessage);
-    }
-
-    public bool Equals(ImportMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (D != other.D) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (D != 0) hash ^= D.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (D != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(D);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (D != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(D);
-      }
-      return size;
-    }
-
-    public void MergeFrom(ImportMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.D != 0) {
-        D = other.D;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            D = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
deleted file mode 100644
index 048ae5e9..00000000
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/unittest_import_public_proto3.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public static partial class UnittestImportPublicProto3 {
-
-    #region Static variables
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_import_PublicImportMessage__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestImportPublicProto3() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CjNnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfaW1wb3J0X3B1YmxpY19wcm90", 
-            "bzMucHJvdG8SGHByb3RvYnVmX3VuaXR0ZXN0X2ltcG9ydCIgChNQdWJsaWNJ", 
-            "bXBvcnRNZXNzYWdlEgkKAWUYASABKAVCNwoYY29tLmdvb2dsZS5wcm90b2J1", 
-          "Zi50ZXN0qgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-          new pbr::FileDescriptor[] {
-          });
-      internal__static_protobuf_unittest_import_PublicImportMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.PublicImportMessage), descriptor.MessageTypes[0],
-              new string[] { "E", }, new string[] { });
-    }
-    #endregion
-
-  }
-  #region Messages
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class PublicImportMessage : pb::IMessage<PublicImportMessage> {
-    private static readonly pb::MessageParser<PublicImportMessage> _parser = new pb::MessageParser<PublicImportMessage>(() => new PublicImportMessage());
-    public static pb::MessageParser<PublicImportMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "e" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestImportPublicProto3.Descriptor.MessageTypes[0]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestImportPublicProto3.internal__static_protobuf_unittest_import_PublicImportMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public PublicImportMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public PublicImportMessage(PublicImportMessage other) : this() {
-      e_ = other.e_;
-    }
-
-    public PublicImportMessage Clone() {
-      return new PublicImportMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int EFieldNumber = 1;
-    private int e_;
-    public int E {
-      get { return e_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        e_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as PublicImportMessage);
-    }
-
-    public bool Equals(PublicImportMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (E != other.E) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (E != 0) hash ^= E.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (E != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(E);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (E != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(E);
-      }
-      return size;
-    }
-
-    public void MergeFrom(PublicImportMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.E != 0) {
-        E = other.E;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            E = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs
deleted file mode 100644
index c68c67fb..00000000
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs
+++ /dev/null
@@ -1,998 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: unittest_issues.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace UnitTest.Issues.TestProtos {
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public static partial class UnittestIssues {
-
-    #region Static variables
-    internal static pbr::FieldAccessorTable internal__static_unittest_issues_Issue307__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_unittest_issues_Issue307_NestedOnce__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_unittest_issues_Issue307_NestedOnce_NestedTwice__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_unittest_issues_NegativeEnumMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_unittest_issues_ItemField__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestIssues() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChV1bml0dGVzdF9pc3N1ZXMucHJvdG8SD3VuaXR0ZXN0X2lzc3VlcyInCghJ", 
-            "c3N1ZTMwNxobCgpOZXN0ZWRPbmNlGg0KC05lc3RlZFR3aWNlIrABChNOZWdh", 
-            "dGl2ZUVudW1NZXNzYWdlEiwKBXZhbHVlGAEgASgOMh0udW5pdHRlc3RfaXNz", 
-            "dWVzLk5lZ2F0aXZlRW51bRIxCgZ2YWx1ZXMYAiADKA4yHS51bml0dGVzdF9p", 
-            "c3N1ZXMuTmVnYXRpdmVFbnVtQgIQABI4Cg1wYWNrZWRfdmFsdWVzGAMgAygO", 
-            "Mh0udW5pdHRlc3RfaXNzdWVzLk5lZ2F0aXZlRW51bUICEAEiEQoPRGVwcmVj", 
-            "YXRlZENoaWxkIrkCChdEZXByZWNhdGVkRmllbGRzTWVzc2FnZRIaCg5Qcmlt", 
-            "aXRpdmVWYWx1ZRgBIAEoBUICGAESGgoOUHJpbWl0aXZlQXJyYXkYAiADKAVC", 
-            "AhgBEjoKDE1lc3NhZ2VWYWx1ZRgDIAEoCzIgLnVuaXR0ZXN0X2lzc3Vlcy5E", 
-            "ZXByZWNhdGVkQ2hpbGRCAhgBEjoKDE1lc3NhZ2VBcnJheRgEIAMoCzIgLnVu", 
-            "aXR0ZXN0X2lzc3Vlcy5EZXByZWNhdGVkQ2hpbGRCAhgBEjYKCUVudW1WYWx1", 
-            "ZRgFIAEoDjIfLnVuaXR0ZXN0X2lzc3Vlcy5EZXByZWNhdGVkRW51bUICGAES", 
-            "NgoJRW51bUFycmF5GAYgAygOMh8udW5pdHRlc3RfaXNzdWVzLkRlcHJlY2F0", 
-            "ZWRFbnVtQgIYASIZCglJdGVtRmllbGQSDAoEaXRlbRgBIAEoBSpVCgxOZWdh", 
-            "dGl2ZUVudW0SFgoSTkVHQVRJVkVfRU5VTV9aRVJPEAASFgoJRml2ZUJlbG93", 
-            "EPv//////////wESFQoITWludXNPbmUQ////////////ASouCg5EZXByZWNh", 
-            "dGVkRW51bRITCg9ERVBSRUNBVEVEX1pFUk8QABIHCgNvbmUQAUIfSAGqAhpV", 
-          "bml0VGVzdC5Jc3N1ZXMuVGVzdFByb3Rvc2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-          new pbr::FileDescriptor[] {
-          });
-      internal__static_unittest_issues_Issue307__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.Issue307), descriptor.MessageTypes[0],
-              new string[] { }, new string[] { });
-      internal__static_unittest_issues_Issue307_NestedOnce__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce), descriptor.MessageTypes[0].NestedTypes[0],
-              new string[] { }, new string[] { });
-      internal__static_unittest_issues_Issue307_NestedOnce_NestedTwice__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Types.NestedTwice), descriptor.MessageTypes[0].NestedTypes[0].NestedTypes[0],
-              new string[] { }, new string[] { });
-      internal__static_unittest_issues_NegativeEnumMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.NegativeEnumMessage), descriptor.MessageTypes[1],
-              new string[] { "Value", "Values", "PackedValues", }, new string[] { });
-      internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.DeprecatedChild), descriptor.MessageTypes[2],
-              new string[] { }, new string[] { });
-      internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage), descriptor.MessageTypes[3],
-              new string[] { "PrimitiveValue", "PrimitiveArray", "MessageValue", "MessageArray", "EnumValue", "EnumArray", }, new string[] { });
-      internal__static_unittest_issues_ItemField__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::UnitTest.Issues.TestProtos.ItemField), descriptor.MessageTypes[4],
-              new string[] { "Item", }, new string[] { });
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum NegativeEnum {
-    NEGATIVE_ENUM_ZERO = 0,
-    FiveBelow = -5,
-    MinusOne = -1,
-  }
-
-  public enum DeprecatedEnum {
-    DEPRECATED_ZERO = 0,
-    one = 1,
-  }
-
-  #endregion
-
-  #region Messages
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class Issue307 : pb::IMessage<Issue307> {
-    private static readonly pb::MessageParser<Issue307> _parser = new pb::MessageParser<Issue307>(() => new Issue307());
-    public static pb::MessageParser<Issue307> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] {  };
-    private static readonly uint[] _fieldTags = new uint[] {  };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[0]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_Issue307__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public Issue307() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public Issue307(Issue307 other) : this() {
-    }
-
-    public Issue307 Clone() {
-      return new Issue307(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as Issue307);
-    }
-
-    public bool Equals(Issue307 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    public void MergeFrom(Issue307 other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-        }
-      }
-    }
-
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types {
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class NestedOnce : pb::IMessage<NestedOnce> {
-        private static readonly pb::MessageParser<NestedOnce> _parser = new pb::MessageParser<NestedOnce>(() => new NestedOnce());
-        public static pb::MessageParser<NestedOnce> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] {  };
-        private static readonly uint[] _fieldTags = new uint[] {  };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::UnitTest.Issues.TestProtos.Issue307.Descriptor.NestedTypes[0]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_Issue307_NestedOnce__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public NestedOnce() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public NestedOnce(NestedOnce other) : this() {
-        }
-
-        public NestedOnce Clone() {
-          return new NestedOnce(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as NestedOnce);
-        }
-
-        public bool Equals(NestedOnce other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          return size;
-        }
-
-        public void MergeFrom(NestedOnce other) {
-          if (other == null) {
-            return;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-            }
-          }
-        }
-
-        #region Nested types
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public static partial class Types {
-          [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-          public sealed partial class NestedTwice : pb::IMessage<NestedTwice> {
-            private static readonly pb::MessageParser<NestedTwice> _parser = new pb::MessageParser<NestedTwice>(() => new NestedTwice());
-            public static pb::MessageParser<NestedTwice> Parser { get { return _parser; } }
-
-            private static readonly string[] _fieldNames = new string[] {  };
-            private static readonly uint[] _fieldTags = new uint[] {  };
-            public static pbr::MessageDescriptor Descriptor {
-              get { return global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Descriptor.NestedTypes[0]; }
-            }
-
-            pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-              get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_Issue307_NestedOnce_NestedTwice__FieldAccessorTable; }
-            }
-
-            private bool _frozen = false;
-            public bool IsFrozen { get { return _frozen; } }
-
-            public NestedTwice() {
-              OnConstruction();
-            }
-
-            partial void OnConstruction();
-
-            public NestedTwice(NestedTwice other) : this() {
-            }
-
-            public NestedTwice Clone() {
-              return new NestedTwice(this);
-            }
-
-            public void Freeze() {
-              if (IsFrozen) {
-                return;
-              }
-              _frozen = true;
-            }
-
-            public override bool Equals(object other) {
-              return Equals(other as NestedTwice);
-            }
-
-            public bool Equals(NestedTwice other) {
-              if (ReferenceEquals(other, null)) {
-                return false;
-              }
-              if (ReferenceEquals(other, this)) {
-                return true;
-              }
-              return true;
-            }
-
-            public override int GetHashCode() {
-              int hash = 1;
-              return hash;
-            }
-
-            public override string ToString() {
-              return pb::JsonFormatter.Default.Format(this);
-            }
-
-            public void WriteTo(pb::CodedOutputStream output) {
-            }
-
-            public int CalculateSize() {
-              int size = 0;
-              return size;
-            }
-
-            public void MergeFrom(NestedTwice other) {
-              if (other == null) {
-                return;
-              }
-            }
-
-            public void MergeFrom(pb::CodedInputStream input) {
-              uint tag;
-              while (input.ReadTag(out tag)) {
-                switch(tag) {
-                  case 0:
-                    throw pb::InvalidProtocolBufferException.InvalidTag();
-                  default:
-                    if (pb::WireFormat.IsEndGroupTag(tag)) {
-                      return;
-                    }
-                    break;
-                }
-              }
-            }
-
-          }
-
-        }
-        #endregion
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class NegativeEnumMessage : pb::IMessage<NegativeEnumMessage> {
-    private static readonly pb::MessageParser<NegativeEnumMessage> _parser = new pb::MessageParser<NegativeEnumMessage>(() => new NegativeEnumMessage());
-    public static pb::MessageParser<NegativeEnumMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "packed_values", "value", "values" };
-    private static readonly uint[] _fieldTags = new uint[] { 26, 8, 16 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[1]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_NegativeEnumMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public NegativeEnumMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public NegativeEnumMessage(NegativeEnumMessage other) : this() {
-      value_ = other.value_;
-      values_ = other.values_.Clone();
-      packedValues_ = other.packedValues_.Clone();
-    }
-
-    public NegativeEnumMessage Clone() {
-      return new NegativeEnumMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      values_.Freeze();
-      packedValues_.Freeze();
-    }
-
-    public const int ValueFieldNumber = 1;
-    private global::UnitTest.Issues.TestProtos.NegativeEnum value_ = global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO;
-    public global::UnitTest.Issues.TestProtos.NegativeEnum Value {
-      get { return value_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        value_ = value;
-      }
-    }
-
-    public const int ValuesFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.NegativeEnum> _repeated_values_codec
-        = pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::UnitTest.Issues.TestProtos.NegativeEnum) x);private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> values_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum>();
-    public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> Values {
-      get { return values_; }
-    }
-
-    public const int PackedValuesFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.NegativeEnum> _repeated_packedValues_codec
-        = pb::FieldCodec.ForEnum(26, x => (int) x, x => (global::UnitTest.Issues.TestProtos.NegativeEnum) x);private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> packedValues_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum>();
-    public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> PackedValues {
-      get { return packedValues_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as NegativeEnumMessage);
-    }
-
-    public bool Equals(NegativeEnumMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Value != other.Value) return false;
-      if(!values_.Equals(other.values_)) return false;
-      if(!packedValues_.Equals(other.packedValues_)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO) hash ^= Value.GetHashCode();
-      hash ^= values_.GetHashCode();
-      hash ^= packedValues_.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) Value);
-      }
-      values_.WriteTo(output, _repeated_values_codec);
-      packedValues_.WriteTo(output, _repeated_packedValues_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Value);
-      }
-      size += values_.CalculateSize(_repeated_values_codec);
-      size += packedValues_.CalculateSize(_repeated_packedValues_codec);
-      return size;
-    }
-
-    public void MergeFrom(NegativeEnumMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value != global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO) {
-        Value = other.Value;
-      }
-      values_.Add(other.values_);
-      packedValues_.Add(other.packedValues_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            value_ = (global::UnitTest.Issues.TestProtos.NegativeEnum) input.ReadEnum();
-            break;
-          }
-          case 18:
-          case 16: {
-            values_.AddEntriesFrom(input, _repeated_values_codec);
-            break;
-          }
-          case 26:
-          case 24: {
-            packedValues_.AddEntriesFrom(input, _repeated_packedValues_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class DeprecatedChild : pb::IMessage<DeprecatedChild> {
-    private static readonly pb::MessageParser<DeprecatedChild> _parser = new pb::MessageParser<DeprecatedChild>(() => new DeprecatedChild());
-    public static pb::MessageParser<DeprecatedChild> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] {  };
-    private static readonly uint[] _fieldTags = new uint[] {  };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[2]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public DeprecatedChild() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public DeprecatedChild(DeprecatedChild other) : this() {
-    }
-
-    public DeprecatedChild Clone() {
-      return new DeprecatedChild(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as DeprecatedChild);
-    }
-
-    public bool Equals(DeprecatedChild other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    public void MergeFrom(DeprecatedChild other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class DeprecatedFieldsMessage : pb::IMessage<DeprecatedFieldsMessage> {
-    private static readonly pb::MessageParser<DeprecatedFieldsMessage> _parser = new pb::MessageParser<DeprecatedFieldsMessage>(() => new DeprecatedFieldsMessage());
-    public static pb::MessageParser<DeprecatedFieldsMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "EnumArray", "EnumValue", "MessageArray", "MessageValue", "PrimitiveArray", "PrimitiveValue" };
-    private static readonly uint[] _fieldTags = new uint[] { 50, 40, 34, 26, 18, 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[3]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public DeprecatedFieldsMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public DeprecatedFieldsMessage(DeprecatedFieldsMessage other) : this() {
-      primitiveValue_ = other.primitiveValue_;
-      primitiveArray_ = other.primitiveArray_.Clone();
-      MessageValue = other.messageValue_ != null ? other.MessageValue.Clone() : null;
-      messageArray_ = other.messageArray_.Clone();
-      enumValue_ = other.enumValue_;
-      enumArray_ = other.enumArray_.Clone();
-    }
-
-    public DeprecatedFieldsMessage Clone() {
-      return new DeprecatedFieldsMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      primitiveArray_.Freeze();
-      if (messageValue_ != null) MessageValue.Freeze();
-      messageArray_.Freeze();
-      enumArray_.Freeze();
-    }
-
-    public const int PrimitiveValueFieldNumber = 1;
-    private int primitiveValue_;
-    [global::System.ObsoleteAttribute()]
-    public int PrimitiveValue {
-      get { return primitiveValue_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        primitiveValue_ = value;
-      }
-    }
-
-    public const int PrimitiveArrayFieldNumber = 2;
-    private static readonly pb::FieldCodec<int> _repeated_primitiveArray_codec
-        = pb::FieldCodec.ForInt32(18);
-    private readonly pbc::RepeatedField<int> primitiveArray_ = new pbc::RepeatedField<int>();
-    [global::System.ObsoleteAttribute()]
-    public pbc::RepeatedField<int> PrimitiveArray {
-      get { return primitiveArray_; }
-    }
-
-    public const int MessageValueFieldNumber = 3;
-    private global::UnitTest.Issues.TestProtos.DeprecatedChild messageValue_;
-    [global::System.ObsoleteAttribute()]
-    public global::UnitTest.Issues.TestProtos.DeprecatedChild MessageValue {
-      get { return messageValue_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        messageValue_ = value;
-      }
-    }
-
-    public const int MessageArrayFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.DeprecatedChild> _repeated_messageArray_codec
-        = pb::FieldCodec.ForMessage(34, global::UnitTest.Issues.TestProtos.DeprecatedChild.Parser);
-    private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedChild> messageArray_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedChild>();
-    [global::System.ObsoleteAttribute()]
-    public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedChild> MessageArray {
-      get { return messageArray_; }
-    }
-
-    public const int EnumValueFieldNumber = 5;
-    private global::UnitTest.Issues.TestProtos.DeprecatedEnum enumValue_ = global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO;
-    [global::System.ObsoleteAttribute()]
-    public global::UnitTest.Issues.TestProtos.DeprecatedEnum EnumValue {
-      get { return enumValue_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        enumValue_ = value;
-      }
-    }
-
-    public const int EnumArrayFieldNumber = 6;
-    private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.DeprecatedEnum> _repeated_enumArray_codec
-        = pb::FieldCodec.ForEnum(50, x => (int) x, x => (global::UnitTest.Issues.TestProtos.DeprecatedEnum) x);private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedEnum> enumArray_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedEnum>();
-    [global::System.ObsoleteAttribute()]
-    public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedEnum> EnumArray {
-      get { return enumArray_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as DeprecatedFieldsMessage);
-    }
-
-    public bool Equals(DeprecatedFieldsMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (PrimitiveValue != other.PrimitiveValue) return false;
-      if(!primitiveArray_.Equals(other.primitiveArray_)) return false;
-      if (!object.Equals(MessageValue, other.MessageValue)) return false;
-      if(!messageArray_.Equals(other.messageArray_)) return false;
-      if (EnumValue != other.EnumValue) return false;
-      if(!enumArray_.Equals(other.enumArray_)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (PrimitiveValue != 0) hash ^= PrimitiveValue.GetHashCode();
-      hash ^= primitiveArray_.GetHashCode();
-      if (messageValue_ != null) hash ^= MessageValue.GetHashCode();
-      hash ^= messageArray_.GetHashCode();
-      if (EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO) hash ^= EnumValue.GetHashCode();
-      hash ^= enumArray_.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (PrimitiveValue != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(PrimitiveValue);
-      }
-      primitiveArray_.WriteTo(output, _repeated_primitiveArray_codec);
-      if (messageValue_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(MessageValue);
-      }
-      messageArray_.WriteTo(output, _repeated_messageArray_codec);
-      if (EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO) {
-        output.WriteRawTag(40);
-        output.WriteEnum((int) EnumValue);
-      }
-      enumArray_.WriteTo(output, _repeated_enumArray_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (PrimitiveValue != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(PrimitiveValue);
-      }
-      size += primitiveArray_.CalculateSize(_repeated_primitiveArray_codec);
-      if (messageValue_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(MessageValue);
-      }
-      size += messageArray_.CalculateSize(_repeated_messageArray_codec);
-      if (EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) EnumValue);
-      }
-      size += enumArray_.CalculateSize(_repeated_enumArray_codec);
-      return size;
-    }
-
-    public void MergeFrom(DeprecatedFieldsMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.PrimitiveValue != 0) {
-        PrimitiveValue = other.PrimitiveValue;
-      }
-      primitiveArray_.Add(other.primitiveArray_);
-      if (other.messageValue_ != null) {
-        if (messageValue_ == null) {
-          messageValue_ = new global::UnitTest.Issues.TestProtos.DeprecatedChild();
-        }
-        MessageValue.MergeFrom(other.MessageValue);
-      }
-      messageArray_.Add(other.messageArray_);
-      if (other.EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO) {
-        EnumValue = other.EnumValue;
-      }
-      enumArray_.Add(other.enumArray_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            PrimitiveValue = input.ReadInt32();
-            break;
-          }
-          case 18:
-          case 16: {
-            primitiveArray_.AddEntriesFrom(input, _repeated_primitiveArray_codec);
-            break;
-          }
-          case 26: {
-            if (messageValue_ == null) {
-              messageValue_ = new global::UnitTest.Issues.TestProtos.DeprecatedChild();
-            }
-            input.ReadMessage(messageValue_);
-            break;
-          }
-          case 34: {
-            messageArray_.AddEntriesFrom(input, _repeated_messageArray_codec);
-            break;
-          }
-          case 40: {
-            enumValue_ = (global::UnitTest.Issues.TestProtos.DeprecatedEnum) input.ReadEnum();
-            break;
-          }
-          case 50:
-          case 48: {
-            enumArray_.AddEntriesFrom(input, _repeated_enumArray_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class ItemField : pb::IMessage<ItemField> {
-    private static readonly pb::MessageParser<ItemField> _parser = new pb::MessageParser<ItemField>(() => new ItemField());
-    public static pb::MessageParser<ItemField> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "item" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor.MessageTypes[4]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_ItemField__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public ItemField() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public ItemField(ItemField other) : this() {
-      item_ = other.item_;
-    }
-
-    public ItemField Clone() {
-      return new ItemField(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int ItemFieldNumber = 1;
-    private int item_;
-    public int Item {
-      get { return item_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        item_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as ItemField);
-    }
-
-    public bool Equals(ItemField other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Item != other.Item) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Item != 0) hash ^= Item.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Item != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Item);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (Item != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Item);
-      }
-      return size;
-    }
-
-    public void MergeFrom(ItemField other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Item != 0) {
-        Item = other.Item;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            Item = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestProto3.cs
deleted file mode 100644
index 67c42708..00000000
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestProto3.cs
+++ /dev/null
@@ -1,6633 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/unittest_proto3.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public static partial class UnittestProto3 {
-
-    #region Static variables
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestAllTypes__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestAllTypes_NestedMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_NestedTestAllTypes__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestDeprecatedFields__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_ForeignMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestReservedFields__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestForeignNested__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestReallyLargeTagNumber__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestRecursiveMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMutualRecursionA__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMutualRecursionB__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestCamelCaseFieldNames__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestFieldOrderings__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestFieldOrderings_NestedMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_SparseEnumMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_OneString__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MoreString__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_OneBytes__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MoreBytes__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_Int32Message__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_Uint32Message__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_Int64Message__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_Uint64Message__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_BoolMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestOneof__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestPackedTypes__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestUnpackedTypes__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestRepeatedScalarDifferentTagSizes__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestCommentInjectionMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_FooRequest__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_FooResponse__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_FooClientMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_FooServerMessage__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_BarRequest__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_BarResponse__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestProto3() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiVnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfcHJvdG8zLnByb3RvEhFwcm90", 
-            "b2J1Zl91bml0dGVzdBosZ29vZ2xlL3Byb3RvYnVmL3VuaXR0ZXN0X2ltcG9y", 
-            "dF9wcm90bzMucHJvdG8i8A8KDFRlc3RBbGxUeXBlcxIUCgxzaW5nbGVfaW50", 
-            "MzIYASABKAUSFAoMc2luZ2xlX2ludDY0GAIgASgDEhUKDXNpbmdsZV91aW50", 
-            "MzIYAyABKA0SFQoNc2luZ2xlX3VpbnQ2NBgEIAEoBBIVCg1zaW5nbGVfc2lu", 
-            "dDMyGAUgASgREhUKDXNpbmdsZV9zaW50NjQYBiABKBISFgoOc2luZ2xlX2Zp", 
-            "eGVkMzIYByABKAcSFgoOc2luZ2xlX2ZpeGVkNjQYCCABKAYSFwoPc2luZ2xl", 
-            "X3NmaXhlZDMyGAkgASgPEhcKD3NpbmdsZV9zZml4ZWQ2NBgKIAEoEBIUCgxz", 
-            "aW5nbGVfZmxvYXQYCyABKAISFQoNc2luZ2xlX2RvdWJsZRgMIAEoARITCgtz", 
-            "aW5nbGVfYm9vbBgNIAEoCBIVCg1zaW5nbGVfc3RyaW5nGA4gASgJEhQKDHNp", 
-            "bmdsZV9ieXRlcxgPIAEoDBJMChVzaW5nbGVfbmVzdGVkX21lc3NhZ2UYEiAB", 
-            "KAsyLS5wcm90b2J1Zl91bml0dGVzdC5UZXN0QWxsVHlwZXMuTmVzdGVkTWVz", 
-            "c2FnZRJBChZzaW5nbGVfZm9yZWlnbl9tZXNzYWdlGBMgASgLMiEucHJvdG9i", 
-            "dWZfdW5pdHRlc3QuRm9yZWlnbk1lc3NhZ2USRgoVc2luZ2xlX2ltcG9ydF9t", 
-            "ZXNzYWdlGBQgASgLMicucHJvdG9idWZfdW5pdHRlc3RfaW1wb3J0LkltcG9y", 
-            "dE1lc3NhZ2USRgoSc2luZ2xlX25lc3RlZF9lbnVtGBUgASgOMioucHJvdG9i", 
-            "dWZfdW5pdHRlc3QuVGVzdEFsbFR5cGVzLk5lc3RlZEVudW0SOwoTc2luZ2xl", 
-            "X2ZvcmVpZ25fZW51bRgWIAEoDjIeLnByb3RvYnVmX3VuaXR0ZXN0LkZvcmVp", 
-            "Z25FbnVtEkAKEnNpbmdsZV9pbXBvcnRfZW51bRgXIAEoDjIkLnByb3RvYnVm", 
-            "X3VuaXR0ZXN0X2ltcG9ydC5JbXBvcnRFbnVtElMKHHNpbmdsZV9wdWJsaWNf", 
-            "aW1wb3J0X21lc3NhZ2UYGiABKAsyLS5wcm90b2J1Zl91bml0dGVzdF9pbXBv", 
-            "cnQuUHVibGljSW1wb3J0TWVzc2FnZRIWCg5yZXBlYXRlZF9pbnQzMhgfIAMo", 
-            "BRIWCg5yZXBlYXRlZF9pbnQ2NBggIAMoAxIXCg9yZXBlYXRlZF91aW50MzIY", 
-            "ISADKA0SFwoPcmVwZWF0ZWRfdWludDY0GCIgAygEEhcKD3JlcGVhdGVkX3Np", 
-            "bnQzMhgjIAMoERIXCg9yZXBlYXRlZF9zaW50NjQYJCADKBISGAoQcmVwZWF0", 
-            "ZWRfZml4ZWQzMhglIAMoBxIYChByZXBlYXRlZF9maXhlZDY0GCYgAygGEhkK", 
-            "EXJlcGVhdGVkX3NmaXhlZDMyGCcgAygPEhkKEXJlcGVhdGVkX3NmaXhlZDY0", 
-            "GCggAygQEhYKDnJlcGVhdGVkX2Zsb2F0GCkgAygCEhcKD3JlcGVhdGVkX2Rv", 
-            "dWJsZRgqIAMoARIVCg1yZXBlYXRlZF9ib29sGCsgAygIEhcKD3JlcGVhdGVk", 
-            "X3N0cmluZxgsIAMoCRIWCg5yZXBlYXRlZF9ieXRlcxgtIAMoDBJOChdyZXBl", 
-            "YXRlZF9uZXN0ZWRfbWVzc2FnZRgwIAMoCzItLnByb3RvYnVmX3VuaXR0ZXN0", 
-            "LlRlc3RBbGxUeXBlcy5OZXN0ZWRNZXNzYWdlEkMKGHJlcGVhdGVkX2ZvcmVp", 
-            "Z25fbWVzc2FnZRgxIAMoCzIhLnByb3RvYnVmX3VuaXR0ZXN0LkZvcmVpZ25N", 
-            "ZXNzYWdlEkgKF3JlcGVhdGVkX2ltcG9ydF9tZXNzYWdlGDIgAygLMicucHJv", 
-            "dG9idWZfdW5pdHRlc3RfaW1wb3J0LkltcG9ydE1lc3NhZ2USSAoUcmVwZWF0", 
-            "ZWRfbmVzdGVkX2VudW0YMyADKA4yKi5wcm90b2J1Zl91bml0dGVzdC5UZXN0", 
-            "QWxsVHlwZXMuTmVzdGVkRW51bRI9ChVyZXBlYXRlZF9mb3JlaWduX2VudW0Y", 
-            "NCADKA4yHi5wcm90b2J1Zl91bml0dGVzdC5Gb3JlaWduRW51bRJCChRyZXBl", 
-            "YXRlZF9pbXBvcnRfZW51bRg1IAMoDjIkLnByb3RvYnVmX3VuaXR0ZXN0X2lt", 
-            "cG9ydC5JbXBvcnRFbnVtElUKHnJlcGVhdGVkX3B1YmxpY19pbXBvcnRfbWVz", 
-            "c2FnZRg2IAMoCzItLnByb3RvYnVmX3VuaXR0ZXN0X2ltcG9ydC5QdWJsaWNJ", 
-            "bXBvcnRNZXNzYWdlEhYKDG9uZW9mX3VpbnQzMhhvIAEoDUgAEk0KFG9uZW9m", 
-            "X25lc3RlZF9tZXNzYWdlGHAgASgLMi0ucHJvdG9idWZfdW5pdHRlc3QuVGVz", 
-            "dEFsbFR5cGVzLk5lc3RlZE1lc3NhZ2VIABIWCgxvbmVvZl9zdHJpbmcYcSAB", 
-            "KAlIABIVCgtvbmVvZl9ieXRlcxhyIAEoDEgAGhsKDU5lc3RlZE1lc3NhZ2US", 
-            "CgoCYmIYASABKAUiVgoKTmVzdGVkRW51bRIbChdORVNURURfRU5VTV9VTlNQ", 
-            "RUNJRklFRBAAEgcKA0ZPTxABEgcKA0JBUhACEgcKA0JBWhADEhAKA05FRxD/", 
-            "//////////8BQg0KC29uZW9mX2ZpZWxkIrsBChJOZXN0ZWRUZXN0QWxsVHlw", 
-            "ZXMSNAoFY2hpbGQYASABKAsyJS5wcm90b2J1Zl91bml0dGVzdC5OZXN0ZWRU", 
-            "ZXN0QWxsVHlwZXMSMAoHcGF5bG9hZBgCIAEoCzIfLnByb3RvYnVmX3VuaXR0", 
-            "ZXN0LlRlc3RBbGxUeXBlcxI9Cg5yZXBlYXRlZF9jaGlsZBgDIAMoCzIlLnBy", 
-            "b3RvYnVmX3VuaXR0ZXN0Lk5lc3RlZFRlc3RBbGxUeXBlcyI0ChRUZXN0RGVw", 
-            "cmVjYXRlZEZpZWxkcxIcChBkZXByZWNhdGVkX2ludDMyGAEgASgFQgIYASIb", 
-            "Cg5Gb3JlaWduTWVzc2FnZRIJCgFjGAEgASgFIjAKElRlc3RSZXNlcnZlZEZp", 
-            "ZWxkc0oECAIQA0oECA8QEEoECAkQDFIDYmFyUgNiYXoiWgoRVGVzdEZvcmVp", 
-            "Z25OZXN0ZWQSRQoOZm9yZWlnbl9uZXN0ZWQYASABKAsyLS5wcm90b2J1Zl91", 
-            "bml0dGVzdC5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZSI0ChhUZXN0UmVh", 
-            "bGx5TGFyZ2VUYWdOdW1iZXISCQoBYRgBIAEoBRINCgJiYhj///9/IAEoBSJV", 
-            "ChRUZXN0UmVjdXJzaXZlTWVzc2FnZRIyCgFhGAEgASgLMicucHJvdG9idWZf", 
-            "dW5pdHRlc3QuVGVzdFJlY3Vyc2l2ZU1lc3NhZ2USCQoBaRgCIAEoBSJLChRU", 
-            "ZXN0TXV0dWFsUmVjdXJzaW9uQRIzCgJiYhgBIAEoCzInLnByb3RvYnVmX3Vu", 
-            "aXR0ZXN0LlRlc3RNdXR1YWxSZWN1cnNpb25CImIKFFRlc3RNdXR1YWxSZWN1", 
-            "cnNpb25CEjIKAWEYASABKAsyJy5wcm90b2J1Zl91bml0dGVzdC5UZXN0TXV0", 
-            "dWFsUmVjdXJzaW9uQRIWCg5vcHRpb25hbF9pbnQzMhgCIAEoBSLrAgoXVGVz", 
-            "dENhbWVsQ2FzZUZpZWxkTmFtZXMSFgoOUHJpbWl0aXZlRmllbGQYASABKAUS", 
-            "EwoLU3RyaW5nRmllbGQYAiABKAkSMQoJRW51bUZpZWxkGAMgASgOMh4ucHJv", 
-            "dG9idWZfdW5pdHRlc3QuRm9yZWlnbkVudW0SNwoMTWVzc2FnZUZpZWxkGAQg", 
-            "ASgLMiEucHJvdG9idWZfdW5pdHRlc3QuRm9yZWlnbk1lc3NhZ2USHgoWUmVw", 
-            "ZWF0ZWRQcmltaXRpdmVGaWVsZBgHIAMoBRIbChNSZXBlYXRlZFN0cmluZ0Zp", 
-            "ZWxkGAggAygJEjkKEVJlcGVhdGVkRW51bUZpZWxkGAkgAygOMh4ucHJvdG9i", 
-            "dWZfdW5pdHRlc3QuRm9yZWlnbkVudW0SPwoUUmVwZWF0ZWRNZXNzYWdlRmll", 
-            "bGQYCiADKAsyIS5wcm90b2J1Zl91bml0dGVzdC5Gb3JlaWduTWVzc2FnZSLH", 
-            "AQoSVGVzdEZpZWxkT3JkZXJpbmdzEhEKCW15X3N0cmluZxgLIAEoCRIOCgZt", 
-            "eV9pbnQYASABKAMSEAoIbXlfZmxvYXQYZSABKAISUwoVc2luZ2xlX25lc3Rl", 
-            "ZF9tZXNzYWdlGMgBIAEoCzIzLnByb3RvYnVmX3VuaXR0ZXN0LlRlc3RGaWVs", 
-            "ZE9yZGVyaW5ncy5OZXN0ZWRNZXNzYWdlGicKDU5lc3RlZE1lc3NhZ2USCgoC", 
-            "b28YAiABKAMSCgoCYmIYASABKAUiSwoRU3BhcnNlRW51bU1lc3NhZ2USNgoL", 
-            "c3BhcnNlX2VudW0YASABKA4yIS5wcm90b2J1Zl91bml0dGVzdC5UZXN0U3Bh", 
-            "cnNlRW51bSIZCglPbmVTdHJpbmcSDAoEZGF0YRgBIAEoCSIaCgpNb3JlU3Ry", 
-            "aW5nEgwKBGRhdGEYASADKAkiGAoIT25lQnl0ZXMSDAoEZGF0YRgBIAEoDCIZ", 
-            "CglNb3JlQnl0ZXMSDAoEZGF0YRgBIAEoDCIcCgxJbnQzMk1lc3NhZ2USDAoE", 
-            "ZGF0YRgBIAEoBSIdCg1VaW50MzJNZXNzYWdlEgwKBGRhdGEYASABKA0iHAoM", 
-            "SW50NjRNZXNzYWdlEgwKBGRhdGEYASABKAMiHQoNVWludDY0TWVzc2FnZRIM", 
-            "CgRkYXRhGAEgASgEIhsKC0Jvb2xNZXNzYWdlEgwKBGRhdGEYASABKAgicwoJ", 
-            "VGVzdE9uZW9mEhEKB2Zvb19pbnQYASABKAVIABIUCgpmb29fc3RyaW5nGAIg", 
-            "ASgJSAASNgoLZm9vX21lc3NhZ2UYAyABKAsyHy5wcm90b2J1Zl91bml0dGVz", 
-            "dC5UZXN0QWxsVHlwZXNIAEIFCgNmb28iqgMKD1Rlc3RQYWNrZWRUeXBlcxIY", 
-            "CgxwYWNrZWRfaW50MzIYWiADKAVCAhABEhgKDHBhY2tlZF9pbnQ2NBhbIAMo", 
-            "A0ICEAESGQoNcGFja2VkX3VpbnQzMhhcIAMoDUICEAESGQoNcGFja2VkX3Vp", 
-            "bnQ2NBhdIAMoBEICEAESGQoNcGFja2VkX3NpbnQzMhheIAMoEUICEAESGQoN", 
-            "cGFja2VkX3NpbnQ2NBhfIAMoEkICEAESGgoOcGFja2VkX2ZpeGVkMzIYYCAD", 
-            "KAdCAhABEhoKDnBhY2tlZF9maXhlZDY0GGEgAygGQgIQARIbCg9wYWNrZWRf", 
-            "c2ZpeGVkMzIYYiADKA9CAhABEhsKD3BhY2tlZF9zZml4ZWQ2NBhjIAMoEEIC", 
-            "EAESGAoMcGFja2VkX2Zsb2F0GGQgAygCQgIQARIZCg1wYWNrZWRfZG91Ymxl", 
-            "GGUgAygBQgIQARIXCgtwYWNrZWRfYm9vbBhmIAMoCEICEAESNwoLcGFja2Vk", 
-            "X2VudW0YZyADKA4yHi5wcm90b2J1Zl91bml0dGVzdC5Gb3JlaWduRW51bUIC", 
-            "EAEiyAMKEVRlc3RVbnBhY2tlZFR5cGVzEhoKDnVucGFja2VkX2ludDMyGFog", 
-            "AygFQgIQABIaCg51bnBhY2tlZF9pbnQ2NBhbIAMoA0ICEAASGwoPdW5wYWNr", 
-            "ZWRfdWludDMyGFwgAygNQgIQABIbCg91bnBhY2tlZF91aW50NjQYXSADKARC", 
-            "AhAAEhsKD3VucGFja2VkX3NpbnQzMhheIAMoEUICEAASGwoPdW5wYWNrZWRf", 
-            "c2ludDY0GF8gAygSQgIQABIcChB1bnBhY2tlZF9maXhlZDMyGGAgAygHQgIQ", 
-            "ABIcChB1bnBhY2tlZF9maXhlZDY0GGEgAygGQgIQABIdChF1bnBhY2tlZF9z", 
-            "Zml4ZWQzMhhiIAMoD0ICEAASHQoRdW5wYWNrZWRfc2ZpeGVkNjQYYyADKBBC", 
-            "AhAAEhoKDnVucGFja2VkX2Zsb2F0GGQgAygCQgIQABIbCg91bnBhY2tlZF9k", 
-            "b3VibGUYZSADKAFCAhAAEhkKDXVucGFja2VkX2Jvb2wYZiADKAhCAhAAEjkK", 
-            "DXVucGFja2VkX2VudW0YZyADKA4yHi5wcm90b2J1Zl91bml0dGVzdC5Gb3Jl", 
-            "aWduRW51bUICEAAiwAEKI1Rlc3RSZXBlYXRlZFNjYWxhckRpZmZlcmVudFRh", 
-            "Z1NpemVzEhgKEHJlcGVhdGVkX2ZpeGVkMzIYDCADKAcSFgoOcmVwZWF0ZWRf", 
-            "aW50MzIYDSADKAUSGQoQcmVwZWF0ZWRfZml4ZWQ2NBj+DyADKAYSFwoOcmVw", 
-            "ZWF0ZWRfaW50NjQY/w8gAygDEhgKDnJlcGVhdGVkX2Zsb2F0GP7/DyADKAIS", 
-            "GQoPcmVwZWF0ZWRfdWludDY0GP//DyADKAQiKAobVGVzdENvbW1lbnRJbmpl", 
-            "Y3Rpb25NZXNzYWdlEgkKAWEYASABKAkiDAoKRm9vUmVxdWVzdCINCgtGb29S", 
-            "ZXNwb25zZSISChBGb29DbGllbnRNZXNzYWdlIhIKEEZvb1NlcnZlck1lc3Nh", 
-            "Z2UiDAoKQmFyUmVxdWVzdCINCgtCYXJSZXNwb25zZSpZCgtGb3JlaWduRW51", 
-            "bRIXChNGT1JFSUdOX1VOU1BFQ0lGSUVEEAASDwoLRk9SRUlHTl9GT08QBBIP", 
-            "CgtGT1JFSUdOX0JBUhAFEg8KC0ZPUkVJR05fQkFaEAYqdQoUVGVzdEVudW1X", 
-            "aXRoRHVwVmFsdWUSKAokVEVTVF9FTlVNX1dJVEhfRFVQX1ZBTFVFX1VOU1BF", 
-            "Q0lGSUVEEAASCAoERk9PMRABEggKBEJBUjEQAhIHCgNCQVoQAxIICgRGT08y", 
-            "EAESCAoEQkFSMhACGgIQASqdAQoOVGVzdFNwYXJzZUVudW0SIAocVEVTVF9T", 
-            "UEFSU0VfRU5VTV9VTlNQRUNJRklFRBAAEgwKCFNQQVJTRV9BEHsSDgoIU1BB", 
-            "UlNFX0IQpucDEg8KCFNQQVJTRV9DELKxgAYSFQoIU1BBUlNFX0QQ8f//////", 
-            "////ARIVCghTUEFSU0VfRRC03vz///////8BEgwKCFNQQVJTRV9HEAIymQEK", 
-            "C1Rlc3RTZXJ2aWNlEkQKA0ZvbxIdLnByb3RvYnVmX3VuaXR0ZXN0LkZvb1Jl", 
-            "cXVlc3QaHi5wcm90b2J1Zl91bml0dGVzdC5Gb29SZXNwb25zZRJECgNCYXIS", 
-            "HS5wcm90b2J1Zl91bml0dGVzdC5CYXJSZXF1ZXN0Gh4ucHJvdG9idWZfdW5p", 
-            "dHRlc3QuQmFyUmVzcG9uc2VCOkINVW5pdHRlc3RQcm90b0gBgAEBiAEBkAEB", 
-          "+AEBqgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-          new pbr::FileDescriptor[] {
-          global::Google.Protobuf.TestProtos.UnittestImportProto3.Descriptor, 
-          });
-      internal__static_protobuf_unittest_TestAllTypes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestAllTypes), descriptor.MessageTypes[0],
-              new string[] { "SingleInt32", "SingleInt64", "SingleUint32", "SingleUint64", "SingleSint32", "SingleSint64", "SingleFixed32", "SingleFixed64", "SingleSfixed32", "SingleSfixed64", "SingleFloat", "SingleDouble", "SingleBool", "SingleString", "SingleBytes", "SingleNestedMessage", "SingleForeignMessage", "SingleImportMessage", "SingleNestedEnum", "SingleForeignEnum", "SingleImportEnum", "SinglePublicImportMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedImportMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "RepeatedImportEnum", "RepeatedPublicImportMessage", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes", }, new string[] { "OneofField", });
-      internal__static_protobuf_unittest_TestAllTypes_NestedMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage), descriptor.MessageTypes[0].NestedTypes[0],
-              new string[] { "Bb", }, new string[] { });
-      internal__static_protobuf_unittest_NestedTestAllTypes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.NestedTestAllTypes), descriptor.MessageTypes[1],
-              new string[] { "Child", "Payload", "RepeatedChild", }, new string[] { });
-      internal__static_protobuf_unittest_TestDeprecatedFields__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestDeprecatedFields), descriptor.MessageTypes[2],
-              new string[] { "DeprecatedInt32", }, new string[] { });
-      internal__static_protobuf_unittest_ForeignMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.ForeignMessage), descriptor.MessageTypes[3],
-              new string[] { "C", }, new string[] { });
-      internal__static_protobuf_unittest_TestReservedFields__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestReservedFields), descriptor.MessageTypes[4],
-              new string[] { }, new string[] { });
-      internal__static_protobuf_unittest_TestForeignNested__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestForeignNested), descriptor.MessageTypes[5],
-              new string[] { "ForeignNested", }, new string[] { });
-      internal__static_protobuf_unittest_TestReallyLargeTagNumber__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestReallyLargeTagNumber), descriptor.MessageTypes[6],
-              new string[] { "A", "Bb", }, new string[] { });
-      internal__static_protobuf_unittest_TestRecursiveMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestRecursiveMessage), descriptor.MessageTypes[7],
-              new string[] { "A", "I", }, new string[] { });
-      internal__static_protobuf_unittest_TestMutualRecursionA__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMutualRecursionA), descriptor.MessageTypes[8],
-              new string[] { "Bb", }, new string[] { });
-      internal__static_protobuf_unittest_TestMutualRecursionB__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMutualRecursionB), descriptor.MessageTypes[9],
-              new string[] { "A", "OptionalInt32", }, new string[] { });
-      internal__static_protobuf_unittest_TestCamelCaseFieldNames__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestCamelCaseFieldNames), descriptor.MessageTypes[10],
-              new string[] { "PrimitiveField", "StringField", "EnumField", "MessageField", "RepeatedPrimitiveField", "RepeatedStringField", "RepeatedEnumField", "RepeatedMessageField", }, new string[] { });
-      internal__static_protobuf_unittest_TestFieldOrderings__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestFieldOrderings), descriptor.MessageTypes[11],
-              new string[] { "MyString", "MyInt", "MyFloat", "SingleNestedMessage", }, new string[] { });
-      internal__static_protobuf_unittest_TestFieldOrderings_NestedMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage), descriptor.MessageTypes[11].NestedTypes[0],
-              new string[] { "Oo", "Bb", }, new string[] { });
-      internal__static_protobuf_unittest_SparseEnumMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.SparseEnumMessage), descriptor.MessageTypes[12],
-              new string[] { "SparseEnum", }, new string[] { });
-      internal__static_protobuf_unittest_OneString__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.OneString), descriptor.MessageTypes[13],
-              new string[] { "Data", }, new string[] { });
-      internal__static_protobuf_unittest_MoreString__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MoreString), descriptor.MessageTypes[14],
-              new string[] { "Data", }, new string[] { });
-      internal__static_protobuf_unittest_OneBytes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.OneBytes), descriptor.MessageTypes[15],
-              new string[] { "Data", }, new string[] { });
-      internal__static_protobuf_unittest_MoreBytes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MoreBytes), descriptor.MessageTypes[16],
-              new string[] { "Data", }, new string[] { });
-      internal__static_protobuf_unittest_Int32Message__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.Int32Message), descriptor.MessageTypes[17],
-              new string[] { "Data", }, new string[] { });
-      internal__static_protobuf_unittest_Uint32Message__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.Uint32Message), descriptor.MessageTypes[18],
-              new string[] { "Data", }, new string[] { });
-      internal__static_protobuf_unittest_Int64Message__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.Int64Message), descriptor.MessageTypes[19],
-              new string[] { "Data", }, new string[] { });
-      internal__static_protobuf_unittest_Uint64Message__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.Uint64Message), descriptor.MessageTypes[20],
-              new string[] { "Data", }, new string[] { });
-      internal__static_protobuf_unittest_BoolMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.BoolMessage), descriptor.MessageTypes[21],
-              new string[] { "Data", }, new string[] { });
-      internal__static_protobuf_unittest_TestOneof__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestOneof), descriptor.MessageTypes[22],
-              new string[] { "FooInt", "FooString", "FooMessage", }, new string[] { "Foo", });
-      internal__static_protobuf_unittest_TestPackedTypes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestPackedTypes), descriptor.MessageTypes[23],
-              new string[] { "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedEnum", }, new string[] { });
-      internal__static_protobuf_unittest_TestUnpackedTypes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestUnpackedTypes), descriptor.MessageTypes[24],
-              new string[] { "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedEnum", }, new string[] { });
-      internal__static_protobuf_unittest_TestRepeatedScalarDifferentTagSizes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestRepeatedScalarDifferentTagSizes), descriptor.MessageTypes[25],
-              new string[] { "RepeatedFixed32", "RepeatedInt32", "RepeatedFixed64", "RepeatedInt64", "RepeatedFloat", "RepeatedUint64", }, new string[] { });
-      internal__static_protobuf_unittest_TestCommentInjectionMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestCommentInjectionMessage), descriptor.MessageTypes[26],
-              new string[] { "A", }, new string[] { });
-      internal__static_protobuf_unittest_FooRequest__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.FooRequest), descriptor.MessageTypes[27],
-              new string[] { }, new string[] { });
-      internal__static_protobuf_unittest_FooResponse__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.FooResponse), descriptor.MessageTypes[28],
-              new string[] { }, new string[] { });
-      internal__static_protobuf_unittest_FooClientMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.FooClientMessage), descriptor.MessageTypes[29],
-              new string[] { }, new string[] { });
-      internal__static_protobuf_unittest_FooServerMessage__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.FooServerMessage), descriptor.MessageTypes[30],
-              new string[] { }, new string[] { });
-      internal__static_protobuf_unittest_BarRequest__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.BarRequest), descriptor.MessageTypes[31],
-              new string[] { }, new string[] { });
-      internal__static_protobuf_unittest_BarResponse__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.BarResponse), descriptor.MessageTypes[32],
-              new string[] { }, new string[] { });
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum ForeignEnum {
-    FOREIGN_UNSPECIFIED = 0,
-    FOREIGN_FOO = 4,
-    FOREIGN_BAR = 5,
-    FOREIGN_BAZ = 6,
-  }
-
-  public enum TestEnumWithDupValue {
-    TEST_ENUM_WITH_DUP_VALUE_UNSPECIFIED = 0,
-    FOO1 = 1,
-    BAR1 = 2,
-    BAZ = 3,
-    FOO2 = 1,
-    BAR2 = 2,
-  }
-
-  public enum TestSparseEnum {
-    TEST_SPARSE_ENUM_UNSPECIFIED = 0,
-    SPARSE_A = 123,
-    SPARSE_B = 62374,
-    SPARSE_C = 12589234,
-    SPARSE_D = -15,
-    SPARSE_E = -53452,
-    SPARSE_G = 2,
-  }
-
-  #endregion
-
-  #region Messages
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestAllTypes : pb::IMessage<TestAllTypes> {
-    private static readonly pb::MessageParser<TestAllTypes> _parser = new pb::MessageParser<TestAllTypes>(() => new TestAllTypes());
-    public static pb::MessageParser<TestAllTypes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "oneof_bytes", "oneof_nested_message", "oneof_string", "oneof_uint32", "repeated_bool", "repeated_bytes", "repeated_double", "repeated_fixed32", "repeated_fixed64", "repeated_float", "repeated_foreign_enum", "repeated_foreign_message", "repeated_import_enum", "repeated_import_message", "repeated_int32", "repeated_int64", "repeated_nested_enum", "repeated_nested_message", "repeated_public_import_message", "repeated_sfixed32", "repeated_sfixed64", "repeated_sint32", "repeated_sint64", "repeated_string", "repeated_uint32", "repeated_uint64", "single_bool", "single_bytes", "single_double", "single_fixed32", "single_fixed64", "single_float", "single_foreign_enum", "single_foreign_message", "single_import_enum", "single_import_message", "single_int32", "single_int64", "single_nested_enum", "single_nested_message", "single_public_import_message", "single_sfixed32", "single_sfixed64", "single_sint32", "single_sint64", "single_string", "single_uint32", "single_uint64" };
-    private static readonly uint[] _fieldTags = new uint[] { 914, 898, 906, 888, 346, 362, 338, 298, 306, 330, 418, 394, 426, 402, 250, 258, 410, 386, 434, 314, 322, 282, 290, 354, 266, 274, 104, 122, 97, 61, 65, 93, 176, 154, 184, 162, 8, 16, 168, 146, 210, 77, 81, 40, 48, 114, 24, 32 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[0]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestAllTypes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestAllTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestAllTypes(TestAllTypes other) : this() {
-      singleInt32_ = other.singleInt32_;
-      singleInt64_ = other.singleInt64_;
-      singleUint32_ = other.singleUint32_;
-      singleUint64_ = other.singleUint64_;
-      singleSint32_ = other.singleSint32_;
-      singleSint64_ = other.singleSint64_;
-      singleFixed32_ = other.singleFixed32_;
-      singleFixed64_ = other.singleFixed64_;
-      singleSfixed32_ = other.singleSfixed32_;
-      singleSfixed64_ = other.singleSfixed64_;
-      singleFloat_ = other.singleFloat_;
-      singleDouble_ = other.singleDouble_;
-      singleBool_ = other.singleBool_;
-      singleString_ = other.singleString_;
-      singleBytes_ = other.singleBytes_;
-      SingleNestedMessage = other.singleNestedMessage_ != null ? other.SingleNestedMessage.Clone() : null;
-      SingleForeignMessage = other.singleForeignMessage_ != null ? other.SingleForeignMessage.Clone() : null;
-      SingleImportMessage = other.singleImportMessage_ != null ? other.SingleImportMessage.Clone() : null;
-      singleNestedEnum_ = other.singleNestedEnum_;
-      singleForeignEnum_ = other.singleForeignEnum_;
-      singleImportEnum_ = other.singleImportEnum_;
-      SinglePublicImportMessage = other.singlePublicImportMessage_ != null ? other.SinglePublicImportMessage.Clone() : null;
-      repeatedInt32_ = other.repeatedInt32_.Clone();
-      repeatedInt64_ = other.repeatedInt64_.Clone();
-      repeatedUint32_ = other.repeatedUint32_.Clone();
-      repeatedUint64_ = other.repeatedUint64_.Clone();
-      repeatedSint32_ = other.repeatedSint32_.Clone();
-      repeatedSint64_ = other.repeatedSint64_.Clone();
-      repeatedFixed32_ = other.repeatedFixed32_.Clone();
-      repeatedFixed64_ = other.repeatedFixed64_.Clone();
-      repeatedSfixed32_ = other.repeatedSfixed32_.Clone();
-      repeatedSfixed64_ = other.repeatedSfixed64_.Clone();
-      repeatedFloat_ = other.repeatedFloat_.Clone();
-      repeatedDouble_ = other.repeatedDouble_.Clone();
-      repeatedBool_ = other.repeatedBool_.Clone();
-      repeatedString_ = other.repeatedString_.Clone();
-      repeatedBytes_ = other.repeatedBytes_.Clone();
-      repeatedNestedMessage_ = other.repeatedNestedMessage_.Clone();
-      repeatedForeignMessage_ = other.repeatedForeignMessage_.Clone();
-      repeatedImportMessage_ = other.repeatedImportMessage_.Clone();
-      repeatedNestedEnum_ = other.repeatedNestedEnum_.Clone();
-      repeatedForeignEnum_ = other.repeatedForeignEnum_.Clone();
-      repeatedImportEnum_ = other.repeatedImportEnum_.Clone();
-      repeatedPublicImportMessage_ = other.repeatedPublicImportMessage_.Clone();
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofNestedMessage:
-          OneofNestedMessage = other.OneofNestedMessage.Clone();
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-      }
-
-    }
-
-    public TestAllTypes Clone() {
-      return new TestAllTypes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (singleNestedMessage_ != null) SingleNestedMessage.Freeze();
-      if (singleForeignMessage_ != null) SingleForeignMessage.Freeze();
-      if (singleImportMessage_ != null) SingleImportMessage.Freeze();
-      if (singlePublicImportMessage_ != null) SinglePublicImportMessage.Freeze();
-      repeatedInt32_.Freeze();
-      repeatedInt64_.Freeze();
-      repeatedUint32_.Freeze();
-      repeatedUint64_.Freeze();
-      repeatedSint32_.Freeze();
-      repeatedSint64_.Freeze();
-      repeatedFixed32_.Freeze();
-      repeatedFixed64_.Freeze();
-      repeatedSfixed32_.Freeze();
-      repeatedSfixed64_.Freeze();
-      repeatedFloat_.Freeze();
-      repeatedDouble_.Freeze();
-      repeatedBool_.Freeze();
-      repeatedString_.Freeze();
-      repeatedBytes_.Freeze();
-      repeatedNestedMessage_.Freeze();
-      repeatedForeignMessage_.Freeze();
-      repeatedImportMessage_.Freeze();
-      repeatedNestedEnum_.Freeze();
-      repeatedForeignEnum_.Freeze();
-      repeatedImportEnum_.Freeze();
-      repeatedPublicImportMessage_.Freeze();
-      if (oneofField_ is IFreezable) ((IFreezable) oneofField_).Freeze();
-    }
-
-    public const int SingleInt32FieldNumber = 1;
-    private int singleInt32_;
-    public int SingleInt32 {
-      get { return singleInt32_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleInt32_ = value;
-      }
-    }
-
-    public const int SingleInt64FieldNumber = 2;
-    private long singleInt64_;
-    public long SingleInt64 {
-      get { return singleInt64_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleInt64_ = value;
-      }
-    }
-
-    public const int SingleUint32FieldNumber = 3;
-    private uint singleUint32_;
-    public uint SingleUint32 {
-      get { return singleUint32_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleUint32_ = value;
-      }
-    }
-
-    public const int SingleUint64FieldNumber = 4;
-    private ulong singleUint64_;
-    public ulong SingleUint64 {
-      get { return singleUint64_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleUint64_ = value;
-      }
-    }
-
-    public const int SingleSint32FieldNumber = 5;
-    private int singleSint32_;
-    public int SingleSint32 {
-      get { return singleSint32_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleSint32_ = value;
-      }
-    }
-
-    public const int SingleSint64FieldNumber = 6;
-    private long singleSint64_;
-    public long SingleSint64 {
-      get { return singleSint64_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleSint64_ = value;
-      }
-    }
-
-    public const int SingleFixed32FieldNumber = 7;
-    private uint singleFixed32_;
-    public uint SingleFixed32 {
-      get { return singleFixed32_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleFixed32_ = value;
-      }
-    }
-
-    public const int SingleFixed64FieldNumber = 8;
-    private ulong singleFixed64_;
-    public ulong SingleFixed64 {
-      get { return singleFixed64_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleFixed64_ = value;
-      }
-    }
-
-    public const int SingleSfixed32FieldNumber = 9;
-    private int singleSfixed32_;
-    public int SingleSfixed32 {
-      get { return singleSfixed32_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleSfixed32_ = value;
-      }
-    }
-
-    public const int SingleSfixed64FieldNumber = 10;
-    private long singleSfixed64_;
-    public long SingleSfixed64 {
-      get { return singleSfixed64_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleSfixed64_ = value;
-      }
-    }
-
-    public const int SingleFloatFieldNumber = 11;
-    private float singleFloat_;
-    public float SingleFloat {
-      get { return singleFloat_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleFloat_ = value;
-      }
-    }
-
-    public const int SingleDoubleFieldNumber = 12;
-    private double singleDouble_;
-    public double SingleDouble {
-      get { return singleDouble_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleDouble_ = value;
-      }
-    }
-
-    public const int SingleBoolFieldNumber = 13;
-    private bool singleBool_;
-    public bool SingleBool {
-      get { return singleBool_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleBool_ = value;
-      }
-    }
-
-    public const int SingleStringFieldNumber = 14;
-    private string singleString_ = "";
-    public string SingleString {
-      get { return singleString_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleString_ = value ?? "";
-      }
-    }
-
-    public const int SingleBytesFieldNumber = 15;
-    private pb::ByteString singleBytes_ = pb::ByteString.Empty;
-    public pb::ByteString SingleBytes {
-      get { return singleBytes_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleBytes_ = value ?? pb::ByteString.Empty;
-      }
-    }
-
-    public const int SingleNestedMessageFieldNumber = 18;
-    private global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage singleNestedMessage_;
-    public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage SingleNestedMessage {
-      get { return singleNestedMessage_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleNestedMessage_ = value;
-      }
-    }
-
-    public const int SingleForeignMessageFieldNumber = 19;
-    private global::Google.Protobuf.TestProtos.ForeignMessage singleForeignMessage_;
-    public global::Google.Protobuf.TestProtos.ForeignMessage SingleForeignMessage {
-      get { return singleForeignMessage_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleForeignMessage_ = value;
-      }
-    }
-
-    public const int SingleImportMessageFieldNumber = 20;
-    private global::Google.Protobuf.TestProtos.ImportMessage singleImportMessage_;
-    public global::Google.Protobuf.TestProtos.ImportMessage SingleImportMessage {
-      get { return singleImportMessage_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleImportMessage_ = value;
-      }
-    }
-
-    public const int SingleNestedEnumFieldNumber = 21;
-    private global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum singleNestedEnum_ = global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.NESTED_ENUM_UNSPECIFIED;
-    public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum SingleNestedEnum {
-      get { return singleNestedEnum_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleNestedEnum_ = value;
-      }
-    }
-
-    public const int SingleForeignEnumFieldNumber = 22;
-    private global::Google.Protobuf.TestProtos.ForeignEnum singleForeignEnum_ = global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED;
-    public global::Google.Protobuf.TestProtos.ForeignEnum SingleForeignEnum {
-      get { return singleForeignEnum_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleForeignEnum_ = value;
-      }
-    }
-
-    public const int SingleImportEnumFieldNumber = 23;
-    private global::Google.Protobuf.TestProtos.ImportEnum singleImportEnum_ = global::Google.Protobuf.TestProtos.ImportEnum.IMPORT_ENUM_UNSPECIFIED;
-    public global::Google.Protobuf.TestProtos.ImportEnum SingleImportEnum {
-      get { return singleImportEnum_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleImportEnum_ = value;
-      }
-    }
-
-    public const int SinglePublicImportMessageFieldNumber = 26;
-    private global::Google.Protobuf.TestProtos.PublicImportMessage singlePublicImportMessage_;
-    public global::Google.Protobuf.TestProtos.PublicImportMessage SinglePublicImportMessage {
-      get { return singlePublicImportMessage_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singlePublicImportMessage_ = value;
-      }
-    }
-
-    public const int RepeatedInt32FieldNumber = 31;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec
-        = pb::FieldCodec.ForInt32(250);
-    private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> RepeatedInt32 {
-      get { return repeatedInt32_; }
-    }
-
-    public const int RepeatedInt64FieldNumber = 32;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedInt64_codec
-        = pb::FieldCodec.ForInt64(258);
-    private readonly pbc::RepeatedField<long> repeatedInt64_ = new pbc::RepeatedField<long>();
-    public pbc::RepeatedField<long> RepeatedInt64 {
-      get { return repeatedInt64_; }
-    }
-
-    public const int RepeatedUint32FieldNumber = 33;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedUint32_codec
-        = pb::FieldCodec.ForUInt32(266);
-    private readonly pbc::RepeatedField<uint> repeatedUint32_ = new pbc::RepeatedField<uint>();
-    public pbc::RepeatedField<uint> RepeatedUint32 {
-      get { return repeatedUint32_; }
-    }
-
-    public const int RepeatedUint64FieldNumber = 34;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedUint64_codec
-        = pb::FieldCodec.ForUInt64(274);
-    private readonly pbc::RepeatedField<ulong> repeatedUint64_ = new pbc::RepeatedField<ulong>();
-    public pbc::RepeatedField<ulong> RepeatedUint64 {
-      get { return repeatedUint64_; }
-    }
-
-    public const int RepeatedSint32FieldNumber = 35;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedSint32_codec
-        = pb::FieldCodec.ForSInt32(282);
-    private readonly pbc::RepeatedField<int> repeatedSint32_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> RepeatedSint32 {
-      get { return repeatedSint32_; }
-    }
-
-    public const int RepeatedSint64FieldNumber = 36;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedSint64_codec
-        = pb::FieldCodec.ForSInt64(290);
-    private readonly pbc::RepeatedField<long> repeatedSint64_ = new pbc::RepeatedField<long>();
-    public pbc::RepeatedField<long> RepeatedSint64 {
-      get { return repeatedSint64_; }
-    }
-
-    public const int RepeatedFixed32FieldNumber = 37;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedFixed32_codec
-        = pb::FieldCodec.ForFixed32(298);
-    private readonly pbc::RepeatedField<uint> repeatedFixed32_ = new pbc::RepeatedField<uint>();
-    public pbc::RepeatedField<uint> RepeatedFixed32 {
-      get { return repeatedFixed32_; }
-    }
-
-    public const int RepeatedFixed64FieldNumber = 38;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedFixed64_codec
-        = pb::FieldCodec.ForFixed64(306);
-    private readonly pbc::RepeatedField<ulong> repeatedFixed64_ = new pbc::RepeatedField<ulong>();
-    public pbc::RepeatedField<ulong> RepeatedFixed64 {
-      get { return repeatedFixed64_; }
-    }
-
-    public const int RepeatedSfixed32FieldNumber = 39;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(314);
-    private readonly pbc::RepeatedField<int> repeatedSfixed32_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> RepeatedSfixed32 {
-      get { return repeatedSfixed32_; }
-    }
-
-    public const int RepeatedSfixed64FieldNumber = 40;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(322);
-    private readonly pbc::RepeatedField<long> repeatedSfixed64_ = new pbc::RepeatedField<long>();
-    public pbc::RepeatedField<long> RepeatedSfixed64 {
-      get { return repeatedSfixed64_; }
-    }
-
-    public const int RepeatedFloatFieldNumber = 41;
-    private static readonly pb::FieldCodec<float> _repeated_repeatedFloat_codec
-        = pb::FieldCodec.ForFloat(330);
-    private readonly pbc::RepeatedField<float> repeatedFloat_ = new pbc::RepeatedField<float>();
-    public pbc::RepeatedField<float> RepeatedFloat {
-      get { return repeatedFloat_; }
-    }
-
-    public const int RepeatedDoubleFieldNumber = 42;
-    private static readonly pb::FieldCodec<double> _repeated_repeatedDouble_codec
-        = pb::FieldCodec.ForDouble(338);
-    private readonly pbc::RepeatedField<double> repeatedDouble_ = new pbc::RepeatedField<double>();
-    public pbc::RepeatedField<double> RepeatedDouble {
-      get { return repeatedDouble_; }
-    }
-
-    public const int RepeatedBoolFieldNumber = 43;
-    private static readonly pb::FieldCodec<bool> _repeated_repeatedBool_codec
-        = pb::FieldCodec.ForBool(346);
-    private readonly pbc::RepeatedField<bool> repeatedBool_ = new pbc::RepeatedField<bool>();
-    public pbc::RepeatedField<bool> RepeatedBool {
-      get { return repeatedBool_; }
-    }
-
-    public const int RepeatedStringFieldNumber = 44;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedString_codec
-        = pb::FieldCodec.ForString(354);
-    private readonly pbc::RepeatedField<string> repeatedString_ = new pbc::RepeatedField<string>();
-    public pbc::RepeatedField<string> RepeatedString {
-      get { return repeatedString_; }
-    }
-
-    public const int RepeatedBytesFieldNumber = 45;
-    private static readonly pb::FieldCodec<pb::ByteString> _repeated_repeatedBytes_codec
-        = pb::FieldCodec.ForBytes(362);
-    private readonly pbc::RepeatedField<pb::ByteString> repeatedBytes_ = new pbc::RepeatedField<pb::ByteString>();
-    public pbc::RepeatedField<pb::ByteString> RepeatedBytes {
-      get { return repeatedBytes_; }
-    }
-
-    public const int RepeatedNestedMessageFieldNumber = 48;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage> _repeated_repeatedNestedMessage_codec
-        = pb::FieldCodec.ForMessage(386, global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage> repeatedNestedMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage> RepeatedNestedMessage {
-      get { return repeatedNestedMessage_; }
-    }
-
-    public const int RepeatedForeignMessageFieldNumber = 49;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignMessage> _repeated_repeatedForeignMessage_codec
-        = pb::FieldCodec.ForMessage(394, global::Google.Protobuf.TestProtos.ForeignMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> repeatedForeignMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> RepeatedForeignMessage {
-      get { return repeatedForeignMessage_; }
-    }
-
-    public const int RepeatedImportMessageFieldNumber = 50;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ImportMessage> _repeated_repeatedImportMessage_codec
-        = pb::FieldCodec.ForMessage(402, global::Google.Protobuf.TestProtos.ImportMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportMessage> repeatedImportMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportMessage>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportMessage> RepeatedImportMessage {
-      get { return repeatedImportMessage_; }
-    }
-
-    public const int RepeatedNestedEnumFieldNumber = 51;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum> _repeated_repeatedNestedEnum_codec
-        = pb::FieldCodec.ForEnum(410, x => (int) x, x => (global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum) x);private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum> repeatedNestedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum> RepeatedNestedEnum {
-      get { return repeatedNestedEnum_; }
-    }
-
-    public const int RepeatedForeignEnumFieldNumber = 52;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_repeatedForeignEnum_codec
-        = pb::FieldCodec.ForEnum(418, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x);private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> repeatedForeignEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> RepeatedForeignEnum {
-      get { return repeatedForeignEnum_; }
-    }
-
-    public const int RepeatedImportEnumFieldNumber = 53;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ImportEnum> _repeated_repeatedImportEnum_codec
-        = pb::FieldCodec.ForEnum(426, x => (int) x, x => (global::Google.Protobuf.TestProtos.ImportEnum) x);private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportEnum> repeatedImportEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportEnum>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportEnum> RepeatedImportEnum {
-      get { return repeatedImportEnum_; }
-    }
-
-    public const int RepeatedPublicImportMessageFieldNumber = 54;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.PublicImportMessage> _repeated_repeatedPublicImportMessage_codec
-        = pb::FieldCodec.ForMessage(434, global::Google.Protobuf.TestProtos.PublicImportMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.PublicImportMessage> repeatedPublicImportMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.PublicImportMessage>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.PublicImportMessage> RepeatedPublicImportMessage {
-      get { return repeatedPublicImportMessage_; }
-    }
-
-    public const int OneofUint32FieldNumber = 111;
-    public uint OneofUint32 {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofUint32 ? (uint) oneofField_ : 0; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofUint32;
-      }
-    }
-
-    public const int OneofNestedMessageFieldNumber = 112;
-    public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage OneofNestedMessage {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage ? (global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage) oneofField_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.OneofNestedMessage;
-      }
-    }
-
-    public const int OneofStringFieldNumber = 113;
-    public string OneofString {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofString ? (string) oneofField_ : ""; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value ?? "";
-        oneofFieldCase_ = OneofFieldOneofCase.OneofString;
-      }
-    }
-
-    public const int OneofBytesFieldNumber = 114;
-    public pb::ByteString OneofBytes {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofBytes ? (pb::ByteString) oneofField_ : pb::ByteString.Empty; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value ?? pb::ByteString.Empty;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofBytes;
-      }
-    }
-
-    private object oneofField_;
-    public enum OneofFieldOneofCase {
-      None = 0,
-      OneofUint32 = 111,
-      OneofNestedMessage = 112,
-      OneofString = 113,
-      OneofBytes = 114,
-    }
-    private OneofFieldOneofCase oneofFieldCase_ = OneofFieldOneofCase.None;
-    public OneofFieldOneofCase OneofFieldCase {
-      get { return oneofFieldCase_; }
-    }
-
-    public void ClearOneofField() {
-      pb::Freezable.CheckMutable(this);
-      oneofFieldCase_ = OneofFieldOneofCase.None;
-      oneofField_ = null;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestAllTypes);
-    }
-
-    public bool Equals(TestAllTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (SingleInt32 != other.SingleInt32) return false;
-      if (SingleInt64 != other.SingleInt64) return false;
-      if (SingleUint32 != other.SingleUint32) return false;
-      if (SingleUint64 != other.SingleUint64) return false;
-      if (SingleSint32 != other.SingleSint32) return false;
-      if (SingleSint64 != other.SingleSint64) return false;
-      if (SingleFixed32 != other.SingleFixed32) return false;
-      if (SingleFixed64 != other.SingleFixed64) return false;
-      if (SingleSfixed32 != other.SingleSfixed32) return false;
-      if (SingleSfixed64 != other.SingleSfixed64) return false;
-      if (SingleFloat != other.SingleFloat) return false;
-      if (SingleDouble != other.SingleDouble) return false;
-      if (SingleBool != other.SingleBool) return false;
-      if (SingleString != other.SingleString) return false;
-      if (SingleBytes != other.SingleBytes) return false;
-      if (!object.Equals(SingleNestedMessage, other.SingleNestedMessage)) return false;
-      if (!object.Equals(SingleForeignMessage, other.SingleForeignMessage)) return false;
-      if (!object.Equals(SingleImportMessage, other.SingleImportMessage)) return false;
-      if (SingleNestedEnum != other.SingleNestedEnum) return false;
-      if (SingleForeignEnum != other.SingleForeignEnum) return false;
-      if (SingleImportEnum != other.SingleImportEnum) return false;
-      if (!object.Equals(SinglePublicImportMessage, other.SinglePublicImportMessage)) return false;
-      if(!repeatedInt32_.Equals(other.repeatedInt32_)) return false;
-      if(!repeatedInt64_.Equals(other.repeatedInt64_)) return false;
-      if(!repeatedUint32_.Equals(other.repeatedUint32_)) return false;
-      if(!repeatedUint64_.Equals(other.repeatedUint64_)) return false;
-      if(!repeatedSint32_.Equals(other.repeatedSint32_)) return false;
-      if(!repeatedSint64_.Equals(other.repeatedSint64_)) return false;
-      if(!repeatedFixed32_.Equals(other.repeatedFixed32_)) return false;
-      if(!repeatedFixed64_.Equals(other.repeatedFixed64_)) return false;
-      if(!repeatedSfixed32_.Equals(other.repeatedSfixed32_)) return false;
-      if(!repeatedSfixed64_.Equals(other.repeatedSfixed64_)) return false;
-      if(!repeatedFloat_.Equals(other.repeatedFloat_)) return false;
-      if(!repeatedDouble_.Equals(other.repeatedDouble_)) return false;
-      if(!repeatedBool_.Equals(other.repeatedBool_)) return false;
-      if(!repeatedString_.Equals(other.repeatedString_)) return false;
-      if(!repeatedBytes_.Equals(other.repeatedBytes_)) return false;
-      if(!repeatedNestedMessage_.Equals(other.repeatedNestedMessage_)) return false;
-      if(!repeatedForeignMessage_.Equals(other.repeatedForeignMessage_)) return false;
-      if(!repeatedImportMessage_.Equals(other.repeatedImportMessage_)) return false;
-      if(!repeatedNestedEnum_.Equals(other.repeatedNestedEnum_)) return false;
-      if(!repeatedForeignEnum_.Equals(other.repeatedForeignEnum_)) return false;
-      if(!repeatedImportEnum_.Equals(other.repeatedImportEnum_)) return false;
-      if(!repeatedPublicImportMessage_.Equals(other.repeatedPublicImportMessage_)) return false;
-      if (OneofUint32 != other.OneofUint32) return false;
-      if (!object.Equals(OneofNestedMessage, other.OneofNestedMessage)) return false;
-      if (OneofString != other.OneofString) return false;
-      if (OneofBytes != other.OneofBytes) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (SingleInt32 != 0) hash ^= SingleInt32.GetHashCode();
-      if (SingleInt64 != 0L) hash ^= SingleInt64.GetHashCode();
-      if (SingleUint32 != 0) hash ^= SingleUint32.GetHashCode();
-      if (SingleUint64 != 0UL) hash ^= SingleUint64.GetHashCode();
-      if (SingleSint32 != 0) hash ^= SingleSint32.GetHashCode();
-      if (SingleSint64 != 0L) hash ^= SingleSint64.GetHashCode();
-      if (SingleFixed32 != 0) hash ^= SingleFixed32.GetHashCode();
-      if (SingleFixed64 != 0UL) hash ^= SingleFixed64.GetHashCode();
-      if (SingleSfixed32 != 0) hash ^= SingleSfixed32.GetHashCode();
-      if (SingleSfixed64 != 0L) hash ^= SingleSfixed64.GetHashCode();
-      if (SingleFloat != 0F) hash ^= SingleFloat.GetHashCode();
-      if (SingleDouble != 0D) hash ^= SingleDouble.GetHashCode();
-      if (SingleBool != false) hash ^= SingleBool.GetHashCode();
-      if (SingleString.Length != 0) hash ^= SingleString.GetHashCode();
-      if (SingleBytes.Length != 0) hash ^= SingleBytes.GetHashCode();
-      if (singleNestedMessage_ != null) hash ^= SingleNestedMessage.GetHashCode();
-      if (singleForeignMessage_ != null) hash ^= SingleForeignMessage.GetHashCode();
-      if (singleImportMessage_ != null) hash ^= SingleImportMessage.GetHashCode();
-      if (SingleNestedEnum != global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.NESTED_ENUM_UNSPECIFIED) hash ^= SingleNestedEnum.GetHashCode();
-      if (SingleForeignEnum != global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED) hash ^= SingleForeignEnum.GetHashCode();
-      if (SingleImportEnum != global::Google.Protobuf.TestProtos.ImportEnum.IMPORT_ENUM_UNSPECIFIED) hash ^= SingleImportEnum.GetHashCode();
-      if (singlePublicImportMessage_ != null) hash ^= SinglePublicImportMessage.GetHashCode();
-      hash ^= repeatedInt32_.GetHashCode();
-      hash ^= repeatedInt64_.GetHashCode();
-      hash ^= repeatedUint32_.GetHashCode();
-      hash ^= repeatedUint64_.GetHashCode();
-      hash ^= repeatedSint32_.GetHashCode();
-      hash ^= repeatedSint64_.GetHashCode();
-      hash ^= repeatedFixed32_.GetHashCode();
-      hash ^= repeatedFixed64_.GetHashCode();
-      hash ^= repeatedSfixed32_.GetHashCode();
-      hash ^= repeatedSfixed64_.GetHashCode();
-      hash ^= repeatedFloat_.GetHashCode();
-      hash ^= repeatedDouble_.GetHashCode();
-      hash ^= repeatedBool_.GetHashCode();
-      hash ^= repeatedString_.GetHashCode();
-      hash ^= repeatedBytes_.GetHashCode();
-      hash ^= repeatedNestedMessage_.GetHashCode();
-      hash ^= repeatedForeignMessage_.GetHashCode();
-      hash ^= repeatedImportMessage_.GetHashCode();
-      hash ^= repeatedNestedEnum_.GetHashCode();
-      hash ^= repeatedForeignEnum_.GetHashCode();
-      hash ^= repeatedImportEnum_.GetHashCode();
-      hash ^= repeatedPublicImportMessage_.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) hash ^= OneofUint32.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) hash ^= OneofNestedMessage.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) hash ^= OneofString.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) hash ^= OneofBytes.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (SingleInt32 != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(SingleInt32);
-      }
-      if (SingleInt64 != 0L) {
-        output.WriteRawTag(16);
-        output.WriteInt64(SingleInt64);
-      }
-      if (SingleUint32 != 0) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(SingleUint32);
-      }
-      if (SingleUint64 != 0UL) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(SingleUint64);
-      }
-      if (SingleSint32 != 0) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(SingleSint32);
-      }
-      if (SingleSint64 != 0L) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(SingleSint64);
-      }
-      if (SingleFixed32 != 0) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(SingleFixed32);
-      }
-      if (SingleFixed64 != 0UL) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(SingleFixed64);
-      }
-      if (SingleSfixed32 != 0) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(SingleSfixed32);
-      }
-      if (SingleSfixed64 != 0L) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(SingleSfixed64);
-      }
-      if (SingleFloat != 0F) {
-        output.WriteRawTag(93);
-        output.WriteFloat(SingleFloat);
-      }
-      if (SingleDouble != 0D) {
-        output.WriteRawTag(97);
-        output.WriteDouble(SingleDouble);
-      }
-      if (SingleBool != false) {
-        output.WriteRawTag(104);
-        output.WriteBool(SingleBool);
-      }
-      if (SingleString.Length != 0) {
-        output.WriteRawTag(114);
-        output.WriteString(SingleString);
-      }
-      if (SingleBytes.Length != 0) {
-        output.WriteRawTag(122);
-        output.WriteBytes(SingleBytes);
-      }
-      if (singleNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(SingleNestedMessage);
-      }
-      if (singleForeignMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(SingleForeignMessage);
-      }
-      if (singleImportMessage_ != null) {
-        output.WriteRawTag(162, 1);
-        output.WriteMessage(SingleImportMessage);
-      }
-      if (SingleNestedEnum != global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.NESTED_ENUM_UNSPECIFIED) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) SingleNestedEnum);
-      }
-      if (SingleForeignEnum != global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) SingleForeignEnum);
-      }
-      if (SingleImportEnum != global::Google.Protobuf.TestProtos.ImportEnum.IMPORT_ENUM_UNSPECIFIED) {
-        output.WriteRawTag(184, 1);
-        output.WriteEnum((int) SingleImportEnum);
-      }
-      if (singlePublicImportMessage_ != null) {
-        output.WriteRawTag(210, 1);
-        output.WriteMessage(SinglePublicImportMessage);
-      }
-      repeatedInt32_.WriteTo(output, _repeated_repeatedInt32_codec);
-      repeatedInt64_.WriteTo(output, _repeated_repeatedInt64_codec);
-      repeatedUint32_.WriteTo(output, _repeated_repeatedUint32_codec);
-      repeatedUint64_.WriteTo(output, _repeated_repeatedUint64_codec);
-      repeatedSint32_.WriteTo(output, _repeated_repeatedSint32_codec);
-      repeatedSint64_.WriteTo(output, _repeated_repeatedSint64_codec);
-      repeatedFixed32_.WriteTo(output, _repeated_repeatedFixed32_codec);
-      repeatedFixed64_.WriteTo(output, _repeated_repeatedFixed64_codec);
-      repeatedSfixed32_.WriteTo(output, _repeated_repeatedSfixed32_codec);
-      repeatedSfixed64_.WriteTo(output, _repeated_repeatedSfixed64_codec);
-      repeatedFloat_.WriteTo(output, _repeated_repeatedFloat_codec);
-      repeatedDouble_.WriteTo(output, _repeated_repeatedDouble_codec);
-      repeatedBool_.WriteTo(output, _repeated_repeatedBool_codec);
-      repeatedString_.WriteTo(output, _repeated_repeatedString_codec);
-      repeatedBytes_.WriteTo(output, _repeated_repeatedBytes_codec);
-      repeatedNestedMessage_.WriteTo(output, _repeated_repeatedNestedMessage_codec);
-      repeatedForeignMessage_.WriteTo(output, _repeated_repeatedForeignMessage_codec);
-      repeatedImportMessage_.WriteTo(output, _repeated_repeatedImportMessage_codec);
-      repeatedNestedEnum_.WriteTo(output, _repeated_repeatedNestedEnum_codec);
-      repeatedForeignEnum_.WriteTo(output, _repeated_repeatedForeignEnum_codec);
-      repeatedImportEnum_.WriteTo(output, _repeated_repeatedImportEnum_codec);
-      repeatedPublicImportMessage_.WriteTo(output, _repeated_repeatedPublicImportMessage_codec);
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) {
-        output.WriteRawTag(248, 6);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        output.WriteRawTag(130, 7);
-        output.WriteMessage(OneofNestedMessage);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) {
-        output.WriteRawTag(138, 7);
-        output.WriteString(OneofString);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) {
-        output.WriteRawTag(146, 7);
-        output.WriteBytes(OneofBytes);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (SingleInt32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(SingleInt32);
-      }
-      if (SingleInt64 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(SingleInt64);
-      }
-      if (SingleUint32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(SingleUint32);
-      }
-      if (SingleUint64 != 0UL) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(SingleUint64);
-      }
-      if (SingleSint32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt32Size(SingleSint32);
-      }
-      if (SingleSint64 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt64Size(SingleSint64);
-      }
-      if (SingleFixed32 != 0) {
-        size += 1 + 4;
-      }
-      if (SingleFixed64 != 0UL) {
-        size += 1 + 8;
-      }
-      if (SingleSfixed32 != 0) {
-        size += 1 + 4;
-      }
-      if (SingleSfixed64 != 0L) {
-        size += 1 + 8;
-      }
-      if (SingleFloat != 0F) {
-        size += 1 + 4;
-      }
-      if (SingleDouble != 0D) {
-        size += 1 + 8;
-      }
-      if (SingleBool != false) {
-        size += 1 + 1;
-      }
-      if (SingleString.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(SingleString);
-      }
-      if (SingleBytes.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(SingleBytes);
-      }
-      if (singleNestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(SingleNestedMessage);
-      }
-      if (singleForeignMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(SingleForeignMessage);
-      }
-      if (singleImportMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(SingleImportMessage);
-      }
-      if (SingleNestedEnum != global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.NESTED_ENUM_UNSPECIFIED) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) SingleNestedEnum);
-      }
-      if (SingleForeignEnum != global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) SingleForeignEnum);
-      }
-      if (SingleImportEnum != global::Google.Protobuf.TestProtos.ImportEnum.IMPORT_ENUM_UNSPECIFIED) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) SingleImportEnum);
-      }
-      if (singlePublicImportMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(SinglePublicImportMessage);
-      }
-      size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
-      size += repeatedInt64_.CalculateSize(_repeated_repeatedInt64_codec);
-      size += repeatedUint32_.CalculateSize(_repeated_repeatedUint32_codec);
-      size += repeatedUint64_.CalculateSize(_repeated_repeatedUint64_codec);
-      size += repeatedSint32_.CalculateSize(_repeated_repeatedSint32_codec);
-      size += repeatedSint64_.CalculateSize(_repeated_repeatedSint64_codec);
-      size += repeatedFixed32_.CalculateSize(_repeated_repeatedFixed32_codec);
-      size += repeatedFixed64_.CalculateSize(_repeated_repeatedFixed64_codec);
-      size += repeatedSfixed32_.CalculateSize(_repeated_repeatedSfixed32_codec);
-      size += repeatedSfixed64_.CalculateSize(_repeated_repeatedSfixed64_codec);
-      size += repeatedFloat_.CalculateSize(_repeated_repeatedFloat_codec);
-      size += repeatedDouble_.CalculateSize(_repeated_repeatedDouble_codec);
-      size += repeatedBool_.CalculateSize(_repeated_repeatedBool_codec);
-      size += repeatedString_.CalculateSize(_repeated_repeatedString_codec);
-      size += repeatedBytes_.CalculateSize(_repeated_repeatedBytes_codec);
-      size += repeatedNestedMessage_.CalculateSize(_repeated_repeatedNestedMessage_codec);
-      size += repeatedForeignMessage_.CalculateSize(_repeated_repeatedForeignMessage_codec);
-      size += repeatedImportMessage_.CalculateSize(_repeated_repeatedImportMessage_codec);
-      size += repeatedNestedEnum_.CalculateSize(_repeated_repeatedNestedEnum_codec);
-      size += repeatedForeignEnum_.CalculateSize(_repeated_repeatedForeignEnum_codec);
-      size += repeatedImportEnum_.CalculateSize(_repeated_repeatedImportEnum_codec);
-      size += repeatedPublicImportMessage_.CalculateSize(_repeated_repeatedPublicImportMessage_codec);
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OneofNestedMessage);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OneofString);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) {
-        size += 2 + pb::CodedOutputStream.ComputeBytesSize(OneofBytes);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestAllTypes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.SingleInt32 != 0) {
-        SingleInt32 = other.SingleInt32;
-      }
-      if (other.SingleInt64 != 0L) {
-        SingleInt64 = other.SingleInt64;
-      }
-      if (other.SingleUint32 != 0) {
-        SingleUint32 = other.SingleUint32;
-      }
-      if (other.SingleUint64 != 0UL) {
-        SingleUint64 = other.SingleUint64;
-      }
-      if (other.SingleSint32 != 0) {
-        SingleSint32 = other.SingleSint32;
-      }
-      if (other.SingleSint64 != 0L) {
-        SingleSint64 = other.SingleSint64;
-      }
-      if (other.SingleFixed32 != 0) {
-        SingleFixed32 = other.SingleFixed32;
-      }
-      if (other.SingleFixed64 != 0UL) {
-        SingleFixed64 = other.SingleFixed64;
-      }
-      if (other.SingleSfixed32 != 0) {
-        SingleSfixed32 = other.SingleSfixed32;
-      }
-      if (other.SingleSfixed64 != 0L) {
-        SingleSfixed64 = other.SingleSfixed64;
-      }
-      if (other.SingleFloat != 0F) {
-        SingleFloat = other.SingleFloat;
-      }
-      if (other.SingleDouble != 0D) {
-        SingleDouble = other.SingleDouble;
-      }
-      if (other.SingleBool != false) {
-        SingleBool = other.SingleBool;
-      }
-      if (other.SingleString.Length != 0) {
-        SingleString = other.SingleString;
-      }
-      if (other.SingleBytes.Length != 0) {
-        SingleBytes = other.SingleBytes;
-      }
-      if (other.singleNestedMessage_ != null) {
-        if (singleNestedMessage_ == null) {
-          singleNestedMessage_ = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-        }
-        SingleNestedMessage.MergeFrom(other.SingleNestedMessage);
-      }
-      if (other.singleForeignMessage_ != null) {
-        if (singleForeignMessage_ == null) {
-          singleForeignMessage_ = new global::Google.Protobuf.TestProtos.ForeignMessage();
-        }
-        SingleForeignMessage.MergeFrom(other.SingleForeignMessage);
-      }
-      if (other.singleImportMessage_ != null) {
-        if (singleImportMessage_ == null) {
-          singleImportMessage_ = new global::Google.Protobuf.TestProtos.ImportMessage();
-        }
-        SingleImportMessage.MergeFrom(other.SingleImportMessage);
-      }
-      if (other.SingleNestedEnum != global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.NESTED_ENUM_UNSPECIFIED) {
-        SingleNestedEnum = other.SingleNestedEnum;
-      }
-      if (other.SingleForeignEnum != global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED) {
-        SingleForeignEnum = other.SingleForeignEnum;
-      }
-      if (other.SingleImportEnum != global::Google.Protobuf.TestProtos.ImportEnum.IMPORT_ENUM_UNSPECIFIED) {
-        SingleImportEnum = other.SingleImportEnum;
-      }
-      if (other.singlePublicImportMessage_ != null) {
-        if (singlePublicImportMessage_ == null) {
-          singlePublicImportMessage_ = new global::Google.Protobuf.TestProtos.PublicImportMessage();
-        }
-        SinglePublicImportMessage.MergeFrom(other.SinglePublicImportMessage);
-      }
-      repeatedInt32_.Add(other.repeatedInt32_);
-      repeatedInt64_.Add(other.repeatedInt64_);
-      repeatedUint32_.Add(other.repeatedUint32_);
-      repeatedUint64_.Add(other.repeatedUint64_);
-      repeatedSint32_.Add(other.repeatedSint32_);
-      repeatedSint64_.Add(other.repeatedSint64_);
-      repeatedFixed32_.Add(other.repeatedFixed32_);
-      repeatedFixed64_.Add(other.repeatedFixed64_);
-      repeatedSfixed32_.Add(other.repeatedSfixed32_);
-      repeatedSfixed64_.Add(other.repeatedSfixed64_);
-      repeatedFloat_.Add(other.repeatedFloat_);
-      repeatedDouble_.Add(other.repeatedDouble_);
-      repeatedBool_.Add(other.repeatedBool_);
-      repeatedString_.Add(other.repeatedString_);
-      repeatedBytes_.Add(other.repeatedBytes_);
-      repeatedNestedMessage_.Add(other.repeatedNestedMessage_);
-      repeatedForeignMessage_.Add(other.repeatedForeignMessage_);
-      repeatedImportMessage_.Add(other.repeatedImportMessage_);
-      repeatedNestedEnum_.Add(other.repeatedNestedEnum_);
-      repeatedForeignEnum_.Add(other.repeatedForeignEnum_);
-      repeatedImportEnum_.Add(other.repeatedImportEnum_);
-      repeatedPublicImportMessage_.Add(other.repeatedPublicImportMessage_);
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofNestedMessage:
-          OneofNestedMessage = other.OneofNestedMessage;
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-      }
-
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            SingleInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            SingleInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            SingleUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            SingleUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            SingleSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            SingleSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            SingleFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            SingleFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            SingleSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            SingleSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            SingleFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            SingleDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            SingleBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            SingleString = input.ReadString();
-            break;
-          }
-          case 122: {
-            SingleBytes = input.ReadBytes();
-            break;
-          }
-          case 146: {
-            if (singleNestedMessage_ == null) {
-              singleNestedMessage_ = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(singleNestedMessage_);
-            break;
-          }
-          case 154: {
-            if (singleForeignMessage_ == null) {
-              singleForeignMessage_ = new global::Google.Protobuf.TestProtos.ForeignMessage();
-            }
-            input.ReadMessage(singleForeignMessage_);
-            break;
-          }
-          case 162: {
-            if (singleImportMessage_ == null) {
-              singleImportMessage_ = new global::Google.Protobuf.TestProtos.ImportMessage();
-            }
-            input.ReadMessage(singleImportMessage_);
-            break;
-          }
-          case 168: {
-            singleNestedEnum_ = (global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            singleForeignEnum_ = (global::Google.Protobuf.TestProtos.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 184: {
-            singleImportEnum_ = (global::Google.Protobuf.TestProtos.ImportEnum) input.ReadEnum();
-            break;
-          }
-          case 210: {
-            if (singlePublicImportMessage_ == null) {
-              singlePublicImportMessage_ = new global::Google.Protobuf.TestProtos.PublicImportMessage();
-            }
-            input.ReadMessage(singlePublicImportMessage_);
-            break;
-          }
-          case 250:
-          case 248: {
-            repeatedInt32_.AddEntriesFrom(input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 258:
-          case 256: {
-            repeatedInt64_.AddEntriesFrom(input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 266:
-          case 264: {
-            repeatedUint32_.AddEntriesFrom(input, _repeated_repeatedUint32_codec);
-            break;
-          }
-          case 274:
-          case 272: {
-            repeatedUint64_.AddEntriesFrom(input, _repeated_repeatedUint64_codec);
-            break;
-          }
-          case 282:
-          case 280: {
-            repeatedSint32_.AddEntriesFrom(input, _repeated_repeatedSint32_codec);
-            break;
-          }
-          case 290:
-          case 288: {
-            repeatedSint64_.AddEntriesFrom(input, _repeated_repeatedSint64_codec);
-            break;
-          }
-          case 298:
-          case 301: {
-            repeatedFixed32_.AddEntriesFrom(input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 306:
-          case 305: {
-            repeatedFixed64_.AddEntriesFrom(input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 314:
-          case 317: {
-            repeatedSfixed32_.AddEntriesFrom(input, _repeated_repeatedSfixed32_codec);
-            break;
-          }
-          case 322:
-          case 321: {
-            repeatedSfixed64_.AddEntriesFrom(input, _repeated_repeatedSfixed64_codec);
-            break;
-          }
-          case 330:
-          case 333: {
-            repeatedFloat_.AddEntriesFrom(input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 338:
-          case 337: {
-            repeatedDouble_.AddEntriesFrom(input, _repeated_repeatedDouble_codec);
-            break;
-          }
-          case 346:
-          case 344: {
-            repeatedBool_.AddEntriesFrom(input, _repeated_repeatedBool_codec);
-            break;
-          }
-          case 354: {
-            repeatedString_.AddEntriesFrom(input, _repeated_repeatedString_codec);
-            break;
-          }
-          case 362: {
-            repeatedBytes_.AddEntriesFrom(input, _repeated_repeatedBytes_codec);
-            break;
-          }
-          case 386: {
-            repeatedNestedMessage_.AddEntriesFrom(input, _repeated_repeatedNestedMessage_codec);
-            break;
-          }
-          case 394: {
-            repeatedForeignMessage_.AddEntriesFrom(input, _repeated_repeatedForeignMessage_codec);
-            break;
-          }
-          case 402: {
-            repeatedImportMessage_.AddEntriesFrom(input, _repeated_repeatedImportMessage_codec);
-            break;
-          }
-          case 410:
-          case 408: {
-            repeatedNestedEnum_.AddEntriesFrom(input, _repeated_repeatedNestedEnum_codec);
-            break;
-          }
-          case 418:
-          case 416: {
-            repeatedForeignEnum_.AddEntriesFrom(input, _repeated_repeatedForeignEnum_codec);
-            break;
-          }
-          case 426:
-          case 424: {
-            repeatedImportEnum_.AddEntriesFrom(input, _repeated_repeatedImportEnum_codec);
-            break;
-          }
-          case 434: {
-            repeatedPublicImportMessage_.AddEntriesFrom(input, _repeated_repeatedPublicImportMessage_codec);
-            break;
-          }
-          case 888: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 898: {
-            global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-              subBuilder.MergeFrom(OneofNestedMessage);
-            }
-            input.ReadMessage(subBuilder);
-            OneofNestedMessage = subBuilder;
-            break;
-          }
-          case 906: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 914: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types {
-      public enum NestedEnum {
-        NESTED_ENUM_UNSPECIFIED = 0,
-        FOO = 1,
-        BAR = 2,
-        BAZ = 3,
-        NEG = -1,
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "bb" };
-        private static readonly uint[] _fieldTags = new uint[] { 8 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestAllTypes.Descriptor.NestedTypes[0]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestAllTypes_NestedMessage__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public NestedMessage(NestedMessage other) : this() {
-          bb_ = other.bb_;
-        }
-
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int BbFieldNumber = 1;
-        private int bb_;
-        public int Bb {
-          get { return bb_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            bb_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Bb != other.Bb) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Bb != 0) hash ^= Bb.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Bb != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Bb != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Bb);
-          }
-          return size;
-        }
-
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Bb != 0) {
-            Bb = other.Bb;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class NestedTestAllTypes : pb::IMessage<NestedTestAllTypes> {
-    private static readonly pb::MessageParser<NestedTestAllTypes> _parser = new pb::MessageParser<NestedTestAllTypes>(() => new NestedTestAllTypes());
-    public static pb::MessageParser<NestedTestAllTypes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "child", "payload", "repeated_child" };
-    private static readonly uint[] _fieldTags = new uint[] { 10, 18, 26 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[1]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_NestedTestAllTypes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public NestedTestAllTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public NestedTestAllTypes(NestedTestAllTypes other) : this() {
-      Child = other.child_ != null ? other.Child.Clone() : null;
-      Payload = other.payload_ != null ? other.Payload.Clone() : null;
-      repeatedChild_ = other.repeatedChild_.Clone();
-    }
-
-    public NestedTestAllTypes Clone() {
-      return new NestedTestAllTypes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (child_ != null) Child.Freeze();
-      if (payload_ != null) Payload.Freeze();
-      repeatedChild_.Freeze();
-    }
-
-    public const int ChildFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.NestedTestAllTypes child_;
-    public global::Google.Protobuf.TestProtos.NestedTestAllTypes Child {
-      get { return child_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        child_ = value;
-      }
-    }
-
-    public const int PayloadFieldNumber = 2;
-    private global::Google.Protobuf.TestProtos.TestAllTypes payload_;
-    public global::Google.Protobuf.TestProtos.TestAllTypes Payload {
-      get { return payload_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        payload_ = value;
-      }
-    }
-
-    public const int RepeatedChildFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.NestedTestAllTypes> _repeated_repeatedChild_codec
-        = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.TestProtos.NestedTestAllTypes.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.NestedTestAllTypes> repeatedChild_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.NestedTestAllTypes>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.NestedTestAllTypes> RepeatedChild {
-      get { return repeatedChild_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as NestedTestAllTypes);
-    }
-
-    public bool Equals(NestedTestAllTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Child, other.Child)) return false;
-      if (!object.Equals(Payload, other.Payload)) return false;
-      if(!repeatedChild_.Equals(other.repeatedChild_)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (child_ != null) hash ^= Child.GetHashCode();
-      if (payload_ != null) hash ^= Payload.GetHashCode();
-      hash ^= repeatedChild_.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (child_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Child);
-      }
-      if (payload_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Payload);
-      }
-      repeatedChild_.WriteTo(output, _repeated_repeatedChild_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (child_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Child);
-      }
-      if (payload_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Payload);
-      }
-      size += repeatedChild_.CalculateSize(_repeated_repeatedChild_codec);
-      return size;
-    }
-
-    public void MergeFrom(NestedTestAllTypes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.child_ != null) {
-        if (child_ == null) {
-          child_ = new global::Google.Protobuf.TestProtos.NestedTestAllTypes();
-        }
-        Child.MergeFrom(other.Child);
-      }
-      if (other.payload_ != null) {
-        if (payload_ == null) {
-          payload_ = new global::Google.Protobuf.TestProtos.TestAllTypes();
-        }
-        Payload.MergeFrom(other.Payload);
-      }
-      repeatedChild_.Add(other.repeatedChild_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            if (child_ == null) {
-              child_ = new global::Google.Protobuf.TestProtos.NestedTestAllTypes();
-            }
-            input.ReadMessage(child_);
-            break;
-          }
-          case 18: {
-            if (payload_ == null) {
-              payload_ = new global::Google.Protobuf.TestProtos.TestAllTypes();
-            }
-            input.ReadMessage(payload_);
-            break;
-          }
-          case 26: {
-            repeatedChild_.AddEntriesFrom(input, _repeated_repeatedChild_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestDeprecatedFields : pb::IMessage<TestDeprecatedFields> {
-    private static readonly pb::MessageParser<TestDeprecatedFields> _parser = new pb::MessageParser<TestDeprecatedFields>(() => new TestDeprecatedFields());
-    public static pb::MessageParser<TestDeprecatedFields> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "deprecated_int32" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[2]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestDeprecatedFields__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestDeprecatedFields() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestDeprecatedFields(TestDeprecatedFields other) : this() {
-      deprecatedInt32_ = other.deprecatedInt32_;
-    }
-
-    public TestDeprecatedFields Clone() {
-      return new TestDeprecatedFields(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int DeprecatedInt32FieldNumber = 1;
-    private int deprecatedInt32_;
-    [global::System.ObsoleteAttribute()]
-    public int DeprecatedInt32 {
-      get { return deprecatedInt32_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        deprecatedInt32_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestDeprecatedFields);
-    }
-
-    public bool Equals(TestDeprecatedFields other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (DeprecatedInt32 != other.DeprecatedInt32) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (DeprecatedInt32 != 0) hash ^= DeprecatedInt32.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (DeprecatedInt32 != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(DeprecatedInt32);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (DeprecatedInt32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(DeprecatedInt32);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestDeprecatedFields other) {
-      if (other == null) {
-        return;
-      }
-      if (other.DeprecatedInt32 != 0) {
-        DeprecatedInt32 = other.DeprecatedInt32;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            DeprecatedInt32 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class ForeignMessage : pb::IMessage<ForeignMessage> {
-    private static readonly pb::MessageParser<ForeignMessage> _parser = new pb::MessageParser<ForeignMessage>(() => new ForeignMessage());
-    public static pb::MessageParser<ForeignMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "c" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[3]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_ForeignMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public ForeignMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public ForeignMessage(ForeignMessage other) : this() {
-      c_ = other.c_;
-    }
-
-    public ForeignMessage Clone() {
-      return new ForeignMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int CFieldNumber = 1;
-    private int c_;
-    public int C {
-      get { return c_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        c_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as ForeignMessage);
-    }
-
-    public bool Equals(ForeignMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (C != other.C) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (C != 0) hash ^= C.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (C != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(C);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (C != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(C);
-      }
-      return size;
-    }
-
-    public void MergeFrom(ForeignMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.C != 0) {
-        C = other.C;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            C = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestReservedFields : pb::IMessage<TestReservedFields> {
-    private static readonly pb::MessageParser<TestReservedFields> _parser = new pb::MessageParser<TestReservedFields>(() => new TestReservedFields());
-    public static pb::MessageParser<TestReservedFields> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] {  };
-    private static readonly uint[] _fieldTags = new uint[] {  };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[4]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestReservedFields__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestReservedFields() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestReservedFields(TestReservedFields other) : this() {
-    }
-
-    public TestReservedFields Clone() {
-      return new TestReservedFields(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestReservedFields);
-    }
-
-    public bool Equals(TestReservedFields other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    public void MergeFrom(TestReservedFields other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestForeignNested : pb::IMessage<TestForeignNested> {
-    private static readonly pb::MessageParser<TestForeignNested> _parser = new pb::MessageParser<TestForeignNested>(() => new TestForeignNested());
-    public static pb::MessageParser<TestForeignNested> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "foreign_nested" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[5]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestForeignNested__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestForeignNested() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestForeignNested(TestForeignNested other) : this() {
-      ForeignNested = other.foreignNested_ != null ? other.ForeignNested.Clone() : null;
-    }
-
-    public TestForeignNested Clone() {
-      return new TestForeignNested(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (foreignNested_ != null) ForeignNested.Freeze();
-    }
-
-    public const int ForeignNestedFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage foreignNested_;
-    public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage ForeignNested {
-      get { return foreignNested_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        foreignNested_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestForeignNested);
-    }
-
-    public bool Equals(TestForeignNested other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(ForeignNested, other.ForeignNested)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (foreignNested_ != null) hash ^= ForeignNested.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (foreignNested_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(ForeignNested);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (foreignNested_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(ForeignNested);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestForeignNested other) {
-      if (other == null) {
-        return;
-      }
-      if (other.foreignNested_ != null) {
-        if (foreignNested_ == null) {
-          foreignNested_ = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-        }
-        ForeignNested.MergeFrom(other.ForeignNested);
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            if (foreignNested_ == null) {
-              foreignNested_ = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(foreignNested_);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestReallyLargeTagNumber : pb::IMessage<TestReallyLargeTagNumber> {
-    private static readonly pb::MessageParser<TestReallyLargeTagNumber> _parser = new pb::MessageParser<TestReallyLargeTagNumber>(() => new TestReallyLargeTagNumber());
-    public static pb::MessageParser<TestReallyLargeTagNumber> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "a", "bb" };
-    private static readonly uint[] _fieldTags = new uint[] { 8, 2147483640 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[6]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestReallyLargeTagNumber__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestReallyLargeTagNumber() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestReallyLargeTagNumber(TestReallyLargeTagNumber other) : this() {
-      a_ = other.a_;
-      bb_ = other.bb_;
-    }
-
-    public TestReallyLargeTagNumber Clone() {
-      return new TestReallyLargeTagNumber(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int AFieldNumber = 1;
-    private int a_;
-    public int A {
-      get { return a_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        a_ = value;
-      }
-    }
-
-    public const int BbFieldNumber = 268435455;
-    private int bb_;
-    public int Bb {
-      get { return bb_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        bb_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestReallyLargeTagNumber);
-    }
-
-    public bool Equals(TestReallyLargeTagNumber other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (A != other.A) return false;
-      if (Bb != other.Bb) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (A != 0) hash ^= A.GetHashCode();
-      if (Bb != 0) hash ^= Bb.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (A != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(A);
-      }
-      if (Bb != 0) {
-        output.WriteRawTag(248, 255, 255, 255, 7);
-        output.WriteInt32(Bb);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (A != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-      }
-      if (Bb != 0) {
-        size += 5 + pb::CodedOutputStream.ComputeInt32Size(Bb);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestReallyLargeTagNumber other) {
-      if (other == null) {
-        return;
-      }
-      if (other.A != 0) {
-        A = other.A;
-      }
-      if (other.Bb != 0) {
-        Bb = other.Bb;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            A = input.ReadInt32();
-            break;
-          }
-          case 2147483640: {
-            Bb = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestRecursiveMessage : pb::IMessage<TestRecursiveMessage> {
-    private static readonly pb::MessageParser<TestRecursiveMessage> _parser = new pb::MessageParser<TestRecursiveMessage>(() => new TestRecursiveMessage());
-    public static pb::MessageParser<TestRecursiveMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "a", "i" };
-    private static readonly uint[] _fieldTags = new uint[] { 10, 16 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[7]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestRecursiveMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestRecursiveMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestRecursiveMessage(TestRecursiveMessage other) : this() {
-      A = other.a_ != null ? other.A.Clone() : null;
-      i_ = other.i_;
-    }
-
-    public TestRecursiveMessage Clone() {
-      return new TestRecursiveMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (a_ != null) A.Freeze();
-    }
-
-    public const int AFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestRecursiveMessage a_;
-    public global::Google.Protobuf.TestProtos.TestRecursiveMessage A {
-      get { return a_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        a_ = value;
-      }
-    }
-
-    public const int IFieldNumber = 2;
-    private int i_;
-    public int I {
-      get { return i_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        i_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestRecursiveMessage);
-    }
-
-    public bool Equals(TestRecursiveMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(A, other.A)) return false;
-      if (I != other.I) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (a_ != null) hash ^= A.GetHashCode();
-      if (I != 0) hash ^= I.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (a_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(A);
-      }
-      if (I != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(I);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (a_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(A);
-      }
-      if (I != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(I);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestRecursiveMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.a_ != null) {
-        if (a_ == null) {
-          a_ = new global::Google.Protobuf.TestProtos.TestRecursiveMessage();
-        }
-        A.MergeFrom(other.A);
-      }
-      if (other.I != 0) {
-        I = other.I;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            if (a_ == null) {
-              a_ = new global::Google.Protobuf.TestProtos.TestRecursiveMessage();
-            }
-            input.ReadMessage(a_);
-            break;
-          }
-          case 16: {
-            I = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestMutualRecursionA : pb::IMessage<TestMutualRecursionA> {
-    private static readonly pb::MessageParser<TestMutualRecursionA> _parser = new pb::MessageParser<TestMutualRecursionA>(() => new TestMutualRecursionA());
-    public static pb::MessageParser<TestMutualRecursionA> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "bb" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[8]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestMutualRecursionA__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestMutualRecursionA() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestMutualRecursionA(TestMutualRecursionA other) : this() {
-      Bb = other.bb_ != null ? other.Bb.Clone() : null;
-    }
-
-    public TestMutualRecursionA Clone() {
-      return new TestMutualRecursionA(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (bb_ != null) Bb.Freeze();
-    }
-
-    public const int BbFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestMutualRecursionB bb_;
-    public global::Google.Protobuf.TestProtos.TestMutualRecursionB Bb {
-      get { return bb_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        bb_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestMutualRecursionA);
-    }
-
-    public bool Equals(TestMutualRecursionA other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Bb, other.Bb)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (bb_ != null) hash ^= Bb.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (bb_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Bb);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (bb_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Bb);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestMutualRecursionA other) {
-      if (other == null) {
-        return;
-      }
-      if (other.bb_ != null) {
-        if (bb_ == null) {
-          bb_ = new global::Google.Protobuf.TestProtos.TestMutualRecursionB();
-        }
-        Bb.MergeFrom(other.Bb);
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            if (bb_ == null) {
-              bb_ = new global::Google.Protobuf.TestProtos.TestMutualRecursionB();
-            }
-            input.ReadMessage(bb_);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestMutualRecursionB : pb::IMessage<TestMutualRecursionB> {
-    private static readonly pb::MessageParser<TestMutualRecursionB> _parser = new pb::MessageParser<TestMutualRecursionB>(() => new TestMutualRecursionB());
-    public static pb::MessageParser<TestMutualRecursionB> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "a", "optional_int32" };
-    private static readonly uint[] _fieldTags = new uint[] { 10, 16 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[9]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestMutualRecursionB__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestMutualRecursionB() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestMutualRecursionB(TestMutualRecursionB other) : this() {
-      A = other.a_ != null ? other.A.Clone() : null;
-      optionalInt32_ = other.optionalInt32_;
-    }
-
-    public TestMutualRecursionB Clone() {
-      return new TestMutualRecursionB(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (a_ != null) A.Freeze();
-    }
-
-    public const int AFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestMutualRecursionA a_;
-    public global::Google.Protobuf.TestProtos.TestMutualRecursionA A {
-      get { return a_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        a_ = value;
-      }
-    }
-
-    public const int OptionalInt32FieldNumber = 2;
-    private int optionalInt32_;
-    public int OptionalInt32 {
-      get { return optionalInt32_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        optionalInt32_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestMutualRecursionB);
-    }
-
-    public bool Equals(TestMutualRecursionB other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(A, other.A)) return false;
-      if (OptionalInt32 != other.OptionalInt32) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (a_ != null) hash ^= A.GetHashCode();
-      if (OptionalInt32 != 0) hash ^= OptionalInt32.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (a_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(A);
-      }
-      if (OptionalInt32 != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(OptionalInt32);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (a_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(A);
-      }
-      if (OptionalInt32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(OptionalInt32);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestMutualRecursionB other) {
-      if (other == null) {
-        return;
-      }
-      if (other.a_ != null) {
-        if (a_ == null) {
-          a_ = new global::Google.Protobuf.TestProtos.TestMutualRecursionA();
-        }
-        A.MergeFrom(other.A);
-      }
-      if (other.OptionalInt32 != 0) {
-        OptionalInt32 = other.OptionalInt32;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            if (a_ == null) {
-              a_ = new global::Google.Protobuf.TestProtos.TestMutualRecursionA();
-            }
-            input.ReadMessage(a_);
-            break;
-          }
-          case 16: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestCamelCaseFieldNames : pb::IMessage<TestCamelCaseFieldNames> {
-    private static readonly pb::MessageParser<TestCamelCaseFieldNames> _parser = new pb::MessageParser<TestCamelCaseFieldNames>(() => new TestCamelCaseFieldNames());
-    public static pb::MessageParser<TestCamelCaseFieldNames> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "EnumField", "MessageField", "PrimitiveField", "RepeatedEnumField", "RepeatedMessageField", "RepeatedPrimitiveField", "RepeatedStringField", "StringField" };
-    private static readonly uint[] _fieldTags = new uint[] { 24, 34, 8, 74, 82, 58, 66, 18 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[10]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestCamelCaseFieldNames__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestCamelCaseFieldNames() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestCamelCaseFieldNames(TestCamelCaseFieldNames other) : this() {
-      primitiveField_ = other.primitiveField_;
-      stringField_ = other.stringField_;
-      enumField_ = other.enumField_;
-      MessageField = other.messageField_ != null ? other.MessageField.Clone() : null;
-      repeatedPrimitiveField_ = other.repeatedPrimitiveField_.Clone();
-      repeatedStringField_ = other.repeatedStringField_.Clone();
-      repeatedEnumField_ = other.repeatedEnumField_.Clone();
-      repeatedMessageField_ = other.repeatedMessageField_.Clone();
-    }
-
-    public TestCamelCaseFieldNames Clone() {
-      return new TestCamelCaseFieldNames(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (messageField_ != null) MessageField.Freeze();
-      repeatedPrimitiveField_.Freeze();
-      repeatedStringField_.Freeze();
-      repeatedEnumField_.Freeze();
-      repeatedMessageField_.Freeze();
-    }
-
-    public const int PrimitiveFieldFieldNumber = 1;
-    private int primitiveField_;
-    public int PrimitiveField {
-      get { return primitiveField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        primitiveField_ = value;
-      }
-    }
-
-    public const int StringFieldFieldNumber = 2;
-    private string stringField_ = "";
-    public string StringField {
-      get { return stringField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        stringField_ = value ?? "";
-      }
-    }
-
-    public const int EnumFieldFieldNumber = 3;
-    private global::Google.Protobuf.TestProtos.ForeignEnum enumField_ = global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED;
-    public global::Google.Protobuf.TestProtos.ForeignEnum EnumField {
-      get { return enumField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        enumField_ = value;
-      }
-    }
-
-    public const int MessageFieldFieldNumber = 4;
-    private global::Google.Protobuf.TestProtos.ForeignMessage messageField_;
-    public global::Google.Protobuf.TestProtos.ForeignMessage MessageField {
-      get { return messageField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        messageField_ = value;
-      }
-    }
-
-    public const int RepeatedPrimitiveFieldFieldNumber = 7;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedPrimitiveField_codec
-        = pb::FieldCodec.ForInt32(58);
-    private readonly pbc::RepeatedField<int> repeatedPrimitiveField_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> RepeatedPrimitiveField {
-      get { return repeatedPrimitiveField_; }
-    }
-
-    public const int RepeatedStringFieldFieldNumber = 8;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedStringField_codec
-        = pb::FieldCodec.ForString(66);
-    private readonly pbc::RepeatedField<string> repeatedStringField_ = new pbc::RepeatedField<string>();
-    public pbc::RepeatedField<string> RepeatedStringField {
-      get { return repeatedStringField_; }
-    }
-
-    public const int RepeatedEnumFieldFieldNumber = 9;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_repeatedEnumField_codec
-        = pb::FieldCodec.ForEnum(74, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x);private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> repeatedEnumField_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> RepeatedEnumField {
-      get { return repeatedEnumField_; }
-    }
-
-    public const int RepeatedMessageFieldFieldNumber = 10;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignMessage> _repeated_repeatedMessageField_codec
-        = pb::FieldCodec.ForMessage(82, global::Google.Protobuf.TestProtos.ForeignMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> repeatedMessageField_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> RepeatedMessageField {
-      get { return repeatedMessageField_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestCamelCaseFieldNames);
-    }
-
-    public bool Equals(TestCamelCaseFieldNames other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (PrimitiveField != other.PrimitiveField) return false;
-      if (StringField != other.StringField) return false;
-      if (EnumField != other.EnumField) return false;
-      if (!object.Equals(MessageField, other.MessageField)) return false;
-      if(!repeatedPrimitiveField_.Equals(other.repeatedPrimitiveField_)) return false;
-      if(!repeatedStringField_.Equals(other.repeatedStringField_)) return false;
-      if(!repeatedEnumField_.Equals(other.repeatedEnumField_)) return false;
-      if(!repeatedMessageField_.Equals(other.repeatedMessageField_)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (PrimitiveField != 0) hash ^= PrimitiveField.GetHashCode();
-      if (StringField.Length != 0) hash ^= StringField.GetHashCode();
-      if (EnumField != global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED) hash ^= EnumField.GetHashCode();
-      if (messageField_ != null) hash ^= MessageField.GetHashCode();
-      hash ^= repeatedPrimitiveField_.GetHashCode();
-      hash ^= repeatedStringField_.GetHashCode();
-      hash ^= repeatedEnumField_.GetHashCode();
-      hash ^= repeatedMessageField_.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (PrimitiveField != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(PrimitiveField);
-      }
-      if (StringField.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(StringField);
-      }
-      if (EnumField != global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED) {
-        output.WriteRawTag(24);
-        output.WriteEnum((int) EnumField);
-      }
-      if (messageField_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(MessageField);
-      }
-      repeatedPrimitiveField_.WriteTo(output, _repeated_repeatedPrimitiveField_codec);
-      repeatedStringField_.WriteTo(output, _repeated_repeatedStringField_codec);
-      repeatedEnumField_.WriteTo(output, _repeated_repeatedEnumField_codec);
-      repeatedMessageField_.WriteTo(output, _repeated_repeatedMessageField_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (PrimitiveField != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(PrimitiveField);
-      }
-      if (StringField.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(StringField);
-      }
-      if (EnumField != global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) EnumField);
-      }
-      if (messageField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(MessageField);
-      }
-      size += repeatedPrimitiveField_.CalculateSize(_repeated_repeatedPrimitiveField_codec);
-      size += repeatedStringField_.CalculateSize(_repeated_repeatedStringField_codec);
-      size += repeatedEnumField_.CalculateSize(_repeated_repeatedEnumField_codec);
-      size += repeatedMessageField_.CalculateSize(_repeated_repeatedMessageField_codec);
-      return size;
-    }
-
-    public void MergeFrom(TestCamelCaseFieldNames other) {
-      if (other == null) {
-        return;
-      }
-      if (other.PrimitiveField != 0) {
-        PrimitiveField = other.PrimitiveField;
-      }
-      if (other.StringField.Length != 0) {
-        StringField = other.StringField;
-      }
-      if (other.EnumField != global::Google.Protobuf.TestProtos.ForeignEnum.FOREIGN_UNSPECIFIED) {
-        EnumField = other.EnumField;
-      }
-      if (other.messageField_ != null) {
-        if (messageField_ == null) {
-          messageField_ = new global::Google.Protobuf.TestProtos.ForeignMessage();
-        }
-        MessageField.MergeFrom(other.MessageField);
-      }
-      repeatedPrimitiveField_.Add(other.repeatedPrimitiveField_);
-      repeatedStringField_.Add(other.repeatedStringField_);
-      repeatedEnumField_.Add(other.repeatedEnumField_);
-      repeatedMessageField_.Add(other.repeatedMessageField_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            PrimitiveField = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            StringField = input.ReadString();
-            break;
-          }
-          case 24: {
-            enumField_ = (global::Google.Protobuf.TestProtos.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 34: {
-            if (messageField_ == null) {
-              messageField_ = new global::Google.Protobuf.TestProtos.ForeignMessage();
-            }
-            input.ReadMessage(messageField_);
-            break;
-          }
-          case 58:
-          case 56: {
-            repeatedPrimitiveField_.AddEntriesFrom(input, _repeated_repeatedPrimitiveField_codec);
-            break;
-          }
-          case 66: {
-            repeatedStringField_.AddEntriesFrom(input, _repeated_repeatedStringField_codec);
-            break;
-          }
-          case 74:
-          case 72: {
-            repeatedEnumField_.AddEntriesFrom(input, _repeated_repeatedEnumField_codec);
-            break;
-          }
-          case 82: {
-            repeatedMessageField_.AddEntriesFrom(input, _repeated_repeatedMessageField_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestFieldOrderings : pb::IMessage<TestFieldOrderings> {
-    private static readonly pb::MessageParser<TestFieldOrderings> _parser = new pb::MessageParser<TestFieldOrderings>(() => new TestFieldOrderings());
-    public static pb::MessageParser<TestFieldOrderings> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "my_float", "my_int", "my_string", "single_nested_message" };
-    private static readonly uint[] _fieldTags = new uint[] { 813, 8, 90, 1602 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[11]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestFieldOrderings__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestFieldOrderings() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestFieldOrderings(TestFieldOrderings other) : this() {
-      myString_ = other.myString_;
-      myInt_ = other.myInt_;
-      myFloat_ = other.myFloat_;
-      SingleNestedMessage = other.singleNestedMessage_ != null ? other.SingleNestedMessage.Clone() : null;
-    }
-
-    public TestFieldOrderings Clone() {
-      return new TestFieldOrderings(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (singleNestedMessage_ != null) SingleNestedMessage.Freeze();
-    }
-
-    public const int MyStringFieldNumber = 11;
-    private string myString_ = "";
-    public string MyString {
-      get { return myString_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        myString_ = value ?? "";
-      }
-    }
-
-    public const int MyIntFieldNumber = 1;
-    private long myInt_;
-    public long MyInt {
-      get { return myInt_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        myInt_ = value;
-      }
-    }
-
-    public const int MyFloatFieldNumber = 101;
-    private float myFloat_;
-    public float MyFloat {
-      get { return myFloat_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        myFloat_ = value;
-      }
-    }
-
-    public const int SingleNestedMessageFieldNumber = 200;
-    private global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage singleNestedMessage_;
-    public global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage SingleNestedMessage {
-      get { return singleNestedMessage_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        singleNestedMessage_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestFieldOrderings);
-    }
-
-    public bool Equals(TestFieldOrderings other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (MyString != other.MyString) return false;
-      if (MyInt != other.MyInt) return false;
-      if (MyFloat != other.MyFloat) return false;
-      if (!object.Equals(SingleNestedMessage, other.SingleNestedMessage)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (MyString.Length != 0) hash ^= MyString.GetHashCode();
-      if (MyInt != 0L) hash ^= MyInt.GetHashCode();
-      if (MyFloat != 0F) hash ^= MyFloat.GetHashCode();
-      if (singleNestedMessage_ != null) hash ^= SingleNestedMessage.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (MyInt != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(MyInt);
-      }
-      if (MyString.Length != 0) {
-        output.WriteRawTag(90);
-        output.WriteString(MyString);
-      }
-      if (MyFloat != 0F) {
-        output.WriteRawTag(173, 6);
-        output.WriteFloat(MyFloat);
-      }
-      if (singleNestedMessage_ != null) {
-        output.WriteRawTag(194, 12);
-        output.WriteMessage(SingleNestedMessage);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (MyString.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(MyString);
-      }
-      if (MyInt != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(MyInt);
-      }
-      if (MyFloat != 0F) {
-        size += 2 + 4;
-      }
-      if (singleNestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(SingleNestedMessage);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestFieldOrderings other) {
-      if (other == null) {
-        return;
-      }
-      if (other.MyString.Length != 0) {
-        MyString = other.MyString;
-      }
-      if (other.MyInt != 0L) {
-        MyInt = other.MyInt;
-      }
-      if (other.MyFloat != 0F) {
-        MyFloat = other.MyFloat;
-      }
-      if (other.singleNestedMessage_ != null) {
-        if (singleNestedMessage_ == null) {
-          singleNestedMessage_ = new global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage();
-        }
-        SingleNestedMessage.MergeFrom(other.SingleNestedMessage);
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            MyInt = input.ReadInt64();
-            break;
-          }
-          case 90: {
-            MyString = input.ReadString();
-            break;
-          }
-          case 813: {
-            MyFloat = input.ReadFloat();
-            break;
-          }
-          case 1602: {
-            if (singleNestedMessage_ == null) {
-              singleNestedMessage_ = new global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage();
-            }
-            input.ReadMessage(singleNestedMessage_);
-            break;
-          }
-        }
-      }
-    }
-
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types {
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "bb", "oo" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestFieldOrderings.Descriptor.NestedTypes[0]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestFieldOrderings_NestedMessage__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public NestedMessage(NestedMessage other) : this() {
-          oo_ = other.oo_;
-          bb_ = other.bb_;
-        }
-
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int OoFieldNumber = 2;
-        private long oo_;
-        public long Oo {
-          get { return oo_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            oo_ = value;
-          }
-        }
-
-        public const int BbFieldNumber = 1;
-        private int bb_;
-        public int Bb {
-          get { return bb_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            bb_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Oo != other.Oo) return false;
-          if (Bb != other.Bb) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Oo != 0L) hash ^= Oo.GetHashCode();
-          if (Bb != 0) hash ^= Bb.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Bb != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (Oo != 0L) {
-            output.WriteRawTag(16);
-            output.WriteInt64(Oo);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Oo != 0L) {
-            size += 1 + pb::CodedOutputStream.ComputeInt64Size(Oo);
-          }
-          if (Bb != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Bb);
-          }
-          return size;
-        }
-
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Oo != 0L) {
-            Oo = other.Oo;
-          }
-          if (other.Bb != 0) {
-            Bb = other.Bb;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Oo = input.ReadInt64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class SparseEnumMessage : pb::IMessage<SparseEnumMessage> {
-    private static readonly pb::MessageParser<SparseEnumMessage> _parser = new pb::MessageParser<SparseEnumMessage>(() => new SparseEnumMessage());
-    public static pb::MessageParser<SparseEnumMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "sparse_enum" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[12]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_SparseEnumMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public SparseEnumMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public SparseEnumMessage(SparseEnumMessage other) : this() {
-      sparseEnum_ = other.sparseEnum_;
-    }
-
-    public SparseEnumMessage Clone() {
-      return new SparseEnumMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int SparseEnumFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestSparseEnum sparseEnum_ = global::Google.Protobuf.TestProtos.TestSparseEnum.TEST_SPARSE_ENUM_UNSPECIFIED;
-    public global::Google.Protobuf.TestProtos.TestSparseEnum SparseEnum {
-      get { return sparseEnum_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        sparseEnum_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as SparseEnumMessage);
-    }
-
-    public bool Equals(SparseEnumMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (SparseEnum != other.SparseEnum) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (SparseEnum != global::Google.Protobuf.TestProtos.TestSparseEnum.TEST_SPARSE_ENUM_UNSPECIFIED) hash ^= SparseEnum.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (SparseEnum != global::Google.Protobuf.TestProtos.TestSparseEnum.TEST_SPARSE_ENUM_UNSPECIFIED) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) SparseEnum);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (SparseEnum != global::Google.Protobuf.TestProtos.TestSparseEnum.TEST_SPARSE_ENUM_UNSPECIFIED) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SparseEnum);
-      }
-      return size;
-    }
-
-    public void MergeFrom(SparseEnumMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.SparseEnum != global::Google.Protobuf.TestProtos.TestSparseEnum.TEST_SPARSE_ENUM_UNSPECIFIED) {
-        SparseEnum = other.SparseEnum;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            sparseEnum_ = (global::Google.Protobuf.TestProtos.TestSparseEnum) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class OneString : pb::IMessage<OneString> {
-    private static readonly pb::MessageParser<OneString> _parser = new pb::MessageParser<OneString>(() => new OneString());
-    public static pb::MessageParser<OneString> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "data" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[13]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_OneString__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public OneString() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public OneString(OneString other) : this() {
-      data_ = other.data_;
-    }
-
-    public OneString Clone() {
-      return new OneString(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int DataFieldNumber = 1;
-    private string data_ = "";
-    public string Data {
-      get { return data_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        data_ = value ?? "";
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as OneString);
-    }
-
-    public bool Equals(OneString other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data.Length != 0) hash ^= Data.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Data.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Data);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (Data.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Data);
-      }
-      return size;
-    }
-
-    public void MergeFrom(OneString other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data.Length != 0) {
-        Data = other.Data;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            Data = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class MoreString : pb::IMessage<MoreString> {
-    private static readonly pb::MessageParser<MoreString> _parser = new pb::MessageParser<MoreString>(() => new MoreString());
-    public static pb::MessageParser<MoreString> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "data" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[14]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_MoreString__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public MoreString() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public MoreString(MoreString other) : this() {
-      data_ = other.data_.Clone();
-    }
-
-    public MoreString Clone() {
-      return new MoreString(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      data_.Freeze();
-    }
-
-    public const int DataFieldNumber = 1;
-    private static readonly pb::FieldCodec<string> _repeated_data_codec
-        = pb::FieldCodec.ForString(10);
-    private readonly pbc::RepeatedField<string> data_ = new pbc::RepeatedField<string>();
-    public pbc::RepeatedField<string> Data {
-      get { return data_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as MoreString);
-    }
-
-    public bool Equals(MoreString other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!data_.Equals(other.data_)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= data_.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      data_.WriteTo(output, _repeated_data_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += data_.CalculateSize(_repeated_data_codec);
-      return size;
-    }
-
-    public void MergeFrom(MoreString other) {
-      if (other == null) {
-        return;
-      }
-      data_.Add(other.data_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            data_.AddEntriesFrom(input, _repeated_data_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class OneBytes : pb::IMessage<OneBytes> {
-    private static readonly pb::MessageParser<OneBytes> _parser = new pb::MessageParser<OneBytes>(() => new OneBytes());
-    public static pb::MessageParser<OneBytes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "data" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[15]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_OneBytes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public OneBytes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public OneBytes(OneBytes other) : this() {
-      data_ = other.data_;
-    }
-
-    public OneBytes Clone() {
-      return new OneBytes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int DataFieldNumber = 1;
-    private pb::ByteString data_ = pb::ByteString.Empty;
-    public pb::ByteString Data {
-      get { return data_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        data_ = value ?? pb::ByteString.Empty;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as OneBytes);
-    }
-
-    public bool Equals(OneBytes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data.Length != 0) hash ^= Data.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Data.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteBytes(Data);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (Data.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(Data);
-      }
-      return size;
-    }
-
-    public void MergeFrom(OneBytes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data.Length != 0) {
-        Data = other.Data;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            Data = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class MoreBytes : pb::IMessage<MoreBytes> {
-    private static readonly pb::MessageParser<MoreBytes> _parser = new pb::MessageParser<MoreBytes>(() => new MoreBytes());
-    public static pb::MessageParser<MoreBytes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "data" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[16]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_MoreBytes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public MoreBytes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public MoreBytes(MoreBytes other) : this() {
-      data_ = other.data_;
-    }
-
-    public MoreBytes Clone() {
-      return new MoreBytes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int DataFieldNumber = 1;
-    private pb::ByteString data_ = pb::ByteString.Empty;
-    public pb::ByteString Data {
-      get { return data_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        data_ = value ?? pb::ByteString.Empty;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as MoreBytes);
-    }
-
-    public bool Equals(MoreBytes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data.Length != 0) hash ^= Data.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Data.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteBytes(Data);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (Data.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(Data);
-      }
-      return size;
-    }
-
-    public void MergeFrom(MoreBytes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data.Length != 0) {
-        Data = other.Data;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            Data = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class Int32Message : pb::IMessage<Int32Message> {
-    private static readonly pb::MessageParser<Int32Message> _parser = new pb::MessageParser<Int32Message>(() => new Int32Message());
-    public static pb::MessageParser<Int32Message> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "data" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[17]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_Int32Message__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public Int32Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public Int32Message(Int32Message other) : this() {
-      data_ = other.data_;
-    }
-
-    public Int32Message Clone() {
-      return new Int32Message(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int DataFieldNumber = 1;
-    private int data_;
-    public int Data {
-      get { return data_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        data_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as Int32Message);
-    }
-
-    public bool Equals(Int32Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data != 0) hash ^= Data.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Data != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Data);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (Data != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Data);
-      }
-      return size;
-    }
-
-    public void MergeFrom(Int32Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data != 0) {
-        Data = other.Data;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            Data = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class Uint32Message : pb::IMessage<Uint32Message> {
-    private static readonly pb::MessageParser<Uint32Message> _parser = new pb::MessageParser<Uint32Message>(() => new Uint32Message());
-    public static pb::MessageParser<Uint32Message> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "data" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[18]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_Uint32Message__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public Uint32Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public Uint32Message(Uint32Message other) : this() {
-      data_ = other.data_;
-    }
-
-    public Uint32Message Clone() {
-      return new Uint32Message(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int DataFieldNumber = 1;
-    private uint data_;
-    public uint Data {
-      get { return data_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        data_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as Uint32Message);
-    }
-
-    public bool Equals(Uint32Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data != 0) hash ^= Data.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Data != 0) {
-        output.WriteRawTag(8);
-        output.WriteUInt32(Data);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (Data != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Data);
-      }
-      return size;
-    }
-
-    public void MergeFrom(Uint32Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data != 0) {
-        Data = other.Data;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            Data = input.ReadUInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class Int64Message : pb::IMessage<Int64Message> {
-    private static readonly pb::MessageParser<Int64Message> _parser = new pb::MessageParser<Int64Message>(() => new Int64Message());
-    public static pb::MessageParser<Int64Message> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "data" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[19]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_Int64Message__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public Int64Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public Int64Message(Int64Message other) : this() {
-      data_ = other.data_;
-    }
-
-    public Int64Message Clone() {
-      return new Int64Message(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int DataFieldNumber = 1;
-    private long data_;
-    public long Data {
-      get { return data_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        data_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as Int64Message);
-    }
-
-    public bool Equals(Int64Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data != 0L) hash ^= Data.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Data != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Data);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (Data != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Data);
-      }
-      return size;
-    }
-
-    public void MergeFrom(Int64Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data != 0L) {
-        Data = other.Data;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            Data = input.ReadInt64();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class Uint64Message : pb::IMessage<Uint64Message> {
-    private static readonly pb::MessageParser<Uint64Message> _parser = new pb::MessageParser<Uint64Message>(() => new Uint64Message());
-    public static pb::MessageParser<Uint64Message> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "data" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[20]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_Uint64Message__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public Uint64Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public Uint64Message(Uint64Message other) : this() {
-      data_ = other.data_;
-    }
-
-    public Uint64Message Clone() {
-      return new Uint64Message(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int DataFieldNumber = 1;
-    private ulong data_;
-    public ulong Data {
-      get { return data_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        data_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as Uint64Message);
-    }
-
-    public bool Equals(Uint64Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data != 0UL) hash ^= Data.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Data != 0UL) {
-        output.WriteRawTag(8);
-        output.WriteUInt64(Data);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (Data != 0UL) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Data);
-      }
-      return size;
-    }
-
-    public void MergeFrom(Uint64Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data != 0UL) {
-        Data = other.Data;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            Data = input.ReadUInt64();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class BoolMessage : pb::IMessage<BoolMessage> {
-    private static readonly pb::MessageParser<BoolMessage> _parser = new pb::MessageParser<BoolMessage>(() => new BoolMessage());
-    public static pb::MessageParser<BoolMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "data" };
-    private static readonly uint[] _fieldTags = new uint[] { 8 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[21]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_BoolMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public BoolMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public BoolMessage(BoolMessage other) : this() {
-      data_ = other.data_;
-    }
-
-    public BoolMessage Clone() {
-      return new BoolMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int DataFieldNumber = 1;
-    private bool data_;
-    public bool Data {
-      get { return data_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        data_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as BoolMessage);
-    }
-
-    public bool Equals(BoolMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data != false) hash ^= Data.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Data != false) {
-        output.WriteRawTag(8);
-        output.WriteBool(Data);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (Data != false) {
-        size += 1 + 1;
-      }
-      return size;
-    }
-
-    public void MergeFrom(BoolMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data != false) {
-        Data = other.Data;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            Data = input.ReadBool();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestOneof : pb::IMessage<TestOneof> {
-    private static readonly pb::MessageParser<TestOneof> _parser = new pb::MessageParser<TestOneof>(() => new TestOneof());
-    public static pb::MessageParser<TestOneof> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "foo_int", "foo_message", "foo_string" };
-    private static readonly uint[] _fieldTags = new uint[] { 8, 26, 18 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[22]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestOneof__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestOneof() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestOneof(TestOneof other) : this() {
-      switch (other.FooCase) {
-        case FooOneofCase.FooInt:
-          FooInt = other.FooInt;
-          break;
-        case FooOneofCase.FooString:
-          FooString = other.FooString;
-          break;
-        case FooOneofCase.FooMessage:
-          FooMessage = other.FooMessage.Clone();
-          break;
-      }
-
-    }
-
-    public TestOneof Clone() {
-      return new TestOneof(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (foo_ is IFreezable) ((IFreezable) foo_).Freeze();
-    }
-
-    public const int FooIntFieldNumber = 1;
-    public int FooInt {
-      get { return fooCase_ == FooOneofCase.FooInt ? (int) foo_ : 0; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        foo_ = value;
-        fooCase_ = FooOneofCase.FooInt;
-      }
-    }
-
-    public const int FooStringFieldNumber = 2;
-    public string FooString {
-      get { return fooCase_ == FooOneofCase.FooString ? (string) foo_ : ""; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        foo_ = value ?? "";
-        fooCase_ = FooOneofCase.FooString;
-      }
-    }
-
-    public const int FooMessageFieldNumber = 3;
-    public global::Google.Protobuf.TestProtos.TestAllTypes FooMessage {
-      get { return fooCase_ == FooOneofCase.FooMessage ? (global::Google.Protobuf.TestProtos.TestAllTypes) foo_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        foo_ = value;
-        fooCase_ = value == null ? FooOneofCase.None : FooOneofCase.FooMessage;
-      }
-    }
-
-    private object foo_;
-    public enum FooOneofCase {
-      None = 0,
-      FooInt = 1,
-      FooString = 2,
-      FooMessage = 3,
-    }
-    private FooOneofCase fooCase_ = FooOneofCase.None;
-    public FooOneofCase FooCase {
-      get { return fooCase_; }
-    }
-
-    public void ClearFoo() {
-      pb::Freezable.CheckMutable(this);
-      fooCase_ = FooOneofCase.None;
-      foo_ = null;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestOneof);
-    }
-
-    public bool Equals(TestOneof other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (FooInt != other.FooInt) return false;
-      if (FooString != other.FooString) return false;
-      if (!object.Equals(FooMessage, other.FooMessage)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (fooCase_ == FooOneofCase.FooInt) hash ^= FooInt.GetHashCode();
-      if (fooCase_ == FooOneofCase.FooString) hash ^= FooString.GetHashCode();
-      if (fooCase_ == FooOneofCase.FooMessage) hash ^= FooMessage.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (fooCase_ == FooOneofCase.FooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (fooCase_ == FooOneofCase.FooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        output.WriteRawTag(26);
-        output.WriteMessage(FooMessage);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (fooCase_ == FooOneofCase.FooInt) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FooInt);
-      }
-      if (fooCase_ == FooOneofCase.FooString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FooMessage);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestOneof other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.FooCase) {
-        case FooOneofCase.FooInt:
-          FooInt = other.FooInt;
-          break;
-        case FooOneofCase.FooString:
-          FooString = other.FooString;
-          break;
-        case FooOneofCase.FooMessage:
-          FooMessage = other.FooMessage;
-          break;
-      }
-
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            global::Google.Protobuf.TestProtos.TestAllTypes subBuilder = new global::Google.Protobuf.TestProtos.TestAllTypes();
-            if (fooCase_ == FooOneofCase.FooMessage) {
-              subBuilder.MergeFrom(FooMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooMessage = subBuilder;
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestPackedTypes : pb::IMessage<TestPackedTypes> {
-    private static readonly pb::MessageParser<TestPackedTypes> _parser = new pb::MessageParser<TestPackedTypes>(() => new TestPackedTypes());
-    public static pb::MessageParser<TestPackedTypes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "packed_bool", "packed_double", "packed_enum", "packed_fixed32", "packed_fixed64", "packed_float", "packed_int32", "packed_int64", "packed_sfixed32", "packed_sfixed64", "packed_sint32", "packed_sint64", "packed_uint32", "packed_uint64" };
-    private static readonly uint[] _fieldTags = new uint[] { 818, 810, 826, 770, 778, 802, 722, 730, 786, 794, 754, 762, 738, 746 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[23]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestPackedTypes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestPackedTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestPackedTypes(TestPackedTypes other) : this() {
-      packedInt32_ = other.packedInt32_.Clone();
-      packedInt64_ = other.packedInt64_.Clone();
-      packedUint32_ = other.packedUint32_.Clone();
-      packedUint64_ = other.packedUint64_.Clone();
-      packedSint32_ = other.packedSint32_.Clone();
-      packedSint64_ = other.packedSint64_.Clone();
-      packedFixed32_ = other.packedFixed32_.Clone();
-      packedFixed64_ = other.packedFixed64_.Clone();
-      packedSfixed32_ = other.packedSfixed32_.Clone();
-      packedSfixed64_ = other.packedSfixed64_.Clone();
-      packedFloat_ = other.packedFloat_.Clone();
-      packedDouble_ = other.packedDouble_.Clone();
-      packedBool_ = other.packedBool_.Clone();
-      packedEnum_ = other.packedEnum_.Clone();
-    }
-
-    public TestPackedTypes Clone() {
-      return new TestPackedTypes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      packedInt32_.Freeze();
-      packedInt64_.Freeze();
-      packedUint32_.Freeze();
-      packedUint64_.Freeze();
-      packedSint32_.Freeze();
-      packedSint64_.Freeze();
-      packedFixed32_.Freeze();
-      packedFixed64_.Freeze();
-      packedSfixed32_.Freeze();
-      packedSfixed64_.Freeze();
-      packedFloat_.Freeze();
-      packedDouble_.Freeze();
-      packedBool_.Freeze();
-      packedEnum_.Freeze();
-    }
-
-    public const int PackedInt32FieldNumber = 90;
-    private static readonly pb::FieldCodec<int> _repeated_packedInt32_codec
-        = pb::FieldCodec.ForInt32(722);
-    private readonly pbc::RepeatedField<int> packedInt32_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> PackedInt32 {
-      get { return packedInt32_; }
-    }
-
-    public const int PackedInt64FieldNumber = 91;
-    private static readonly pb::FieldCodec<long> _repeated_packedInt64_codec
-        = pb::FieldCodec.ForInt64(730);
-    private readonly pbc::RepeatedField<long> packedInt64_ = new pbc::RepeatedField<long>();
-    public pbc::RepeatedField<long> PackedInt64 {
-      get { return packedInt64_; }
-    }
-
-    public const int PackedUint32FieldNumber = 92;
-    private static readonly pb::FieldCodec<uint> _repeated_packedUint32_codec
-        = pb::FieldCodec.ForUInt32(738);
-    private readonly pbc::RepeatedField<uint> packedUint32_ = new pbc::RepeatedField<uint>();
-    public pbc::RepeatedField<uint> PackedUint32 {
-      get { return packedUint32_; }
-    }
-
-    public const int PackedUint64FieldNumber = 93;
-    private static readonly pb::FieldCodec<ulong> _repeated_packedUint64_codec
-        = pb::FieldCodec.ForUInt64(746);
-    private readonly pbc::RepeatedField<ulong> packedUint64_ = new pbc::RepeatedField<ulong>();
-    public pbc::RepeatedField<ulong> PackedUint64 {
-      get { return packedUint64_; }
-    }
-
-    public const int PackedSint32FieldNumber = 94;
-    private static readonly pb::FieldCodec<int> _repeated_packedSint32_codec
-        = pb::FieldCodec.ForSInt32(754);
-    private readonly pbc::RepeatedField<int> packedSint32_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> PackedSint32 {
-      get { return packedSint32_; }
-    }
-
-    public const int PackedSint64FieldNumber = 95;
-    private static readonly pb::FieldCodec<long> _repeated_packedSint64_codec
-        = pb::FieldCodec.ForSInt64(762);
-    private readonly pbc::RepeatedField<long> packedSint64_ = new pbc::RepeatedField<long>();
-    public pbc::RepeatedField<long> PackedSint64 {
-      get { return packedSint64_; }
-    }
-
-    public const int PackedFixed32FieldNumber = 96;
-    private static readonly pb::FieldCodec<uint> _repeated_packedFixed32_codec
-        = pb::FieldCodec.ForFixed32(770);
-    private readonly pbc::RepeatedField<uint> packedFixed32_ = new pbc::RepeatedField<uint>();
-    public pbc::RepeatedField<uint> PackedFixed32 {
-      get { return packedFixed32_; }
-    }
-
-    public const int PackedFixed64FieldNumber = 97;
-    private static readonly pb::FieldCodec<ulong> _repeated_packedFixed64_codec
-        = pb::FieldCodec.ForFixed64(778);
-    private readonly pbc::RepeatedField<ulong> packedFixed64_ = new pbc::RepeatedField<ulong>();
-    public pbc::RepeatedField<ulong> PackedFixed64 {
-      get { return packedFixed64_; }
-    }
-
-    public const int PackedSfixed32FieldNumber = 98;
-    private static readonly pb::FieldCodec<int> _repeated_packedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(786);
-    private readonly pbc::RepeatedField<int> packedSfixed32_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> PackedSfixed32 {
-      get { return packedSfixed32_; }
-    }
-
-    public const int PackedSfixed64FieldNumber = 99;
-    private static readonly pb::FieldCodec<long> _repeated_packedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(794);
-    private readonly pbc::RepeatedField<long> packedSfixed64_ = new pbc::RepeatedField<long>();
-    public pbc::RepeatedField<long> PackedSfixed64 {
-      get { return packedSfixed64_; }
-    }
-
-    public const int PackedFloatFieldNumber = 100;
-    private static readonly pb::FieldCodec<float> _repeated_packedFloat_codec
-        = pb::FieldCodec.ForFloat(802);
-    private readonly pbc::RepeatedField<float> packedFloat_ = new pbc::RepeatedField<float>();
-    public pbc::RepeatedField<float> PackedFloat {
-      get { return packedFloat_; }
-    }
-
-    public const int PackedDoubleFieldNumber = 101;
-    private static readonly pb::FieldCodec<double> _repeated_packedDouble_codec
-        = pb::FieldCodec.ForDouble(810);
-    private readonly pbc::RepeatedField<double> packedDouble_ = new pbc::RepeatedField<double>();
-    public pbc::RepeatedField<double> PackedDouble {
-      get { return packedDouble_; }
-    }
-
-    public const int PackedBoolFieldNumber = 102;
-    private static readonly pb::FieldCodec<bool> _repeated_packedBool_codec
-        = pb::FieldCodec.ForBool(818);
-    private readonly pbc::RepeatedField<bool> packedBool_ = new pbc::RepeatedField<bool>();
-    public pbc::RepeatedField<bool> PackedBool {
-      get { return packedBool_; }
-    }
-
-    public const int PackedEnumFieldNumber = 103;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_packedEnum_codec
-        = pb::FieldCodec.ForEnum(826, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x);private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> packedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> PackedEnum {
-      get { return packedEnum_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestPackedTypes);
-    }
-
-    public bool Equals(TestPackedTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!packedInt32_.Equals(other.packedInt32_)) return false;
-      if(!packedInt64_.Equals(other.packedInt64_)) return false;
-      if(!packedUint32_.Equals(other.packedUint32_)) return false;
-      if(!packedUint64_.Equals(other.packedUint64_)) return false;
-      if(!packedSint32_.Equals(other.packedSint32_)) return false;
-      if(!packedSint64_.Equals(other.packedSint64_)) return false;
-      if(!packedFixed32_.Equals(other.packedFixed32_)) return false;
-      if(!packedFixed64_.Equals(other.packedFixed64_)) return false;
-      if(!packedSfixed32_.Equals(other.packedSfixed32_)) return false;
-      if(!packedSfixed64_.Equals(other.packedSfixed64_)) return false;
-      if(!packedFloat_.Equals(other.packedFloat_)) return false;
-      if(!packedDouble_.Equals(other.packedDouble_)) return false;
-      if(!packedBool_.Equals(other.packedBool_)) return false;
-      if(!packedEnum_.Equals(other.packedEnum_)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= packedInt32_.GetHashCode();
-      hash ^= packedInt64_.GetHashCode();
-      hash ^= packedUint32_.GetHashCode();
-      hash ^= packedUint64_.GetHashCode();
-      hash ^= packedSint32_.GetHashCode();
-      hash ^= packedSint64_.GetHashCode();
-      hash ^= packedFixed32_.GetHashCode();
-      hash ^= packedFixed64_.GetHashCode();
-      hash ^= packedSfixed32_.GetHashCode();
-      hash ^= packedSfixed64_.GetHashCode();
-      hash ^= packedFloat_.GetHashCode();
-      hash ^= packedDouble_.GetHashCode();
-      hash ^= packedBool_.GetHashCode();
-      hash ^= packedEnum_.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      packedInt32_.WriteTo(output, _repeated_packedInt32_codec);
-      packedInt64_.WriteTo(output, _repeated_packedInt64_codec);
-      packedUint32_.WriteTo(output, _repeated_packedUint32_codec);
-      packedUint64_.WriteTo(output, _repeated_packedUint64_codec);
-      packedSint32_.WriteTo(output, _repeated_packedSint32_codec);
-      packedSint64_.WriteTo(output, _repeated_packedSint64_codec);
-      packedFixed32_.WriteTo(output, _repeated_packedFixed32_codec);
-      packedFixed64_.WriteTo(output, _repeated_packedFixed64_codec);
-      packedSfixed32_.WriteTo(output, _repeated_packedSfixed32_codec);
-      packedSfixed64_.WriteTo(output, _repeated_packedSfixed64_codec);
-      packedFloat_.WriteTo(output, _repeated_packedFloat_codec);
-      packedDouble_.WriteTo(output, _repeated_packedDouble_codec);
-      packedBool_.WriteTo(output, _repeated_packedBool_codec);
-      packedEnum_.WriteTo(output, _repeated_packedEnum_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += packedInt32_.CalculateSize(_repeated_packedInt32_codec);
-      size += packedInt64_.CalculateSize(_repeated_packedInt64_codec);
-      size += packedUint32_.CalculateSize(_repeated_packedUint32_codec);
-      size += packedUint64_.CalculateSize(_repeated_packedUint64_codec);
-      size += packedSint32_.CalculateSize(_repeated_packedSint32_codec);
-      size += packedSint64_.CalculateSize(_repeated_packedSint64_codec);
-      size += packedFixed32_.CalculateSize(_repeated_packedFixed32_codec);
-      size += packedFixed64_.CalculateSize(_repeated_packedFixed64_codec);
-      size += packedSfixed32_.CalculateSize(_repeated_packedSfixed32_codec);
-      size += packedSfixed64_.CalculateSize(_repeated_packedSfixed64_codec);
-      size += packedFloat_.CalculateSize(_repeated_packedFloat_codec);
-      size += packedDouble_.CalculateSize(_repeated_packedDouble_codec);
-      size += packedBool_.CalculateSize(_repeated_packedBool_codec);
-      size += packedEnum_.CalculateSize(_repeated_packedEnum_codec);
-      return size;
-    }
-
-    public void MergeFrom(TestPackedTypes other) {
-      if (other == null) {
-        return;
-      }
-      packedInt32_.Add(other.packedInt32_);
-      packedInt64_.Add(other.packedInt64_);
-      packedUint32_.Add(other.packedUint32_);
-      packedUint64_.Add(other.packedUint64_);
-      packedSint32_.Add(other.packedSint32_);
-      packedSint64_.Add(other.packedSint64_);
-      packedFixed32_.Add(other.packedFixed32_);
-      packedFixed64_.Add(other.packedFixed64_);
-      packedSfixed32_.Add(other.packedSfixed32_);
-      packedSfixed64_.Add(other.packedSfixed64_);
-      packedFloat_.Add(other.packedFloat_);
-      packedDouble_.Add(other.packedDouble_);
-      packedBool_.Add(other.packedBool_);
-      packedEnum_.Add(other.packedEnum_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 722:
-          case 720: {
-            packedInt32_.AddEntriesFrom(input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            packedInt64_.AddEntriesFrom(input, _repeated_packedInt64_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            packedUint32_.AddEntriesFrom(input, _repeated_packedUint32_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            packedUint64_.AddEntriesFrom(input, _repeated_packedUint64_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            packedSint32_.AddEntriesFrom(input, _repeated_packedSint32_codec);
-            break;
-          }
-          case 762:
-          case 760: {
-            packedSint64_.AddEntriesFrom(input, _repeated_packedSint64_codec);
-            break;
-          }
-          case 770:
-          case 773: {
-            packedFixed32_.AddEntriesFrom(input, _repeated_packedFixed32_codec);
-            break;
-          }
-          case 778:
-          case 777: {
-            packedFixed64_.AddEntriesFrom(input, _repeated_packedFixed64_codec);
-            break;
-          }
-          case 786:
-          case 789: {
-            packedSfixed32_.AddEntriesFrom(input, _repeated_packedSfixed32_codec);
-            break;
-          }
-          case 794:
-          case 793: {
-            packedSfixed64_.AddEntriesFrom(input, _repeated_packedSfixed64_codec);
-            break;
-          }
-          case 802:
-          case 805: {
-            packedFloat_.AddEntriesFrom(input, _repeated_packedFloat_codec);
-            break;
-          }
-          case 810:
-          case 809: {
-            packedDouble_.AddEntriesFrom(input, _repeated_packedDouble_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            packedBool_.AddEntriesFrom(input, _repeated_packedBool_codec);
-            break;
-          }
-          case 826:
-          case 824: {
-            packedEnum_.AddEntriesFrom(input, _repeated_packedEnum_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestUnpackedTypes : pb::IMessage<TestUnpackedTypes> {
-    private static readonly pb::MessageParser<TestUnpackedTypes> _parser = new pb::MessageParser<TestUnpackedTypes>(() => new TestUnpackedTypes());
-    public static pb::MessageParser<TestUnpackedTypes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "unpacked_bool", "unpacked_double", "unpacked_enum", "unpacked_fixed32", "unpacked_fixed64", "unpacked_float", "unpacked_int32", "unpacked_int64", "unpacked_sfixed32", "unpacked_sfixed64", "unpacked_sint32", "unpacked_sint64", "unpacked_uint32", "unpacked_uint64" };
-    private static readonly uint[] _fieldTags = new uint[] { 816, 809, 824, 773, 777, 805, 720, 728, 789, 793, 752, 760, 736, 744 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[24]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestUnpackedTypes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestUnpackedTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestUnpackedTypes(TestUnpackedTypes other) : this() {
-      unpackedInt32_ = other.unpackedInt32_.Clone();
-      unpackedInt64_ = other.unpackedInt64_.Clone();
-      unpackedUint32_ = other.unpackedUint32_.Clone();
-      unpackedUint64_ = other.unpackedUint64_.Clone();
-      unpackedSint32_ = other.unpackedSint32_.Clone();
-      unpackedSint64_ = other.unpackedSint64_.Clone();
-      unpackedFixed32_ = other.unpackedFixed32_.Clone();
-      unpackedFixed64_ = other.unpackedFixed64_.Clone();
-      unpackedSfixed32_ = other.unpackedSfixed32_.Clone();
-      unpackedSfixed64_ = other.unpackedSfixed64_.Clone();
-      unpackedFloat_ = other.unpackedFloat_.Clone();
-      unpackedDouble_ = other.unpackedDouble_.Clone();
-      unpackedBool_ = other.unpackedBool_.Clone();
-      unpackedEnum_ = other.unpackedEnum_.Clone();
-    }
-
-    public TestUnpackedTypes Clone() {
-      return new TestUnpackedTypes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      unpackedInt32_.Freeze();
-      unpackedInt64_.Freeze();
-      unpackedUint32_.Freeze();
-      unpackedUint64_.Freeze();
-      unpackedSint32_.Freeze();
-      unpackedSint64_.Freeze();
-      unpackedFixed32_.Freeze();
-      unpackedFixed64_.Freeze();
-      unpackedSfixed32_.Freeze();
-      unpackedSfixed64_.Freeze();
-      unpackedFloat_.Freeze();
-      unpackedDouble_.Freeze();
-      unpackedBool_.Freeze();
-      unpackedEnum_.Freeze();
-    }
-
-    public const int UnpackedInt32FieldNumber = 90;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedInt32_codec
-        = pb::FieldCodec.ForInt32(720);
-    private readonly pbc::RepeatedField<int> unpackedInt32_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> UnpackedInt32 {
-      get { return unpackedInt32_; }
-    }
-
-    public const int UnpackedInt64FieldNumber = 91;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedInt64_codec
-        = pb::FieldCodec.ForInt64(728);
-    private readonly pbc::RepeatedField<long> unpackedInt64_ = new pbc::RepeatedField<long>();
-    public pbc::RepeatedField<long> UnpackedInt64 {
-      get { return unpackedInt64_; }
-    }
-
-    public const int UnpackedUint32FieldNumber = 92;
-    private static readonly pb::FieldCodec<uint> _repeated_unpackedUint32_codec
-        = pb::FieldCodec.ForUInt32(736);
-    private readonly pbc::RepeatedField<uint> unpackedUint32_ = new pbc::RepeatedField<uint>();
-    public pbc::RepeatedField<uint> UnpackedUint32 {
-      get { return unpackedUint32_; }
-    }
-
-    public const int UnpackedUint64FieldNumber = 93;
-    private static readonly pb::FieldCodec<ulong> _repeated_unpackedUint64_codec
-        = pb::FieldCodec.ForUInt64(744);
-    private readonly pbc::RepeatedField<ulong> unpackedUint64_ = new pbc::RepeatedField<ulong>();
-    public pbc::RepeatedField<ulong> UnpackedUint64 {
-      get { return unpackedUint64_; }
-    }
-
-    public const int UnpackedSint32FieldNumber = 94;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedSint32_codec
-        = pb::FieldCodec.ForSInt32(752);
-    private readonly pbc::RepeatedField<int> unpackedSint32_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> UnpackedSint32 {
-      get { return unpackedSint32_; }
-    }
-
-    public const int UnpackedSint64FieldNumber = 95;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedSint64_codec
-        = pb::FieldCodec.ForSInt64(760);
-    private readonly pbc::RepeatedField<long> unpackedSint64_ = new pbc::RepeatedField<long>();
-    public pbc::RepeatedField<long> UnpackedSint64 {
-      get { return unpackedSint64_; }
-    }
-
-    public const int UnpackedFixed32FieldNumber = 96;
-    private static readonly pb::FieldCodec<uint> _repeated_unpackedFixed32_codec
-        = pb::FieldCodec.ForFixed32(773);
-    private readonly pbc::RepeatedField<uint> unpackedFixed32_ = new pbc::RepeatedField<uint>();
-    public pbc::RepeatedField<uint> UnpackedFixed32 {
-      get { return unpackedFixed32_; }
-    }
-
-    public const int UnpackedFixed64FieldNumber = 97;
-    private static readonly pb::FieldCodec<ulong> _repeated_unpackedFixed64_codec
-        = pb::FieldCodec.ForFixed64(777);
-    private readonly pbc::RepeatedField<ulong> unpackedFixed64_ = new pbc::RepeatedField<ulong>();
-    public pbc::RepeatedField<ulong> UnpackedFixed64 {
-      get { return unpackedFixed64_; }
-    }
-
-    public const int UnpackedSfixed32FieldNumber = 98;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(789);
-    private readonly pbc::RepeatedField<int> unpackedSfixed32_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> UnpackedSfixed32 {
-      get { return unpackedSfixed32_; }
-    }
-
-    public const int UnpackedSfixed64FieldNumber = 99;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(793);
-    private readonly pbc::RepeatedField<long> unpackedSfixed64_ = new pbc::RepeatedField<long>();
-    public pbc::RepeatedField<long> UnpackedSfixed64 {
-      get { return unpackedSfixed64_; }
-    }
-
-    public const int UnpackedFloatFieldNumber = 100;
-    private static readonly pb::FieldCodec<float> _repeated_unpackedFloat_codec
-        = pb::FieldCodec.ForFloat(805);
-    private readonly pbc::RepeatedField<float> unpackedFloat_ = new pbc::RepeatedField<float>();
-    public pbc::RepeatedField<float> UnpackedFloat {
-      get { return unpackedFloat_; }
-    }
-
-    public const int UnpackedDoubleFieldNumber = 101;
-    private static readonly pb::FieldCodec<double> _repeated_unpackedDouble_codec
-        = pb::FieldCodec.ForDouble(809);
-    private readonly pbc::RepeatedField<double> unpackedDouble_ = new pbc::RepeatedField<double>();
-    public pbc::RepeatedField<double> UnpackedDouble {
-      get { return unpackedDouble_; }
-    }
-
-    public const int UnpackedBoolFieldNumber = 102;
-    private static readonly pb::FieldCodec<bool> _repeated_unpackedBool_codec
-        = pb::FieldCodec.ForBool(816);
-    private readonly pbc::RepeatedField<bool> unpackedBool_ = new pbc::RepeatedField<bool>();
-    public pbc::RepeatedField<bool> UnpackedBool {
-      get { return unpackedBool_; }
-    }
-
-    public const int UnpackedEnumFieldNumber = 103;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_unpackedEnum_codec
-        = pb::FieldCodec.ForEnum(824, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x);private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> unpackedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>();
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> UnpackedEnum {
-      get { return unpackedEnum_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestUnpackedTypes);
-    }
-
-    public bool Equals(TestUnpackedTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!unpackedInt32_.Equals(other.unpackedInt32_)) return false;
-      if(!unpackedInt64_.Equals(other.unpackedInt64_)) return false;
-      if(!unpackedUint32_.Equals(other.unpackedUint32_)) return false;
-      if(!unpackedUint64_.Equals(other.unpackedUint64_)) return false;
-      if(!unpackedSint32_.Equals(other.unpackedSint32_)) return false;
-      if(!unpackedSint64_.Equals(other.unpackedSint64_)) return false;
-      if(!unpackedFixed32_.Equals(other.unpackedFixed32_)) return false;
-      if(!unpackedFixed64_.Equals(other.unpackedFixed64_)) return false;
-      if(!unpackedSfixed32_.Equals(other.unpackedSfixed32_)) return false;
-      if(!unpackedSfixed64_.Equals(other.unpackedSfixed64_)) return false;
-      if(!unpackedFloat_.Equals(other.unpackedFloat_)) return false;
-      if(!unpackedDouble_.Equals(other.unpackedDouble_)) return false;
-      if(!unpackedBool_.Equals(other.unpackedBool_)) return false;
-      if(!unpackedEnum_.Equals(other.unpackedEnum_)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= unpackedInt32_.GetHashCode();
-      hash ^= unpackedInt64_.GetHashCode();
-      hash ^= unpackedUint32_.GetHashCode();
-      hash ^= unpackedUint64_.GetHashCode();
-      hash ^= unpackedSint32_.GetHashCode();
-      hash ^= unpackedSint64_.GetHashCode();
-      hash ^= unpackedFixed32_.GetHashCode();
-      hash ^= unpackedFixed64_.GetHashCode();
-      hash ^= unpackedSfixed32_.GetHashCode();
-      hash ^= unpackedSfixed64_.GetHashCode();
-      hash ^= unpackedFloat_.GetHashCode();
-      hash ^= unpackedDouble_.GetHashCode();
-      hash ^= unpackedBool_.GetHashCode();
-      hash ^= unpackedEnum_.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      unpackedInt32_.WriteTo(output, _repeated_unpackedInt32_codec);
-      unpackedInt64_.WriteTo(output, _repeated_unpackedInt64_codec);
-      unpackedUint32_.WriteTo(output, _repeated_unpackedUint32_codec);
-      unpackedUint64_.WriteTo(output, _repeated_unpackedUint64_codec);
-      unpackedSint32_.WriteTo(output, _repeated_unpackedSint32_codec);
-      unpackedSint64_.WriteTo(output, _repeated_unpackedSint64_codec);
-      unpackedFixed32_.WriteTo(output, _repeated_unpackedFixed32_codec);
-      unpackedFixed64_.WriteTo(output, _repeated_unpackedFixed64_codec);
-      unpackedSfixed32_.WriteTo(output, _repeated_unpackedSfixed32_codec);
-      unpackedSfixed64_.WriteTo(output, _repeated_unpackedSfixed64_codec);
-      unpackedFloat_.WriteTo(output, _repeated_unpackedFloat_codec);
-      unpackedDouble_.WriteTo(output, _repeated_unpackedDouble_codec);
-      unpackedBool_.WriteTo(output, _repeated_unpackedBool_codec);
-      unpackedEnum_.WriteTo(output, _repeated_unpackedEnum_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += unpackedInt32_.CalculateSize(_repeated_unpackedInt32_codec);
-      size += unpackedInt64_.CalculateSize(_repeated_unpackedInt64_codec);
-      size += unpackedUint32_.CalculateSize(_repeated_unpackedUint32_codec);
-      size += unpackedUint64_.CalculateSize(_repeated_unpackedUint64_codec);
-      size += unpackedSint32_.CalculateSize(_repeated_unpackedSint32_codec);
-      size += unpackedSint64_.CalculateSize(_repeated_unpackedSint64_codec);
-      size += unpackedFixed32_.CalculateSize(_repeated_unpackedFixed32_codec);
-      size += unpackedFixed64_.CalculateSize(_repeated_unpackedFixed64_codec);
-      size += unpackedSfixed32_.CalculateSize(_repeated_unpackedSfixed32_codec);
-      size += unpackedSfixed64_.CalculateSize(_repeated_unpackedSfixed64_codec);
-      size += unpackedFloat_.CalculateSize(_repeated_unpackedFloat_codec);
-      size += unpackedDouble_.CalculateSize(_repeated_unpackedDouble_codec);
-      size += unpackedBool_.CalculateSize(_repeated_unpackedBool_codec);
-      size += unpackedEnum_.CalculateSize(_repeated_unpackedEnum_codec);
-      return size;
-    }
-
-    public void MergeFrom(TestUnpackedTypes other) {
-      if (other == null) {
-        return;
-      }
-      unpackedInt32_.Add(other.unpackedInt32_);
-      unpackedInt64_.Add(other.unpackedInt64_);
-      unpackedUint32_.Add(other.unpackedUint32_);
-      unpackedUint64_.Add(other.unpackedUint64_);
-      unpackedSint32_.Add(other.unpackedSint32_);
-      unpackedSint64_.Add(other.unpackedSint64_);
-      unpackedFixed32_.Add(other.unpackedFixed32_);
-      unpackedFixed64_.Add(other.unpackedFixed64_);
-      unpackedSfixed32_.Add(other.unpackedSfixed32_);
-      unpackedSfixed64_.Add(other.unpackedSfixed64_);
-      unpackedFloat_.Add(other.unpackedFloat_);
-      unpackedDouble_.Add(other.unpackedDouble_);
-      unpackedBool_.Add(other.unpackedBool_);
-      unpackedEnum_.Add(other.unpackedEnum_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 722:
-          case 720: {
-            unpackedInt32_.AddEntriesFrom(input, _repeated_unpackedInt32_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            unpackedInt64_.AddEntriesFrom(input, _repeated_unpackedInt64_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            unpackedUint32_.AddEntriesFrom(input, _repeated_unpackedUint32_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            unpackedUint64_.AddEntriesFrom(input, _repeated_unpackedUint64_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            unpackedSint32_.AddEntriesFrom(input, _repeated_unpackedSint32_codec);
-            break;
-          }
-          case 762:
-          case 760: {
-            unpackedSint64_.AddEntriesFrom(input, _repeated_unpackedSint64_codec);
-            break;
-          }
-          case 770:
-          case 773: {
-            unpackedFixed32_.AddEntriesFrom(input, _repeated_unpackedFixed32_codec);
-            break;
-          }
-          case 778:
-          case 777: {
-            unpackedFixed64_.AddEntriesFrom(input, _repeated_unpackedFixed64_codec);
-            break;
-          }
-          case 786:
-          case 789: {
-            unpackedSfixed32_.AddEntriesFrom(input, _repeated_unpackedSfixed32_codec);
-            break;
-          }
-          case 794:
-          case 793: {
-            unpackedSfixed64_.AddEntriesFrom(input, _repeated_unpackedSfixed64_codec);
-            break;
-          }
-          case 802:
-          case 805: {
-            unpackedFloat_.AddEntriesFrom(input, _repeated_unpackedFloat_codec);
-            break;
-          }
-          case 810:
-          case 809: {
-            unpackedDouble_.AddEntriesFrom(input, _repeated_unpackedDouble_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            unpackedBool_.AddEntriesFrom(input, _repeated_unpackedBool_codec);
-            break;
-          }
-          case 826:
-          case 824: {
-            unpackedEnum_.AddEntriesFrom(input, _repeated_unpackedEnum_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestRepeatedScalarDifferentTagSizes : pb::IMessage<TestRepeatedScalarDifferentTagSizes> {
-    private static readonly pb::MessageParser<TestRepeatedScalarDifferentTagSizes> _parser = new pb::MessageParser<TestRepeatedScalarDifferentTagSizes>(() => new TestRepeatedScalarDifferentTagSizes());
-    public static pb::MessageParser<TestRepeatedScalarDifferentTagSizes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "repeated_fixed32", "repeated_fixed64", "repeated_float", "repeated_int32", "repeated_int64", "repeated_uint64" };
-    private static readonly uint[] _fieldTags = new uint[] { 98, 16370, 2097138, 106, 16378, 2097146 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[25]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestRepeatedScalarDifferentTagSizes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestRepeatedScalarDifferentTagSizes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestRepeatedScalarDifferentTagSizes(TestRepeatedScalarDifferentTagSizes other) : this() {
-      repeatedFixed32_ = other.repeatedFixed32_.Clone();
-      repeatedInt32_ = other.repeatedInt32_.Clone();
-      repeatedFixed64_ = other.repeatedFixed64_.Clone();
-      repeatedInt64_ = other.repeatedInt64_.Clone();
-      repeatedFloat_ = other.repeatedFloat_.Clone();
-      repeatedUint64_ = other.repeatedUint64_.Clone();
-    }
-
-    public TestRepeatedScalarDifferentTagSizes Clone() {
-      return new TestRepeatedScalarDifferentTagSizes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      repeatedFixed32_.Freeze();
-      repeatedInt32_.Freeze();
-      repeatedFixed64_.Freeze();
-      repeatedInt64_.Freeze();
-      repeatedFloat_.Freeze();
-      repeatedUint64_.Freeze();
-    }
-
-    public const int RepeatedFixed32FieldNumber = 12;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedFixed32_codec
-        = pb::FieldCodec.ForFixed32(98);
-    private readonly pbc::RepeatedField<uint> repeatedFixed32_ = new pbc::RepeatedField<uint>();
-    public pbc::RepeatedField<uint> RepeatedFixed32 {
-      get { return repeatedFixed32_; }
-    }
-
-    public const int RepeatedInt32FieldNumber = 13;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec
-        = pb::FieldCodec.ForInt32(106);
-    private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> RepeatedInt32 {
-      get { return repeatedInt32_; }
-    }
-
-    public const int RepeatedFixed64FieldNumber = 2046;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedFixed64_codec
-        = pb::FieldCodec.ForFixed64(16370);
-    private readonly pbc::RepeatedField<ulong> repeatedFixed64_ = new pbc::RepeatedField<ulong>();
-    public pbc::RepeatedField<ulong> RepeatedFixed64 {
-      get { return repeatedFixed64_; }
-    }
-
-    public const int RepeatedInt64FieldNumber = 2047;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedInt64_codec
-        = pb::FieldCodec.ForInt64(16378);
-    private readonly pbc::RepeatedField<long> repeatedInt64_ = new pbc::RepeatedField<long>();
-    public pbc::RepeatedField<long> RepeatedInt64 {
-      get { return repeatedInt64_; }
-    }
-
-    public const int RepeatedFloatFieldNumber = 262142;
-    private static readonly pb::FieldCodec<float> _repeated_repeatedFloat_codec
-        = pb::FieldCodec.ForFloat(2097138);
-    private readonly pbc::RepeatedField<float> repeatedFloat_ = new pbc::RepeatedField<float>();
-    public pbc::RepeatedField<float> RepeatedFloat {
-      get { return repeatedFloat_; }
-    }
-
-    public const int RepeatedUint64FieldNumber = 262143;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedUint64_codec
-        = pb::FieldCodec.ForUInt64(2097146);
-    private readonly pbc::RepeatedField<ulong> repeatedUint64_ = new pbc::RepeatedField<ulong>();
-    public pbc::RepeatedField<ulong> RepeatedUint64 {
-      get { return repeatedUint64_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestRepeatedScalarDifferentTagSizes);
-    }
-
-    public bool Equals(TestRepeatedScalarDifferentTagSizes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!repeatedFixed32_.Equals(other.repeatedFixed32_)) return false;
-      if(!repeatedInt32_.Equals(other.repeatedInt32_)) return false;
-      if(!repeatedFixed64_.Equals(other.repeatedFixed64_)) return false;
-      if(!repeatedInt64_.Equals(other.repeatedInt64_)) return false;
-      if(!repeatedFloat_.Equals(other.repeatedFloat_)) return false;
-      if(!repeatedUint64_.Equals(other.repeatedUint64_)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= repeatedFixed32_.GetHashCode();
-      hash ^= repeatedInt32_.GetHashCode();
-      hash ^= repeatedFixed64_.GetHashCode();
-      hash ^= repeatedInt64_.GetHashCode();
-      hash ^= repeatedFloat_.GetHashCode();
-      hash ^= repeatedUint64_.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      repeatedFixed32_.WriteTo(output, _repeated_repeatedFixed32_codec);
-      repeatedInt32_.WriteTo(output, _repeated_repeatedInt32_codec);
-      repeatedFixed64_.WriteTo(output, _repeated_repeatedFixed64_codec);
-      repeatedInt64_.WriteTo(output, _repeated_repeatedInt64_codec);
-      repeatedFloat_.WriteTo(output, _repeated_repeatedFloat_codec);
-      repeatedUint64_.WriteTo(output, _repeated_repeatedUint64_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += repeatedFixed32_.CalculateSize(_repeated_repeatedFixed32_codec);
-      size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
-      size += repeatedFixed64_.CalculateSize(_repeated_repeatedFixed64_codec);
-      size += repeatedInt64_.CalculateSize(_repeated_repeatedInt64_codec);
-      size += repeatedFloat_.CalculateSize(_repeated_repeatedFloat_codec);
-      size += repeatedUint64_.CalculateSize(_repeated_repeatedUint64_codec);
-      return size;
-    }
-
-    public void MergeFrom(TestRepeatedScalarDifferentTagSizes other) {
-      if (other == null) {
-        return;
-      }
-      repeatedFixed32_.Add(other.repeatedFixed32_);
-      repeatedInt32_.Add(other.repeatedInt32_);
-      repeatedFixed64_.Add(other.repeatedFixed64_);
-      repeatedInt64_.Add(other.repeatedInt64_);
-      repeatedFloat_.Add(other.repeatedFloat_);
-      repeatedUint64_.Add(other.repeatedUint64_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 98:
-          case 101: {
-            repeatedFixed32_.AddEntriesFrom(input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 106:
-          case 104: {
-            repeatedInt32_.AddEntriesFrom(input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 16370:
-          case 16369: {
-            repeatedFixed64_.AddEntriesFrom(input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 16378:
-          case 16376: {
-            repeatedInt64_.AddEntriesFrom(input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 2097138:
-          case 2097141: {
-            repeatedFloat_.AddEntriesFrom(input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 2097146:
-          case 2097144: {
-            repeatedUint64_.AddEntriesFrom(input, _repeated_repeatedUint64_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestCommentInjectionMessage : pb::IMessage<TestCommentInjectionMessage> {
-    private static readonly pb::MessageParser<TestCommentInjectionMessage> _parser = new pb::MessageParser<TestCommentInjectionMessage>(() => new TestCommentInjectionMessage());
-    public static pb::MessageParser<TestCommentInjectionMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "a" };
-    private static readonly uint[] _fieldTags = new uint[] { 10 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[26]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_TestCommentInjectionMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestCommentInjectionMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestCommentInjectionMessage(TestCommentInjectionMessage other) : this() {
-      a_ = other.a_;
-    }
-
-    public TestCommentInjectionMessage Clone() {
-      return new TestCommentInjectionMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public const int AFieldNumber = 1;
-    private string a_ = "";
-    public string A {
-      get { return a_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        a_ = value ?? "";
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestCommentInjectionMessage);
-    }
-
-    public bool Equals(TestCommentInjectionMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (A != other.A) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (A.Length != 0) hash ^= A.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (A.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(A);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (A.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(A);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestCommentInjectionMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.A.Length != 0) {
-        A = other.A;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            A = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class FooRequest : pb::IMessage<FooRequest> {
-    private static readonly pb::MessageParser<FooRequest> _parser = new pb::MessageParser<FooRequest>(() => new FooRequest());
-    public static pb::MessageParser<FooRequest> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] {  };
-    private static readonly uint[] _fieldTags = new uint[] {  };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[27]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_FooRequest__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public FooRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public FooRequest(FooRequest other) : this() {
-    }
-
-    public FooRequest Clone() {
-      return new FooRequest(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as FooRequest);
-    }
-
-    public bool Equals(FooRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    public void MergeFrom(FooRequest other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class FooResponse : pb::IMessage<FooResponse> {
-    private static readonly pb::MessageParser<FooResponse> _parser = new pb::MessageParser<FooResponse>(() => new FooResponse());
-    public static pb::MessageParser<FooResponse> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] {  };
-    private static readonly uint[] _fieldTags = new uint[] {  };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[28]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_FooResponse__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public FooResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public FooResponse(FooResponse other) : this() {
-    }
-
-    public FooResponse Clone() {
-      return new FooResponse(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as FooResponse);
-    }
-
-    public bool Equals(FooResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    public void MergeFrom(FooResponse other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class FooClientMessage : pb::IMessage<FooClientMessage> {
-    private static readonly pb::MessageParser<FooClientMessage> _parser = new pb::MessageParser<FooClientMessage>(() => new FooClientMessage());
-    public static pb::MessageParser<FooClientMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] {  };
-    private static readonly uint[] _fieldTags = new uint[] {  };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[29]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_FooClientMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public FooClientMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public FooClientMessage(FooClientMessage other) : this() {
-    }
-
-    public FooClientMessage Clone() {
-      return new FooClientMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as FooClientMessage);
-    }
-
-    public bool Equals(FooClientMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    public void MergeFrom(FooClientMessage other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class FooServerMessage : pb::IMessage<FooServerMessage> {
-    private static readonly pb::MessageParser<FooServerMessage> _parser = new pb::MessageParser<FooServerMessage>(() => new FooServerMessage());
-    public static pb::MessageParser<FooServerMessage> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] {  };
-    private static readonly uint[] _fieldTags = new uint[] {  };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[30]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_FooServerMessage__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public FooServerMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public FooServerMessage(FooServerMessage other) : this() {
-    }
-
-    public FooServerMessage Clone() {
-      return new FooServerMessage(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as FooServerMessage);
-    }
-
-    public bool Equals(FooServerMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    public void MergeFrom(FooServerMessage other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class BarRequest : pb::IMessage<BarRequest> {
-    private static readonly pb::MessageParser<BarRequest> _parser = new pb::MessageParser<BarRequest>(() => new BarRequest());
-    public static pb::MessageParser<BarRequest> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] {  };
-    private static readonly uint[] _fieldTags = new uint[] {  };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[31]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_BarRequest__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public BarRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public BarRequest(BarRequest other) : this() {
-    }
-
-    public BarRequest Clone() {
-      return new BarRequest(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as BarRequest);
-    }
-
-    public bool Equals(BarRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    public void MergeFrom(BarRequest other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class BarResponse : pb::IMessage<BarResponse> {
-    private static readonly pb::MessageParser<BarResponse> _parser = new pb::MessageParser<BarResponse>(() => new BarResponse());
-    public static pb::MessageParser<BarResponse> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] {  };
-    private static readonly uint[] _fieldTags = new uint[] {  };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.Descriptor.MessageTypes[32]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3.internal__static_protobuf_unittest_BarResponse__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public BarResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public BarResponse(BarResponse other) : this() {
-    }
-
-    public BarResponse Clone() {
-      return new BarResponse(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as BarResponse);
-    }
-
-    public bool Equals(BarResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    public void MergeFrom(BarResponse other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestWellKnownTypes.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestWellKnownTypes.cs
deleted file mode 100644
index af7d83ba..00000000
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestWellKnownTypes.cs
+++ /dev/null
@@ -1,2453 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/unittest_well_known_types.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public static partial class UnittestWellKnownTypes {
-
-    #region Static variables
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestWellKnownTypes__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_RepeatedWellKnownTypes__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_OneofWellKnownTypes__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MapWellKnownTypes__FieldAccessorTable;
-    #endregion
-    #region Descriptor
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestWellKnownTypes() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ci9nb29nbGUvcHJvdG9idWYvdW5pdHRlc3Rfd2VsbF9rbm93bl90eXBlcy5w", 
-            "cm90bxIRcHJvdG9idWZfdW5pdHRlc3QaGWdvb2dsZS9wcm90b2J1Zi9hbnku", 
-            "cHJvdG8aGWdvb2dsZS9wcm90b2J1Zi9hcGkucHJvdG8aHmdvb2dsZS9wcm90", 
-            "b2J1Zi9kdXJhdGlvbi5wcm90bxobZ29vZ2xlL3Byb3RvYnVmL2VtcHR5LnBy", 
-            "b3RvGiBnb29nbGUvcHJvdG9idWYvZmllbGRfbWFzay5wcm90bxokZ29vZ2xl", 
-            "L3Byb3RvYnVmL3NvdXJjZV9jb250ZXh0LnByb3RvGhxnb29nbGUvcHJvdG9i", 
-            "dWYvc3RydWN0LnByb3RvGh9nb29nbGUvcHJvdG9idWYvdGltZXN0YW1wLnBy", 
-            "b3RvGhpnb29nbGUvcHJvdG9idWYvdHlwZS5wcm90bxoeZ29vZ2xlL3Byb3Rv", 
-            "YnVmL3dyYXBwZXJzLnByb3RvIpEHChJUZXN0V2VsbEtub3duVHlwZXMSJwoJ", 
-            "YW55X2ZpZWxkGAEgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueRInCglhcGlf", 
-            "ZmllbGQYAiABKAsyFC5nb29nbGUucHJvdG9idWYuQXBpEjEKDmR1cmF0aW9u", 
-            "X2ZpZWxkGAMgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEisKC2Vt", 
-            "cHR5X2ZpZWxkGAQgASgLMhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5EjQKEGZp", 
-            "ZWxkX21hc2tfZmllbGQYBSABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRN", 
-            "YXNrEjwKFHNvdXJjZV9jb250ZXh0X2ZpZWxkGAYgASgLMh4uZ29vZ2xlLnBy", 
-            "b3RvYnVmLlNvdXJjZUNvbnRleHQSLQoMc3RydWN0X2ZpZWxkGAcgASgLMhcu", 
-            "Z29vZ2xlLnByb3RvYnVmLlN0cnVjdBIzCg90aW1lc3RhbXBfZmllbGQYCCAB", 
-            "KAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEikKCnR5cGVfZmllbGQY", 
-            "CSABKAsyFS5nb29nbGUucHJvdG9idWYuVHlwZRIyCgxkb3VibGVfZmllbGQY", 
-            "CiABKAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSMAoLZmxvYXRf", 
-            "ZmllbGQYCyABKAsyGy5nb29nbGUucHJvdG9idWYuRmxvYXRWYWx1ZRIwCgtp", 
-            "bnQ2NF9maWVsZBgMIAEoCzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQ2NFZhbHVl", 
-            "EjIKDHVpbnQ2NF9maWVsZBgNIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5VSW50", 
-            "NjRWYWx1ZRIwCgtpbnQzMl9maWVsZBgOIAEoCzIbLmdvb2dsZS5wcm90b2J1", 
-            "Zi5JbnQzMlZhbHVlEjIKDHVpbnQzMl9maWVsZBgPIAEoCzIcLmdvb2dsZS5w", 
-            "cm90b2J1Zi5VSW50MzJWYWx1ZRIuCgpib29sX2ZpZWxkGBAgASgLMhouZ29v", 
-            "Z2xlLnByb3RvYnVmLkJvb2xWYWx1ZRIyCgxzdHJpbmdfZmllbGQYESABKAsy", 
-            "HC5nb29nbGUucHJvdG9idWYuU3RyaW5nVmFsdWUSMAoLYnl0ZXNfZmllbGQY", 
-            "EiABKAsyGy5nb29nbGUucHJvdG9idWYuQnl0ZXNWYWx1ZSKVBwoWUmVwZWF0", 
-            "ZWRXZWxsS25vd25UeXBlcxInCglhbnlfZmllbGQYASADKAsyFC5nb29nbGUu", 
-            "cHJvdG9idWYuQW55EicKCWFwaV9maWVsZBgCIAMoCzIULmdvb2dsZS5wcm90", 
-            "b2J1Zi5BcGkSMQoOZHVyYXRpb25fZmllbGQYAyADKAsyGS5nb29nbGUucHJv", 
-            "dG9idWYuRHVyYXRpb24SKwoLZW1wdHlfZmllbGQYBCADKAsyFi5nb29nbGUu", 
-            "cHJvdG9idWYuRW1wdHkSNAoQZmllbGRfbWFza19maWVsZBgFIAMoCzIaLmdv", 
-            "b2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSPAoUc291cmNlX2NvbnRleHRfZmll", 
-            "bGQYBiADKAsyHi5nb29nbGUucHJvdG9idWYuU291cmNlQ29udGV4dBItCgxz", 
-            "dHJ1Y3RfZmllbGQYByADKAsyFy5nb29nbGUucHJvdG9idWYuU3RydWN0EjMK", 
-            "D3RpbWVzdGFtcF9maWVsZBgIIAMoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1l", 
-            "c3RhbXASKQoKdHlwZV9maWVsZBgJIAMoCzIVLmdvb2dsZS5wcm90b2J1Zi5U", 
-            "eXBlEjIKDGRvdWJsZV9maWVsZBgKIAMoCzIcLmdvb2dsZS5wcm90b2J1Zi5E", 
-            "b3VibGVWYWx1ZRIwCgtmbG9hdF9maWVsZBgLIAMoCzIbLmdvb2dsZS5wcm90", 
-            "b2J1Zi5GbG9hdFZhbHVlEjAKC2ludDY0X2ZpZWxkGAwgAygLMhsuZ29vZ2xl", 
-            "LnByb3RvYnVmLkludDY0VmFsdWUSMgoMdWludDY0X2ZpZWxkGA0gAygLMhwu", 
-            "Z29vZ2xlLnByb3RvYnVmLlVJbnQ2NFZhbHVlEjAKC2ludDMyX2ZpZWxkGA4g", 
-            "AygLMhsuZ29vZ2xlLnByb3RvYnVmLkludDMyVmFsdWUSMgoMdWludDMyX2Zp", 
-            "ZWxkGA8gAygLMhwuZ29vZ2xlLnByb3RvYnVmLlVJbnQzMlZhbHVlEi4KCmJv", 
-            "b2xfZmllbGQYECADKAsyGi5nb29nbGUucHJvdG9idWYuQm9vbFZhbHVlEjIK", 
-            "DHN0cmluZ19maWVsZBgRIAMoCzIcLmdvb2dsZS5wcm90b2J1Zi5TdHJpbmdW", 
-            "YWx1ZRIwCgtieXRlc19maWVsZBgSIAMoCzIbLmdvb2dsZS5wcm90b2J1Zi5C", 
-            "eXRlc1ZhbHVlIsUHChNPbmVvZldlbGxLbm93blR5cGVzEikKCWFueV9maWVs", 
-            "ZBgBIAEoCzIULmdvb2dsZS5wcm90b2J1Zi5BbnlIABIpCglhcGlfZmllbGQY", 
-            "AiABKAsyFC5nb29nbGUucHJvdG9idWYuQXBpSAASMwoOZHVyYXRpb25fZmll", 
-            "bGQYAyABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb25IABItCgtlbXB0", 
-            "eV9maWVsZBgEIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgAEjYKEGZp", 
-            "ZWxkX21hc2tfZmllbGQYBSABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRN", 
-            "YXNrSAASPgoUc291cmNlX2NvbnRleHRfZmllbGQYBiABKAsyHi5nb29nbGUu", 
-            "cHJvdG9idWYuU291cmNlQ29udGV4dEgAEi8KDHN0cnVjdF9maWVsZBgHIAEo", 
-            "CzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RIABI1Cg90aW1lc3RhbXBfZmll", 
-            "bGQYCCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAASKwoKdHlw", 
-            "ZV9maWVsZBgJIAEoCzIVLmdvb2dsZS5wcm90b2J1Zi5UeXBlSAASNAoMZG91", 
-            "YmxlX2ZpZWxkGAogASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVl", 
-            "SAASMgoLZmxvYXRfZmllbGQYCyABKAsyGy5nb29nbGUucHJvdG9idWYuRmxv", 
-            "YXRWYWx1ZUgAEjIKC2ludDY0X2ZpZWxkGAwgASgLMhsuZ29vZ2xlLnByb3Rv", 
-            "YnVmLkludDY0VmFsdWVIABI0Cgx1aW50NjRfZmllbGQYDSABKAsyHC5nb29n", 
-            "bGUucHJvdG9idWYuVUludDY0VmFsdWVIABIyCgtpbnQzMl9maWVsZBgOIAEo", 
-            "CzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQzMlZhbHVlSAASNAoMdWludDMyX2Zp", 
-            "ZWxkGA8gASgLMhwuZ29vZ2xlLnByb3RvYnVmLlVJbnQzMlZhbHVlSAASMAoK", 
-            "Ym9vbF9maWVsZBgQIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5Cb29sVmFsdWVI", 
-            "ABI0CgxzdHJpbmdfZmllbGQYESABKAsyHC5nb29nbGUucHJvdG9idWYuU3Ry", 
-            "aW5nVmFsdWVIABIyCgtieXRlc19maWVsZBgSIAEoCzIbLmdvb2dsZS5wcm90", 
-            "b2J1Zi5CeXRlc1ZhbHVlSABCDQoLb25lb2ZfZmllbGQilhYKEU1hcFdlbGxL", 
-            "bm93blR5cGVzEkUKCWFueV9maWVsZBgBIAMoCzIyLnByb3RvYnVmX3VuaXR0", 
-            "ZXN0Lk1hcFdlbGxLbm93blR5cGVzLkFueUZpZWxkRW50cnkSRQoJYXBpX2Zp", 
-            "ZWxkGAIgAygLMjIucHJvdG9idWZfdW5pdHRlc3QuTWFwV2VsbEtub3duVHlw", 
-            "ZXMuQXBpRmllbGRFbnRyeRJPCg5kdXJhdGlvbl9maWVsZBgDIAMoCzI3LnBy", 
-            "b3RvYnVmX3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5cGVzLkR1cmF0aW9uRmll", 
-            "bGRFbnRyeRJJCgtlbXB0eV9maWVsZBgEIAMoCzI0LnByb3RvYnVmX3VuaXR0", 
-            "ZXN0Lk1hcFdlbGxLbm93blR5cGVzLkVtcHR5RmllbGRFbnRyeRJSChBmaWVs", 
-            "ZF9tYXNrX2ZpZWxkGAUgAygLMjgucHJvdG9idWZfdW5pdHRlc3QuTWFwV2Vs", 
-            "bEtub3duVHlwZXMuRmllbGRNYXNrRmllbGRFbnRyeRJaChRzb3VyY2VfY29u", 
-            "dGV4dF9maWVsZBgGIAMoCzI8LnByb3RvYnVmX3VuaXR0ZXN0Lk1hcFdlbGxL", 
-            "bm93blR5cGVzLlNvdXJjZUNvbnRleHRGaWVsZEVudHJ5EksKDHN0cnVjdF9m", 
-            "aWVsZBgHIAMoCzI1LnByb3RvYnVmX3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5", 
-            "cGVzLlN0cnVjdEZpZWxkRW50cnkSUQoPdGltZXN0YW1wX2ZpZWxkGAggAygL", 
-            "MjgucHJvdG9idWZfdW5pdHRlc3QuTWFwV2VsbEtub3duVHlwZXMuVGltZXN0", 
-            "YW1wRmllbGRFbnRyeRJHCgp0eXBlX2ZpZWxkGAkgAygLMjMucHJvdG9idWZf", 
-            "dW5pdHRlc3QuTWFwV2VsbEtub3duVHlwZXMuVHlwZUZpZWxkRW50cnkSSwoM", 
-            "ZG91YmxlX2ZpZWxkGAogAygLMjUucHJvdG9idWZfdW5pdHRlc3QuTWFwV2Vs", 
-            "bEtub3duVHlwZXMuRG91YmxlRmllbGRFbnRyeRJJCgtmbG9hdF9maWVsZBgL", 
-            "IAMoCzI0LnByb3RvYnVmX3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5cGVzLkZs", 
-            "b2F0RmllbGRFbnRyeRJJCgtpbnQ2NF9maWVsZBgMIAMoCzI0LnByb3RvYnVm", 
-            "X3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5cGVzLkludDY0RmllbGRFbnRyeRJL", 
-            "Cgx1aW50NjRfZmllbGQYDSADKAsyNS5wcm90b2J1Zl91bml0dGVzdC5NYXBX", 
-            "ZWxsS25vd25UeXBlcy5VaW50NjRGaWVsZEVudHJ5EkkKC2ludDMyX2ZpZWxk", 
-            "GA4gAygLMjQucHJvdG9idWZfdW5pdHRlc3QuTWFwV2VsbEtub3duVHlwZXMu", 
-            "SW50MzJGaWVsZEVudHJ5EksKDHVpbnQzMl9maWVsZBgPIAMoCzI1LnByb3Rv", 
-            "YnVmX3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5cGVzLlVpbnQzMkZpZWxkRW50", 
-            "cnkSRwoKYm9vbF9maWVsZBgQIAMoCzIzLnByb3RvYnVmX3VuaXR0ZXN0Lk1h", 
-            "cFdlbGxLbm93blR5cGVzLkJvb2xGaWVsZEVudHJ5EksKDHN0cmluZ19maWVs", 
-            "ZBgRIAMoCzI1LnByb3RvYnVmX3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5cGVz", 
-            "LlN0cmluZ0ZpZWxkRW50cnkSSQoLYnl0ZXNfZmllbGQYEiADKAsyNC5wcm90", 
-            "b2J1Zl91bml0dGVzdC5NYXBXZWxsS25vd25UeXBlcy5CeXRlc0ZpZWxkRW50", 
-            "cnkaRQoNQW55RmllbGRFbnRyeRILCgNrZXkYASABKAUSIwoFdmFsdWUYAiAB", 
-            "KAsyFC5nb29nbGUucHJvdG9idWYuQW55OgI4ARpFCg1BcGlGaWVsZEVudHJ5", 
-            "EgsKA2tleRgBIAEoBRIjCgV2YWx1ZRgCIAEoCzIULmdvb2dsZS5wcm90b2J1", 
-            "Zi5BcGk6AjgBGk8KEkR1cmF0aW9uRmllbGRFbnRyeRILCgNrZXkYASABKAUS", 
-            "KAoFdmFsdWUYAiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb246AjgB", 
-            "GkkKD0VtcHR5RmllbGRFbnRyeRILCgNrZXkYASABKAUSJQoFdmFsdWUYAiAB", 
-            "KAsyFi5nb29nbGUucHJvdG9idWYuRW1wdHk6AjgBGlEKE0ZpZWxkTWFza0Zp", 
-            "ZWxkRW50cnkSCwoDa2V5GAEgASgFEikKBXZhbHVlGAIgASgLMhouZ29vZ2xl", 
-            "LnByb3RvYnVmLkZpZWxkTWFzazoCOAEaWQoXU291cmNlQ29udGV4dEZpZWxk", 
-            "RW50cnkSCwoDa2V5GAEgASgFEi0KBXZhbHVlGAIgASgLMh4uZ29vZ2xlLnBy", 
-            "b3RvYnVmLlNvdXJjZUNvbnRleHQ6AjgBGksKEFN0cnVjdEZpZWxkRW50cnkS", 
-            "CwoDa2V5GAEgASgFEiYKBXZhbHVlGAIgASgLMhcuZ29vZ2xlLnByb3RvYnVm", 
-            "LlN0cnVjdDoCOAEaUQoTVGltZXN0YW1wRmllbGRFbnRyeRILCgNrZXkYASAB", 
-            "KAUSKQoFdmFsdWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1w", 
-            "OgI4ARpHCg5UeXBlRmllbGRFbnRyeRILCgNrZXkYASABKAUSJAoFdmFsdWUY", 
-            "AiABKAsyFS5nb29nbGUucHJvdG9idWYuVHlwZToCOAEaUAoQRG91YmxlRmll", 
-            "bGRFbnRyeRILCgNrZXkYASABKAUSKwoFdmFsdWUYAiABKAsyHC5nb29nbGUu", 
-            "cHJvdG9idWYuRG91YmxlVmFsdWU6AjgBGk4KD0Zsb2F0RmllbGRFbnRyeRIL", 
-            "CgNrZXkYASABKAUSKgoFdmFsdWUYAiABKAsyGy5nb29nbGUucHJvdG9idWYu", 
-            "RmxvYXRWYWx1ZToCOAEaTgoPSW50NjRGaWVsZEVudHJ5EgsKA2tleRgBIAEo", 
-            "BRIqCgV2YWx1ZRgCIAEoCzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQ2NFZhbHVl", 
-            "OgI4ARpQChBVaW50NjRGaWVsZEVudHJ5EgsKA2tleRgBIAEoBRIrCgV2YWx1", 
-            "ZRgCIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5VSW50NjRWYWx1ZToCOAEaTgoP", 
-            "SW50MzJGaWVsZEVudHJ5EgsKA2tleRgBIAEoBRIqCgV2YWx1ZRgCIAEoCzIb", 
-            "Lmdvb2dsZS5wcm90b2J1Zi5JbnQzMlZhbHVlOgI4ARpQChBVaW50MzJGaWVs", 
-            "ZEVudHJ5EgsKA2tleRgBIAEoBRIrCgV2YWx1ZRgCIAEoCzIcLmdvb2dsZS5w", 
-            "cm90b2J1Zi5VSW50MzJWYWx1ZToCOAEaTAoOQm9vbEZpZWxkRW50cnkSCwoD", 
-            "a2V5GAEgASgFEikKBXZhbHVlGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkJv", 
-            "b2xWYWx1ZToCOAEaUAoQU3RyaW5nRmllbGRFbnRyeRILCgNrZXkYASABKAUS", 
-            "KwoFdmFsdWUYAiABKAsyHC5nb29nbGUucHJvdG9idWYuU3RyaW5nVmFsdWU6", 
-            "AjgBGk4KD0J5dGVzRmllbGRFbnRyeRILCgNrZXkYASABKAUSKgoFdmFsdWUY", 
-            "AiABKAsyGy5nb29nbGUucHJvdG9idWYuQnl0ZXNWYWx1ZToCOAFCOQoYY29t", 
-            "Lmdvb2dsZS5wcm90b2J1Zi50ZXN0UAGqAhpHb29nbGUuUHJvdG9idWYuVGVz", 
-          "dFByb3Rvc2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
-          new pbr::FileDescriptor[] {
-          global::Google.Protobuf.WellKnownTypes.Proto.Any.Descriptor, 
-          global::Google.Protobuf.WellKnownTypes.Proto.Api.Descriptor, 
-          global::Google.Protobuf.WellKnownTypes.Proto.Duration.Descriptor, 
-          global::Google.Protobuf.WellKnownTypes.Proto.Empty.Descriptor, 
-          global::Google.Protobuf.WellKnownTypes.Proto.FieldMask.Descriptor, 
-          global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor, 
-          global::Google.Protobuf.WellKnownTypes.Proto.Struct.Descriptor, 
-          global::Google.Protobuf.WellKnownTypes.Proto.Timestamp.Descriptor, 
-          global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor, 
-          global::Google.Protobuf.WellKnownTypes.Wrappers.Descriptor, 
-          });
-      internal__static_protobuf_unittest_TestWellKnownTypes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestWellKnownTypes), descriptor.MessageTypes[0],
-              new string[] { "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField", }, new string[] { });
-      internal__static_protobuf_unittest_RepeatedWellKnownTypes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.RepeatedWellKnownTypes), descriptor.MessageTypes[1],
-              new string[] { "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField", }, new string[] { });
-      internal__static_protobuf_unittest_OneofWellKnownTypes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.OneofWellKnownTypes), descriptor.MessageTypes[2],
-              new string[] { "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField", }, new string[] { "OneofField", });
-      internal__static_protobuf_unittest_MapWellKnownTypes__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MapWellKnownTypes), descriptor.MessageTypes[3],
-              new string[] { "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField", }, new string[] { });
-    }
-    #endregion
-
-  }
-  #region Messages
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class TestWellKnownTypes : pb::IMessage<TestWellKnownTypes> {
-    private static readonly pb::MessageParser<TestWellKnownTypes> _parser = new pb::MessageParser<TestWellKnownTypes>(() => new TestWellKnownTypes());
-    public static pb::MessageParser<TestWellKnownTypes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "any_field", "api_field", "bool_field", "bytes_field", "double_field", "duration_field", "empty_field", "field_mask_field", "float_field", "int32_field", "int64_field", "source_context_field", "string_field", "struct_field", "timestamp_field", "type_field", "uint32_field", "uint64_field" };
-    private static readonly uint[] _fieldTags = new uint[] { 10, 18, 130, 146, 82, 26, 34, 42, 90, 114, 98, 50, 138, 58, 66, 74, 122, 106 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[0]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.internal__static_protobuf_unittest_TestWellKnownTypes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public TestWellKnownTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public TestWellKnownTypes(TestWellKnownTypes other) : this() {
-      AnyField = other.anyField_ != null ? other.AnyField.Clone() : null;
-      ApiField = other.apiField_ != null ? other.ApiField.Clone() : null;
-      DurationField = other.durationField_ != null ? other.DurationField.Clone() : null;
-      EmptyField = other.emptyField_ != null ? other.EmptyField.Clone() : null;
-      FieldMaskField = other.fieldMaskField_ != null ? other.FieldMaskField.Clone() : null;
-      SourceContextField = other.sourceContextField_ != null ? other.SourceContextField.Clone() : null;
-      StructField = other.structField_ != null ? other.StructField.Clone() : null;
-      TimestampField = other.timestampField_ != null ? other.TimestampField.Clone() : null;
-      TypeField = other.typeField_ != null ? other.TypeField.Clone() : null;
-      DoubleField = other.DoubleField;
-      FloatField = other.FloatField;
-      Int64Field = other.Int64Field;
-      Uint64Field = other.Uint64Field;
-      Int32Field = other.Int32Field;
-      Uint32Field = other.Uint32Field;
-      BoolField = other.BoolField;
-      StringField = other.StringField;
-      BytesField = other.BytesField;
-    }
-
-    public TestWellKnownTypes Clone() {
-      return new TestWellKnownTypes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (anyField_ != null) AnyField.Freeze();
-      if (apiField_ != null) ApiField.Freeze();
-      if (durationField_ != null) DurationField.Freeze();
-      if (emptyField_ != null) EmptyField.Freeze();
-      if (fieldMaskField_ != null) FieldMaskField.Freeze();
-      if (sourceContextField_ != null) SourceContextField.Freeze();
-      if (structField_ != null) StructField.Freeze();
-      if (timestampField_ != null) TimestampField.Freeze();
-      if (typeField_ != null) TypeField.Freeze();
-    }
-
-    public const int AnyFieldFieldNumber = 1;
-    private global::Google.Protobuf.WellKnownTypes.Any anyField_;
-    public global::Google.Protobuf.WellKnownTypes.Any AnyField {
-      get { return anyField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        anyField_ = value;
-      }
-    }
-
-    public const int ApiFieldFieldNumber = 2;
-    private global::Google.Protobuf.WellKnownTypes.Api apiField_;
-    public global::Google.Protobuf.WellKnownTypes.Api ApiField {
-      get { return apiField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        apiField_ = value;
-      }
-    }
-
-    public const int DurationFieldFieldNumber = 3;
-    private global::Google.Protobuf.WellKnownTypes.Duration durationField_;
-    public global::Google.Protobuf.WellKnownTypes.Duration DurationField {
-      get { return durationField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        durationField_ = value;
-      }
-    }
-
-    public const int EmptyFieldFieldNumber = 4;
-    private global::Google.Protobuf.WellKnownTypes.Empty emptyField_;
-    public global::Google.Protobuf.WellKnownTypes.Empty EmptyField {
-      get { return emptyField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        emptyField_ = value;
-      }
-    }
-
-    public const int FieldMaskFieldFieldNumber = 5;
-    private global::Google.Protobuf.WellKnownTypes.FieldMask fieldMaskField_;
-    public global::Google.Protobuf.WellKnownTypes.FieldMask FieldMaskField {
-      get { return fieldMaskField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        fieldMaskField_ = value;
-      }
-    }
-
-    public const int SourceContextFieldFieldNumber = 6;
-    private global::Google.Protobuf.WellKnownTypes.SourceContext sourceContextField_;
-    public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContextField {
-      get { return sourceContextField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        sourceContextField_ = value;
-      }
-    }
-
-    public const int StructFieldFieldNumber = 7;
-    private global::Google.Protobuf.WellKnownTypes.Struct structField_;
-    public global::Google.Protobuf.WellKnownTypes.Struct StructField {
-      get { return structField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        structField_ = value;
-      }
-    }
-
-    public const int TimestampFieldFieldNumber = 8;
-    private global::Google.Protobuf.WellKnownTypes.Timestamp timestampField_;
-    public global::Google.Protobuf.WellKnownTypes.Timestamp TimestampField {
-      get { return timestampField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        timestampField_ = value;
-      }
-    }
-
-    public const int TypeFieldFieldNumber = 9;
-    private global::Google.Protobuf.WellKnownTypes.Type typeField_;
-    public global::Google.Protobuf.WellKnownTypes.Type TypeField {
-      get { return typeField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        typeField_ = value;
-      }
-    }
-
-    public const int DoubleFieldFieldNumber = 10;
-    private static readonly pb::FieldCodec<double?> _single_doubleField_codec = pb::FieldCodec.ForStructWrapper<double>(82);
-    private double? doubleField_;
-    public double? DoubleField {
-      get { return doubleField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        doubleField_ = value;
-      }
-    }
-
-    public const int FloatFieldFieldNumber = 11;
-    private static readonly pb::FieldCodec<float?> _single_floatField_codec = pb::FieldCodec.ForStructWrapper<float>(90);
-    private float? floatField_;
-    public float? FloatField {
-      get { return floatField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        floatField_ = value;
-      }
-    }
-
-    public const int Int64FieldFieldNumber = 12;
-    private static readonly pb::FieldCodec<long?> _single_int64Field_codec = pb::FieldCodec.ForStructWrapper<long>(98);
-    private long? int64Field_;
-    public long? Int64Field {
-      get { return int64Field_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        int64Field_ = value;
-      }
-    }
-
-    public const int Uint64FieldFieldNumber = 13;
-    private static readonly pb::FieldCodec<ulong?> _single_uint64Field_codec = pb::FieldCodec.ForStructWrapper<ulong>(106);
-    private ulong? uint64Field_;
-    public ulong? Uint64Field {
-      get { return uint64Field_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        uint64Field_ = value;
-      }
-    }
-
-    public const int Int32FieldFieldNumber = 14;
-    private static readonly pb::FieldCodec<int?> _single_int32Field_codec = pb::FieldCodec.ForStructWrapper<int>(114);
-    private int? int32Field_;
-    public int? Int32Field {
-      get { return int32Field_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        int32Field_ = value;
-      }
-    }
-
-    public const int Uint32FieldFieldNumber = 15;
-    private static readonly pb::FieldCodec<uint?> _single_uint32Field_codec = pb::FieldCodec.ForStructWrapper<uint>(122);
-    private uint? uint32Field_;
-    public uint? Uint32Field {
-      get { return uint32Field_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        uint32Field_ = value;
-      }
-    }
-
-    public const int BoolFieldFieldNumber = 16;
-    private static readonly pb::FieldCodec<bool?> _single_boolField_codec = pb::FieldCodec.ForStructWrapper<bool>(130);
-    private bool? boolField_;
-    public bool? BoolField {
-      get { return boolField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        boolField_ = value;
-      }
-    }
-
-    public const int StringFieldFieldNumber = 17;
-    private static readonly pb::FieldCodec<string> _single_stringField_codec = pb::FieldCodec.ForClassWrapper<string>(138);
-    private string stringField_;
-    public string StringField {
-      get { return stringField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        stringField_ = value;
-      }
-    }
-
-    public const int BytesFieldFieldNumber = 18;
-    private static readonly pb::FieldCodec<pb::ByteString> _single_bytesField_codec = pb::FieldCodec.ForClassWrapper<pb::ByteString>(146);
-    private pb::ByteString bytesField_;
-    public pb::ByteString BytesField {
-      get { return bytesField_; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        bytesField_ = value;
-      }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as TestWellKnownTypes);
-    }
-
-    public bool Equals(TestWellKnownTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(AnyField, other.AnyField)) return false;
-      if (!object.Equals(ApiField, other.ApiField)) return false;
-      if (!object.Equals(DurationField, other.DurationField)) return false;
-      if (!object.Equals(EmptyField, other.EmptyField)) return false;
-      if (!object.Equals(FieldMaskField, other.FieldMaskField)) return false;
-      if (!object.Equals(SourceContextField, other.SourceContextField)) return false;
-      if (!object.Equals(StructField, other.StructField)) return false;
-      if (!object.Equals(TimestampField, other.TimestampField)) return false;
-      if (!object.Equals(TypeField, other.TypeField)) return false;
-      if (DoubleField != other.DoubleField) return false;
-      if (FloatField != other.FloatField) return false;
-      if (Int64Field != other.Int64Field) return false;
-      if (Uint64Field != other.Uint64Field) return false;
-      if (Int32Field != other.Int32Field) return false;
-      if (Uint32Field != other.Uint32Field) return false;
-      if (BoolField != other.BoolField) return false;
-      if (StringField != other.StringField) return false;
-      if (BytesField != other.BytesField) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (anyField_ != null) hash ^= AnyField.GetHashCode();
-      if (apiField_ != null) hash ^= ApiField.GetHashCode();
-      if (durationField_ != null) hash ^= DurationField.GetHashCode();
-      if (emptyField_ != null) hash ^= EmptyField.GetHashCode();
-      if (fieldMaskField_ != null) hash ^= FieldMaskField.GetHashCode();
-      if (sourceContextField_ != null) hash ^= SourceContextField.GetHashCode();
-      if (structField_ != null) hash ^= StructField.GetHashCode();
-      if (timestampField_ != null) hash ^= TimestampField.GetHashCode();
-      if (typeField_ != null) hash ^= TypeField.GetHashCode();
-      if (doubleField_ != null) hash ^= DoubleField.GetHashCode();
-      if (floatField_ != null) hash ^= FloatField.GetHashCode();
-      if (int64Field_ != null) hash ^= Int64Field.GetHashCode();
-      if (uint64Field_ != null) hash ^= Uint64Field.GetHashCode();
-      if (int32Field_ != null) hash ^= Int32Field.GetHashCode();
-      if (uint32Field_ != null) hash ^= Uint32Field.GetHashCode();
-      if (boolField_ != null) hash ^= BoolField.GetHashCode();
-      if (stringField_ != null) hash ^= StringField.GetHashCode();
-      if (bytesField_ != null) hash ^= BytesField.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (anyField_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(AnyField);
-      }
-      if (apiField_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(ApiField);
-      }
-      if (durationField_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(DurationField);
-      }
-      if (emptyField_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(EmptyField);
-      }
-      if (fieldMaskField_ != null) {
-        output.WriteRawTag(42);
-        output.WriteMessage(FieldMaskField);
-      }
-      if (sourceContextField_ != null) {
-        output.WriteRawTag(50);
-        output.WriteMessage(SourceContextField);
-      }
-      if (structField_ != null) {
-        output.WriteRawTag(58);
-        output.WriteMessage(StructField);
-      }
-      if (timestampField_ != null) {
-        output.WriteRawTag(66);
-        output.WriteMessage(TimestampField);
-      }
-      if (typeField_ != null) {
-        output.WriteRawTag(74);
-        output.WriteMessage(TypeField);
-      }
-      if (doubleField_ != null) {
-        _single_doubleField_codec.WriteTagAndValue(output, DoubleField);
-      }
-      if (floatField_ != null) {
-        _single_floatField_codec.WriteTagAndValue(output, FloatField);
-      }
-      if (int64Field_ != null) {
-        _single_int64Field_codec.WriteTagAndValue(output, Int64Field);
-      }
-      if (uint64Field_ != null) {
-        _single_uint64Field_codec.WriteTagAndValue(output, Uint64Field);
-      }
-      if (int32Field_ != null) {
-        _single_int32Field_codec.WriteTagAndValue(output, Int32Field);
-      }
-      if (uint32Field_ != null) {
-        _single_uint32Field_codec.WriteTagAndValue(output, Uint32Field);
-      }
-      if (boolField_ != null) {
-        _single_boolField_codec.WriteTagAndValue(output, BoolField);
-      }
-      if (stringField_ != null) {
-        _single_stringField_codec.WriteTagAndValue(output, StringField);
-      }
-      if (bytesField_ != null) {
-        _single_bytesField_codec.WriteTagAndValue(output, BytesField);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (anyField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(AnyField);
-      }
-      if (apiField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(ApiField);
-      }
-      if (durationField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(DurationField);
-      }
-      if (emptyField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(EmptyField);
-      }
-      if (fieldMaskField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FieldMaskField);
-      }
-      if (sourceContextField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContextField);
-      }
-      if (structField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(StructField);
-      }
-      if (timestampField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(TimestampField);
-      }
-      if (typeField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(TypeField);
-      }
-      if (doubleField_ != null) {
-        size += _single_doubleField_codec.CalculateSizeWithTag(DoubleField);
-      }
-      if (floatField_ != null) {
-        size += _single_floatField_codec.CalculateSizeWithTag(FloatField);
-      }
-      if (int64Field_ != null) {
-        size += _single_int64Field_codec.CalculateSizeWithTag(Int64Field);
-      }
-      if (uint64Field_ != null) {
-        size += _single_uint64Field_codec.CalculateSizeWithTag(Uint64Field);
-      }
-      if (int32Field_ != null) {
-        size += _single_int32Field_codec.CalculateSizeWithTag(Int32Field);
-      }
-      if (uint32Field_ != null) {
-        size += _single_uint32Field_codec.CalculateSizeWithTag(Uint32Field);
-      }
-      if (boolField_ != null) {
-        size += _single_boolField_codec.CalculateSizeWithTag(BoolField);
-      }
-      if (stringField_ != null) {
-        size += _single_stringField_codec.CalculateSizeWithTag(StringField);
-      }
-      if (bytesField_ != null) {
-        size += _single_bytesField_codec.CalculateSizeWithTag(BytesField);
-      }
-      return size;
-    }
-
-    public void MergeFrom(TestWellKnownTypes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.anyField_ != null) {
-        if (anyField_ == null) {
-          anyField_ = new global::Google.Protobuf.WellKnownTypes.Any();
-        }
-        AnyField.MergeFrom(other.AnyField);
-      }
-      if (other.apiField_ != null) {
-        if (apiField_ == null) {
-          apiField_ = new global::Google.Protobuf.WellKnownTypes.Api();
-        }
-        ApiField.MergeFrom(other.ApiField);
-      }
-      if (other.durationField_ != null) {
-        if (durationField_ == null) {
-          durationField_ = new global::Google.Protobuf.WellKnownTypes.Duration();
-        }
-        DurationField.MergeFrom(other.DurationField);
-      }
-      if (other.emptyField_ != null) {
-        if (emptyField_ == null) {
-          emptyField_ = new global::Google.Protobuf.WellKnownTypes.Empty();
-        }
-        EmptyField.MergeFrom(other.EmptyField);
-      }
-      if (other.fieldMaskField_ != null) {
-        if (fieldMaskField_ == null) {
-          fieldMaskField_ = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-        }
-        FieldMaskField.MergeFrom(other.FieldMaskField);
-      }
-      if (other.sourceContextField_ != null) {
-        if (sourceContextField_ == null) {
-          sourceContextField_ = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-        }
-        SourceContextField.MergeFrom(other.SourceContextField);
-      }
-      if (other.structField_ != null) {
-        if (structField_ == null) {
-          structField_ = new global::Google.Protobuf.WellKnownTypes.Struct();
-        }
-        StructField.MergeFrom(other.StructField);
-      }
-      if (other.timestampField_ != null) {
-        if (timestampField_ == null) {
-          timestampField_ = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-        }
-        TimestampField.MergeFrom(other.TimestampField);
-      }
-      if (other.typeField_ != null) {
-        if (typeField_ == null) {
-          typeField_ = new global::Google.Protobuf.WellKnownTypes.Type();
-        }
-        TypeField.MergeFrom(other.TypeField);
-      }
-      if (other.doubleField_ != null) {
-        if (doubleField_ == null || other.DoubleField != 0D) {
-          DoubleField = other.DoubleField;
-        }
-      }
-      if (other.floatField_ != null) {
-        if (floatField_ == null || other.FloatField != 0F) {
-          FloatField = other.FloatField;
-        }
-      }
-      if (other.int64Field_ != null) {
-        if (int64Field_ == null || other.Int64Field != 0L) {
-          Int64Field = other.Int64Field;
-        }
-      }
-      if (other.uint64Field_ != null) {
-        if (uint64Field_ == null || other.Uint64Field != 0UL) {
-          Uint64Field = other.Uint64Field;
-        }
-      }
-      if (other.int32Field_ != null) {
-        if (int32Field_ == null || other.Int32Field != 0) {
-          Int32Field = other.Int32Field;
-        }
-      }
-      if (other.uint32Field_ != null) {
-        if (uint32Field_ == null || other.Uint32Field != 0) {
-          Uint32Field = other.Uint32Field;
-        }
-      }
-      if (other.boolField_ != null) {
-        if (boolField_ == null || other.BoolField != false) {
-          BoolField = other.BoolField;
-        }
-      }
-      if (other.stringField_ != null) {
-        if (stringField_ == null || other.StringField != "") {
-          StringField = other.StringField;
-        }
-      }
-      if (other.bytesField_ != null) {
-        if (bytesField_ == null || other.BytesField != pb::ByteString.Empty) {
-          BytesField = other.BytesField;
-        }
-      }
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            if (anyField_ == null) {
-              anyField_ = new global::Google.Protobuf.WellKnownTypes.Any();
-            }
-            input.ReadMessage(anyField_);
-            break;
-          }
-          case 18: {
-            if (apiField_ == null) {
-              apiField_ = new global::Google.Protobuf.WellKnownTypes.Api();
-            }
-            input.ReadMessage(apiField_);
-            break;
-          }
-          case 26: {
-            if (durationField_ == null) {
-              durationField_ = new global::Google.Protobuf.WellKnownTypes.Duration();
-            }
-            input.ReadMessage(durationField_);
-            break;
-          }
-          case 34: {
-            if (emptyField_ == null) {
-              emptyField_ = new global::Google.Protobuf.WellKnownTypes.Empty();
-            }
-            input.ReadMessage(emptyField_);
-            break;
-          }
-          case 42: {
-            if (fieldMaskField_ == null) {
-              fieldMaskField_ = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-            }
-            input.ReadMessage(fieldMaskField_);
-            break;
-          }
-          case 50: {
-            if (sourceContextField_ == null) {
-              sourceContextField_ = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            }
-            input.ReadMessage(sourceContextField_);
-            break;
-          }
-          case 58: {
-            if (structField_ == null) {
-              structField_ = new global::Google.Protobuf.WellKnownTypes.Struct();
-            }
-            input.ReadMessage(structField_);
-            break;
-          }
-          case 66: {
-            if (timestampField_ == null) {
-              timestampField_ = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-            }
-            input.ReadMessage(timestampField_);
-            break;
-          }
-          case 74: {
-            if (typeField_ == null) {
-              typeField_ = new global::Google.Protobuf.WellKnownTypes.Type();
-            }
-            input.ReadMessage(typeField_);
-            break;
-          }
-          case 82: {
-            double? value = _single_doubleField_codec.Read(input);
-            if (doubleField_ == null || value != 0D) {
-              DoubleField = value;
-            }
-            break;
-          }
-          case 90: {
-            float? value = _single_floatField_codec.Read(input);
-            if (floatField_ == null || value != 0F) {
-              FloatField = value;
-            }
-            break;
-          }
-          case 98: {
-            long? value = _single_int64Field_codec.Read(input);
-            if (int64Field_ == null || value != 0L) {
-              Int64Field = value;
-            }
-            break;
-          }
-          case 106: {
-            ulong? value = _single_uint64Field_codec.Read(input);
-            if (uint64Field_ == null || value != 0UL) {
-              Uint64Field = value;
-            }
-            break;
-          }
-          case 114: {
-            int? value = _single_int32Field_codec.Read(input);
-            if (int32Field_ == null || value != 0) {
-              Int32Field = value;
-            }
-            break;
-          }
-          case 122: {
-            uint? value = _single_uint32Field_codec.Read(input);
-            if (uint32Field_ == null || value != 0) {
-              Uint32Field = value;
-            }
-            break;
-          }
-          case 130: {
-            bool? value = _single_boolField_codec.Read(input);
-            if (boolField_ == null || value != false) {
-              BoolField = value;
-            }
-            break;
-          }
-          case 138: {
-            string value = _single_stringField_codec.Read(input);
-            if (stringField_ == null || value != "") {
-              StringField = value;
-            }
-            break;
-          }
-          case 146: {
-            pb::ByteString value = _single_bytesField_codec.Read(input);
-            if (bytesField_ == null || value != pb::ByteString.Empty) {
-              BytesField = value;
-            }
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class RepeatedWellKnownTypes : pb::IMessage<RepeatedWellKnownTypes> {
-    private static readonly pb::MessageParser<RepeatedWellKnownTypes> _parser = new pb::MessageParser<RepeatedWellKnownTypes>(() => new RepeatedWellKnownTypes());
-    public static pb::MessageParser<RepeatedWellKnownTypes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "any_field", "api_field", "bool_field", "bytes_field", "double_field", "duration_field", "empty_field", "field_mask_field", "float_field", "int32_field", "int64_field", "source_context_field", "string_field", "struct_field", "timestamp_field", "type_field", "uint32_field", "uint64_field" };
-    private static readonly uint[] _fieldTags = new uint[] { 10, 18, 130, 146, 82, 26, 34, 42, 90, 114, 98, 50, 138, 58, 66, 74, 122, 106 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[1]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.internal__static_protobuf_unittest_RepeatedWellKnownTypes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public RepeatedWellKnownTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public RepeatedWellKnownTypes(RepeatedWellKnownTypes other) : this() {
-      anyField_ = other.anyField_.Clone();
-      apiField_ = other.apiField_.Clone();
-      durationField_ = other.durationField_.Clone();
-      emptyField_ = other.emptyField_.Clone();
-      fieldMaskField_ = other.fieldMaskField_.Clone();
-      sourceContextField_ = other.sourceContextField_.Clone();
-      structField_ = other.structField_.Clone();
-      timestampField_ = other.timestampField_.Clone();
-      typeField_ = other.typeField_.Clone();
-      doubleField_ = other.doubleField_.Clone();
-      floatField_ = other.floatField_.Clone();
-      int64Field_ = other.int64Field_.Clone();
-      uint64Field_ = other.uint64Field_.Clone();
-      int32Field_ = other.int32Field_.Clone();
-      uint32Field_ = other.uint32Field_.Clone();
-      boolField_ = other.boolField_.Clone();
-      stringField_ = other.stringField_.Clone();
-      bytesField_ = other.bytesField_.Clone();
-    }
-
-    public RepeatedWellKnownTypes Clone() {
-      return new RepeatedWellKnownTypes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      anyField_.Freeze();
-      apiField_.Freeze();
-      durationField_.Freeze();
-      emptyField_.Freeze();
-      fieldMaskField_.Freeze();
-      sourceContextField_.Freeze();
-      structField_.Freeze();
-      timestampField_.Freeze();
-      typeField_.Freeze();
-      doubleField_.Freeze();
-      floatField_.Freeze();
-      int64Field_.Freeze();
-      uint64Field_.Freeze();
-      int32Field_.Freeze();
-      uint32Field_.Freeze();
-      boolField_.Freeze();
-      stringField_.Freeze();
-      bytesField_.Freeze();
-    }
-
-    public const int AnyFieldFieldNumber = 1;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Any> _repeated_anyField_codec
-        = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.WellKnownTypes.Any.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any> anyField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any>();
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any> AnyField {
-      get { return anyField_; }
-    }
-
-    public const int ApiFieldFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Api> _repeated_apiField_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Api.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Api> apiField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Api>();
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Api> ApiField {
-      get { return apiField_; }
-    }
-
-    public const int DurationFieldFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Duration> _repeated_durationField_codec
-        = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.WellKnownTypes.Duration.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration> durationField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration>();
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration> DurationField {
-      get { return durationField_; }
-    }
-
-    public const int EmptyFieldFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Empty> _repeated_emptyField_codec
-        = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.WellKnownTypes.Empty.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Empty> emptyField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Empty>();
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Empty> EmptyField {
-      get { return emptyField_; }
-    }
-
-    public const int FieldMaskFieldFieldNumber = 5;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.FieldMask> _repeated_fieldMaskField_codec
-        = pb::FieldCodec.ForMessage(42, global::Google.Protobuf.WellKnownTypes.FieldMask.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask> fieldMaskField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask>();
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask> FieldMaskField {
-      get { return fieldMaskField_; }
-    }
-
-    public const int SourceContextFieldFieldNumber = 6;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.SourceContext> _repeated_sourceContextField_codec
-        = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.WellKnownTypes.SourceContext.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.SourceContext> sourceContextField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.SourceContext>();
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.SourceContext> SourceContextField {
-      get { return sourceContextField_; }
-    }
-
-    public const int StructFieldFieldNumber = 7;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Struct> _repeated_structField_codec
-        = pb::FieldCodec.ForMessage(58, global::Google.Protobuf.WellKnownTypes.Struct.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct> structField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct>();
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct> StructField {
-      get { return structField_; }
-    }
-
-    public const int TimestampFieldFieldNumber = 8;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Timestamp> _repeated_timestampField_codec
-        = pb::FieldCodec.ForMessage(66, global::Google.Protobuf.WellKnownTypes.Timestamp.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp> timestampField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp>();
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp> TimestampField {
-      get { return timestampField_; }
-    }
-
-    public const int TypeFieldFieldNumber = 9;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Type> _repeated_typeField_codec
-        = pb::FieldCodec.ForMessage(74, global::Google.Protobuf.WellKnownTypes.Type.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Type> typeField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Type>();
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Type> TypeField {
-      get { return typeField_; }
-    }
-
-    public const int DoubleFieldFieldNumber = 10;
-    private static readonly pb::FieldCodec<double?> _repeated_doubleField_codec
-        = pb::FieldCodec.ForStructWrapper<double>(82);
-    private readonly pbc::RepeatedField<double?> doubleField_ = new pbc::RepeatedField<double?>();
-    public pbc::RepeatedField<double?> DoubleField {
-      get { return doubleField_; }
-    }
-
-    public const int FloatFieldFieldNumber = 11;
-    private static readonly pb::FieldCodec<float?> _repeated_floatField_codec
-        = pb::FieldCodec.ForStructWrapper<float>(90);
-    private readonly pbc::RepeatedField<float?> floatField_ = new pbc::RepeatedField<float?>();
-    public pbc::RepeatedField<float?> FloatField {
-      get { return floatField_; }
-    }
-
-    public const int Int64FieldFieldNumber = 12;
-    private static readonly pb::FieldCodec<long?> _repeated_int64Field_codec
-        = pb::FieldCodec.ForStructWrapper<long>(98);
-    private readonly pbc::RepeatedField<long?> int64Field_ = new pbc::RepeatedField<long?>();
-    public pbc::RepeatedField<long?> Int64Field {
-      get { return int64Field_; }
-    }
-
-    public const int Uint64FieldFieldNumber = 13;
-    private static readonly pb::FieldCodec<ulong?> _repeated_uint64Field_codec
-        = pb::FieldCodec.ForStructWrapper<ulong>(106);
-    private readonly pbc::RepeatedField<ulong?> uint64Field_ = new pbc::RepeatedField<ulong?>();
-    public pbc::RepeatedField<ulong?> Uint64Field {
-      get { return uint64Field_; }
-    }
-
-    public const int Int32FieldFieldNumber = 14;
-    private static readonly pb::FieldCodec<int?> _repeated_int32Field_codec
-        = pb::FieldCodec.ForStructWrapper<int>(114);
-    private readonly pbc::RepeatedField<int?> int32Field_ = new pbc::RepeatedField<int?>();
-    public pbc::RepeatedField<int?> Int32Field {
-      get { return int32Field_; }
-    }
-
-    public const int Uint32FieldFieldNumber = 15;
-    private static readonly pb::FieldCodec<uint?> _repeated_uint32Field_codec
-        = pb::FieldCodec.ForStructWrapper<uint>(122);
-    private readonly pbc::RepeatedField<uint?> uint32Field_ = new pbc::RepeatedField<uint?>();
-    public pbc::RepeatedField<uint?> Uint32Field {
-      get { return uint32Field_; }
-    }
-
-    public const int BoolFieldFieldNumber = 16;
-    private static readonly pb::FieldCodec<bool?> _repeated_boolField_codec
-        = pb::FieldCodec.ForStructWrapper<bool>(130);
-    private readonly pbc::RepeatedField<bool?> boolField_ = new pbc::RepeatedField<bool?>();
-    public pbc::RepeatedField<bool?> BoolField {
-      get { return boolField_; }
-    }
-
-    public const int StringFieldFieldNumber = 17;
-    private static readonly pb::FieldCodec<string> _repeated_stringField_codec
-        = pb::FieldCodec.ForClassWrapper<string>(138);
-    private readonly pbc::RepeatedField<string> stringField_ = new pbc::RepeatedField<string>();
-    public pbc::RepeatedField<string> StringField {
-      get { return stringField_; }
-    }
-
-    public const int BytesFieldFieldNumber = 18;
-    private static readonly pb::FieldCodec<pb::ByteString> _repeated_bytesField_codec
-        = pb::FieldCodec.ForClassWrapper<pb::ByteString>(146);
-    private readonly pbc::RepeatedField<pb::ByteString> bytesField_ = new pbc::RepeatedField<pb::ByteString>();
-    public pbc::RepeatedField<pb::ByteString> BytesField {
-      get { return bytesField_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as RepeatedWellKnownTypes);
-    }
-
-    public bool Equals(RepeatedWellKnownTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!anyField_.Equals(other.anyField_)) return false;
-      if(!apiField_.Equals(other.apiField_)) return false;
-      if(!durationField_.Equals(other.durationField_)) return false;
-      if(!emptyField_.Equals(other.emptyField_)) return false;
-      if(!fieldMaskField_.Equals(other.fieldMaskField_)) return false;
-      if(!sourceContextField_.Equals(other.sourceContextField_)) return false;
-      if(!structField_.Equals(other.structField_)) return false;
-      if(!timestampField_.Equals(other.timestampField_)) return false;
-      if(!typeField_.Equals(other.typeField_)) return false;
-      if(!doubleField_.Equals(other.doubleField_)) return false;
-      if(!floatField_.Equals(other.floatField_)) return false;
-      if(!int64Field_.Equals(other.int64Field_)) return false;
-      if(!uint64Field_.Equals(other.uint64Field_)) return false;
-      if(!int32Field_.Equals(other.int32Field_)) return false;
-      if(!uint32Field_.Equals(other.uint32Field_)) return false;
-      if(!boolField_.Equals(other.boolField_)) return false;
-      if(!stringField_.Equals(other.stringField_)) return false;
-      if(!bytesField_.Equals(other.bytesField_)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= anyField_.GetHashCode();
-      hash ^= apiField_.GetHashCode();
-      hash ^= durationField_.GetHashCode();
-      hash ^= emptyField_.GetHashCode();
-      hash ^= fieldMaskField_.GetHashCode();
-      hash ^= sourceContextField_.GetHashCode();
-      hash ^= structField_.GetHashCode();
-      hash ^= timestampField_.GetHashCode();
-      hash ^= typeField_.GetHashCode();
-      hash ^= doubleField_.GetHashCode();
-      hash ^= floatField_.GetHashCode();
-      hash ^= int64Field_.GetHashCode();
-      hash ^= uint64Field_.GetHashCode();
-      hash ^= int32Field_.GetHashCode();
-      hash ^= uint32Field_.GetHashCode();
-      hash ^= boolField_.GetHashCode();
-      hash ^= stringField_.GetHashCode();
-      hash ^= bytesField_.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      anyField_.WriteTo(output, _repeated_anyField_codec);
-      apiField_.WriteTo(output, _repeated_apiField_codec);
-      durationField_.WriteTo(output, _repeated_durationField_codec);
-      emptyField_.WriteTo(output, _repeated_emptyField_codec);
-      fieldMaskField_.WriteTo(output, _repeated_fieldMaskField_codec);
-      sourceContextField_.WriteTo(output, _repeated_sourceContextField_codec);
-      structField_.WriteTo(output, _repeated_structField_codec);
-      timestampField_.WriteTo(output, _repeated_timestampField_codec);
-      typeField_.WriteTo(output, _repeated_typeField_codec);
-      doubleField_.WriteTo(output, _repeated_doubleField_codec);
-      floatField_.WriteTo(output, _repeated_floatField_codec);
-      int64Field_.WriteTo(output, _repeated_int64Field_codec);
-      uint64Field_.WriteTo(output, _repeated_uint64Field_codec);
-      int32Field_.WriteTo(output, _repeated_int32Field_codec);
-      uint32Field_.WriteTo(output, _repeated_uint32Field_codec);
-      boolField_.WriteTo(output, _repeated_boolField_codec);
-      stringField_.WriteTo(output, _repeated_stringField_codec);
-      bytesField_.WriteTo(output, _repeated_bytesField_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += anyField_.CalculateSize(_repeated_anyField_codec);
-      size += apiField_.CalculateSize(_repeated_apiField_codec);
-      size += durationField_.CalculateSize(_repeated_durationField_codec);
-      size += emptyField_.CalculateSize(_repeated_emptyField_codec);
-      size += fieldMaskField_.CalculateSize(_repeated_fieldMaskField_codec);
-      size += sourceContextField_.CalculateSize(_repeated_sourceContextField_codec);
-      size += structField_.CalculateSize(_repeated_structField_codec);
-      size += timestampField_.CalculateSize(_repeated_timestampField_codec);
-      size += typeField_.CalculateSize(_repeated_typeField_codec);
-      size += doubleField_.CalculateSize(_repeated_doubleField_codec);
-      size += floatField_.CalculateSize(_repeated_floatField_codec);
-      size += int64Field_.CalculateSize(_repeated_int64Field_codec);
-      size += uint64Field_.CalculateSize(_repeated_uint64Field_codec);
-      size += int32Field_.CalculateSize(_repeated_int32Field_codec);
-      size += uint32Field_.CalculateSize(_repeated_uint32Field_codec);
-      size += boolField_.CalculateSize(_repeated_boolField_codec);
-      size += stringField_.CalculateSize(_repeated_stringField_codec);
-      size += bytesField_.CalculateSize(_repeated_bytesField_codec);
-      return size;
-    }
-
-    public void MergeFrom(RepeatedWellKnownTypes other) {
-      if (other == null) {
-        return;
-      }
-      anyField_.Add(other.anyField_);
-      apiField_.Add(other.apiField_);
-      durationField_.Add(other.durationField_);
-      emptyField_.Add(other.emptyField_);
-      fieldMaskField_.Add(other.fieldMaskField_);
-      sourceContextField_.Add(other.sourceContextField_);
-      structField_.Add(other.structField_);
-      timestampField_.Add(other.timestampField_);
-      typeField_.Add(other.typeField_);
-      doubleField_.Add(other.doubleField_);
-      floatField_.Add(other.floatField_);
-      int64Field_.Add(other.int64Field_);
-      uint64Field_.Add(other.uint64Field_);
-      int32Field_.Add(other.int32Field_);
-      uint32Field_.Add(other.uint32Field_);
-      boolField_.Add(other.boolField_);
-      stringField_.Add(other.stringField_);
-      bytesField_.Add(other.bytesField_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            anyField_.AddEntriesFrom(input, _repeated_anyField_codec);
-            break;
-          }
-          case 18: {
-            apiField_.AddEntriesFrom(input, _repeated_apiField_codec);
-            break;
-          }
-          case 26: {
-            durationField_.AddEntriesFrom(input, _repeated_durationField_codec);
-            break;
-          }
-          case 34: {
-            emptyField_.AddEntriesFrom(input, _repeated_emptyField_codec);
-            break;
-          }
-          case 42: {
-            fieldMaskField_.AddEntriesFrom(input, _repeated_fieldMaskField_codec);
-            break;
-          }
-          case 50: {
-            sourceContextField_.AddEntriesFrom(input, _repeated_sourceContextField_codec);
-            break;
-          }
-          case 58: {
-            structField_.AddEntriesFrom(input, _repeated_structField_codec);
-            break;
-          }
-          case 66: {
-            timestampField_.AddEntriesFrom(input, _repeated_timestampField_codec);
-            break;
-          }
-          case 74: {
-            typeField_.AddEntriesFrom(input, _repeated_typeField_codec);
-            break;
-          }
-          case 82: {
-            doubleField_.AddEntriesFrom(input, _repeated_doubleField_codec);
-            break;
-          }
-          case 90: {
-            floatField_.AddEntriesFrom(input, _repeated_floatField_codec);
-            break;
-          }
-          case 98: {
-            int64Field_.AddEntriesFrom(input, _repeated_int64Field_codec);
-            break;
-          }
-          case 106: {
-            uint64Field_.AddEntriesFrom(input, _repeated_uint64Field_codec);
-            break;
-          }
-          case 114: {
-            int32Field_.AddEntriesFrom(input, _repeated_int32Field_codec);
-            break;
-          }
-          case 122: {
-            uint32Field_.AddEntriesFrom(input, _repeated_uint32Field_codec);
-            break;
-          }
-          case 130: {
-            boolField_.AddEntriesFrom(input, _repeated_boolField_codec);
-            break;
-          }
-          case 138: {
-            stringField_.AddEntriesFrom(input, _repeated_stringField_codec);
-            break;
-          }
-          case 146: {
-            bytesField_.AddEntriesFrom(input, _repeated_bytesField_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class OneofWellKnownTypes : pb::IMessage<OneofWellKnownTypes> {
-    private static readonly pb::MessageParser<OneofWellKnownTypes> _parser = new pb::MessageParser<OneofWellKnownTypes>(() => new OneofWellKnownTypes());
-    public static pb::MessageParser<OneofWellKnownTypes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "any_field", "api_field", "bool_field", "bytes_field", "double_field", "duration_field", "empty_field", "field_mask_field", "float_field", "int32_field", "int64_field", "source_context_field", "string_field", "struct_field", "timestamp_field", "type_field", "uint32_field", "uint64_field" };
-    private static readonly uint[] _fieldTags = new uint[] { 10, 18, 130, 146, 82, 26, 34, 42, 90, 114, 98, 50, 138, 58, 66, 74, 122, 106 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[2]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.internal__static_protobuf_unittest_OneofWellKnownTypes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public OneofWellKnownTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public OneofWellKnownTypes(OneofWellKnownTypes other) : this() {
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.AnyField:
-          AnyField = other.AnyField.Clone();
-          break;
-        case OneofFieldOneofCase.ApiField:
-          ApiField = other.ApiField.Clone();
-          break;
-        case OneofFieldOneofCase.DurationField:
-          DurationField = other.DurationField.Clone();
-          break;
-        case OneofFieldOneofCase.EmptyField:
-          EmptyField = other.EmptyField.Clone();
-          break;
-        case OneofFieldOneofCase.FieldMaskField:
-          FieldMaskField = other.FieldMaskField.Clone();
-          break;
-        case OneofFieldOneofCase.SourceContextField:
-          SourceContextField = other.SourceContextField.Clone();
-          break;
-        case OneofFieldOneofCase.StructField:
-          StructField = other.StructField.Clone();
-          break;
-        case OneofFieldOneofCase.TimestampField:
-          TimestampField = other.TimestampField.Clone();
-          break;
-        case OneofFieldOneofCase.TypeField:
-          TypeField = other.TypeField.Clone();
-          break;
-        case OneofFieldOneofCase.DoubleField:
-          DoubleField = other.DoubleField;
-          break;
-        case OneofFieldOneofCase.FloatField:
-          FloatField = other.FloatField;
-          break;
-        case OneofFieldOneofCase.Int64Field:
-          Int64Field = other.Int64Field;
-          break;
-        case OneofFieldOneofCase.Uint64Field:
-          Uint64Field = other.Uint64Field;
-          break;
-        case OneofFieldOneofCase.Int32Field:
-          Int32Field = other.Int32Field;
-          break;
-        case OneofFieldOneofCase.Uint32Field:
-          Uint32Field = other.Uint32Field;
-          break;
-        case OneofFieldOneofCase.BoolField:
-          BoolField = other.BoolField;
-          break;
-        case OneofFieldOneofCase.StringField:
-          StringField = other.StringField;
-          break;
-        case OneofFieldOneofCase.BytesField:
-          BytesField = other.BytesField;
-          break;
-      }
-
-    }
-
-    public OneofWellKnownTypes Clone() {
-      return new OneofWellKnownTypes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      if (oneofField_ is IFreezable) ((IFreezable) oneofField_).Freeze();
-    }
-
-    public const int AnyFieldFieldNumber = 1;
-    public global::Google.Protobuf.WellKnownTypes.Any AnyField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.AnyField ? (global::Google.Protobuf.WellKnownTypes.Any) oneofField_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.AnyField;
-      }
-    }
-
-    public const int ApiFieldFieldNumber = 2;
-    public global::Google.Protobuf.WellKnownTypes.Api ApiField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.ApiField ? (global::Google.Protobuf.WellKnownTypes.Api) oneofField_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.ApiField;
-      }
-    }
-
-    public const int DurationFieldFieldNumber = 3;
-    public global::Google.Protobuf.WellKnownTypes.Duration DurationField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.DurationField ? (global::Google.Protobuf.WellKnownTypes.Duration) oneofField_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.DurationField;
-      }
-    }
-
-    public const int EmptyFieldFieldNumber = 4;
-    public global::Google.Protobuf.WellKnownTypes.Empty EmptyField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.EmptyField ? (global::Google.Protobuf.WellKnownTypes.Empty) oneofField_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.EmptyField;
-      }
-    }
-
-    public const int FieldMaskFieldFieldNumber = 5;
-    public global::Google.Protobuf.WellKnownTypes.FieldMask FieldMaskField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField ? (global::Google.Protobuf.WellKnownTypes.FieldMask) oneofField_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.FieldMaskField;
-      }
-    }
-
-    public const int SourceContextFieldFieldNumber = 6;
-    public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContextField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.SourceContextField ? (global::Google.Protobuf.WellKnownTypes.SourceContext) oneofField_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.SourceContextField;
-      }
-    }
-
-    public const int StructFieldFieldNumber = 7;
-    public global::Google.Protobuf.WellKnownTypes.Struct StructField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.StructField ? (global::Google.Protobuf.WellKnownTypes.Struct) oneofField_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.StructField;
-      }
-    }
-
-    public const int TimestampFieldFieldNumber = 8;
-    public global::Google.Protobuf.WellKnownTypes.Timestamp TimestampField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.TimestampField ? (global::Google.Protobuf.WellKnownTypes.Timestamp) oneofField_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.TimestampField;
-      }
-    }
-
-    public const int TypeFieldFieldNumber = 9;
-    public global::Google.Protobuf.WellKnownTypes.Type TypeField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.TypeField ? (global::Google.Protobuf.WellKnownTypes.Type) oneofField_ : null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.TypeField;
-      }
-    }
-
-    public const int DoubleFieldFieldNumber = 10;
-    private static readonly pb::FieldCodec<double?> _oneof_doubleField_codec = pb::FieldCodec.ForStructWrapper<double>(82);
-    public double? DoubleField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.DoubleField ? (double?) oneofField_ : (double?) null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.DoubleField;
-      }
-    }
-
-    public const int FloatFieldFieldNumber = 11;
-    private static readonly pb::FieldCodec<float?> _oneof_floatField_codec = pb::FieldCodec.ForStructWrapper<float>(90);
-    public float? FloatField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.FloatField ? (float?) oneofField_ : (float?) null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.FloatField;
-      }
-    }
-
-    public const int Int64FieldFieldNumber = 12;
-    private static readonly pb::FieldCodec<long?> _oneof_int64Field_codec = pb::FieldCodec.ForStructWrapper<long>(98);
-    public long? Int64Field {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.Int64Field ? (long?) oneofField_ : (long?) null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.Int64Field;
-      }
-    }
-
-    public const int Uint64FieldFieldNumber = 13;
-    private static readonly pb::FieldCodec<ulong?> _oneof_uint64Field_codec = pb::FieldCodec.ForStructWrapper<ulong>(106);
-    public ulong? Uint64Field {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.Uint64Field ? (ulong?) oneofField_ : (ulong?) null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.Uint64Field;
-      }
-    }
-
-    public const int Int32FieldFieldNumber = 14;
-    private static readonly pb::FieldCodec<int?> _oneof_int32Field_codec = pb::FieldCodec.ForStructWrapper<int>(114);
-    public int? Int32Field {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.Int32Field ? (int?) oneofField_ : (int?) null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.Int32Field;
-      }
-    }
-
-    public const int Uint32FieldFieldNumber = 15;
-    private static readonly pb::FieldCodec<uint?> _oneof_uint32Field_codec = pb::FieldCodec.ForStructWrapper<uint>(122);
-    public uint? Uint32Field {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.Uint32Field ? (uint?) oneofField_ : (uint?) null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.Uint32Field;
-      }
-    }
-
-    public const int BoolFieldFieldNumber = 16;
-    private static readonly pb::FieldCodec<bool?> _oneof_boolField_codec = pb::FieldCodec.ForStructWrapper<bool>(130);
-    public bool? BoolField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.BoolField ? (bool?) oneofField_ : (bool?) null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.BoolField;
-      }
-    }
-
-    public const int StringFieldFieldNumber = 17;
-    private static readonly pb::FieldCodec<string> _oneof_stringField_codec = pb::FieldCodec.ForClassWrapper<string>(138);
-    public string StringField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.StringField ? (string) oneofField_ : (string) null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.StringField;
-      }
-    }
-
-    public const int BytesFieldFieldNumber = 18;
-    private static readonly pb::FieldCodec<pb::ByteString> _oneof_bytesField_codec = pb::FieldCodec.ForClassWrapper<pb::ByteString>(146);
-    public pb::ByteString BytesField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.BytesField ? (pb::ByteString) oneofField_ : (pb::ByteString) null; }
-      set {
-        pb::Freezable.CheckMutable(this);
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.BytesField;
-      }
-    }
-
-    private object oneofField_;
-    public enum OneofFieldOneofCase {
-      None = 0,
-      AnyField = 1,
-      ApiField = 2,
-      DurationField = 3,
-      EmptyField = 4,
-      FieldMaskField = 5,
-      SourceContextField = 6,
-      StructField = 7,
-      TimestampField = 8,
-      TypeField = 9,
-      DoubleField = 10,
-      FloatField = 11,
-      Int64Field = 12,
-      Uint64Field = 13,
-      Int32Field = 14,
-      Uint32Field = 15,
-      BoolField = 16,
-      StringField = 17,
-      BytesField = 18,
-    }
-    private OneofFieldOneofCase oneofFieldCase_ = OneofFieldOneofCase.None;
-    public OneofFieldOneofCase OneofFieldCase {
-      get { return oneofFieldCase_; }
-    }
-
-    public void ClearOneofField() {
-      pb::Freezable.CheckMutable(this);
-      oneofFieldCase_ = OneofFieldOneofCase.None;
-      oneofField_ = null;
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as OneofWellKnownTypes);
-    }
-
-    public bool Equals(OneofWellKnownTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(AnyField, other.AnyField)) return false;
-      if (!object.Equals(ApiField, other.ApiField)) return false;
-      if (!object.Equals(DurationField, other.DurationField)) return false;
-      if (!object.Equals(EmptyField, other.EmptyField)) return false;
-      if (!object.Equals(FieldMaskField, other.FieldMaskField)) return false;
-      if (!object.Equals(SourceContextField, other.SourceContextField)) return false;
-      if (!object.Equals(StructField, other.StructField)) return false;
-      if (!object.Equals(TimestampField, other.TimestampField)) return false;
-      if (!object.Equals(TypeField, other.TypeField)) return false;
-      if (DoubleField != other.DoubleField) return false;
-      if (FloatField != other.FloatField) return false;
-      if (Int64Field != other.Int64Field) return false;
-      if (Uint64Field != other.Uint64Field) return false;
-      if (Int32Field != other.Int32Field) return false;
-      if (Uint32Field != other.Uint32Field) return false;
-      if (BoolField != other.BoolField) return false;
-      if (StringField != other.StringField) return false;
-      if (BytesField != other.BytesField) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      if (oneofFieldCase_ == OneofFieldOneofCase.AnyField) hash ^= AnyField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.ApiField) hash ^= ApiField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.DurationField) hash ^= DurationField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.EmptyField) hash ^= EmptyField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField) hash ^= FieldMaskField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.SourceContextField) hash ^= SourceContextField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.StructField) hash ^= StructField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.TimestampField) hash ^= TimestampField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.TypeField) hash ^= TypeField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.DoubleField) hash ^= DoubleField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.FloatField) hash ^= FloatField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int64Field) hash ^= Int64Field.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint64Field) hash ^= Uint64Field.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int32Field) hash ^= Int32Field.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint32Field) hash ^= Uint32Field.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.BoolField) hash ^= BoolField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.StringField) hash ^= StringField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.BytesField) hash ^= BytesField.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (oneofFieldCase_ == OneofFieldOneofCase.AnyField) {
-        output.WriteRawTag(10);
-        output.WriteMessage(AnyField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.ApiField) {
-        output.WriteRawTag(18);
-        output.WriteMessage(ApiField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.DurationField) {
-        output.WriteRawTag(26);
-        output.WriteMessage(DurationField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.EmptyField) {
-        output.WriteRawTag(34);
-        output.WriteMessage(EmptyField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField) {
-        output.WriteRawTag(42);
-        output.WriteMessage(FieldMaskField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.SourceContextField) {
-        output.WriteRawTag(50);
-        output.WriteMessage(SourceContextField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.StructField) {
-        output.WriteRawTag(58);
-        output.WriteMessage(StructField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.TimestampField) {
-        output.WriteRawTag(66);
-        output.WriteMessage(TimestampField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.TypeField) {
-        output.WriteRawTag(74);
-        output.WriteMessage(TypeField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.DoubleField) {
-        _oneof_doubleField_codec.WriteTagAndValue(output, (double?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.FloatField) {
-        _oneof_floatField_codec.WriteTagAndValue(output, (float?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int64Field) {
-        _oneof_int64Field_codec.WriteTagAndValue(output, (long?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint64Field) {
-        _oneof_uint64Field_codec.WriteTagAndValue(output, (ulong?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int32Field) {
-        _oneof_int32Field_codec.WriteTagAndValue(output, (int?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint32Field) {
-        _oneof_uint32Field_codec.WriteTagAndValue(output, (uint?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.BoolField) {
-        _oneof_boolField_codec.WriteTagAndValue(output, (bool?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.StringField) {
-        _oneof_stringField_codec.WriteTagAndValue(output, (string) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.BytesField) {
-        _oneof_bytesField_codec.WriteTagAndValue(output, (pb::ByteString) oneofField_);
-      }
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      if (oneofFieldCase_ == OneofFieldOneofCase.AnyField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(AnyField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.ApiField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(ApiField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.DurationField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(DurationField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.EmptyField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(EmptyField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FieldMaskField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.SourceContextField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContextField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.StructField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(StructField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.TimestampField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(TimestampField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.TypeField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(TypeField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.DoubleField) {
-        size += _oneof_doubleField_codec.CalculateSizeWithTag(DoubleField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.FloatField) {
-        size += _oneof_floatField_codec.CalculateSizeWithTag(FloatField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int64Field) {
-        size += _oneof_int64Field_codec.CalculateSizeWithTag(Int64Field);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint64Field) {
-        size += _oneof_uint64Field_codec.CalculateSizeWithTag(Uint64Field);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int32Field) {
-        size += _oneof_int32Field_codec.CalculateSizeWithTag(Int32Field);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint32Field) {
-        size += _oneof_uint32Field_codec.CalculateSizeWithTag(Uint32Field);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.BoolField) {
-        size += _oneof_boolField_codec.CalculateSizeWithTag(BoolField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.StringField) {
-        size += _oneof_stringField_codec.CalculateSizeWithTag(StringField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.BytesField) {
-        size += _oneof_bytesField_codec.CalculateSizeWithTag(BytesField);
-      }
-      return size;
-    }
-
-    public void MergeFrom(OneofWellKnownTypes other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.AnyField:
-          AnyField = other.AnyField;
-          break;
-        case OneofFieldOneofCase.ApiField:
-          ApiField = other.ApiField;
-          break;
-        case OneofFieldOneofCase.DurationField:
-          DurationField = other.DurationField;
-          break;
-        case OneofFieldOneofCase.EmptyField:
-          EmptyField = other.EmptyField;
-          break;
-        case OneofFieldOneofCase.FieldMaskField:
-          FieldMaskField = other.FieldMaskField;
-          break;
-        case OneofFieldOneofCase.SourceContextField:
-          SourceContextField = other.SourceContextField;
-          break;
-        case OneofFieldOneofCase.StructField:
-          StructField = other.StructField;
-          break;
-        case OneofFieldOneofCase.TimestampField:
-          TimestampField = other.TimestampField;
-          break;
-        case OneofFieldOneofCase.TypeField:
-          TypeField = other.TypeField;
-          break;
-        case OneofFieldOneofCase.DoubleField:
-          DoubleField = other.DoubleField;
-          break;
-        case OneofFieldOneofCase.FloatField:
-          FloatField = other.FloatField;
-          break;
-        case OneofFieldOneofCase.Int64Field:
-          Int64Field = other.Int64Field;
-          break;
-        case OneofFieldOneofCase.Uint64Field:
-          Uint64Field = other.Uint64Field;
-          break;
-        case OneofFieldOneofCase.Int32Field:
-          Int32Field = other.Int32Field;
-          break;
-        case OneofFieldOneofCase.Uint32Field:
-          Uint32Field = other.Uint32Field;
-          break;
-        case OneofFieldOneofCase.BoolField:
-          BoolField = other.BoolField;
-          break;
-        case OneofFieldOneofCase.StringField:
-          StringField = other.StringField;
-          break;
-        case OneofFieldOneofCase.BytesField:
-          BytesField = other.BytesField;
-          break;
-      }
-
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            global::Google.Protobuf.WellKnownTypes.Any subBuilder = new global::Google.Protobuf.WellKnownTypes.Any();
-            if (oneofFieldCase_ == OneofFieldOneofCase.AnyField) {
-              subBuilder.MergeFrom(AnyField);
-            }
-            input.ReadMessage(subBuilder);
-            AnyField = subBuilder;
-            break;
-          }
-          case 18: {
-            global::Google.Protobuf.WellKnownTypes.Api subBuilder = new global::Google.Protobuf.WellKnownTypes.Api();
-            if (oneofFieldCase_ == OneofFieldOneofCase.ApiField) {
-              subBuilder.MergeFrom(ApiField);
-            }
-            input.ReadMessage(subBuilder);
-            ApiField = subBuilder;
-            break;
-          }
-          case 26: {
-            global::Google.Protobuf.WellKnownTypes.Duration subBuilder = new global::Google.Protobuf.WellKnownTypes.Duration();
-            if (oneofFieldCase_ == OneofFieldOneofCase.DurationField) {
-              subBuilder.MergeFrom(DurationField);
-            }
-            input.ReadMessage(subBuilder);
-            DurationField = subBuilder;
-            break;
-          }
-          case 34: {
-            global::Google.Protobuf.WellKnownTypes.Empty subBuilder = new global::Google.Protobuf.WellKnownTypes.Empty();
-            if (oneofFieldCase_ == OneofFieldOneofCase.EmptyField) {
-              subBuilder.MergeFrom(EmptyField);
-            }
-            input.ReadMessage(subBuilder);
-            EmptyField = subBuilder;
-            break;
-          }
-          case 42: {
-            global::Google.Protobuf.WellKnownTypes.FieldMask subBuilder = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-            if (oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField) {
-              subBuilder.MergeFrom(FieldMaskField);
-            }
-            input.ReadMessage(subBuilder);
-            FieldMaskField = subBuilder;
-            break;
-          }
-          case 50: {
-            global::Google.Protobuf.WellKnownTypes.SourceContext subBuilder = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            if (oneofFieldCase_ == OneofFieldOneofCase.SourceContextField) {
-              subBuilder.MergeFrom(SourceContextField);
-            }
-            input.ReadMessage(subBuilder);
-            SourceContextField = subBuilder;
-            break;
-          }
-          case 58: {
-            global::Google.Protobuf.WellKnownTypes.Struct subBuilder = new global::Google.Protobuf.WellKnownTypes.Struct();
-            if (oneofFieldCase_ == OneofFieldOneofCase.StructField) {
-              subBuilder.MergeFrom(StructField);
-            }
-            input.ReadMessage(subBuilder);
-            StructField = subBuilder;
-            break;
-          }
-          case 66: {
-            global::Google.Protobuf.WellKnownTypes.Timestamp subBuilder = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-            if (oneofFieldCase_ == OneofFieldOneofCase.TimestampField) {
-              subBuilder.MergeFrom(TimestampField);
-            }
-            input.ReadMessage(subBuilder);
-            TimestampField = subBuilder;
-            break;
-          }
-          case 74: {
-            global::Google.Protobuf.WellKnownTypes.Type subBuilder = new global::Google.Protobuf.WellKnownTypes.Type();
-            if (oneofFieldCase_ == OneofFieldOneofCase.TypeField) {
-              subBuilder.MergeFrom(TypeField);
-            }
-            input.ReadMessage(subBuilder);
-            TypeField = subBuilder;
-            break;
-          }
-          case 82: {
-            DoubleField = _oneof_doubleField_codec.Read(input);
-            break;
-          }
-          case 90: {
-            FloatField = _oneof_floatField_codec.Read(input);
-            break;
-          }
-          case 98: {
-            Int64Field = _oneof_int64Field_codec.Read(input);
-            break;
-          }
-          case 106: {
-            Uint64Field = _oneof_uint64Field_codec.Read(input);
-            break;
-          }
-          case 114: {
-            Int32Field = _oneof_int32Field_codec.Read(input);
-            break;
-          }
-          case 122: {
-            Uint32Field = _oneof_uint32Field_codec.Read(input);
-            break;
-          }
-          case 130: {
-            BoolField = _oneof_boolField_codec.Read(input);
-            break;
-          }
-          case 138: {
-            StringField = _oneof_stringField_codec.Read(input);
-            break;
-          }
-          case 146: {
-            BytesField = _oneof_bytesField_codec.Read(input);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class MapWellKnownTypes : pb::IMessage<MapWellKnownTypes> {
-    private static readonly pb::MessageParser<MapWellKnownTypes> _parser = new pb::MessageParser<MapWellKnownTypes>(() => new MapWellKnownTypes());
-    public static pb::MessageParser<MapWellKnownTypes> Parser { get { return _parser; } }
-
-    private static readonly string[] _fieldNames = new string[] { "any_field", "api_field", "bool_field", "bytes_field", "double_field", "duration_field", "empty_field", "field_mask_field", "float_field", "int32_field", "int64_field", "source_context_field", "string_field", "struct_field", "timestamp_field", "type_field", "uint32_field", "uint64_field" };
-    private static readonly uint[] _fieldTags = new uint[] { 10, 18, 130, 146, 82, 26, 34, 42, 90, 114, 98, 50, 138, 58, 66, 74, 122, 106 };
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.Descriptor.MessageTypes[3]; }
-    }
-
-    pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypes.internal__static_protobuf_unittest_MapWellKnownTypes__FieldAccessorTable; }
-    }
-
-    private bool _frozen = false;
-    public bool IsFrozen { get { return _frozen; } }
-
-    public MapWellKnownTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    public MapWellKnownTypes(MapWellKnownTypes other) : this() {
-      anyField_ = other.anyField_.Clone();
-      apiField_ = other.apiField_.Clone();
-      durationField_ = other.durationField_.Clone();
-      emptyField_ = other.emptyField_.Clone();
-      fieldMaskField_ = other.fieldMaskField_.Clone();
-      sourceContextField_ = other.sourceContextField_.Clone();
-      structField_ = other.structField_.Clone();
-      timestampField_ = other.timestampField_.Clone();
-      typeField_ = other.typeField_.Clone();
-      doubleField_ = other.doubleField_.Clone();
-      floatField_ = other.floatField_.Clone();
-      int64Field_ = other.int64Field_.Clone();
-      uint64Field_ = other.uint64Field_.Clone();
-      int32Field_ = other.int32Field_.Clone();
-      uint32Field_ = other.uint32Field_.Clone();
-      boolField_ = other.boolField_.Clone();
-      stringField_ = other.stringField_.Clone();
-      bytesField_ = other.bytesField_.Clone();
-    }
-
-    public MapWellKnownTypes Clone() {
-      return new MapWellKnownTypes(this);
-    }
-
-    public void Freeze() {
-      if (IsFrozen) {
-        return;
-      }
-      _frozen = true;
-      anyField_.Freeze();
-      apiField_.Freeze();
-      durationField_.Freeze();
-      emptyField_.Freeze();
-      fieldMaskField_.Freeze();
-      sourceContextField_.Freeze();
-      structField_.Freeze();
-      timestampField_.Freeze();
-      typeField_.Freeze();
-      doubleField_.Freeze();
-      floatField_.Freeze();
-      int64Field_.Freeze();
-      uint64Field_.Freeze();
-      int32Field_.Freeze();
-      uint32Field_.Freeze();
-      boolField_.Freeze();
-      stringField_.Freeze();
-      bytesField_.Freeze();
-    }
-
-    public const int AnyFieldFieldNumber = 1;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any>.Codec _map_anyField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Any.Parser), 10);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any> anyField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any>();
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any> AnyField {
-      get { return anyField_; }
-    }
-
-    public const int ApiFieldFieldNumber = 2;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api>.Codec _map_apiField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Api.Parser), 18);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api> apiField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api>();
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api> ApiField {
-      get { return apiField_; }
-    }
-
-    public const int DurationFieldFieldNumber = 3;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration>.Codec _map_durationField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Duration.Parser), 26);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration> durationField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration>();
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration> DurationField {
-      get { return durationField_; }
-    }
-
-    public const int EmptyFieldFieldNumber = 4;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty>.Codec _map_emptyField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Empty.Parser), 34);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty> emptyField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty>();
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty> EmptyField {
-      get { return emptyField_; }
-    }
-
-    public const int FieldMaskFieldFieldNumber = 5;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask>.Codec _map_fieldMaskField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.FieldMask.Parser), 42);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask> fieldMaskField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask>();
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask> FieldMaskField {
-      get { return fieldMaskField_; }
-    }
-
-    public const int SourceContextFieldFieldNumber = 6;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext>.Codec _map_sourceContextField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.SourceContext.Parser), 50);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext> sourceContextField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext>();
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext> SourceContextField {
-      get { return sourceContextField_; }
-    }
-
-    public const int StructFieldFieldNumber = 7;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct>.Codec _map_structField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Struct.Parser), 58);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct> structField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct>();
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct> StructField {
-      get { return structField_; }
-    }
-
-    public const int TimestampFieldFieldNumber = 8;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp>.Codec _map_timestampField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Timestamp.Parser), 66);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp> timestampField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp>();
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp> TimestampField {
-      get { return timestampField_; }
-    }
-
-    public const int TypeFieldFieldNumber = 9;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type>.Codec _map_typeField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Type.Parser), 74);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type> typeField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type>();
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type> TypeField {
-      get { return typeField_; }
-    }
-
-    public const int DoubleFieldFieldNumber = 10;
-    private static readonly pbc::MapField<int, double?>.Codec _map_doubleField_codec
-        = new pbc::MapField<int, double?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<double>(18), 82);
-    private readonly pbc::MapField<int, double?> doubleField_ = new pbc::MapField<int, double?>(true);
-    public pbc::MapField<int, double?> DoubleField {
-      get { return doubleField_; }
-    }
-
-    public const int FloatFieldFieldNumber = 11;
-    private static readonly pbc::MapField<int, float?>.Codec _map_floatField_codec
-        = new pbc::MapField<int, float?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<float>(18), 90);
-    private readonly pbc::MapField<int, float?> floatField_ = new pbc::MapField<int, float?>(true);
-    public pbc::MapField<int, float?> FloatField {
-      get { return floatField_; }
-    }
-
-    public const int Int64FieldFieldNumber = 12;
-    private static readonly pbc::MapField<int, long?>.Codec _map_int64Field_codec
-        = new pbc::MapField<int, long?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<long>(18), 98);
-    private readonly pbc::MapField<int, long?> int64Field_ = new pbc::MapField<int, long?>(true);
-    public pbc::MapField<int, long?> Int64Field {
-      get { return int64Field_; }
-    }
-
-    public const int Uint64FieldFieldNumber = 13;
-    private static readonly pbc::MapField<int, ulong?>.Codec _map_uint64Field_codec
-        = new pbc::MapField<int, ulong?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<ulong>(18), 106);
-    private readonly pbc::MapField<int, ulong?> uint64Field_ = new pbc::MapField<int, ulong?>(true);
-    public pbc::MapField<int, ulong?> Uint64Field {
-      get { return uint64Field_; }
-    }
-
-    public const int Int32FieldFieldNumber = 14;
-    private static readonly pbc::MapField<int, int?>.Codec _map_int32Field_codec
-        = new pbc::MapField<int, int?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<int>(18), 114);
-    private readonly pbc::MapField<int, int?> int32Field_ = new pbc::MapField<int, int?>(true);
-    public pbc::MapField<int, int?> Int32Field {
-      get { return int32Field_; }
-    }
-
-    public const int Uint32FieldFieldNumber = 15;
-    private static readonly pbc::MapField<int, uint?>.Codec _map_uint32Field_codec
-        = new pbc::MapField<int, uint?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<uint>(18), 122);
-    private readonly pbc::MapField<int, uint?> uint32Field_ = new pbc::MapField<int, uint?>(true);
-    public pbc::MapField<int, uint?> Uint32Field {
-      get { return uint32Field_; }
-    }
-
-    public const int BoolFieldFieldNumber = 16;
-    private static readonly pbc::MapField<int, bool?>.Codec _map_boolField_codec
-        = new pbc::MapField<int, bool?>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForStructWrapper<bool>(18), 130);
-    private readonly pbc::MapField<int, bool?> boolField_ = new pbc::MapField<int, bool?>(true);
-    public pbc::MapField<int, bool?> BoolField {
-      get { return boolField_; }
-    }
-
-    public const int StringFieldFieldNumber = 17;
-    private static readonly pbc::MapField<int, string>.Codec _map_stringField_codec
-        = new pbc::MapField<int, string>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForClassWrapper<string>(18), 138);
-    private readonly pbc::MapField<int, string> stringField_ = new pbc::MapField<int, string>(true);
-    public pbc::MapField<int, string> StringField {
-      get { return stringField_; }
-    }
-
-    public const int BytesFieldFieldNumber = 18;
-    private static readonly pbc::MapField<int, pb::ByteString>.Codec _map_bytesField_codec
-        = new pbc::MapField<int, pb::ByteString>.Codec(pb::FieldCodec.ForInt32(8), pb::FieldCodec.ForClassWrapper<pb::ByteString>(18), 146);
-    private readonly pbc::MapField<int, pb::ByteString> bytesField_ = new pbc::MapField<int, pb::ByteString>(true);
-    public pbc::MapField<int, pb::ByteString> BytesField {
-      get { return bytesField_; }
-    }
-
-    public override bool Equals(object other) {
-      return Equals(other as MapWellKnownTypes);
-    }
-
-    public bool Equals(MapWellKnownTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!AnyField.Equals(other.AnyField)) return false;
-      if (!ApiField.Equals(other.ApiField)) return false;
-      if (!DurationField.Equals(other.DurationField)) return false;
-      if (!EmptyField.Equals(other.EmptyField)) return false;
-      if (!FieldMaskField.Equals(other.FieldMaskField)) return false;
-      if (!SourceContextField.Equals(other.SourceContextField)) return false;
-      if (!StructField.Equals(other.StructField)) return false;
-      if (!TimestampField.Equals(other.TimestampField)) return false;
-      if (!TypeField.Equals(other.TypeField)) return false;
-      if (!DoubleField.Equals(other.DoubleField)) return false;
-      if (!FloatField.Equals(other.FloatField)) return false;
-      if (!Int64Field.Equals(other.Int64Field)) return false;
-      if (!Uint64Field.Equals(other.Uint64Field)) return false;
-      if (!Int32Field.Equals(other.Int32Field)) return false;
-      if (!Uint32Field.Equals(other.Uint32Field)) return false;
-      if (!BoolField.Equals(other.BoolField)) return false;
-      if (!StringField.Equals(other.StringField)) return false;
-      if (!BytesField.Equals(other.BytesField)) return false;
-      return true;
-    }
-
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= AnyField.GetHashCode();
-      hash ^= ApiField.GetHashCode();
-      hash ^= DurationField.GetHashCode();
-      hash ^= EmptyField.GetHashCode();
-      hash ^= FieldMaskField.GetHashCode();
-      hash ^= SourceContextField.GetHashCode();
-      hash ^= StructField.GetHashCode();
-      hash ^= TimestampField.GetHashCode();
-      hash ^= TypeField.GetHashCode();
-      hash ^= DoubleField.GetHashCode();
-      hash ^= FloatField.GetHashCode();
-      hash ^= Int64Field.GetHashCode();
-      hash ^= Uint64Field.GetHashCode();
-      hash ^= Int32Field.GetHashCode();
-      hash ^= Uint32Field.GetHashCode();
-      hash ^= BoolField.GetHashCode();
-      hash ^= StringField.GetHashCode();
-      hash ^= BytesField.GetHashCode();
-      return hash;
-    }
-
-    public override string ToString() {
-      return pb::JsonFormatter.Default.Format(this);
-    }
-
-    public void WriteTo(pb::CodedOutputStream output) {
-      anyField_.WriteTo(output, _map_anyField_codec);
-      apiField_.WriteTo(output, _map_apiField_codec);
-      durationField_.WriteTo(output, _map_durationField_codec);
-      emptyField_.WriteTo(output, _map_emptyField_codec);
-      fieldMaskField_.WriteTo(output, _map_fieldMaskField_codec);
-      sourceContextField_.WriteTo(output, _map_sourceContextField_codec);
-      structField_.WriteTo(output, _map_structField_codec);
-      timestampField_.WriteTo(output, _map_timestampField_codec);
-      typeField_.WriteTo(output, _map_typeField_codec);
-      doubleField_.WriteTo(output, _map_doubleField_codec);
-      floatField_.WriteTo(output, _map_floatField_codec);
-      int64Field_.WriteTo(output, _map_int64Field_codec);
-      uint64Field_.WriteTo(output, _map_uint64Field_codec);
-      int32Field_.WriteTo(output, _map_int32Field_codec);
-      uint32Field_.WriteTo(output, _map_uint32Field_codec);
-      boolField_.WriteTo(output, _map_boolField_codec);
-      stringField_.WriteTo(output, _map_stringField_codec);
-      bytesField_.WriteTo(output, _map_bytesField_codec);
-    }
-
-    public int CalculateSize() {
-      int size = 0;
-      size += anyField_.CalculateSize(_map_anyField_codec);
-      size += apiField_.CalculateSize(_map_apiField_codec);
-      size += durationField_.CalculateSize(_map_durationField_codec);
-      size += emptyField_.CalculateSize(_map_emptyField_codec);
-      size += fieldMaskField_.CalculateSize(_map_fieldMaskField_codec);
-      size += sourceContextField_.CalculateSize(_map_sourceContextField_codec);
-      size += structField_.CalculateSize(_map_structField_codec);
-      size += timestampField_.CalculateSize(_map_timestampField_codec);
-      size += typeField_.CalculateSize(_map_typeField_codec);
-      size += doubleField_.CalculateSize(_map_doubleField_codec);
-      size += floatField_.CalculateSize(_map_floatField_codec);
-      size += int64Field_.CalculateSize(_map_int64Field_codec);
-      size += uint64Field_.CalculateSize(_map_uint64Field_codec);
-      size += int32Field_.CalculateSize(_map_int32Field_codec);
-      size += uint32Field_.CalculateSize(_map_uint32Field_codec);
-      size += boolField_.CalculateSize(_map_boolField_codec);
-      size += stringField_.CalculateSize(_map_stringField_codec);
-      size += bytesField_.CalculateSize(_map_bytesField_codec);
-      return size;
-    }
-
-    public void MergeFrom(MapWellKnownTypes other) {
-      if (other == null) {
-        return;
-      }
-      anyField_.Add(other.anyField_);
-      apiField_.Add(other.apiField_);
-      durationField_.Add(other.durationField_);
-      emptyField_.Add(other.emptyField_);
-      fieldMaskField_.Add(other.fieldMaskField_);
-      sourceContextField_.Add(other.sourceContextField_);
-      structField_.Add(other.structField_);
-      timestampField_.Add(other.timestampField_);
-      typeField_.Add(other.typeField_);
-      doubleField_.Add(other.doubleField_);
-      floatField_.Add(other.floatField_);
-      int64Field_.Add(other.int64Field_);
-      uint64Field_.Add(other.uint64Field_);
-      int32Field_.Add(other.int32Field_);
-      uint32Field_.Add(other.uint32Field_);
-      boolField_.Add(other.boolField_);
-      stringField_.Add(other.stringField_);
-      bytesField_.Add(other.bytesField_);
-    }
-
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while (input.ReadTag(out tag)) {
-        switch(tag) {
-          case 0:
-            throw pb::InvalidProtocolBufferException.InvalidTag();
-          default:
-            if (pb::WireFormat.IsEndGroupTag(tag)) {
-              return;
-            }
-            break;
-          case 10: {
-            anyField_.AddEntriesFrom(input, _map_anyField_codec);
-            break;
-          }
-          case 18: {
-            apiField_.AddEntriesFrom(input, _map_apiField_codec);
-            break;
-          }
-          case 26: {
-            durationField_.AddEntriesFrom(input, _map_durationField_codec);
-            break;
-          }
-          case 34: {
-            emptyField_.AddEntriesFrom(input, _map_emptyField_codec);
-            break;
-          }
-          case 42: {
-            fieldMaskField_.AddEntriesFrom(input, _map_fieldMaskField_codec);
-            break;
-          }
-          case 50: {
-            sourceContextField_.AddEntriesFrom(input, _map_sourceContextField_codec);
-            break;
-          }
-          case 58: {
-            structField_.AddEntriesFrom(input, _map_structField_codec);
-            break;
-          }
-          case 66: {
-            timestampField_.AddEntriesFrom(input, _map_timestampField_codec);
-            break;
-          }
-          case 74: {
-            typeField_.AddEntriesFrom(input, _map_typeField_codec);
-            break;
-          }
-          case 82: {
-            doubleField_.AddEntriesFrom(input, _map_doubleField_codec);
-            break;
-          }
-          case 90: {
-            floatField_.AddEntriesFrom(input, _map_floatField_codec);
-            break;
-          }
-          case 98: {
-            int64Field_.AddEntriesFrom(input, _map_int64Field_codec);
-            break;
-          }
-          case 106: {
-            uint64Field_.AddEntriesFrom(input, _map_uint64Field_codec);
-            break;
-          }
-          case 114: {
-            int32Field_.AddEntriesFrom(input, _map_int32Field_codec);
-            break;
-          }
-          case 122: {
-            uint32Field_.AddEntriesFrom(input, _map_uint32Field_codec);
-            break;
-          }
-          case 130: {
-            boolField_.AddEntriesFrom(input, _map_boolField_codec);
-            break;
-          }
-          case 138: {
-            stringField_.AddEntriesFrom(input, _map_stringField_codec);
-            break;
-          }
-          case 146: {
-            bytesField_.AddEntriesFrom(input, _map_bytesField_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/csharp/src/ProtocolBuffers.Test/WellKnownTypes/WrappersTest.cs b/csharp/src/ProtocolBuffers.Test/WellKnownTypes/WrappersTest.cs
deleted file mode 100644
index ad88c4eb..00000000
--- a/csharp/src/ProtocolBuffers.Test/WellKnownTypes/WrappersTest.cs
+++ /dev/null
@@ -1,326 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System.Collections;
-using System.IO;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class WrappersTest
-    {
-        [Test]
-        public void NullIsDefault()
-        {
-            var message = new TestWellKnownTypes();
-            Assert.IsNull(message.StringField);
-            Assert.IsNull(message.BytesField);
-            Assert.IsNull(message.BoolField);
-            Assert.IsNull(message.FloatField);
-            Assert.IsNull(message.DoubleField);
-            Assert.IsNull(message.Int32Field);
-            Assert.IsNull(message.Int64Field);
-            Assert.IsNull(message.Uint32Field);
-            Assert.IsNull(message.Uint64Field);
-        }
-
-        [Test]
-        public void NonDefaultSingleValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-
-            var bytes = message.ToByteArray();
-            var parsed = TestWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual("x", parsed.StringField);
-            Assert.AreEqual(ByteString.CopyFrom(1, 2, 3), parsed.BytesField);
-            Assert.AreEqual(true, parsed.BoolField);
-            Assert.AreEqual(12.5f, parsed.FloatField);
-            Assert.AreEqual(12.25d, parsed.DoubleField);
-            Assert.AreEqual(1, parsed.Int32Field);
-            Assert.AreEqual(2L, parsed.Int64Field);
-            Assert.AreEqual(3U, parsed.Uint32Field);
-            Assert.AreEqual(4UL, parsed.Uint64Field);
-        }
-
-        [Test]
-        public void NonNullDefaultIsPreservedThroughSerialization()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "",
-                BytesField = ByteString.Empty,
-                BoolField = false,
-                FloatField = 0f,
-                DoubleField = 0d,
-                Int32Field = 0,
-                Int64Field = 0,
-                Uint32Field = 0,
-                Uint64Field = 0
-            };
-
-            var bytes = message.ToByteArray();
-            var parsed = TestWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual("", parsed.StringField);
-            Assert.AreEqual(ByteString.Empty, parsed.BytesField);
-            Assert.AreEqual(false, parsed.BoolField);
-            Assert.AreEqual(0f, parsed.FloatField);
-            Assert.AreEqual(0d, parsed.DoubleField);
-            Assert.AreEqual(0, parsed.Int32Field);
-            Assert.AreEqual(0L, parsed.Int64Field);
-            Assert.AreEqual(0U, parsed.Uint32Field);
-            Assert.AreEqual(0UL, parsed.Uint64Field);
-        }
-
-        [Test]
-        public void RepeatedWrappersProhibitNullItems()
-        {
-            var message = new RepeatedWellKnownTypes();
-            Assert.Throws<ArgumentNullException>(() => message.BoolField.Add((bool?) null));
-            Assert.Throws<ArgumentNullException>(() => message.Int32Field.Add((int?) null));
-            Assert.Throws<ArgumentNullException>(() => message.StringField.Add((string) null));
-            Assert.Throws<ArgumentNullException>(() => message.BytesField.Add((ByteString) null));
-        }
-
-        [Test]
-        public void RepeatedWrappersSerializeDeserialize()
-        {
-            var message = new RepeatedWellKnownTypes
-            {
-                BoolField = { true, false },
-                BytesField = { ByteString.CopyFrom(1, 2, 3), ByteString.CopyFrom(4, 5, 6), ByteString.Empty },
-                DoubleField = { 12.5, -1.5, 0d },
-                FloatField = { 123.25f, -20f, 0f },
-                Int32Field = { int.MaxValue, int.MinValue, 0 },
-                Int64Field = { long.MaxValue, long.MinValue, 0L },                
-                StringField = { "First", "Second", "" },
-                Uint32Field = { uint.MaxValue, uint.MinValue, 0U },
-                Uint64Field = { ulong.MaxValue, ulong.MinValue, 0UL },
-            };
-            var bytes = message.ToByteArray();
-            var parsed = RepeatedWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual(message, parsed);
-            // Just to test a single value for sanity...
-            Assert.AreEqual("Second", message.StringField[1]);
-        }
-
-        [Test]
-        public void MapWrappersSerializeDeserialize()
-        {
-            var message = new MapWellKnownTypes
-            {
-                BoolField = { { 10, false }, { 20, true } },
-                BytesField = {
-                    { -1, ByteString.CopyFrom(1, 2, 3) },
-                    { 10, ByteString.CopyFrom(4, 5, 6) },
-                    { 1000, ByteString.Empty },
-                    { 10000, null }
-                },
-                DoubleField = { { 1, 12.5 }, { 10, -1.5 }, { 20, 0d } },
-                FloatField = { { 2, 123.25f }, { 3, -20f }, { 4, 0f } },
-                Int32Field = { { 5, int.MaxValue }, { 6, int.MinValue }, { 7, 0 } },
-                Int64Field = { { 8, long.MaxValue }, { 9, long.MinValue }, { 10, 0L } },
-                StringField = { { 11, "First" }, { 12, "Second" }, { 13, "" }, { 14, null } },
-                Uint32Field = { { 15, uint.MaxValue }, { 16, uint.MinValue }, { 17, 0U } },
-                Uint64Field = { { 18, ulong.MaxValue }, { 19, ulong.MinValue }, { 20, 0UL } },
-            };
-
-            var bytes = message.ToByteArray();
-            var parsed = MapWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual(message, parsed);
-            // Just to test a single value for sanity...
-            Assert.AreEqual("Second", message.StringField[12]);
-        }
-
-        [Test]
-        public void Reflection_SingleValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-            var fields = ((IReflectedMessage) message).Fields;
-
-            Assert.AreEqual("x", fields[TestWellKnownTypes.StringFieldFieldNumber].GetValue(message));
-            Assert.AreEqual(ByteString.CopyFrom(1, 2, 3), fields[TestWellKnownTypes.BytesFieldFieldNumber].GetValue(message));
-            Assert.AreEqual(true, fields[TestWellKnownTypes.BoolFieldFieldNumber].GetValue(message));
-            Assert.AreEqual(12.5f, fields[TestWellKnownTypes.FloatFieldFieldNumber].GetValue(message));
-            Assert.AreEqual(12.25d, fields[TestWellKnownTypes.DoubleFieldFieldNumber].GetValue(message));
-            Assert.AreEqual(1, fields[TestWellKnownTypes.Int32FieldFieldNumber].GetValue(message));
-            Assert.AreEqual(2L, fields[TestWellKnownTypes.Int64FieldFieldNumber].GetValue(message));
-            Assert.AreEqual(3U, fields[TestWellKnownTypes.Uint32FieldFieldNumber].GetValue(message));
-            Assert.AreEqual(4UL, fields[TestWellKnownTypes.Uint64FieldFieldNumber].GetValue(message));
-
-            // And a couple of null fields...
-            message.StringField = null;
-            message.FloatField = null;
-            Assert.IsNull(fields[TestWellKnownTypes.StringFieldFieldNumber].GetValue(message));
-            Assert.IsNull(fields[TestWellKnownTypes.FloatFieldFieldNumber].GetValue(message));
-        }
-
-        [Test]
-        public void Reflection_RepeatedFields()
-        {
-            // Just a single example... note that we can't have a null value here
-            var message = new RepeatedWellKnownTypes { Int32Field = { 1, 2 } };
-            var fields = ((IReflectedMessage) message).Fields;
-            var list = (IList) fields[RepeatedWellKnownTypes.Int32FieldFieldNumber].GetValue(message);
-            CollectionAssert.AreEqual(new[] { 1, 2 }, list);
-        }
-
-        [Test]
-        public void Reflection_MapFields()
-        {
-            // Just a single example... note that we can't have a null value here
-            var message = new MapWellKnownTypes { Int32Field = { { 1, 2 }, { 3, null } } };
-            var fields = ((IReflectedMessage) message).Fields;
-            var dictionary = (IDictionary) fields[MapWellKnownTypes.Int32FieldFieldNumber].GetValue(message);
-            Assert.AreEqual(2, dictionary[1]);
-            Assert.IsNull(dictionary[3]);
-            Assert.IsTrue(dictionary.Contains(3));
-        }
-
-        [Test]
-        public void Oneof()
-        {
-            var message = new OneofWellKnownTypes { EmptyField = new Empty() };
-            // Start off with a non-wrapper
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.EmptyField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.StringField = "foo";
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.StringField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.StringField = "foo";
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.StringField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.DoubleField = 0.0f;
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.DoubleField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.DoubleField = 1.0f;
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.DoubleField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.ClearOneofField();
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-        }
-
-        private void AssertOneofRoundTrip(OneofWellKnownTypes message)
-        {
-            // Normal roundtrip, but explicitly checking the case...
-            var bytes = message.ToByteArray();
-            var parsed = OneofWellKnownTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-            Assert.AreEqual(message.OneofFieldCase, parsed.OneofFieldCase);
-        }
-
-        [Test]
-        [TestCase("x", "y", "y")]
-        [TestCase("x", "", "x")]
-        [TestCase("x", null, "x")]
-        [TestCase("", "y", "y")]
-        [TestCase("", "", "")]
-        [TestCase("", null, "")]
-        [TestCase(null, "y", "y")]
-        [TestCase(null, "", "")]
-        [TestCase(null, null, null)]
-        public void Merging(string original, string merged, string expected)
-        {
-            var originalMessage = new TestWellKnownTypes { StringField = original };
-            var mergingMessage = new TestWellKnownTypes { StringField = merged };
-            originalMessage.MergeFrom(mergingMessage);
-            Assert.AreEqual(expected, originalMessage.StringField);
-
-            // Try it using MergeFrom(CodedInputStream) too...
-            originalMessage = new TestWellKnownTypes { StringField = original };
-            originalMessage.MergeFrom(mergingMessage.ToByteArray());
-            Assert.AreEqual(expected, originalMessage.StringField);
-        }
-
-        // Merging is odd with wrapper types, due to the way that default values aren't emitted in
-        // the binary stream. In fact we cheat a little bit - a message with an explicitly present default
-        // value will have that default value ignored.
-        [Test]
-        public void MergingCornerCase()
-        {
-            var message = new TestWellKnownTypes { Int32Field = 5 };
-
-            // Create a byte array which has the data of an Int32Value explicitly containing a value of 0.
-            // This wouldn't normally happen.
-            byte[] bytes;
-            var wrapperTag = WireFormat.MakeTag(TestWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            var valueTag = WireFormat.MakeTag(Int32Value.ValueFieldNumber, WireFormat.WireType.Varint);
-            using (var stream = new MemoryStream())
-            {
-                var coded = CodedOutputStream.CreateInstance(stream);
-                coded.WriteTag(wrapperTag);
-                coded.WriteLength(2); // valueTag + a value 0, each one byte
-                coded.WriteTag(valueTag);
-                coded.WriteInt32(0);
-                coded.Flush();
-                bytes = stream.ToArray();
-            }
-
-            message.MergeFrom(bytes);
-            // A normal implementation would have 0 now, as the explicit default would have been overwritten the 5.
-            Assert.AreEqual(5, message.Int32Field);
-        }
-    }
-}
diff --git a/csharp/src/ProtocolBuffers.Test/packages.config b/csharp/src/ProtocolBuffers.Test/packages.config
deleted file mode 100644
index c7653992..00000000
--- a/csharp/src/ProtocolBuffers.Test/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net45" userInstalled="true" />
-  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" userInstalled="true" />
-</packages>
\ No newline at end of file