Fix for public constructor on messages

26 files changed, 202 insertions, 6 deletions

diff --git a/src/AddressBook/AddressBookProtos.cs b/src/AddressBook/AddressBookProtos.cs
index cb8a2d91..9b99452e 100644
--- a/src/AddressBook/AddressBookProtos.cs
+++ b/src/AddressBook/AddressBookProtos.cs
@@ -68,6 +68,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class Person : pb::GeneratedMessage<Person, Person.Builder> {

+    private Person() { }

     private static readonly Person defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _personFieldNames = new string[] { "email", "id", "name", "phone" };

     private static readonly uint[] _personFieldTags = new uint[] { 26, 16, 10, 34 };

@@ -108,6 +109,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class PhoneNumber : pb::GeneratedMessage<PhoneNumber, PhoneNumber.Builder> {

+        private PhoneNumber() { }

         private static readonly PhoneNumber defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _phoneNumberFieldNames = new string[] { "number", "type" };

         private static readonly uint[] _phoneNumberFieldTags = new uint[] { 10, 16 };

@@ -766,6 +768,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class AddressBook : pb::GeneratedMessage<AddressBook, AddressBook.Builder> {

+    private AddressBook() { }

     private static readonly AddressBook defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _addressBookFieldNames = new string[] { "person" };

     private static readonly uint[] _addressBookFieldTags = new uint[] { 10 };

diff --git a/src/ProtoGen.Test/DependencyResolutionTest.cs b/src/ProtoGen.Test/DependencyResolutionTest.cs
index 8ac5b348..c4422b8c 100644
--- a/src/ProtoGen.Test/DependencyResolutionTest.cs
+++ b/src/ProtoGen.Test/DependencyResolutionTest.cs
@@ -52,7 +52,7 @@ namespace Google.ProtocolBuffers.ProtoGen
         {

             FileDescriptorProto first = new FileDescriptorProto.Builder {Name = "First"}.Build();

             FileDescriptorProto second = new FileDescriptorProto.Builder {Name = "Second"}.Build();

-            FileDescriptorSet set = new FileDescriptorSet {FileList = {first, second}};

+            FileDescriptorSet set = new FileDescriptorSet.Builder { FileList = { first, second } }.Build();

 

             IList<FileDescriptor> converted = Generator.ConvertDescriptors(CSharpFileOptions.DefaultInstance, set);

             Assert.AreEqual(2, converted.Count);

@@ -68,7 +68,7 @@ namespace Google.ProtocolBuffers.ProtoGen
             FileDescriptorProto first =

                 new FileDescriptorProto.Builder {Name = "First", DependencyList = {"Second"}}.Build();

             FileDescriptorProto second = new FileDescriptorProto.Builder {Name = "Second"}.Build();

-            FileDescriptorSet set = new FileDescriptorSet {FileList = {first, second}};

+            FileDescriptorSet set = new FileDescriptorSet.Builder { FileList = { first, second } }.Build();

             IList<FileDescriptor> converted = Generator.ConvertDescriptors(CSharpFileOptions.DefaultInstance, set);

             Assert.AreEqual(2, converted.Count);

             Assert.AreEqual("First", converted[0].Name);

@@ -84,7 +84,7 @@ namespace Google.ProtocolBuffers.ProtoGen
             FileDescriptorProto first = new FileDescriptorProto.Builder {Name = "First"}.Build();

             FileDescriptorProto second =

                 new FileDescriptorProto.Builder {Name = "Second", DependencyList = {"First"}}.Build();

-            FileDescriptorSet set = new FileDescriptorSet {FileList = {first, second}};

+            FileDescriptorSet set = new FileDescriptorSet.Builder { FileList = { first, second } }.Build();

             IList<FileDescriptor> converted = Generator.ConvertDescriptors(CSharpFileOptions.DefaultInstance, set);

             Assert.AreEqual(2, converted.Count);

             Assert.AreEqual("First", converted[0].Name);

@@ -101,7 +101,7 @@ namespace Google.ProtocolBuffers.ProtoGen
                 new FileDescriptorProto.Builder {Name = "First", DependencyList = {"Second"}}.Build();

             FileDescriptorProto second =

                 new FileDescriptorProto.Builder {Name = "Second", DependencyList = {"First"}}.Build();

-            FileDescriptorSet set = new FileDescriptorSet {FileList = {first, second}};

+            FileDescriptorSet set = new FileDescriptorSet.Builder { FileList = { first, second } }.Build();

             try

             {

                 Generator.ConvertDescriptors(CSharpFileOptions.DefaultInstance, set);

@@ -118,7 +118,7 @@ namespace Google.ProtocolBuffers.ProtoGen
         {

             FileDescriptorProto first =

                 new FileDescriptorProto.Builder {Name = "First", DependencyList = {"Second"}}.Build();

-            FileDescriptorSet set = new FileDescriptorSet {FileList = {first}};

+            FileDescriptorSet set = new FileDescriptorSet.Builder { FileList = { first } }.Build();

             try

             {

                 Generator.ConvertDescriptors(CSharpFileOptions.DefaultInstance, set);

@@ -135,7 +135,7 @@ namespace Google.ProtocolBuffers.ProtoGen
         {

             FileDescriptorProto first =

                 new FileDescriptorProto.Builder {Name = "First", DependencyList = {"First"}}.Build();

-            FileDescriptorSet set = new FileDescriptorSet {FileList = {first}};

+            FileDescriptorSet set = new FileDescriptorSet.Builder { FileList = { first } }.Build();

             try

             {

                 Generator.ConvertDescriptors(CSharpFileOptions.DefaultInstance, set);

diff --git a/src/ProtoGen/MessageGenerator.cs b/src/ProtoGen/MessageGenerator.cs
index 83004da9..c8b2087f 100644
--- a/src/ProtoGen/MessageGenerator.cs
+++ b/src/ProtoGen/MessageGenerator.cs
@@ -181,6 +181,7 @@ namespace Google.ProtocolBuffers.ProtoGen
                              Descriptor.Proto.ExtensionRangeCount > 0 ? "Extendable" : "Generated",

                              RuntimeSuffix);

             writer.Indent();

+            writer.WriteLine("private {0}() {{ }}", ClassName);

             // Must call BuildPartial() to make sure all lists are made read-only

             writer.WriteLine("private static readonly {0} defaultInstance = new Builder().BuildPartial();", ClassName);

 

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs
index 01a536d7..565dc1d0 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs
@@ -60,6 +60,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class OptionsMessage : pb::GeneratedMessage<OptionsMessage, OptionsMessage.Builder> {

+    private OptionsMessage() { }

     private static readonly OptionsMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _optionsMessageFieldNames = new string[] { "customized", "normal", "options_message" };

     private static readonly uint[] _optionsMessageFieldTags = new uint[] { 26, 10, 18 };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs
index 9c8abc44..fc22c716 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs
@@ -400,6 +400,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMessageWithCustomOptions : pb::GeneratedMessage<TestMessageWithCustomOptions, TestMessageWithCustomOptions.Builder> {

+    private TestMessageWithCustomOptions() { }

     private static readonly TestMessageWithCustomOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMessageWithCustomOptionsFieldNames = new string[] { "field1" };

     private static readonly uint[] _testMessageWithCustomOptionsFieldTags = new uint[] { 10 };

@@ -655,6 +656,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CustomOptionFooRequest : pb::GeneratedMessage<CustomOptionFooRequest, CustomOptionFooRequest.Builder> {

+    private CustomOptionFooRequest() { }

     private static readonly CustomOptionFooRequest defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _customOptionFooRequestFieldNames = new string[] {  };

     private static readonly uint[] _customOptionFooRequestFieldTags = new uint[] {  };

@@ -853,6 +855,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CustomOptionFooResponse : pb::GeneratedMessage<CustomOptionFooResponse, CustomOptionFooResponse.Builder> {

+    private CustomOptionFooResponse() { }

     private static readonly CustomOptionFooResponse defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _customOptionFooResponseFieldNames = new string[] {  };

     private static readonly uint[] _customOptionFooResponseFieldTags = new uint[] {  };

@@ -1051,6 +1054,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class DummyMessageContainingEnum : pb::GeneratedMessage<DummyMessageContainingEnum, DummyMessageContainingEnum.Builder> {

+    private DummyMessageContainingEnum() { }

     private static readonly DummyMessageContainingEnum defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _dummyMessageContainingEnumFieldNames = new string[] {  };

     private static readonly uint[] _dummyMessageContainingEnumFieldTags = new uint[] {  };

@@ -1264,6 +1268,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class DummyMessageInvalidAsOptionType : pb::GeneratedMessage<DummyMessageInvalidAsOptionType, DummyMessageInvalidAsOptionType.Builder> {

+    private DummyMessageInvalidAsOptionType() { }

     private static readonly DummyMessageInvalidAsOptionType defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _dummyMessageInvalidAsOptionTypeFieldNames = new string[] {  };

     private static readonly uint[] _dummyMessageInvalidAsOptionTypeFieldTags = new uint[] {  };

@@ -1462,6 +1467,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CustomOptionMinIntegerValues : pb::GeneratedMessage<CustomOptionMinIntegerValues, CustomOptionMinIntegerValues.Builder> {

+    private CustomOptionMinIntegerValues() { }

     private static readonly CustomOptionMinIntegerValues defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _customOptionMinIntegerValuesFieldNames = new string[] {  };

     private static readonly uint[] _customOptionMinIntegerValuesFieldTags = new uint[] {  };

@@ -1660,6 +1666,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CustomOptionMaxIntegerValues : pb::GeneratedMessage<CustomOptionMaxIntegerValues, CustomOptionMaxIntegerValues.Builder> {

+    private CustomOptionMaxIntegerValues() { }

     private static readonly CustomOptionMaxIntegerValues defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _customOptionMaxIntegerValuesFieldNames = new string[] {  };

     private static readonly uint[] _customOptionMaxIntegerValuesFieldTags = new uint[] {  };

@@ -1858,6 +1865,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CustomOptionOtherValues : pb::GeneratedMessage<CustomOptionOtherValues, CustomOptionOtherValues.Builder> {

+    private CustomOptionOtherValues() { }

     private static readonly CustomOptionOtherValues defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _customOptionOtherValuesFieldNames = new string[] {  };

     private static readonly uint[] _customOptionOtherValuesFieldTags = new uint[] {  };

@@ -2056,6 +2064,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SettingRealsFromPositiveInts : pb::GeneratedMessage<SettingRealsFromPositiveInts, SettingRealsFromPositiveInts.Builder> {

+    private SettingRealsFromPositiveInts() { }

     private static readonly SettingRealsFromPositiveInts defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _settingRealsFromPositiveIntsFieldNames = new string[] {  };

     private static readonly uint[] _settingRealsFromPositiveIntsFieldTags = new uint[] {  };

@@ -2254,6 +2263,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SettingRealsFromNegativeInts : pb::GeneratedMessage<SettingRealsFromNegativeInts, SettingRealsFromNegativeInts.Builder> {

+    private SettingRealsFromNegativeInts() { }

     private static readonly SettingRealsFromNegativeInts defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _settingRealsFromNegativeIntsFieldNames = new string[] {  };

     private static readonly uint[] _settingRealsFromNegativeIntsFieldTags = new uint[] {  };

@@ -2452,6 +2462,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ComplexOptionType1 : pb::ExtendableMessage<ComplexOptionType1, ComplexOptionType1.Builder> {

+    private ComplexOptionType1() { }

     private static readonly ComplexOptionType1 defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _complexOptionType1FieldNames = new string[] { "foo", "foo2", "foo3" };

     private static readonly uint[] _complexOptionType1FieldTags = new uint[] { 8, 16, 24 };

@@ -2778,6 +2789,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ComplexOptionType2 : pb::ExtendableMessage<ComplexOptionType2, ComplexOptionType2.Builder> {

+    private ComplexOptionType2() { }

     private static readonly ComplexOptionType2 defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _complexOptionType2FieldNames = new string[] { "bar", "baz", "fred" };

     private static readonly uint[] _complexOptionType2FieldTags = new uint[] { 10, 16, 26 };

@@ -2810,6 +2822,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class ComplexOptionType4 : pb::GeneratedMessage<ComplexOptionType4, ComplexOptionType4.Builder> {

+        private ComplexOptionType4() { }

         private static readonly ComplexOptionType4 defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _complexOptionType4FieldNames = new string[] { "waldo" };

         private static readonly uint[] _complexOptionType4FieldTags = new uint[] { 8 };

@@ -3402,6 +3415,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ComplexOptionType3 : pb::GeneratedMessage<ComplexOptionType3, ComplexOptionType3.Builder> {

+    private ComplexOptionType3() { }

     private static readonly ComplexOptionType3 defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _complexOptionType3FieldNames = new string[] { "complexoptiontype5", "qux" };

     private static readonly uint[] _complexOptionType3FieldTags = new uint[] { 19, 8 };

@@ -3434,6 +3448,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class ComplexOptionType5 : pb::GeneratedMessage<ComplexOptionType5, ComplexOptionType5.Builder> {

+        private ComplexOptionType5() { }

         private static readonly ComplexOptionType5 defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _complexOptionType5FieldNames = new string[] { "plugh" };

         private static readonly uint[] _complexOptionType5FieldTags = new uint[] { 24 };

@@ -3952,6 +3967,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ComplexOpt6 : pb::GeneratedMessage<ComplexOpt6, ComplexOpt6.Builder> {

+    private ComplexOpt6() { }

     private static readonly ComplexOpt6 defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _complexOpt6FieldNames = new string[] { "xyzzy" };

     private static readonly uint[] _complexOpt6FieldTags = new uint[] { 60751608 };

@@ -4191,6 +4207,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class VariousComplexOptions : pb::GeneratedMessage<VariousComplexOptions, VariousComplexOptions.Builder> {

+    private VariousComplexOptions() { }

     private static readonly VariousComplexOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _variousComplexOptionsFieldNames = new string[] {  };

     private static readonly uint[] _variousComplexOptionsFieldTags = new uint[] {  };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
index 8ba6ecd8..149f2182 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
@@ -64,6 +64,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestEmbedOptimizedForSize : pb::GeneratedMessage<TestEmbedOptimizedForSize, TestEmbedOptimizedForSize.Builder> {

+    private TestEmbedOptimizedForSize() { }

     private static readonly TestEmbedOptimizedForSize defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testEmbedOptimizedForSizeFieldNames = new string[] { "optional_message", "repeated_message" };

     private static readonly uint[] _testEmbedOptimizedForSizeFieldTags = new uint[] { 10, 18 };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs
index 6ff79d52..aefa95e1 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs
@@ -125,6 +125,7 @@ namespace UnitTest.Issues.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class A : pb::GeneratedMessage<A, A.Builder> {

+    private A() { }

     private static readonly A defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _aFieldNames = new string[] { "_A" };

     private static readonly uint[] _aFieldTags = new uint[] { 8 };

@@ -364,6 +365,7 @@ namespace UnitTest.Issues.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class B : pb::GeneratedMessage<B, B.Builder> {

+    private B() { }

     private static readonly B defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _bFieldNames = new string[] { "B_" };

     private static readonly uint[] _bFieldTags = new uint[] { 8 };

@@ -603,6 +605,7 @@ namespace UnitTest.Issues.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class AB : pb::GeneratedMessage<AB, AB.Builder> {

+    private AB() { }

     private static readonly AB defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _aBFieldNames = new string[] { "a_b" };

     private static readonly uint[] _aBFieldTags = new uint[] { 8 };

@@ -842,6 +845,7 @@ namespace UnitTest.Issues.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class NumberField : pb::GeneratedMessage<NumberField, NumberField.Builder> {

+    private NumberField() { }

     private static readonly NumberField defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _numberFieldFieldNames = new string[] { "_01" };

     private static readonly uint[] _numberFieldFieldTags = new uint[] { 8 };

@@ -1085,6 +1089,7 @@ namespace UnitTest.Issues.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class NegativeEnumMessage : pb::GeneratedMessage<NegativeEnumMessage, NegativeEnumMessage.Builder> {

+    private NegativeEnumMessage() { }

     private static readonly NegativeEnumMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _negativeEnumMessageFieldNames = new string[] { "packed_values", "value", "values" };

     private static readonly uint[] _negativeEnumMessageFieldTags = new uint[] { 26, 8, 16 };

@@ -1473,6 +1478,7 @@ namespace UnitTest.Issues.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class DeprecatedChild : pb::GeneratedMessage<DeprecatedChild, DeprecatedChild.Builder> {

+    private DeprecatedChild() { }

     private static readonly DeprecatedChild defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _deprecatedChildFieldNames = new string[] {  };

     private static readonly uint[] _deprecatedChildFieldTags = new uint[] {  };

@@ -1671,6 +1677,7 @@ namespace UnitTest.Issues.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class DeprecatedFieldsMessage : pb::GeneratedMessage<DeprecatedFieldsMessage, DeprecatedFieldsMessage.Builder> {

+    private DeprecatedFieldsMessage() { }

     private static readonly DeprecatedFieldsMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _deprecatedFieldsMessageFieldNames = new string[] { "EnumArray", "EnumValue", "MessageArray", "MessageValue", "PrimitiveArray", "PrimitiveValue" };

     private static readonly uint[] _deprecatedFieldsMessageFieldTags = new uint[] { 48, 40, 34, 26, 16, 8 };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs
index 6bfb136c..e38fe007 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs
@@ -137,6 +137,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SizeMessage1 : pb::GeneratedMessage<SizeMessage1, SizeMessage1.Builder> {

+    private SizeMessage1() { }

     private static readonly SizeMessage1 defaultInstance = new Builder().BuildPartial();

     public static SizeMessage1 DefaultInstance {

       get { return defaultInstance; }

@@ -1438,6 +1439,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SizeMessage1SubMessage : pb::GeneratedMessage<SizeMessage1SubMessage, SizeMessage1SubMessage.Builder> {

+    private SizeMessage1SubMessage() { }

     private static readonly SizeMessage1SubMessage defaultInstance = new Builder().BuildPartial();

     public static SizeMessage1SubMessage DefaultInstance {

       get { return defaultInstance; }

@@ -2121,6 +2123,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SizeMessage2 : pb::GeneratedMessage<SizeMessage2, SizeMessage2.Builder> {

+    private SizeMessage2() { }

     private static readonly SizeMessage2 defaultInstance = new Builder().BuildPartial();

     public static SizeMessage2 DefaultInstance {

       get { return defaultInstance; }

@@ -2151,6 +2154,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Group1 : pb::GeneratedMessage<Group1, Group1.Builder> {

+        private Group1() { }

         private static readonly Group1 defaultInstance = new Builder().BuildPartial();

         public static Group1 DefaultInstance {

           get { return defaultInstance; }

@@ -3762,6 +3766,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SizeMessage2GroupedMessage : pb::GeneratedMessage<SizeMessage2GroupedMessage, SizeMessage2GroupedMessage.Builder> {

+    private SizeMessage2GroupedMessage() { }

     private static readonly SizeMessage2GroupedMessage defaultInstance = new Builder().BuildPartial();

     public static SizeMessage2GroupedMessage DefaultInstance {

       get { return defaultInstance; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs
index d54e126b..93589ecf 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs
@@ -137,6 +137,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SpeedMessage1 : pb::GeneratedMessage<SpeedMessage1, SpeedMessage1.Builder> {

+    private SpeedMessage1() { }

     private static readonly SpeedMessage1 defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _speedMessage1FieldNames = new string[] { "field1", "field100", "field101", "field102", "field103", "field104", "field12", "field128", "field129", "field13", "field130", "field131", "field14", "field15", "field150", "field16", "field17", "field18", "field2", "field22", "field23", "field24", "field25", "field271", "field272", "field280", "field29", "field3", "field30", "field4", "field5", "field59", "field6", "field60", "field67", "field68", "field7", "field78", "field80", "field81", "field9" };

     private static readonly uint[] _speedMessage1FieldTags = new uint[] { 10, 800, 808, 818, 826, 832, 96, 1024, 1034, 104, 1040, 1048, 112, 122, 1200, 128, 136, 146, 16, 176, 184, 192, 200, 2168, 2176, 2240, 232, 24, 240, 34, 41, 472, 48, 480, 536, 544, 58, 624, 640, 648, 74 };

@@ -2072,6 +2073,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SpeedMessage1SubMessage : pb::GeneratedMessage<SpeedMessage1SubMessage, SpeedMessage1SubMessage.Builder> {

+    private SpeedMessage1SubMessage() { }

     private static readonly SpeedMessage1SubMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _speedMessage1SubMessageFieldNames = new string[] { "field1", "field12", "field13", "field14", "field15", "field16", "field19", "field2", "field20", "field203", "field204", "field205", "field206", "field207", "field21", "field22", "field23", "field28", "field3", "field300" };

     private static readonly uint[] _speedMessage1SubMessageFieldTags = new uint[] { 8, 96, 104, 112, 122, 128, 152, 16, 160, 1629, 1632, 1642, 1648, 1656, 169, 176, 184, 224, 24, 2400 };

@@ -3104,6 +3106,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SpeedMessage2 : pb::GeneratedMessage<SpeedMessage2, SpeedMessage2.Builder> {

+    private SpeedMessage2() { }

     private static readonly SpeedMessage2 defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _speedMessage2FieldNames = new string[] { "field1", "field109", "field127", "field128", "field129", "field130", "field131", "field2", "field205", "field206", "field21", "field210", "field211", "field212", "field213", "field216", "field217", "field218", "field220", "field221", "field222", "field25", "field3", "field30", "field4", "field6", "field63", "field71", "field75", "group1" };

     private static readonly uint[] _speedMessage2FieldTags = new uint[] { 10, 872, 1018, 1026, 1032, 1040, 1048, 18, 1640, 1648, 168, 1680, 1688, 1696, 1704, 1728, 1736, 1744, 1760, 1768, 1781, 205, 24, 240, 32, 50, 504, 568, 600, 83 };

@@ -3136,6 +3139,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Group1 : pb::GeneratedMessage<Group1, Group1.Builder> {

+        private Group1() { }

         private static readonly Group1 defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _group1FieldNames = new string[] { "field11", "field12", "field13", "field14", "field15", "field16", "field20", "field22", "field24", "field26", "field27", "field28", "field29", "field31", "field5", "field73" };

         private static readonly uint[] _group1FieldTags = new uint[] { 93, 98, 106, 114, 120, 130, 160, 178, 194, 213, 218, 224, 234, 250, 40, 584 };

@@ -5560,6 +5564,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SpeedMessage2GroupedMessage : pb::GeneratedMessage<SpeedMessage2GroupedMessage, SpeedMessage2GroupedMessage.Builder> {

+    private SpeedMessage2GroupedMessage() { }

     private static readonly SpeedMessage2GroupedMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _speedMessage2GroupedMessageFieldNames = new string[] { "field1", "field10", "field11", "field2", "field3", "field4", "field5", "field6", "field7", "field8", "field9" };

     private static readonly uint[] _speedMessage2GroupedMessageFieldTags = new uint[] { 13, 85, 88, 21, 29, 32, 40, 48, 56, 69, 72 };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs
index 239eaa48..594c9417 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs
@@ -43,6 +43,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ImportMessageLite : pb::GeneratedMessageLite<ImportMessageLite, ImportMessageLite.Builder> {

+    private ImportMessageLite() { }

     private static readonly ImportMessageLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _importMessageLiteFieldNames = new string[] { "d" };

     private static readonly uint[] _importMessageLiteFieldTags = new uint[] { 8 };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs
index f1fff865..c5da5537 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs
@@ -71,6 +71,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ImportMessage : pb::GeneratedMessage<ImportMessage, ImportMessage.Builder> {

+    private ImportMessage() { }

     private static readonly ImportMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _importMessageFieldNames = new string[] { "d" };

     private static readonly uint[] _importMessageFieldTags = new uint[] { 8 };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
index 73c78c25..590af6d6 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
@@ -103,6 +103,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMessageSet : pb::ExtendableMessage<TestMessageSet, TestMessageSet.Builder> {

+    private TestMessageSet() { }

     private static readonly TestMessageSet defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMessageSetFieldNames = new string[] {  };

     private static readonly uint[] _testMessageSetFieldTags = new uint[] {  };

@@ -306,6 +307,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMessageSetContainer : pb::GeneratedMessage<TestMessageSetContainer, TestMessageSetContainer.Builder> {

+    private TestMessageSetContainer() { }

     private static readonly TestMessageSetContainer defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMessageSetContainerFieldNames = new string[] { "message_set" };

     private static readonly uint[] _testMessageSetContainerFieldTags = new uint[] { 10 };

@@ -568,6 +570,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMessageSetExtension1 : pb::GeneratedMessage<TestMessageSetExtension1, TestMessageSetExtension1.Builder> {

+    private TestMessageSetExtension1() { }

     private static readonly TestMessageSetExtension1 defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMessageSetExtension1FieldNames = new string[] { "i" };

     private static readonly uint[] _testMessageSetExtension1FieldTags = new uint[] { 120 };

@@ -809,6 +812,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMessageSetExtension2 : pb::GeneratedMessage<TestMessageSetExtension2, TestMessageSetExtension2.Builder> {

+    private TestMessageSetExtension2() { }

     private static readonly TestMessageSetExtension2 defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMessageSetExtension2FieldNames = new string[] { "str" };

     private static readonly uint[] _testMessageSetExtension2FieldTags = new uint[] { 202 };

@@ -1051,6 +1055,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class RawMessageSet : pb::GeneratedMessage<RawMessageSet, RawMessageSet.Builder> {

+    private RawMessageSet() { }

     private static readonly RawMessageSet defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _rawMessageSetFieldNames = new string[] { "item" };

     private static readonly uint[] _rawMessageSetFieldTags = new uint[] { 11 };

@@ -1083,6 +1088,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Item : pb::GeneratedMessage<Item, Item.Builder> {

+        private Item() { }

         private static readonly Item defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _itemFieldNames = new string[] { "message", "type_id" };

         private static readonly uint[] _itemFieldTags = new uint[] { 26, 16 };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs
index 89a5c30e..5b652871 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs
@@ -81,6 +81,7 @@ namespace Google.ProtocolBuffers.TestProtos.NoGenericService {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMessage : pb::ExtendableMessage<TestMessage, TestMessage.Builder> {

+    private TestMessage() { }

     private static readonly TestMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMessageFieldNames = new string[] { "a" };

     private static readonly uint[] _testMessageFieldTags = new uint[] { 8 };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs
index 1f6e6ff4..d436afc8 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs
@@ -85,6 +85,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestOptimizedForSize : pb::ExtendableMessage<TestOptimizedForSize, TestOptimizedForSize.Builder> {

+    private TestOptimizedForSize() { }

     private static readonly TestOptimizedForSize defaultInstance = new Builder().BuildPartial();

     public static TestOptimizedForSize DefaultInstance {

       get { return defaultInstance; }

@@ -272,6 +273,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestRequiredOptimizedForSize : pb::GeneratedMessage<TestRequiredOptimizedForSize, TestRequiredOptimizedForSize.Builder> {

+    private TestRequiredOptimizedForSize() { }

     private static readonly TestRequiredOptimizedForSize defaultInstance = new Builder().BuildPartial();

     public static TestRequiredOptimizedForSize DefaultInstance {

       get { return defaultInstance; }

@@ -409,6 +411,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestOptionalOptimizedForSize : pb::GeneratedMessage<TestOptionalOptimizedForSize, TestOptionalOptimizedForSize.Builder> {

+    private TestOptionalOptimizedForSize() { }

     private static readonly TestOptionalOptimizedForSize defaultInstance = new Builder().BuildPartial();

     public static TestOptionalOptimizedForSize DefaultInstance {

       get { return defaultInstance; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
index 753ff3e0..86616743 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
@@ -1122,6 +1122,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestAllTypes : pb::GeneratedMessage<TestAllTypes, TestAllTypes.Builder> {

+    private TestAllTypes() { }

     private static readonly TestAllTypes defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testAllTypesFieldNames = new string[] { "default_bool", "default_bytes", "default_cord", "default_double", "default_fixed32", "default_fixed64", "default_float", "default_foreign_enum", "default_import_enum", "default_int32", "default_int64", "default_nested_enum", "default_sfixed32", "default_sfixed64", "default_sint32", "default_sint64", "default_string", "default_string_piece", "default_uint32", "default_uint64", "optional_bool", "optional_bytes", "optional_cord", "optional_double", "optional_fixed32", "optional_fixed64", "optional_float", "optional_foreign_enum", "optional_foreign_message", "optional_import_enum", "optional_import_message", "optional_int32", "optional_int64", "optional_nested_enum", "optional_nested_message", "optional_sfixed32", "optional_sfixed64", "optional_sint32", "optional_sint64", "optional_string", "optional_string_piece", "optional_uint32", "optional_uint64", "optionalgroup", "repeated_bool", "repeated_bytes", "repeated_cord", "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_sfixed32", "repeated_sfixed64", "repeated_sint32", "repeated_sint64", "repeated_string", "repeated_string_piece", "repeated_uint32", "repeated_uint64", "repeatedgroup" };

     private static readonly uint[] _testAllTypesFieldTags = new uint[] { 584, 602, 682, 577, 541, 545, 573, 656, 664, 488, 496, 648, 557, 561, 520, 528, 594, 674, 504, 512, 104, 122, 202, 97, 61, 65, 93, 176, 154, 184, 162, 8, 16, 168, 146, 77, 81, 40, 48, 114, 194, 24, 32, 131, 344, 362, 442, 337, 301, 305, 333, 416, 394, 424, 402, 248, 256, 408, 386, 317, 321, 280, 288, 354, 434, 264, 272, 371 };

@@ -1162,6 +1163,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class NestedMessage : pb::GeneratedMessage<NestedMessage, NestedMessage.Builder> {

+        private NestedMessage() { }

         private static readonly NestedMessage defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _nestedMessageFieldNames = new string[] { "bb" };

         private static readonly uint[] _nestedMessageFieldTags = new uint[] { 8 };

@@ -1401,6 +1403,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class OptionalGroup : pb::GeneratedMessage<OptionalGroup, OptionalGroup.Builder> {

+        private OptionalGroup() { }

         private static readonly OptionalGroup defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _optionalGroupFieldNames = new string[] { "a" };

         private static readonly uint[] _optionalGroupFieldTags = new uint[] { 136 };

@@ -1640,6 +1643,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class RepeatedGroup : pb::GeneratedMessage<RepeatedGroup, RepeatedGroup.Builder> {

+        private RepeatedGroup() { }

         private static readonly RepeatedGroup defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _repeatedGroupFieldNames = new string[] { "a" };

         private static readonly uint[] _repeatedGroupFieldTags = new uint[] { 376 };

@@ -5496,6 +5500,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestDeprecatedFields : pb::GeneratedMessage<TestDeprecatedFields, TestDeprecatedFields.Builder> {

+    private TestDeprecatedFields() { }

     private static readonly TestDeprecatedFields defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testDeprecatedFieldsFieldNames = new string[] { "deprecated_int32" };

     private static readonly uint[] _testDeprecatedFieldsFieldTags = new uint[] { 8 };

@@ -5741,6 +5746,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ForeignMessage : pb::GeneratedMessage<ForeignMessage, ForeignMessage.Builder> {

+    private ForeignMessage() { }

     private static readonly ForeignMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _foreignMessageFieldNames = new string[] { "c" };

     private static readonly uint[] _foreignMessageFieldTags = new uint[] { 8 };

@@ -5980,6 +5986,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestAllExtensions : pb::ExtendableMessage<TestAllExtensions, TestAllExtensions.Builder> {

+    private TestAllExtensions() { }

     private static readonly TestAllExtensions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testAllExtensionsFieldNames = new string[] {  };

     private static readonly uint[] _testAllExtensionsFieldTags = new uint[] {  };

@@ -6183,6 +6190,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class OptionalGroup_extension : pb::GeneratedMessage<OptionalGroup_extension, OptionalGroup_extension.Builder> {

+    private OptionalGroup_extension() { }

     private static readonly OptionalGroup_extension defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _optionalGroupExtensionFieldNames = new string[] { "a" };

     private static readonly uint[] _optionalGroupExtensionFieldTags = new uint[] { 136 };

@@ -6422,6 +6430,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class RepeatedGroup_extension : pb::GeneratedMessage<RepeatedGroup_extension, RepeatedGroup_extension.Builder> {

+    private RepeatedGroup_extension() { }

     private static readonly RepeatedGroup_extension defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _repeatedGroupExtensionFieldNames = new string[] { "a" };

     private static readonly uint[] _repeatedGroupExtensionFieldTags = new uint[] { 376 };

@@ -6661,6 +6670,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestNestedExtension : pb::GeneratedMessage<TestNestedExtension, TestNestedExtension.Builder> {

+    private TestNestedExtension() { }

     private static readonly TestNestedExtension defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testNestedExtensionFieldNames = new string[] {  };

     private static readonly uint[] _testNestedExtensionFieldTags = new uint[] {  };

@@ -6861,6 +6871,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestRequired : pb::GeneratedMessage<TestRequired, TestRequired.Builder> {

+    private TestRequired() { }

     private static readonly TestRequired defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testRequiredFieldNames = new string[] { "a", "b", "c", "dummy10", "dummy11", "dummy12", "dummy13", "dummy14", "dummy15", "dummy16", "dummy17", "dummy18", "dummy19", "dummy2", "dummy20", "dummy21", "dummy22", "dummy23", "dummy24", "dummy25", "dummy26", "dummy27", "dummy28", "dummy29", "dummy30", "dummy31", "dummy32", "dummy4", "dummy5", "dummy6", "dummy7", "dummy8", "dummy9" };

     private static readonly uint[] _testRequiredFieldTags = new uint[] { 8, 24, 264, 80, 88, 96, 104, 112, 120, 128, 136, 144, 152, 16, 160, 168, 176, 184, 192, 200, 208, 216, 224, 232, 240, 248, 256, 32, 40, 48, 56, 64, 72 };

@@ -8419,6 +8430,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestRequiredForeign : pb::GeneratedMessage<TestRequiredForeign, TestRequiredForeign.Builder> {

+    private TestRequiredForeign() { }

     private static readonly TestRequiredForeign defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testRequiredForeignFieldNames = new string[] { "dummy", "optional_message", "repeated_message" };

     private static readonly uint[] _testRequiredForeignFieldTags = new uint[] { 24, 10, 18 };

@@ -8792,6 +8804,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestForeignNested : pb::GeneratedMessage<TestForeignNested, TestForeignNested.Builder> {

+    private TestForeignNested() { }

     private static readonly TestForeignNested defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testForeignNestedFieldNames = new string[] { "foreign_nested" };

     private static readonly uint[] _testForeignNestedFieldTags = new uint[] { 10 };

@@ -9054,6 +9067,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestEmptyMessage : pb::GeneratedMessage<TestEmptyMessage, TestEmptyMessage.Builder> {

+    private TestEmptyMessage() { }

     private static readonly TestEmptyMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testEmptyMessageFieldNames = new string[] {  };

     private static readonly uint[] _testEmptyMessageFieldTags = new uint[] {  };

@@ -9252,6 +9266,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestEmptyMessageWithExtensions : pb::ExtendableMessage<TestEmptyMessageWithExtensions, TestEmptyMessageWithExtensions.Builder> {

+    private TestEmptyMessageWithExtensions() { }

     private static readonly TestEmptyMessageWithExtensions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testEmptyMessageWithExtensionsFieldNames = new string[] {  };

     private static readonly uint[] _testEmptyMessageWithExtensionsFieldTags = new uint[] {  };

@@ -9455,6 +9470,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMultipleExtensionRanges : pb::ExtendableMessage<TestMultipleExtensionRanges, TestMultipleExtensionRanges.Builder> {

+    private TestMultipleExtensionRanges() { }

     private static readonly TestMultipleExtensionRanges defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMultipleExtensionRangesFieldNames = new string[] {  };

     private static readonly uint[] _testMultipleExtensionRangesFieldTags = new uint[] {  };

@@ -9660,6 +9676,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestReallyLargeTagNumber : pb::GeneratedMessage<TestReallyLargeTagNumber, TestReallyLargeTagNumber.Builder> {

+    private TestReallyLargeTagNumber() { }

     private static readonly TestReallyLargeTagNumber defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testReallyLargeTagNumberFieldNames = new string[] { "a", "bb" };

     private static readonly uint[] _testReallyLargeTagNumberFieldTags = new uint[] { 8, 2147483640 };

@@ -9940,6 +9957,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestRecursiveMessage : pb::GeneratedMessage<TestRecursiveMessage, TestRecursiveMessage.Builder> {

+    private TestRecursiveMessage() { }

     private static readonly TestRecursiveMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testRecursiveMessageFieldNames = new string[] { "a", "i" };

     private static readonly uint[] _testRecursiveMessageFieldTags = new uint[] { 10, 16 };

@@ -10243,6 +10261,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMutualRecursionA : pb::GeneratedMessage<TestMutualRecursionA, TestMutualRecursionA.Builder> {

+    private TestMutualRecursionA() { }

     private static readonly TestMutualRecursionA defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMutualRecursionAFieldNames = new string[] { "bb" };

     private static readonly uint[] _testMutualRecursionAFieldTags = new uint[] { 10 };

@@ -10505,6 +10524,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMutualRecursionB : pb::GeneratedMessage<TestMutualRecursionB, TestMutualRecursionB.Builder> {

+    private TestMutualRecursionB() { }

     private static readonly TestMutualRecursionB defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMutualRecursionBFieldNames = new string[] { "a", "optional_int32" };

     private static readonly uint[] _testMutualRecursionBFieldTags = new uint[] { 10, 16 };

@@ -10808,6 +10828,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestDupFieldNumber : pb::GeneratedMessage<TestDupFieldNumber, TestDupFieldNumber.Builder> {

+    private TestDupFieldNumber() { }

     private static readonly TestDupFieldNumber defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testDupFieldNumberFieldNames = new string[] { "a", "bar", "foo" };

     private static readonly uint[] _testDupFieldNumberFieldTags = new uint[] { 8, 27, 19 };

@@ -10840,6 +10861,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Foo : pb::GeneratedMessage<Foo, Foo.Builder> {

+        private Foo() { }

         private static readonly Foo defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _fooFieldNames = new string[] { "a" };

         private static readonly uint[] _fooFieldTags = new uint[] { 8 };

@@ -11079,6 +11101,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Bar : pb::GeneratedMessage<Bar, Bar.Builder> {

+        private Bar() { }

         private static readonly Bar defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _barFieldNames = new string[] { "a" };

         private static readonly uint[] _barFieldTags = new uint[] { 8 };

@@ -11661,6 +11684,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestNestedMessageHasBits : pb::GeneratedMessage<TestNestedMessageHasBits, TestNestedMessageHasBits.Builder> {

+    private TestNestedMessageHasBits() { }

     private static readonly TestNestedMessageHasBits defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testNestedMessageHasBitsFieldNames = new string[] { "optional_nested_message" };

     private static readonly uint[] _testNestedMessageHasBitsFieldTags = new uint[] { 10 };

@@ -11693,6 +11717,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class NestedMessage : pb::GeneratedMessage<NestedMessage, NestedMessage.Builder> {

+        private NestedMessage() { }

         private static readonly NestedMessage defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _nestedMessageFieldNames = new string[] { "nestedmessage_repeated_foreignmessage", "nestedmessage_repeated_int32" };

         private static readonly uint[] _nestedMessageFieldTags = new uint[] { 18, 8 };

@@ -12251,6 +12276,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestCamelCaseFieldNames : pb::GeneratedMessage<TestCamelCaseFieldNames, TestCamelCaseFieldNames.Builder> {

+    private TestCamelCaseFieldNames() { }

     private static readonly TestCamelCaseFieldNames defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testCamelCaseFieldNamesFieldNames = new string[] { "CordField", "EnumField", "MessageField", "PrimitiveField", "RepeatedCordField", "RepeatedEnumField", "RepeatedMessageField", "RepeatedPrimitiveField", "RepeatedStringField", "RepeatedStringPieceField", "StringField", "StringPieceField" };

     private static readonly uint[] _testCamelCaseFieldNamesFieldTags = new uint[] { 50, 24, 34, 8, 98, 72, 82, 56, 66, 90, 18, 42 };

@@ -13097,6 +13123,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestFieldOrderings : pb::ExtendableMessage<TestFieldOrderings, TestFieldOrderings.Builder> {

+    private TestFieldOrderings() { }

     private static readonly TestFieldOrderings defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testFieldOrderingsFieldNames = new string[] { "my_float", "my_int", "my_string" };

     private static readonly uint[] _testFieldOrderingsFieldTags = new uint[] { 813, 8, 90 };

@@ -13425,6 +13452,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestExtremeDefaultValues : pb::GeneratedMessage<TestExtremeDefaultValues, TestExtremeDefaultValues.Builder> {

+    private TestExtremeDefaultValues() { }

     private static readonly TestExtremeDefaultValues defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testExtremeDefaultValuesFieldNames = new string[] { "escaped_bytes", "inf_double", "inf_float", "large_float", "large_uint32", "large_uint64", "nan_double", "nan_float", "neg_inf_double", "neg_inf_float", "negative_float", "negative_one_float", "one_float", "small_float", "small_int32", "small_int64", "small_negative_float", "utf8_string", "zero_float" };

     private static readonly uint[] _testExtremeDefaultValuesFieldTags = new uint[] { 10, 113, 141, 101, 16, 24, 129, 157, 121, 149, 93, 85, 69, 77, 32, 40, 109, 50, 61 };

@@ -14410,6 +14438,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class OneString : pb::GeneratedMessage<OneString, OneString.Builder> {

+    private OneString() { }

     private static readonly OneString defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _oneStringFieldNames = new string[] { "data" };

     private static readonly uint[] _oneStringFieldTags = new uint[] { 10 };

@@ -14650,6 +14679,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class OneBytes : pb::GeneratedMessage<OneBytes, OneBytes.Builder> {

+    private OneBytes() { }

     private static readonly OneBytes defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _oneBytesFieldNames = new string[] { "data" };

     private static readonly uint[] _oneBytesFieldTags = new uint[] { 10 };

@@ -14890,6 +14920,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestPackedTypes : pb::GeneratedMessage<TestPackedTypes, TestPackedTypes.Builder> {

+    private TestPackedTypes() { }

     private static readonly TestPackedTypes defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testPackedTypesFieldNames = 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[] _testPackedTypesFieldTags = new uint[] { 818, 810, 826, 770, 778, 802, 722, 730, 786, 794, 754, 762, 738, 746 };

@@ -15980,6 +16011,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestUnpackedTypes : pb::GeneratedMessage<TestUnpackedTypes, TestUnpackedTypes.Builder> {

+    private TestUnpackedTypes() { }

     private static readonly TestUnpackedTypes defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testUnpackedTypesFieldNames = 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[] _testUnpackedTypesFieldTags = new uint[] { 816, 809, 824, 773, 777, 805, 720, 728, 789, 793, 752, 760, 736, 744 };

@@ -17015,6 +17047,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestPackedExtensions : pb::ExtendableMessage<TestPackedExtensions, TestPackedExtensions.Builder> {

+    private TestPackedExtensions() { }

     private static readonly TestPackedExtensions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testPackedExtensionsFieldNames = new string[] {  };

     private static readonly uint[] _testPackedExtensionsFieldTags = new uint[] {  };

@@ -17218,6 +17251,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestUnpackedExtensions : pb::ExtendableMessage<TestUnpackedExtensions, TestUnpackedExtensions.Builder> {

+    private TestUnpackedExtensions() { }

     private static readonly TestUnpackedExtensions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testUnpackedExtensionsFieldNames = new string[] {  };

     private static readonly uint[] _testUnpackedExtensionsFieldTags = new uint[] {  };

@@ -17421,6 +17455,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestDynamicExtensions : pb::GeneratedMessage<TestDynamicExtensions, TestDynamicExtensions.Builder> {

+    private TestDynamicExtensions() { }

     private static readonly TestDynamicExtensions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testDynamicExtensionsFieldNames = new string[] { "dynamic_enum_extension", "dynamic_message_extension", "enum_extension", "message_extension", "packed_extension", "repeated_extension", "scalar_extension" };

     private static readonly uint[] _testDynamicExtensionsFieldTags = new uint[] { 16016, 16034, 16008, 16026, 16050, 16042, 16005 };

@@ -17461,6 +17496,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class DynamicMessageType : pb::GeneratedMessage<DynamicMessageType, DynamicMessageType.Builder> {

+        private DynamicMessageType() { }

         private static readonly DynamicMessageType defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _dynamicMessageTypeFieldNames = new string[] { "dynamic_field" };

         private static readonly uint[] _dynamicMessageTypeFieldTags = new uint[] { 16800 };

@@ -18265,6 +18301,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestRepeatedScalarDifferentTagSizes : pb::GeneratedMessage<TestRepeatedScalarDifferentTagSizes, TestRepeatedScalarDifferentTagSizes.Builder> {

+    private TestRepeatedScalarDifferentTagSizes() { }

     private static readonly TestRepeatedScalarDifferentTagSizes defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testRepeatedScalarDifferentTagSizesFieldNames = new string[] { "repeated_fixed32", "repeated_fixed64", "repeated_float", "repeated_int32", "repeated_int64", "repeated_uint64" };

     private static readonly uint[] _testRepeatedScalarDifferentTagSizesFieldTags = new uint[] { 101, 16369, 2097141, 104, 16376, 2097144 };

@@ -18826,6 +18863,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class FooRequest : pb::GeneratedMessage<FooRequest, FooRequest.Builder> {

+    private FooRequest() { }

     private static readonly FooRequest defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _fooRequestFieldNames = new string[] {  };

     private static readonly uint[] _fooRequestFieldTags = new uint[] {  };

@@ -19024,6 +19062,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class FooResponse : pb::GeneratedMessage<FooResponse, FooResponse.Builder> {

+    private FooResponse() { }

     private static readonly FooResponse defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _fooResponseFieldNames = new string[] {  };

     private static readonly uint[] _fooResponseFieldTags = new uint[] {  };

@@ -19222,6 +19261,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class BarRequest : pb::GeneratedMessage<BarRequest, BarRequest.Builder> {

+    private BarRequest() { }

     private static readonly BarRequest defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _barRequestFieldNames = new string[] {  };

     private static readonly uint[] _barRequestFieldTags = new uint[] {  };

@@ -19420,6 +19460,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class BarResponse : pb::GeneratedMessage<BarResponse, BarResponse.Builder> {

+    private BarResponse() { }

     private static readonly BarResponse defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _barResponseFieldNames = new string[] {  };

     private static readonly uint[] _barResponseFieldTags = new uint[] {  };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs
index 782a9bdf..a2a965eb 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs
@@ -83,6 +83,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SearchRequest : pb::GeneratedMessage<SearchRequest, SearchRequest.Builder> {

+    private SearchRequest() { }

     private static readonly SearchRequest defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _searchRequestFieldNames = new string[] { "Criteria" };

     private static readonly uint[] _searchRequestFieldTags = new uint[] { 10 };

@@ -340,6 +341,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class SearchResponse : pb::GeneratedMessage<SearchResponse, SearchResponse.Builder> {

+    private SearchResponse() { }

     private static readonly SearchResponse defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _searchResponseFieldNames = new string[] { "results" };

     private static readonly uint[] _searchResponseFieldTags = new uint[] { 10 };

@@ -372,6 +374,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class ResultItem : pb::GeneratedMessage<ResultItem, ResultItem.Builder> {

+        private ResultItem() { }

         private static readonly ResultItem defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _resultItemFieldNames = new string[] { "name", "url" };

         private static readonly uint[] _resultItemFieldTags = new uint[] { 18, 10 };

@@ -896,6 +899,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class RefineSearchRequest : pb::GeneratedMessage<RefineSearchRequest, RefineSearchRequest.Builder> {

+    private RefineSearchRequest() { }

     private static readonly RefineSearchRequest defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _refineSearchRequestFieldNames = new string[] { "Criteria", "previous_results" };

     private static readonly uint[] _refineSearchRequestFieldTags = new uint[] { 10, 18 };

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs
index 37ce670b..ca0be5ab 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs
@@ -139,6 +139,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestXmlChild : pb::GeneratedMessage<TestXmlChild, TestXmlChild.Builder> {

+    private TestXmlChild() { }

     private static readonly TestXmlChild defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testXmlChildFieldNames = new string[] { "binary", "options" };

     private static readonly uint[] _testXmlChildFieldTags = new uint[] { 34, 24 };

@@ -450,6 +451,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestXmlNoFields : pb::GeneratedMessage<TestXmlNoFields, TestXmlNoFields.Builder> {

+    private TestXmlNoFields() { }

     private static readonly TestXmlNoFields defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testXmlNoFieldsFieldNames = new string[] {  };

     private static readonly uint[] _testXmlNoFieldsFieldTags = new uint[] {  };

@@ -650,6 +652,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestXmlRescursive : pb::GeneratedMessage<TestXmlRescursive, TestXmlRescursive.Builder> {

+    private TestXmlRescursive() { }

     private static readonly TestXmlRescursive defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testXmlRescursiveFieldNames = new string[] { "child" };

     private static readonly uint[] _testXmlRescursiveFieldTags = new uint[] { 10 };

@@ -914,6 +917,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestXmlMessage : pb::ExtendableMessage<TestXmlMessage, TestXmlMessage.Builder> {

+    private TestXmlMessage() { }

     private static readonly TestXmlMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testXmlMessageFieldNames = new string[] { "child", "children", "number", "numbers", "text", "textlines", "valid" };

     private static readonly uint[] _testXmlMessageFieldTags = new uint[] { 10, 3211, 48, 16, 26, 5602, 40 };

@@ -947,6 +951,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Children : pb::GeneratedMessage<Children, Children.Builder> {

+        private Children() { }

         private static readonly Children defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _childrenFieldNames = new string[] { "binary", "options" };

         private static readonly uint[] _childrenFieldTags = new uint[] { 34, 24 };

@@ -1807,6 +1812,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestXmlExtension : pb::GeneratedMessage<TestXmlExtension, TestXmlExtension.Builder> {

+    private TestXmlExtension() { }

     private static readonly TestXmlExtension defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testXmlExtensionFieldNames = new string[] { "number" };

     private static readonly uint[] _testXmlExtensionFieldTags = new uint[] { 8 };

diff --git a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
index 70222e0a..76cb1fee 100644
--- a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
+++ b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
@@ -126,6 +126,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CSharpFileOptions : pb::GeneratedMessage<CSharpFileOptions, CSharpFileOptions.Builder> {

+    private CSharpFileOptions() { }

     private static readonly CSharpFileOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _cSharpFileOptionsFieldNames = new string[] { "add_serializable", "cls_compliance", "code_contracts", "expand_namespace_directories", "file_extension", "ignore_google_protobuf", "multiple_files", "namespace", "nest_classes", "output_directory", "public_classes", "service_generator_type", "umbrella_classname", "umbrella_namespace" };

     private static readonly uint[] _cSharpFileOptionsFieldTags = new uint[] { 72, 64, 48, 56, 1770, 1792, 32, 10, 40, 1786, 24, 1800, 18, 1778 };

@@ -911,6 +912,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CSharpFieldOptions : pb::GeneratedMessage<CSharpFieldOptions, CSharpFieldOptions.Builder> {

+    private CSharpFieldOptions() { }

     private static readonly CSharpFieldOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _cSharpFieldOptionsFieldNames = new string[] { "property_name" };

     private static readonly uint[] _cSharpFieldOptionsFieldTags = new uint[] { 10 };

@@ -1151,6 +1153,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CSharpServiceOptions : pb::GeneratedMessage<CSharpServiceOptions, CSharpServiceOptions.Builder> {

+    private CSharpServiceOptions() { }

     private static readonly CSharpServiceOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _cSharpServiceOptionsFieldNames = new string[] { "interface_id" };

     private static readonly uint[] _cSharpServiceOptionsFieldTags = new uint[] { 10 };

@@ -1391,6 +1394,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class CSharpMethodOptions : pb::GeneratedMessage<CSharpMethodOptions, CSharpMethodOptions.Builder> {

+    private CSharpMethodOptions() { }

     private static readonly CSharpMethodOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _cSharpMethodOptionsFieldNames = new string[] { "dispatch_id" };

     private static readonly uint[] _cSharpMethodOptionsFieldTags = new uint[] { 8 };

diff --git a/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs b/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
index e5da80b3..ff5429d8 100644
--- a/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
+++ b/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
@@ -233,6 +233,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class FileDescriptorSet : pb::GeneratedMessage<FileDescriptorSet, FileDescriptorSet.Builder> {

+    private FileDescriptorSet() { }

     private static readonly FileDescriptorSet defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _fileDescriptorSetFieldNames = new string[] { "file" };

     private static readonly uint[] _fileDescriptorSetFieldTags = new uint[] { 10 };

@@ -498,6 +499,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class FileDescriptorProto : pb::GeneratedMessage<FileDescriptorProto, FileDescriptorProto.Builder> {

+    private FileDescriptorProto() { }

     private static readonly FileDescriptorProto defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _fileDescriptorProtoFieldNames = new string[] { "dependency", "enum_type", "extension", "message_type", "name", "options", "package", "service" };

     private static readonly uint[] _fileDescriptorProtoFieldTags = new uint[] { 26, 42, 58, 34, 10, 66, 18, 50 };

@@ -1174,6 +1176,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class DescriptorProto : pb::GeneratedMessage<DescriptorProto, DescriptorProto.Builder> {

+    private DescriptorProto() { }

     private static readonly DescriptorProto defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _descriptorProtoFieldNames = new string[] { "enum_type", "extension", "extension_range", "field", "name", "nested_type", "options" };

     private static readonly uint[] _descriptorProtoFieldTags = new uint[] { 34, 50, 42, 18, 10, 26, 58 };

@@ -1206,6 +1209,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class ExtensionRange : pb::GeneratedMessage<ExtensionRange, ExtensionRange.Builder> {

+        private ExtensionRange() { }

         private static readonly ExtensionRange defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _extensionRangeFieldNames = new string[] { "end", "start" };

         private static readonly uint[] _extensionRangeFieldTags = new uint[] { 16, 8 };

@@ -2101,6 +2105,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class FieldDescriptorProto : pb::GeneratedMessage<FieldDescriptorProto, FieldDescriptorProto.Builder> {

+    private FieldDescriptorProto() { }

     private static readonly FieldDescriptorProto defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _fieldDescriptorProtoFieldNames = new string[] { "default_value", "extendee", "label", "name", "number", "options", "type", "type_name" };

     private static readonly uint[] _fieldDescriptorProtoFieldTags = new uint[] { 58, 18, 32, 10, 24, 66, 40, 50 };

@@ -2712,6 +2717,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class EnumDescriptorProto : pb::GeneratedMessage<EnumDescriptorProto, EnumDescriptorProto.Builder> {

+    private EnumDescriptorProto() { }

     private static readonly EnumDescriptorProto defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _enumDescriptorProtoFieldNames = new string[] { "name", "options", "value" };

     private static readonly uint[] _enumDescriptorProtoFieldTags = new uint[] { 10, 26, 18 };

@@ -3086,6 +3092,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class EnumValueDescriptorProto : pb::GeneratedMessage<EnumValueDescriptorProto, EnumValueDescriptorProto.Builder> {

+    private EnumValueDescriptorProto() { }

     private static readonly EnumValueDescriptorProto defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _enumValueDescriptorProtoFieldNames = new string[] { "name", "number", "options" };

     private static readonly uint[] _enumValueDescriptorProtoFieldTags = new uint[] { 10, 16, 26 };

@@ -3434,6 +3441,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ServiceDescriptorProto : pb::GeneratedMessage<ServiceDescriptorProto, ServiceDescriptorProto.Builder> {

+    private ServiceDescriptorProto() { }

     private static readonly ServiceDescriptorProto defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _serviceDescriptorProtoFieldNames = new string[] { "method", "name", "options" };

     private static readonly uint[] _serviceDescriptorProtoFieldTags = new uint[] { 18, 10, 26 };

@@ -3808,6 +3816,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class MethodDescriptorProto : pb::GeneratedMessage<MethodDescriptorProto, MethodDescriptorProto.Builder> {

+    private MethodDescriptorProto() { }

     private static readonly MethodDescriptorProto defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _methodDescriptorProtoFieldNames = new string[] { "input_type", "name", "options", "output_type" };

     private static readonly uint[] _methodDescriptorProtoFieldTags = new uint[] { 18, 10, 34, 26 };

@@ -4199,6 +4208,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class FileOptions : pb::ExtendableMessage<FileOptions, FileOptions.Builder> {

+    private FileOptions() { }

     private static readonly FileOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _fileOptionsFieldNames = new string[] { "cc_generic_services", "java_generic_services", "java_multiple_files", "java_outer_classname", "java_package", "optimize_for", "py_generic_services", "uninterpreted_option" };

     private static readonly uint[] _fileOptionsFieldTags = new uint[] { 128, 136, 80, 66, 10, 72, 144, 7994 };

@@ -4782,6 +4792,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class MessageOptions : pb::ExtendableMessage<MessageOptions, MessageOptions.Builder> {

+    private MessageOptions() { }

     private static readonly MessageOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _messageOptionsFieldNames = new string[] { "message_set_wire_format", "no_standard_descriptor_accessor", "uninterpreted_option" };

     private static readonly uint[] _messageOptionsFieldTags = new uint[] { 8, 16, 7994 };

@@ -5134,6 +5145,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class FieldOptions : pb::ExtendableMessage<FieldOptions, FieldOptions.Builder> {

+    private FieldOptions() { }

     private static readonly FieldOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _fieldOptionsFieldNames = new string[] { "ctype", "deprecated", "experimental_map_key", "packed", "uninterpreted_option" };

     private static readonly uint[] _fieldOptionsFieldTags = new uint[] { 8, 24, 74, 16, 7994 };

@@ -5593,6 +5605,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class EnumOptions : pb::ExtendableMessage<EnumOptions, EnumOptions.Builder> {

+    private EnumOptions() { }

     private static readonly EnumOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _enumOptionsFieldNames = new string[] { "uninterpreted_option" };

     private static readonly uint[] _enumOptionsFieldTags = new uint[] { 7994 };

@@ -5863,6 +5876,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class EnumValueOptions : pb::ExtendableMessage<EnumValueOptions, EnumValueOptions.Builder> {

+    private EnumValueOptions() { }

     private static readonly EnumValueOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _enumValueOptionsFieldNames = new string[] { "uninterpreted_option" };

     private static readonly uint[] _enumValueOptionsFieldTags = new uint[] { 7994 };

@@ -6133,6 +6147,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ServiceOptions : pb::ExtendableMessage<ServiceOptions, ServiceOptions.Builder> {

+    private ServiceOptions() { }

     private static readonly ServiceOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _serviceOptionsFieldNames = new string[] { "uninterpreted_option" };

     private static readonly uint[] _serviceOptionsFieldTags = new uint[] { 7994 };

@@ -6403,6 +6418,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class MethodOptions : pb::ExtendableMessage<MethodOptions, MethodOptions.Builder> {

+    private MethodOptions() { }

     private static readonly MethodOptions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _methodOptionsFieldNames = new string[] { "uninterpreted_option" };

     private static readonly uint[] _methodOptionsFieldTags = new uint[] { 7994 };

@@ -6673,6 +6689,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class UninterpretedOption : pb::GeneratedMessage<UninterpretedOption, UninterpretedOption.Builder> {

+    private UninterpretedOption() { }

     private static readonly UninterpretedOption defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _uninterpretedOptionFieldNames = new string[] { "double_value", "identifier_value", "name", "negative_int_value", "positive_int_value", "string_value" };

     private static readonly uint[] _uninterpretedOptionFieldTags = new uint[] { 49, 26, 18, 40, 32, 58 };

@@ -6705,6 +6722,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class NamePart : pb::GeneratedMessage<NamePart, NamePart.Builder> {

+        private NamePart() { }

         private static readonly NamePart defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _namePartFieldNames = new string[] { "is_extension", "name_part" };

         private static readonly uint[] _namePartFieldTags = new uint[] { 16, 10 };

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasFullProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasFullProtoFile.cs
index 58c57312..9119e4e9 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasFullProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasFullProtoFile.cs
@@ -128,6 +128,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestInteropPerson : pb::ExtendableMessage<TestInteropPerson, TestInteropPerson.Builder> {

+    private TestInteropPerson() { }

     private static readonly TestInteropPerson defaultInstance = new Builder().BuildPartial();

     public static TestInteropPerson DefaultInstance {

       get { return defaultInstance; }

@@ -166,6 +167,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class PhoneNumber : pb::GeneratedMessage<PhoneNumber, PhoneNumber.Builder> {

+        private PhoneNumber() { }

         private static readonly PhoneNumber defaultInstance = new Builder().BuildPartial();

         public static PhoneNumber DefaultInstance {

           get { return defaultInstance; }

@@ -332,6 +334,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Addresses : pb::GeneratedMessage<Addresses, Addresses.Builder> {

+        private Addresses() { }

         private static readonly Addresses defaultInstance = new Builder().BuildPartial();

         public static Addresses DefaultInstance {

           get { return defaultInstance; }

@@ -902,6 +905,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestInteropEmployeeId : pb::GeneratedMessage<TestInteropEmployeeId, TestInteropEmployeeId.Builder> {

+    private TestInteropEmployeeId() { }

     private static readonly TestInteropEmployeeId defaultInstance = new Builder().BuildPartial();

     public static TestInteropEmployeeId DefaultInstance {

       get { return defaultInstance; }

@@ -1040,6 +1044,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMissingFieldsA : pb::GeneratedMessage<TestMissingFieldsA, TestMissingFieldsA.Builder> {

+    private TestMissingFieldsA() { }

     private static readonly TestMissingFieldsA defaultInstance = new Builder().BuildPartial();

     public static TestMissingFieldsA DefaultInstance {

       get { return defaultInstance; }

@@ -1070,6 +1075,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class SubA : pb::GeneratedMessage<SubA, SubA.Builder> {

+        private SubA() { }

         private static readonly SubA defaultInstance = new Builder().BuildPartial();

         public static SubA DefaultInstance {

           get { return defaultInstance; }

@@ -1467,6 +1473,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMissingFieldsB : pb::GeneratedMessage<TestMissingFieldsB, TestMissingFieldsB.Builder> {

+    private TestMissingFieldsB() { }

     private static readonly TestMissingFieldsB defaultInstance = new Builder().BuildPartial();

     public static TestMissingFieldsB DefaultInstance {

       get { return defaultInstance; }

@@ -1497,6 +1504,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class SubB : pb::GeneratedMessage<SubB, SubB.Builder> {

+        private SubB() { }

         private static readonly SubB defaultInstance = new Builder().BuildPartial();

         public static SubB DefaultInstance {

           get { return defaultInstance; }

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs
index bf0d302e..07de8a6f 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs
@@ -60,6 +60,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestRequiredLite : pb::GeneratedMessageLite<TestRequiredLite, TestRequiredLite.Builder> {

+    private TestRequiredLite() { }

     private static readonly TestRequiredLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testRequiredLiteFieldNames = new string[] { "d", "en" };

     private static readonly uint[] _testRequiredLiteFieldTags = new uint[] { 8, 16 };

@@ -342,6 +343,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestInteropPersonLite : pb::ExtendableMessageLite<TestInteropPersonLite, TestInteropPersonLite.Builder> {

+    private TestInteropPersonLite() { }

     private static readonly TestInteropPersonLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testInteropPersonLiteFieldNames = new string[] { "addresses", "codes", "email", "id", "name", "phone" };

     private static readonly uint[] _testInteropPersonLiteFieldTags = new uint[] { 43, 82, 26, 16, 10, 34 };

@@ -375,6 +377,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class PhoneNumber : pb::GeneratedMessageLite<PhoneNumber, PhoneNumber.Builder> {

+        private PhoneNumber() { }

         private static readonly PhoneNumber defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _phoneNumberFieldNames = new string[] { "number", "type" };

         private static readonly uint[] _phoneNumberFieldTags = new uint[] { 10, 16 };

@@ -657,6 +660,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Addresses : pb::GeneratedMessageLite<Addresses, Addresses.Builder> {

+        private Addresses() { }

         private static readonly Addresses defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _addressesFieldNames = new string[] { "address", "address2", "city", "state", "zip" };

         private static readonly uint[] _addressesFieldTags = new uint[] { 10, 18, 26, 34, 45 };

@@ -1602,6 +1606,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestInteropEmployeeIdLite : pb::GeneratedMessageLite<TestInteropEmployeeIdLite, TestInteropEmployeeIdLite.Builder> {

+    private TestInteropEmployeeIdLite() { }

     private static readonly TestInteropEmployeeIdLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testInteropEmployeeIdLiteFieldNames = new string[] { "number" };

     private static readonly uint[] _testInteropEmployeeIdLiteFieldTags = new uint[] { 10 };

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs
index 239eaa48..594c9417 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs
@@ -43,6 +43,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ImportMessageLite : pb::GeneratedMessageLite<ImportMessageLite, ImportMessageLite.Builder> {

+    private ImportMessageLite() { }

     private static readonly ImportMessageLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _importMessageLiteFieldNames = new string[] { "d" };

     private static readonly uint[] _importMessageLiteFieldTags = new uint[] { 8 };

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs
index f1fff865..c5da5537 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs
@@ -71,6 +71,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ImportMessage : pb::GeneratedMessage<ImportMessage, ImportMessage.Builder> {

+    private ImportMessage() { }

     private static readonly ImportMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _importMessageFieldNames = new string[] { "d" };

     private static readonly uint[] _importMessageFieldTags = new uint[] { 8 };

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs
index bb53b646..7d72f288 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs
@@ -32,6 +32,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestLiteImportsNonlite : pb::GeneratedMessageLite<TestLiteImportsNonlite, TestLiteImportsNonlite.Builder> {

+    private TestLiteImportsNonlite() { }

     private static readonly TestLiteImportsNonlite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testLiteImportsNonliteFieldNames = new string[] { "message" };

     private static readonly uint[] _testLiteImportsNonliteFieldTags = new uint[] { 10 };

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs
index e728a75b..3135a4ba 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs
@@ -1228,6 +1228,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestAllTypesLite : pb::GeneratedMessageLite<TestAllTypesLite, TestAllTypesLite.Builder> {

+    private TestAllTypesLite() { }

     private static readonly TestAllTypesLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testAllTypesLiteFieldNames = new string[] { "default_bool", "default_bytes", "default_cord", "default_double", "default_fixed32", "default_fixed64", "default_float", "default_foreign_enum", "default_import_enum", "default_int32", "default_int64", "default_nested_enum", "default_sfixed32", "default_sfixed64", "default_sint32", "default_sint64", "default_string", "default_string_piece", "default_uint32", "default_uint64", "optional_bool", "optional_bytes", "optional_cord", "optional_double", "optional_fixed32", "optional_fixed64", "optional_float", "optional_foreign_enum", "optional_foreign_message", "optional_import_enum", "optional_import_message", "optional_int32", "optional_int64", "optional_nested_enum", "optional_nested_message", "optional_sfixed32", "optional_sfixed64", "optional_sint32", "optional_sint64", "optional_string", "optional_string_piece", "optional_uint32", "optional_uint64", "optionalgroup", "repeated_bool", "repeated_bytes", "repeated_cord", "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_sfixed32", "repeated_sfixed64", "repeated_sint32", "repeated_sint64", "repeated_string", "repeated_string_piece", "repeated_uint32", "repeated_uint64", "repeatedgroup" };

     private static readonly uint[] _testAllTypesLiteFieldTags = new uint[] { 584, 602, 682, 577, 541, 545, 573, 656, 664, 488, 496, 648, 557, 561, 520, 528, 594, 674, 504, 512, 104, 122, 202, 97, 61, 65, 93, 176, 154, 184, 162, 8, 16, 168, 146, 77, 81, 40, 48, 114, 194, 24, 32, 131, 344, 362, 442, 337, 301, 305, 333, 416, 394, 424, 402, 248, 256, 408, 386, 317, 321, 280, 288, 354, 434, 264, 272, 371 };

@@ -1260,6 +1261,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class NestedMessage : pb::GeneratedMessageLite<NestedMessage, NestedMessage.Builder> {

+        private NestedMessage() { }

         private static readonly NestedMessage defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _nestedMessageFieldNames = new string[] { "bb" };

         private static readonly uint[] _nestedMessageFieldTags = new uint[] { 8 };

@@ -1490,6 +1492,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class OptionalGroup : pb::GeneratedMessageLite<OptionalGroup, OptionalGroup.Builder> {

+        private OptionalGroup() { }

         private static readonly OptionalGroup defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _optionalGroupFieldNames = new string[] { "a" };

         private static readonly uint[] _optionalGroupFieldTags = new uint[] { 136 };

@@ -1720,6 +1723,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class RepeatedGroup : pb::GeneratedMessageLite<RepeatedGroup, RepeatedGroup.Builder> {

+        private RepeatedGroup() { }

         private static readonly RepeatedGroup defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _repeatedGroupFieldNames = new string[] { "a" };

         private static readonly uint[] _repeatedGroupFieldTags = new uint[] { 376 };

@@ -5791,6 +5795,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ForeignMessageLite : pb::GeneratedMessageLite<ForeignMessageLite, ForeignMessageLite.Builder> {

+    private ForeignMessageLite() { }

     private static readonly ForeignMessageLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _foreignMessageLiteFieldNames = new string[] { "c" };

     private static readonly uint[] _foreignMessageLiteFieldTags = new uint[] { 8 };

@@ -6021,6 +6026,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestPackedTypesLite : pb::GeneratedMessageLite<TestPackedTypesLite, TestPackedTypesLite.Builder> {

+    private TestPackedTypesLite() { }

     private static readonly TestPackedTypesLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testPackedTypesLiteFieldNames = 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[] _testPackedTypesLiteFieldTags = new uint[] { 818, 810, 826, 770, 778, 802, 722, 730, 786, 794, 754, 762, 738, 746 };

@@ -7175,6 +7181,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestUnpackedTypesLite : pb::GeneratedMessageLite<TestUnpackedTypesLite, TestUnpackedTypesLite.Builder> {

+    private TestUnpackedTypesLite() { }

     private static readonly TestUnpackedTypesLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testUnpackedTypesLiteFieldNames = 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[] _testUnpackedTypesLiteFieldTags = new uint[] { 816, 809, 824, 773, 777, 805, 720, 728, 789, 793, 752, 760, 736, 744 };

@@ -8274,6 +8281,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestAllExtensionsLite : pb::ExtendableMessageLite<TestAllExtensionsLite, TestAllExtensionsLite.Builder> {

+    private TestAllExtensionsLite() { }

     private static readonly TestAllExtensionsLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testAllExtensionsLiteFieldNames = new string[] {  };

     private static readonly uint[] _testAllExtensionsLiteFieldTags = new uint[] {  };

@@ -8468,6 +8476,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class OptionalGroup_extension_lite : pb::GeneratedMessageLite<OptionalGroup_extension_lite, OptionalGroup_extension_lite.Builder> {

+    private OptionalGroup_extension_lite() { }

     private static readonly OptionalGroup_extension_lite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _optionalGroupExtensionLiteFieldNames = new string[] { "a" };

     private static readonly uint[] _optionalGroupExtensionLiteFieldTags = new uint[] { 136 };

@@ -8698,6 +8707,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class RepeatedGroup_extension_lite : pb::GeneratedMessageLite<RepeatedGroup_extension_lite, RepeatedGroup_extension_lite.Builder> {

+    private RepeatedGroup_extension_lite() { }

     private static readonly RepeatedGroup_extension_lite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _repeatedGroupExtensionLiteFieldNames = new string[] { "a" };

     private static readonly uint[] _repeatedGroupExtensionLiteFieldTags = new uint[] { 376 };

@@ -8928,6 +8938,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestPackedExtensionsLite : pb::ExtendableMessageLite<TestPackedExtensionsLite, TestPackedExtensionsLite.Builder> {

+    private TestPackedExtensionsLite() { }

     private static readonly TestPackedExtensionsLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testPackedExtensionsLiteFieldNames = new string[] {  };

     private static readonly uint[] _testPackedExtensionsLiteFieldTags = new uint[] {  };

@@ -9122,6 +9133,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestUnpackedExtensionsLite : pb::ExtendableMessageLite<TestUnpackedExtensionsLite, TestUnpackedExtensionsLite.Builder> {

+    private TestUnpackedExtensionsLite() { }

     private static readonly TestUnpackedExtensionsLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testUnpackedExtensionsLiteFieldNames = new string[] {  };

     private static readonly uint[] _testUnpackedExtensionsLiteFieldTags = new uint[] {  };

@@ -9316,6 +9328,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestNestedExtensionLite : pb::GeneratedMessageLite<TestNestedExtensionLite, TestNestedExtensionLite.Builder> {

+    private TestNestedExtensionLite() { }

     private static readonly TestNestedExtensionLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testNestedExtensionLiteFieldNames = new string[] {  };

     private static readonly uint[] _testNestedExtensionLiteFieldTags = new uint[] {  };

@@ -9504,6 +9517,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestDeprecatedLite : pb::GeneratedMessageLite<TestDeprecatedLite, TestDeprecatedLite.Builder> {

+    private TestDeprecatedLite() { }

     private static readonly TestDeprecatedLite defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testDeprecatedLiteFieldNames = new string[] { "deprecated_field" };

     private static readonly uint[] _testDeprecatedLiteFieldTags = new uint[] { 8 };

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs
index 753ff3e0..86616743 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs
@@ -1122,6 +1122,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestAllTypes : pb::GeneratedMessage<TestAllTypes, TestAllTypes.Builder> {

+    private TestAllTypes() { }

     private static readonly TestAllTypes defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testAllTypesFieldNames = new string[] { "default_bool", "default_bytes", "default_cord", "default_double", "default_fixed32", "default_fixed64", "default_float", "default_foreign_enum", "default_import_enum", "default_int32", "default_int64", "default_nested_enum", "default_sfixed32", "default_sfixed64", "default_sint32", "default_sint64", "default_string", "default_string_piece", "default_uint32", "default_uint64", "optional_bool", "optional_bytes", "optional_cord", "optional_double", "optional_fixed32", "optional_fixed64", "optional_float", "optional_foreign_enum", "optional_foreign_message", "optional_import_enum", "optional_import_message", "optional_int32", "optional_int64", "optional_nested_enum", "optional_nested_message", "optional_sfixed32", "optional_sfixed64", "optional_sint32", "optional_sint64", "optional_string", "optional_string_piece", "optional_uint32", "optional_uint64", "optionalgroup", "repeated_bool", "repeated_bytes", "repeated_cord", "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_sfixed32", "repeated_sfixed64", "repeated_sint32", "repeated_sint64", "repeated_string", "repeated_string_piece", "repeated_uint32", "repeated_uint64", "repeatedgroup" };

     private static readonly uint[] _testAllTypesFieldTags = new uint[] { 584, 602, 682, 577, 541, 545, 573, 656, 664, 488, 496, 648, 557, 561, 520, 528, 594, 674, 504, 512, 104, 122, 202, 97, 61, 65, 93, 176, 154, 184, 162, 8, 16, 168, 146, 77, 81, 40, 48, 114, 194, 24, 32, 131, 344, 362, 442, 337, 301, 305, 333, 416, 394, 424, 402, 248, 256, 408, 386, 317, 321, 280, 288, 354, 434, 264, 272, 371 };

@@ -1162,6 +1163,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class NestedMessage : pb::GeneratedMessage<NestedMessage, NestedMessage.Builder> {

+        private NestedMessage() { }

         private static readonly NestedMessage defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _nestedMessageFieldNames = new string[] { "bb" };

         private static readonly uint[] _nestedMessageFieldTags = new uint[] { 8 };

@@ -1401,6 +1403,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class OptionalGroup : pb::GeneratedMessage<OptionalGroup, OptionalGroup.Builder> {

+        private OptionalGroup() { }

         private static readonly OptionalGroup defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _optionalGroupFieldNames = new string[] { "a" };

         private static readonly uint[] _optionalGroupFieldTags = new uint[] { 136 };

@@ -1640,6 +1643,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class RepeatedGroup : pb::GeneratedMessage<RepeatedGroup, RepeatedGroup.Builder> {

+        private RepeatedGroup() { }

         private static readonly RepeatedGroup defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _repeatedGroupFieldNames = new string[] { "a" };

         private static readonly uint[] _repeatedGroupFieldTags = new uint[] { 376 };

@@ -5496,6 +5500,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestDeprecatedFields : pb::GeneratedMessage<TestDeprecatedFields, TestDeprecatedFields.Builder> {

+    private TestDeprecatedFields() { }

     private static readonly TestDeprecatedFields defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testDeprecatedFieldsFieldNames = new string[] { "deprecated_int32" };

     private static readonly uint[] _testDeprecatedFieldsFieldTags = new uint[] { 8 };

@@ -5741,6 +5746,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class ForeignMessage : pb::GeneratedMessage<ForeignMessage, ForeignMessage.Builder> {

+    private ForeignMessage() { }

     private static readonly ForeignMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _foreignMessageFieldNames = new string[] { "c" };

     private static readonly uint[] _foreignMessageFieldTags = new uint[] { 8 };

@@ -5980,6 +5986,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestAllExtensions : pb::ExtendableMessage<TestAllExtensions, TestAllExtensions.Builder> {

+    private TestAllExtensions() { }

     private static readonly TestAllExtensions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testAllExtensionsFieldNames = new string[] {  };

     private static readonly uint[] _testAllExtensionsFieldTags = new uint[] {  };

@@ -6183,6 +6190,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class OptionalGroup_extension : pb::GeneratedMessage<OptionalGroup_extension, OptionalGroup_extension.Builder> {

+    private OptionalGroup_extension() { }

     private static readonly OptionalGroup_extension defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _optionalGroupExtensionFieldNames = new string[] { "a" };

     private static readonly uint[] _optionalGroupExtensionFieldTags = new uint[] { 136 };

@@ -6422,6 +6430,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class RepeatedGroup_extension : pb::GeneratedMessage<RepeatedGroup_extension, RepeatedGroup_extension.Builder> {

+    private RepeatedGroup_extension() { }

     private static readonly RepeatedGroup_extension defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _repeatedGroupExtensionFieldNames = new string[] { "a" };

     private static readonly uint[] _repeatedGroupExtensionFieldTags = new uint[] { 376 };

@@ -6661,6 +6670,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestNestedExtension : pb::GeneratedMessage<TestNestedExtension, TestNestedExtension.Builder> {

+    private TestNestedExtension() { }

     private static readonly TestNestedExtension defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testNestedExtensionFieldNames = new string[] {  };

     private static readonly uint[] _testNestedExtensionFieldTags = new uint[] {  };

@@ -6861,6 +6871,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestRequired : pb::GeneratedMessage<TestRequired, TestRequired.Builder> {

+    private TestRequired() { }

     private static readonly TestRequired defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testRequiredFieldNames = new string[] { "a", "b", "c", "dummy10", "dummy11", "dummy12", "dummy13", "dummy14", "dummy15", "dummy16", "dummy17", "dummy18", "dummy19", "dummy2", "dummy20", "dummy21", "dummy22", "dummy23", "dummy24", "dummy25", "dummy26", "dummy27", "dummy28", "dummy29", "dummy30", "dummy31", "dummy32", "dummy4", "dummy5", "dummy6", "dummy7", "dummy8", "dummy9" };

     private static readonly uint[] _testRequiredFieldTags = new uint[] { 8, 24, 264, 80, 88, 96, 104, 112, 120, 128, 136, 144, 152, 16, 160, 168, 176, 184, 192, 200, 208, 216, 224, 232, 240, 248, 256, 32, 40, 48, 56, 64, 72 };

@@ -8419,6 +8430,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestRequiredForeign : pb::GeneratedMessage<TestRequiredForeign, TestRequiredForeign.Builder> {

+    private TestRequiredForeign() { }

     private static readonly TestRequiredForeign defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testRequiredForeignFieldNames = new string[] { "dummy", "optional_message", "repeated_message" };

     private static readonly uint[] _testRequiredForeignFieldTags = new uint[] { 24, 10, 18 };

@@ -8792,6 +8804,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestForeignNested : pb::GeneratedMessage<TestForeignNested, TestForeignNested.Builder> {

+    private TestForeignNested() { }

     private static readonly TestForeignNested defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testForeignNestedFieldNames = new string[] { "foreign_nested" };

     private static readonly uint[] _testForeignNestedFieldTags = new uint[] { 10 };

@@ -9054,6 +9067,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestEmptyMessage : pb::GeneratedMessage<TestEmptyMessage, TestEmptyMessage.Builder> {

+    private TestEmptyMessage() { }

     private static readonly TestEmptyMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testEmptyMessageFieldNames = new string[] {  };

     private static readonly uint[] _testEmptyMessageFieldTags = new uint[] {  };

@@ -9252,6 +9266,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestEmptyMessageWithExtensions : pb::ExtendableMessage<TestEmptyMessageWithExtensions, TestEmptyMessageWithExtensions.Builder> {

+    private TestEmptyMessageWithExtensions() { }

     private static readonly TestEmptyMessageWithExtensions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testEmptyMessageWithExtensionsFieldNames = new string[] {  };

     private static readonly uint[] _testEmptyMessageWithExtensionsFieldTags = new uint[] {  };

@@ -9455,6 +9470,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMultipleExtensionRanges : pb::ExtendableMessage<TestMultipleExtensionRanges, TestMultipleExtensionRanges.Builder> {

+    private TestMultipleExtensionRanges() { }

     private static readonly TestMultipleExtensionRanges defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMultipleExtensionRangesFieldNames = new string[] {  };

     private static readonly uint[] _testMultipleExtensionRangesFieldTags = new uint[] {  };

@@ -9660,6 +9676,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestReallyLargeTagNumber : pb::GeneratedMessage<TestReallyLargeTagNumber, TestReallyLargeTagNumber.Builder> {

+    private TestReallyLargeTagNumber() { }

     private static readonly TestReallyLargeTagNumber defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testReallyLargeTagNumberFieldNames = new string[] { "a", "bb" };

     private static readonly uint[] _testReallyLargeTagNumberFieldTags = new uint[] { 8, 2147483640 };

@@ -9940,6 +9957,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestRecursiveMessage : pb::GeneratedMessage<TestRecursiveMessage, TestRecursiveMessage.Builder> {

+    private TestRecursiveMessage() { }

     private static readonly TestRecursiveMessage defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testRecursiveMessageFieldNames = new string[] { "a", "i" };

     private static readonly uint[] _testRecursiveMessageFieldTags = new uint[] { 10, 16 };

@@ -10243,6 +10261,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMutualRecursionA : pb::GeneratedMessage<TestMutualRecursionA, TestMutualRecursionA.Builder> {

+    private TestMutualRecursionA() { }

     private static readonly TestMutualRecursionA defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMutualRecursionAFieldNames = new string[] { "bb" };

     private static readonly uint[] _testMutualRecursionAFieldTags = new uint[] { 10 };

@@ -10505,6 +10524,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestMutualRecursionB : pb::GeneratedMessage<TestMutualRecursionB, TestMutualRecursionB.Builder> {

+    private TestMutualRecursionB() { }

     private static readonly TestMutualRecursionB defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testMutualRecursionBFieldNames = new string[] { "a", "optional_int32" };

     private static readonly uint[] _testMutualRecursionBFieldTags = new uint[] { 10, 16 };

@@ -10808,6 +10828,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestDupFieldNumber : pb::GeneratedMessage<TestDupFieldNumber, TestDupFieldNumber.Builder> {

+    private TestDupFieldNumber() { }

     private static readonly TestDupFieldNumber defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testDupFieldNumberFieldNames = new string[] { "a", "bar", "foo" };

     private static readonly uint[] _testDupFieldNumberFieldTags = new uint[] { 8, 27, 19 };

@@ -10840,6 +10861,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Foo : pb::GeneratedMessage<Foo, Foo.Builder> {

+        private Foo() { }

         private static readonly Foo defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _fooFieldNames = new string[] { "a" };

         private static readonly uint[] _fooFieldTags = new uint[] { 8 };

@@ -11079,6 +11101,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class Bar : pb::GeneratedMessage<Bar, Bar.Builder> {

+        private Bar() { }

         private static readonly Bar defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _barFieldNames = new string[] { "a" };

         private static readonly uint[] _barFieldTags = new uint[] { 8 };

@@ -11661,6 +11684,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestNestedMessageHasBits : pb::GeneratedMessage<TestNestedMessageHasBits, TestNestedMessageHasBits.Builder> {

+    private TestNestedMessageHasBits() { }

     private static readonly TestNestedMessageHasBits defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testNestedMessageHasBitsFieldNames = new string[] { "optional_nested_message" };

     private static readonly uint[] _testNestedMessageHasBitsFieldTags = new uint[] { 10 };

@@ -11693,6 +11717,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class NestedMessage : pb::GeneratedMessage<NestedMessage, NestedMessage.Builder> {

+        private NestedMessage() { }

         private static readonly NestedMessage defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _nestedMessageFieldNames = new string[] { "nestedmessage_repeated_foreignmessage", "nestedmessage_repeated_int32" };

         private static readonly uint[] _nestedMessageFieldTags = new uint[] { 18, 8 };

@@ -12251,6 +12276,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestCamelCaseFieldNames : pb::GeneratedMessage<TestCamelCaseFieldNames, TestCamelCaseFieldNames.Builder> {

+    private TestCamelCaseFieldNames() { }

     private static readonly TestCamelCaseFieldNames defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testCamelCaseFieldNamesFieldNames = new string[] { "CordField", "EnumField", "MessageField", "PrimitiveField", "RepeatedCordField", "RepeatedEnumField", "RepeatedMessageField", "RepeatedPrimitiveField", "RepeatedStringField", "RepeatedStringPieceField", "StringField", "StringPieceField" };

     private static readonly uint[] _testCamelCaseFieldNamesFieldTags = new uint[] { 50, 24, 34, 8, 98, 72, 82, 56, 66, 90, 18, 42 };

@@ -13097,6 +13123,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestFieldOrderings : pb::ExtendableMessage<TestFieldOrderings, TestFieldOrderings.Builder> {

+    private TestFieldOrderings() { }

     private static readonly TestFieldOrderings defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testFieldOrderingsFieldNames = new string[] { "my_float", "my_int", "my_string" };

     private static readonly uint[] _testFieldOrderingsFieldTags = new uint[] { 813, 8, 90 };

@@ -13425,6 +13452,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestExtremeDefaultValues : pb::GeneratedMessage<TestExtremeDefaultValues, TestExtremeDefaultValues.Builder> {

+    private TestExtremeDefaultValues() { }

     private static readonly TestExtremeDefaultValues defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testExtremeDefaultValuesFieldNames = new string[] { "escaped_bytes", "inf_double", "inf_float", "large_float", "large_uint32", "large_uint64", "nan_double", "nan_float", "neg_inf_double", "neg_inf_float", "negative_float", "negative_one_float", "one_float", "small_float", "small_int32", "small_int64", "small_negative_float", "utf8_string", "zero_float" };

     private static readonly uint[] _testExtremeDefaultValuesFieldTags = new uint[] { 10, 113, 141, 101, 16, 24, 129, 157, 121, 149, 93, 85, 69, 77, 32, 40, 109, 50, 61 };

@@ -14410,6 +14438,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class OneString : pb::GeneratedMessage<OneString, OneString.Builder> {

+    private OneString() { }

     private static readonly OneString defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _oneStringFieldNames = new string[] { "data" };

     private static readonly uint[] _oneStringFieldTags = new uint[] { 10 };

@@ -14650,6 +14679,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class OneBytes : pb::GeneratedMessage<OneBytes, OneBytes.Builder> {

+    private OneBytes() { }

     private static readonly OneBytes defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _oneBytesFieldNames = new string[] { "data" };

     private static readonly uint[] _oneBytesFieldTags = new uint[] { 10 };

@@ -14890,6 +14920,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestPackedTypes : pb::GeneratedMessage<TestPackedTypes, TestPackedTypes.Builder> {

+    private TestPackedTypes() { }

     private static readonly TestPackedTypes defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testPackedTypesFieldNames = 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[] _testPackedTypesFieldTags = new uint[] { 818, 810, 826, 770, 778, 802, 722, 730, 786, 794, 754, 762, 738, 746 };

@@ -15980,6 +16011,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestUnpackedTypes : pb::GeneratedMessage<TestUnpackedTypes, TestUnpackedTypes.Builder> {

+    private TestUnpackedTypes() { }

     private static readonly TestUnpackedTypes defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testUnpackedTypesFieldNames = 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[] _testUnpackedTypesFieldTags = new uint[] { 816, 809, 824, 773, 777, 805, 720, 728, 789, 793, 752, 760, 736, 744 };

@@ -17015,6 +17047,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestPackedExtensions : pb::ExtendableMessage<TestPackedExtensions, TestPackedExtensions.Builder> {

+    private TestPackedExtensions() { }

     private static readonly TestPackedExtensions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testPackedExtensionsFieldNames = new string[] {  };

     private static readonly uint[] _testPackedExtensionsFieldTags = new uint[] {  };

@@ -17218,6 +17251,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestUnpackedExtensions : pb::ExtendableMessage<TestUnpackedExtensions, TestUnpackedExtensions.Builder> {

+    private TestUnpackedExtensions() { }

     private static readonly TestUnpackedExtensions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testUnpackedExtensionsFieldNames = new string[] {  };

     private static readonly uint[] _testUnpackedExtensionsFieldTags = new uint[] {  };

@@ -17421,6 +17455,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestDynamicExtensions : pb::GeneratedMessage<TestDynamicExtensions, TestDynamicExtensions.Builder> {

+    private TestDynamicExtensions() { }

     private static readonly TestDynamicExtensions defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testDynamicExtensionsFieldNames = new string[] { "dynamic_enum_extension", "dynamic_message_extension", "enum_extension", "message_extension", "packed_extension", "repeated_extension", "scalar_extension" };

     private static readonly uint[] _testDynamicExtensionsFieldTags = new uint[] { 16016, 16034, 16008, 16026, 16050, 16042, 16005 };

@@ -17461,6 +17496,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

       public sealed partial class DynamicMessageType : pb::GeneratedMessage<DynamicMessageType, DynamicMessageType.Builder> {

+        private DynamicMessageType() { }

         private static readonly DynamicMessageType defaultInstance = new Builder().BuildPartial();

         private static readonly string[] _dynamicMessageTypeFieldNames = new string[] { "dynamic_field" };

         private static readonly uint[] _dynamicMessageTypeFieldTags = new uint[] { 16800 };

@@ -18265,6 +18301,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class TestRepeatedScalarDifferentTagSizes : pb::GeneratedMessage<TestRepeatedScalarDifferentTagSizes, TestRepeatedScalarDifferentTagSizes.Builder> {

+    private TestRepeatedScalarDifferentTagSizes() { }

     private static readonly TestRepeatedScalarDifferentTagSizes defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _testRepeatedScalarDifferentTagSizesFieldNames = new string[] { "repeated_fixed32", "repeated_fixed64", "repeated_float", "repeated_int32", "repeated_int64", "repeated_uint64" };

     private static readonly uint[] _testRepeatedScalarDifferentTagSizesFieldTags = new uint[] { 101, 16369, 2097141, 104, 16376, 2097144 };

@@ -18826,6 +18863,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class FooRequest : pb::GeneratedMessage<FooRequest, FooRequest.Builder> {

+    private FooRequest() { }

     private static readonly FooRequest defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _fooRequestFieldNames = new string[] {  };

     private static readonly uint[] _fooRequestFieldTags = new uint[] {  };

@@ -19024,6 +19062,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class FooResponse : pb::GeneratedMessage<FooResponse, FooResponse.Builder> {

+    private FooResponse() { }

     private static readonly FooResponse defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _fooResponseFieldNames = new string[] {  };

     private static readonly uint[] _fooResponseFieldTags = new uint[] {  };

@@ -19222,6 +19261,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class BarRequest : pb::GeneratedMessage<BarRequest, BarRequest.Builder> {

+    private BarRequest() { }

     private static readonly BarRequest defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _barRequestFieldNames = new string[] {  };

     private static readonly uint[] _barRequestFieldTags = new uint[] {  };

@@ -19420,6 +19460,7 @@ namespace Google.ProtocolBuffers.TestProtos {
   [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

   [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.3.0.277")]

   public sealed partial class BarResponse : pb::GeneratedMessage<BarResponse, BarResponse.Builder> {

+    private BarResponse() { }

     private static readonly BarResponse defaultInstance = new Builder().BuildPartial();

     private static readonly string[] _barResponseFieldNames = new string[] {  };

     private static readonly uint[] _barResponseFieldTags = new uint[] {  };