Add generated_code_attributes option, defaulted to false to generate the CompilerGeneratedAttribute and GeneratedCodeAttribute attributes

39 files changed, 104 insertions, 1107 deletions

diff --git a/protos/google/protobuf/csharp_options.proto b/protos/google/protobuf/csharp_options.proto
index 4718dbef..f09b96aa 100644
--- a/protos/google/protobuf/csharp_options.proto
+++ b/protos/google/protobuf/csharp_options.proto
@@ -65,6 +65,10 @@ message CSharpFileOptions {
   // INTERFACE generates service interfaces only, RPCINTEROP generates interfaces and 

   // implementations using the included Windows RPC interop libarary.

   optional CSharpServiceType service_generator_type = 225 [default = NONE];

+  

+  // Used to add the System.Runtime.CompilerServices.CompilerGeneratedAttribute and 

+  // System.CodeDom.Compiler.GeneratedCodeAttribute attributes to generated code.

+  optional bool generated_code_attributes = 226 [default = false];

 }

 

 enum CSharpServiceType {

diff --git a/src/AddressBook/AddressBookProtos.cs b/src/AddressBook/AddressBookProtos.cs
index 3e39bacc..00869413 100644
--- a/src/AddressBook/AddressBookProtos.cs
+++ b/src/AddressBook/AddressBookProtos.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.Examples.AddressBook {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class AddressBookProtos {

   

     #region Extension registration

@@ -72,8 +70,6 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private Person() { }

     private static readonly Person defaultInstance = new Person().MakeReadOnly();

@@ -101,11 +97,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum PhoneType {

         MOBILE = 0,

         HOME = 1,

@@ -113,8 +105,6 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private PhoneNumber() { }

         private static readonly PhoneNumber defaultInstance = new PhoneNumber().MakeReadOnly();

@@ -240,8 +230,6 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -581,8 +569,6 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -852,8 +838,6 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private AddressBook() { }

     private static readonly AddressBook defaultInstance = new AddressBook().MakeReadOnly();

@@ -968,8 +952,6 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtoGen/EnumGenerator.cs b/src/ProtoGen/EnumGenerator.cs
index 35fda7ed..a6ed45d1 100644
--- a/src/ProtoGen/EnumGenerator.cs
+++ b/src/ProtoGen/EnumGenerator.cs
@@ -47,9 +47,7 @@ namespace Google.ProtocolBuffers.ProtoGen
         // TODO(jonskeet): Write out enum descriptors? Can be retrieved from file...

         public void Generate(TextGenerator writer)

         {

-            writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            WriteGeneratedCodeAttributes(writer);

             writer.WriteLine("{0} enum {1} {{", ClassAccessLevel, Descriptor.Name);

             writer.Indent();

             foreach (EnumValueDescriptor value in Descriptor.Values)

diff --git a/src/ProtoGen/MessageGenerator.cs b/src/ProtoGen/MessageGenerator.cs
index 9529ff13..fb43f3c9 100644
--- a/src/ProtoGen/MessageGenerator.cs
+++ b/src/ProtoGen/MessageGenerator.cs
@@ -173,9 +173,7 @@ namespace Google.ProtocolBuffers.ProtoGen
                 writer.WriteLine("[global::System.SerializableAttribute()]");

             }

             writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

-            writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            WriteGeneratedCodeAttributes(writer);

             writer.WriteLine("{0} sealed partial class {1} : pb::{2}Message{3}<{1}, {1}.Builder> {{",

                              ClassAccessLevel, ClassName,

                              Descriptor.Proto.ExtensionRangeCount > 0 ? "Extendable" : "Generated",

@@ -239,9 +237,7 @@ namespace Google.ProtocolBuffers.ProtoGen
             {

                 writer.WriteLine("#region Nested types");

                 writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

-                writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-                writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                                 GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+                WriteGeneratedCodeAttributes(writer);

                 writer.WriteLine("public static partial class Types {");

                 writer.Indent();

                 WriteChildren(writer, null, Descriptor.EnumTypes);

@@ -578,9 +574,7 @@ namespace Google.ProtocolBuffers.ProtoGen
                 writer.WriteLine("[global::System.SerializableAttribute()]");

             }

             writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

-            writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            WriteGeneratedCodeAttributes(writer);

             writer.WriteLine("{0} sealed partial class Builder : pb::{2}Builder{3}<{1}, Builder> {{",

                              ClassAccessLevel, ClassName,

                              Descriptor.Proto.ExtensionRangeCount > 0 ? "Extendable" : "Generated", RuntimeSuffix);

diff --git a/src/ProtoGen/ServiceGenerator.cs b/src/ProtoGen/ServiceGenerator.cs
index ac84d3d8..a6b9eb28 100644
--- a/src/ProtoGen/ServiceGenerator.cs
+++ b/src/ProtoGen/ServiceGenerator.cs
@@ -54,9 +54,7 @@ namespace Google.ProtocolBuffers.ProtoGen
         public void Generate(TextGenerator writer)

         {

             writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

-            writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            WriteGeneratedCodeAttributes(writer);

             writer.WriteLine("{0} abstract class {1} : pb::IService {{", ClassAccessLevel, Descriptor.Name);

             writer.Indent();

 

@@ -156,9 +154,7 @@ namespace Google.ProtocolBuffers.ProtoGen
             writer.WriteLine("}");

             writer.WriteLine();

             writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

-            writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            WriteGeneratedCodeAttributes(writer);

             writer.WriteLine("{0} class Stub : {1} {{", ClassAccessLevel, GetClassName(Descriptor));

             writer.Indent();

             writer.WriteLine("internal Stub(pb::IRpcChannel channel) {");

diff --git a/src/ProtoGen/ServiceInterfaceGenerator.cs b/src/ProtoGen/ServiceInterfaceGenerator.cs
index 64b6d69b..11e3d3d0 100644
--- a/src/ProtoGen/ServiceInterfaceGenerator.cs
+++ b/src/ProtoGen/ServiceInterfaceGenerator.cs
@@ -104,9 +104,7 @@ namespace Google.ProtocolBuffers.ProtoGen
                     writer.WriteLine("[global::System.Runtime.InteropServices.GuidAttribute(\"{0}\")]",

                                      new Guid(options.InterfaceId));

                 }

-                writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-                writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                                 GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+                WriteGeneratedCodeAttributes(writer);

                 writer.WriteLine("{0} partial interface I{1} {{", ClassAccessLevel, Descriptor.Name);

                 writer.Indent();

 

@@ -147,9 +145,7 @@ namespace Google.ProtocolBuffers.ProtoGen
                         writer.WriteLine("[global::System.CLSCompliant(false)]");

                     }

                     writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

-                    writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-                    writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                                     GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+                    WriteGeneratedCodeAttributes(writer);

                     writer.WriteLine("{0} partial class {1} : I{1}, pb::IRpcDispatch, global::System.IDisposable {{",

                                      ClassAccessLevel, Descriptor.Name);

                     writer.Indent();

@@ -196,9 +192,7 @@ namespace Google.ProtocolBuffers.ProtoGen
                         writer.WriteLine("[global::System.CLSCompliant(false)]");

                     }

                     writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

-                    writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-                    writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                                     GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+                    WriteGeneratedCodeAttributes(writer);

                     writer.WriteLine("public partial class Dispatch : pb::IRpcDispatch, global::System.IDisposable {");

                     writer.Indent();

                     writer.WriteLine("private readonly bool dispose;");

@@ -248,9 +242,7 @@ namespace Google.ProtocolBuffers.ProtoGen
                         writer.WriteLine("[global::System.CLSCompliant(false)]");

                     }

                     writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

-                    writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-                    writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                                     GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+                    WriteGeneratedCodeAttributes(writer);

                     writer.WriteLine(

                         "public partial class ServerStub : pb::IRpcServerStub, global::System.IDisposable {");

                     writer.Indent();

diff --git a/src/ProtoGen/SourceGeneratorBase.cs b/src/ProtoGen/SourceGeneratorBase.cs
index fd833373..535c6f73 100644
--- a/src/ProtoGen/SourceGeneratorBase.cs
+++ b/src/ProtoGen/SourceGeneratorBase.cs
@@ -129,6 +129,16 @@ namespace Google.ProtocolBuffers.ProtoGen
             get { return descriptor.File.CSharpOptions.PublicClasses ? "public" : "internal"; }

         }

 

+        protected void WriteGeneratedCodeAttributes(TextGenerator writer)

+        {

+            if (descriptor.File.CSharpOptions.GeneratedCodeAttributes)

+            {

+                writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

+                writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

+                                 GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            }

+        }

+

         protected void WriteChildren<TChild>(TextGenerator writer, string region, IEnumerable<TChild> children)

             where TChild : IDescriptor

         {

diff --git a/src/ProtoGen/UmbrellaClassGenerator.cs b/src/ProtoGen/UmbrellaClassGenerator.cs
index 85dd4606..ef41be5d 100644
--- a/src/ProtoGen/UmbrellaClassGenerator.cs
+++ b/src/ProtoGen/UmbrellaClassGenerator.cs
@@ -167,9 +167,7 @@ namespace Google.ProtocolBuffers.ProtoGen
                 writer.WriteLine("[global::System.Diagnostics.Contracts.ContractVerificationAttribute(false)]");

             }

             writer.WriteLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");

-            writer.WriteLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");

-            writer.WriteLine("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{0}\", \"{1}\")]",

-                             GetType().Assembly.GetName().Name, GetType().Assembly.GetName().Version);

+            WriteGeneratedCodeAttributes(writer);

             writer.WriteLine("{0} static partial class {1} {{", ClassAccessLevel,

                              Descriptor.CSharpOptions.UmbrellaClassname);

             writer.WriteLine();

diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj
index ac0e355a..75132d5e 100644
--- a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj
+++ b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj
@@ -51,6 +51,9 @@
     <Reference Include="System.Core" Condition="'$(TargetFrameworkVersion)' != 'v2.0'" />

   </ItemGroup>

   <ItemGroup>

+    <Compile Include="..\ProtocolBuffers\FrameworkPortability.cs">

+      <Link>FrameworkPortability.cs</Link>

+    </Compile>

     <Compile Include="Extensions.cs" />

     <Compile Include="Http\FormUrlEncodedReader.cs" />

     <Compile Include="Http\MessageFormatFactory.cs" />

diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.csproj
index c5005345..457a9cfa 100644
--- a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.csproj
+++ b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.csproj
@@ -51,6 +51,9 @@
     <Reference Include="System.Core" Condition="'$(TargetFrameworkVersion)' != 'v2.0'" />

   </ItemGroup>

   <ItemGroup>

+    <Compile Include="..\ProtocolBuffers\FrameworkPortability.cs">

+      <Link>FrameworkPortability.cs</Link>

+    </Compile>

     <Compile Include="Extensions.cs" />

     <Compile Include="Http\FormUrlEncodedReader.cs" />

     <Compile Include="Http\MessageFormatFactory.cs" />

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs
index 65fb3423..b53d8c54 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestCSharpOptionsProtoFile {

   

     #region Extension registration

@@ -57,8 +55,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private OptionsMessage() { }

     private static readonly OptionsMessage defaultInstance = new OptionsMessage().MakeReadOnly();

@@ -199,8 +195,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs
index 0287a1a4..b4b9159a 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestCustomOptionsProtoFile {

   

     #region Extension registration

@@ -476,15 +474,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum MethodOpt1 {

     METHODOPT1_VAL1 = 1,

     METHODOPT1_VAL2 = 2,

   }

   

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum AggregateEnum {

     VALUE = 1,

   }

@@ -493,8 +487,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMessageWithCustomOptions() { }

     private static readonly TestMessageWithCustomOptions defaultInstance = new TestMessageWithCustomOptions().MakeReadOnly();

@@ -522,11 +514,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum AnEnum {

         ANENUM_VAL1 = 1,

         ANENUM_VAL2 = 2,

@@ -618,8 +606,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -783,8 +769,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private CustomOptionFooRequest() { }

     private static readonly CustomOptionFooRequest defaultInstance = new CustomOptionFooRequest().MakeReadOnly();

@@ -877,8 +861,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1014,8 +996,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private CustomOptionFooResponse() { }

     private static readonly CustomOptionFooResponse defaultInstance = new CustomOptionFooResponse().MakeReadOnly();

@@ -1108,8 +1088,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1245,8 +1223,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private DummyMessageContainingEnum() { }

     private static readonly DummyMessageContainingEnum defaultInstance = new DummyMessageContainingEnum().MakeReadOnly();

@@ -1274,11 +1250,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum TestEnumType {

         TEST_OPTION_ENUM_TYPE1 = 22,

         TEST_OPTION_ENUM_TYPE2 = -23,

@@ -1354,8 +1326,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1491,8 +1461,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private DummyMessageInvalidAsOptionType() { }

     private static readonly DummyMessageInvalidAsOptionType defaultInstance = new DummyMessageInvalidAsOptionType().MakeReadOnly();

@@ -1585,8 +1553,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1722,8 +1688,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private CustomOptionMinIntegerValues() { }

     private static readonly CustomOptionMinIntegerValues defaultInstance = new CustomOptionMinIntegerValues().MakeReadOnly();

@@ -1816,8 +1780,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1953,8 +1915,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private CustomOptionMaxIntegerValues() { }

     private static readonly CustomOptionMaxIntegerValues defaultInstance = new CustomOptionMaxIntegerValues().MakeReadOnly();

@@ -2047,8 +2007,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2184,8 +2142,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private CustomOptionOtherValues() { }

     private static readonly CustomOptionOtherValues defaultInstance = new CustomOptionOtherValues().MakeReadOnly();

@@ -2278,8 +2234,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2415,8 +2369,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SettingRealsFromPositiveInts() { }

     private static readonly SettingRealsFromPositiveInts defaultInstance = new SettingRealsFromPositiveInts().MakeReadOnly();

@@ -2509,8 +2461,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2646,8 +2596,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SettingRealsFromNegativeInts() { }

     private static readonly SettingRealsFromNegativeInts defaultInstance = new SettingRealsFromNegativeInts().MakeReadOnly();

@@ -2740,8 +2688,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2877,8 +2823,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ComplexOptionType1() { }

     private static readonly ComplexOptionType1 defaultInstance = new ComplexOptionType1().MakeReadOnly();

@@ -3023,8 +2967,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -3242,8 +3184,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ComplexOptionType2() { }

     private static readonly ComplexOptionType2 defaultInstance = new ComplexOptionType2().MakeReadOnly();

@@ -3271,12 +3211,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private ComplexOptionType4() { }

         private static readonly ComplexOptionType4 defaultInstance = new ComplexOptionType4().MakeReadOnly();

@@ -3387,8 +3323,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -3675,8 +3609,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -3944,8 +3876,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ComplexOptionType3() { }

     private static readonly ComplexOptionType3 defaultInstance = new ComplexOptionType3().MakeReadOnly();

@@ -3973,12 +3903,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private ComplexOptionType5() { }

         private static readonly ComplexOptionType5 defaultInstance = new ComplexOptionType5().MakeReadOnly();

@@ -4087,8 +4013,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -4352,8 +4276,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -4568,8 +4490,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ComplexOpt6() { }

     private static readonly ComplexOpt6 defaultInstance = new ComplexOpt6().MakeReadOnly();

@@ -4678,8 +4598,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -4842,8 +4760,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private VariousComplexOptions() { }

     private static readonly VariousComplexOptions defaultInstance = new VariousComplexOptions().MakeReadOnly();

@@ -4936,8 +4852,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -5073,8 +4987,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private AggregateMessageSet() { }

     private static readonly AggregateMessageSet defaultInstance = new AggregateMessageSet().MakeReadOnly();

@@ -5171,8 +5083,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::ExtendableBuilder<AggregateMessageSet, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -5309,8 +5219,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private AggregateMessageSetElement() { }

     private static readonly AggregateMessageSetElement defaultInstance = new AggregateMessageSetElement().MakeReadOnly();

@@ -5421,8 +5329,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilder<AggregateMessageSetElement, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -5586,8 +5492,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private Aggregate() { }

     private static readonly Aggregate defaultInstance = new Aggregate().MakeReadOnly();

@@ -5768,8 +5672,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilder<Aggregate, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6116,8 +6018,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private AggregateMessage() { }

     private static readonly AggregateMessage defaultInstance = new AggregateMessage().MakeReadOnly();

@@ -6226,8 +6126,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilder<AggregateMessage, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
index 1616054c..acb400bf 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestEmbedOptimizeForProtoFile {

   

     #region Extension registration

@@ -61,8 +59,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestEmbedOptimizedForSize() { }

     private static readonly TestEmbedOptimizedForSize defaultInstance = new TestEmbedOptimizedForSize().MakeReadOnly();

@@ -196,8 +192,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmptyProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmptyProtoFile.cs
index 5e3d9e21..975c754a 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmptyProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmptyProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestEmptyProtoFile {

   

     #region Extension registration

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs
index 41f4a284..a178d02d 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace UnitTest.Issues.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestExtrasIssuesProtoFile {

   

     #region Extension registration

@@ -126,16 +124,12 @@ namespace UnitTest.Issues.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum NegativeEnum {

     FiveBelow = -5,

     MinusOne = -1,

     Zero = 0,

   }

   

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum DeprecatedEnum {

     one = 1,

   }

@@ -144,8 +138,6 @@ namespace UnitTest.Issues.TestProtos {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private A() { }

     private static readonly A defaultInstance = new A().MakeReadOnly();

@@ -254,8 +246,6 @@ namespace UnitTest.Issues.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -418,8 +408,6 @@ namespace UnitTest.Issues.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private B() { }

     private static readonly B defaultInstance = new B().MakeReadOnly();

@@ -528,8 +516,6 @@ namespace UnitTest.Issues.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -692,8 +678,6 @@ namespace UnitTest.Issues.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private AB() { }

     private static readonly AB defaultInstance = new AB().MakeReadOnly();

@@ -802,8 +786,6 @@ namespace UnitTest.Issues.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -966,8 +948,6 @@ namespace UnitTest.Issues.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private NumberField() { }

     private static readonly NumberField defaultInstance = new NumberField().MakeReadOnly();

@@ -1078,8 +1058,6 @@ namespace UnitTest.Issues.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1244,8 +1222,6 @@ namespace UnitTest.Issues.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private MyMessageAReferenceB() { }

     private static readonly MyMessageAReferenceB defaultInstance = new MyMessageAReferenceB().MakeReadOnly();

@@ -1356,8 +1332,6 @@ namespace UnitTest.Issues.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilder<MyMessageAReferenceB, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1545,8 +1519,6 @@ namespace UnitTest.Issues.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private MyMessageBReferenceA() { }

     private static readonly MyMessageBReferenceA defaultInstance = new MyMessageBReferenceA().MakeReadOnly();

@@ -1657,8 +1629,6 @@ namespace UnitTest.Issues.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilder<MyMessageBReferenceA, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1846,8 +1816,6 @@ namespace UnitTest.Issues.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private NegativeEnumMessage() { }

     private static readonly NegativeEnumMessage defaultInstance = new NegativeEnumMessage().MakeReadOnly();

@@ -2011,8 +1979,6 @@ namespace UnitTest.Issues.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2277,8 +2243,6 @@ namespace UnitTest.Issues.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private DeprecatedChild() { }

     private static readonly DeprecatedChild defaultInstance = new DeprecatedChild().MakeReadOnly();

@@ -2371,8 +2335,6 @@ namespace UnitTest.Issues.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2508,8 +2470,6 @@ namespace UnitTest.Issues.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private DeprecatedFieldsMessage() { }

     private static readonly DeprecatedFieldsMessage defaultInstance = new DeprecatedFieldsMessage().MakeReadOnly();

@@ -2734,8 +2694,6 @@ namespace UnitTest.Issues.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -3158,8 +3116,6 @@ namespace UnitTest.Issues.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ItemField() { }

     private static readonly ItemField defaultInstance = new ItemField().MakeReadOnly();

@@ -3268,8 +3224,6 @@ namespace UnitTest.Issues.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilder<ItemField, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasProtoFile.cs
index cc480375..e822fd48 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestExtrasProtoFile {

   

     #region Extension registration

@@ -147,8 +145,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum UnpackedExtensionsForeignEnum {

     FOREIGN_FOO = 4,

     FOREIGN_BAR = 5,

@@ -160,8 +156,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   #region Messages

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestUnpackedExtensions() { }

     private static readonly TestUnpackedExtensions defaultInstance = new TestUnpackedExtensions().MakeReadOnly();

@@ -259,8 +253,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestGenericServices.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestGenericServices.cs
index 1c4f97f8..e9e1ca5d 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestGenericServices.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestGenericServices.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestGenericServices {

   

     #region Extension registration

@@ -61,8 +59,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Services

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public abstract class TestGenericService : pb::IService {

     public abstract void Foo(

         pb::IRpcController controller,

@@ -140,8 +136,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public class Stub : global::Google.ProtocolBuffers.TestProtos.TestGenericService {

       internal Stub(pb::IRpcChannel channel) {

         this.channel = channel;

@@ -173,8 +167,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

   }

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public abstract class TestGenericServiceWithCustomOptions : pb::IService {

     public abstract void Foo(

         pb::IRpcController controller,

@@ -239,8 +231,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public class Stub : global::Google.ProtocolBuffers.TestProtos.TestGenericServiceWithCustomOptions {

       internal Stub(pb::IRpcChannel channel) {

         this.channel = channel;

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs
index 8872c9bf..ad62c45c 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestGoogleSizeProtoFile {

   

     #region Extension registration

@@ -134,8 +132,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SizeMessage1() { }

     private static readonly SizeMessage1 defaultInstance = new SizeMessage1().MakeReadOnly();

@@ -616,8 +612,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1552,8 +1546,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SizeMessage1SubMessage() { }

     private static readonly SizeMessage1SubMessage defaultInstance = new SizeMessage1SubMessage().MakeReadOnly();

@@ -1823,8 +1815,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2306,8 +2296,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SizeMessage2() { }

     private static readonly SizeMessage2 defaultInstance = new SizeMessage2().MakeReadOnly();

@@ -2333,12 +2321,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private Group1() { }

         private static readonly Group1 defaultInstance = new Group1().MakeReadOnly();

@@ -2574,8 +2558,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -3385,8 +3367,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -4119,8 +4099,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SizeMessage2GroupedMessage() { }

     private static readonly SizeMessage2GroupedMessage defaultInstance = new SizeMessage2GroupedMessage().MakeReadOnly();

@@ -4296,8 +4274,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs
index a0a9d771..d9f3d5d5 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestGoogleSpeedProtoFile {

   

     #region Extension registration

@@ -134,8 +132,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SpeedMessage1() { }

     private static readonly SpeedMessage1 defaultInstance = new SpeedMessage1().MakeReadOnly();

@@ -895,8 +891,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2188,8 +2182,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SpeedMessage1SubMessage() { }

     private static readonly SpeedMessage1SubMessage defaultInstance = new SpeedMessage1SubMessage().MakeReadOnly();

@@ -2606,8 +2598,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -3293,8 +3283,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SpeedMessage2() { }

     private static readonly SpeedMessage2 defaultInstance = new SpeedMessage2().MakeReadOnly();

@@ -3322,12 +3310,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private Group1() { }

         private static readonly Group1 defaultInstance = new Group1().MakeReadOnly();

@@ -3703,8 +3687,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -4916,8 +4898,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -5925,8 +5905,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SpeedMessage2GroupedMessage() { }

     private static readonly SpeedMessage2GroupedMessage defaultInstance = new SpeedMessage2GroupedMessage().MakeReadOnly();

@@ -6195,8 +6173,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs
index 072da5a1..45410fd6 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestImportLiteProtoFile {

   

     #region Extension registration

@@ -28,8 +26,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum ImportEnumLite {

     IMPORT_LITE_FOO = 7,

     IMPORT_LITE_BAR = 8,

@@ -40,8 +36,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ImportMessageLite() { }

     private static readonly ImportMessageLite defaultInstance = new ImportMessageLite().MakeReadOnly();

@@ -159,8 +153,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs
index 1803b625..dd6e9669 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestImportProtoFile {

   

     #region Extension registration

@@ -56,8 +54,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum ImportEnum {

     IMPORT_FOO = 7,

     IMPORT_BAR = 8,

@@ -68,8 +64,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ImportMessage() { }

     private static readonly ImportMessage defaultInstance = new ImportMessage().MakeReadOnly();

@@ -178,8 +172,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
index c39858f4..206c3c45 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestMessageSetProtoFile {

   

     #region Extension registration

@@ -100,8 +98,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMessageSet() { }

     private static readonly TestMessageSet defaultInstance = new TestMessageSet().MakeReadOnly();

@@ -198,8 +194,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -336,8 +330,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMessageSetContainer() { }

     private static readonly TestMessageSetContainer defaultInstance = new TestMessageSetContainer().MakeReadOnly();

@@ -446,8 +438,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -635,8 +625,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMessageSetExtension1() { }

     private static readonly TestMessageSetExtension1 defaultInstance = new TestMessageSetExtension1().MakeReadOnly();

@@ -747,8 +735,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -911,8 +897,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMessageSetExtension2() { }

     private static readonly TestMessageSetExtension2 defaultInstance = new TestMessageSetExtension2().MakeReadOnly();

@@ -1023,8 +1007,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1188,8 +1170,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private RawMessageSet() { }

     private static readonly RawMessageSet defaultInstance = new RawMessageSet().MakeReadOnly();

@@ -1217,12 +1197,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private Item() { }

         private static readonly Item defaultInstance = new Item().MakeReadOnly();

@@ -1349,8 +1325,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1629,8 +1603,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs
index 3ab3d5e0..d6a9ef18 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos.NoGenericService {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestNoGenericServicesProtoFile {

   

     #region Extension registration

@@ -68,8 +66,6 @@ namespace Google.ProtocolBuffers.TestProtos.NoGenericService {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum TestEnum {

     FOO = 1,

   }

@@ -78,8 +74,6 @@ namespace Google.ProtocolBuffers.TestProtos.NoGenericService {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMessage() { }

     private static readonly TestMessage defaultInstance = new TestMessage().MakeReadOnly();

@@ -192,8 +186,6 @@ namespace Google.ProtocolBuffers.TestProtos.NoGenericService {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs
index 27af5ee9..0d8239d6 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestOptimizeForProtoFile {

   

     #region Extension registration

@@ -82,8 +80,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestOptimizedForSize() { }

     private static readonly TestOptimizedForSize defaultInstance = new TestOptimizedForSize().MakeReadOnly();

@@ -173,8 +169,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -306,8 +300,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestRequiredOptimizedForSize() { }

     private static readonly TestRequiredOptimizedForSize defaultInstance = new TestRequiredOptimizedForSize().MakeReadOnly();

@@ -383,8 +375,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -476,8 +466,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestOptionalOptimizedForSize() { }

     private static readonly TestOptionalOptimizedForSize defaultInstance = new TestOptionalOptimizedForSize().MakeReadOnly();

@@ -553,8 +541,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
index be3592dd..931563a5 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestProtoFile {

   

     #region Extension registration

@@ -1002,16 +1000,12 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum ForeignEnum {

     FOREIGN_FOO = 4,

     FOREIGN_BAR = 5,

     FOREIGN_BAZ = 6,

   }

   

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum TestEnumWithDupValue {

     FOO1 = 1,

     BAR1 = 2,

@@ -1020,8 +1014,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     BAR2 = 2,

   }

   

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum TestSparseEnum {

     SPARSE_A = 123,

     SPARSE_B = 62374,

@@ -1036,8 +1028,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestAllTypes() { }

     private static readonly TestAllTypes defaultInstance = new TestAllTypes().MakeReadOnly();

@@ -1065,11 +1055,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum NestedEnum {

         FOO = 1,

         BAR = 2,

@@ -1077,8 +1063,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private NestedMessage() { }

         private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly();

@@ -1187,8 +1171,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1351,8 +1333,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private OptionalGroup() { }

         private static readonly OptionalGroup defaultInstance = new OptionalGroup().MakeReadOnly();

@@ -1461,8 +1441,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1625,8 +1603,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private RepeatedGroup() { }

         private static readonly RepeatedGroup defaultInstance = new RepeatedGroup().MakeReadOnly();

@@ -1735,8 +1711,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -3236,8 +3210,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -5748,8 +5720,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestDeprecatedFields() { }

     private static readonly TestDeprecatedFields defaultInstance = new TestDeprecatedFields().MakeReadOnly();

@@ -5860,8 +5830,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6028,8 +5996,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ForeignMessage() { }

     private static readonly ForeignMessage defaultInstance = new ForeignMessage().MakeReadOnly();

@@ -6138,8 +6104,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6302,8 +6266,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestAllExtensions() { }

     private static readonly TestAllExtensions defaultInstance = new TestAllExtensions().MakeReadOnly();

@@ -6400,8 +6362,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6538,8 +6498,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private OptionalGroup_extension() { }

     private static readonly OptionalGroup_extension defaultInstance = new OptionalGroup_extension().MakeReadOnly();

@@ -6648,8 +6606,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6812,8 +6768,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private RepeatedGroup_extension() { }

     private static readonly RepeatedGroup_extension defaultInstance = new RepeatedGroup_extension().MakeReadOnly();

@@ -6922,8 +6876,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -7086,8 +7038,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestNestedExtension() { }

     private static readonly TestNestedExtension defaultInstance = new TestNestedExtension().MakeReadOnly();

@@ -7182,8 +7132,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -7319,8 +7267,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestRequired() { }

     private static readonly TestRequired defaultInstance = new TestRequired().MakeReadOnly();

@@ -7948,8 +7894,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -8976,8 +8920,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestRequiredForeign() { }

     private static readonly TestRequiredForeign defaultInstance = new TestRequiredForeign().MakeReadOnly();

@@ -9127,8 +9069,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -9394,8 +9334,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestForeignNested() { }

     private static readonly TestForeignNested defaultInstance = new TestForeignNested().MakeReadOnly();

@@ -9504,8 +9442,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -9693,8 +9629,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestEmptyMessage() { }

     private static readonly TestEmptyMessage defaultInstance = new TestEmptyMessage().MakeReadOnly();

@@ -9787,8 +9721,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -9924,8 +9856,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestEmptyMessageWithExtensions() { }

     private static readonly TestEmptyMessageWithExtensions defaultInstance = new TestEmptyMessageWithExtensions().MakeReadOnly();

@@ -10022,8 +9952,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -10160,8 +10088,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMultipleExtensionRanges() { }

     private static readonly TestMultipleExtensionRanges defaultInstance = new TestMultipleExtensionRanges().MakeReadOnly();

@@ -10260,8 +10186,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -10398,8 +10322,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestReallyLargeTagNumber() { }

     private static readonly TestReallyLargeTagNumber defaultInstance = new TestReallyLargeTagNumber().MakeReadOnly();

@@ -10524,8 +10446,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -10715,8 +10635,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestRecursiveMessage() { }

     private static readonly TestRecursiveMessage defaultInstance = new TestRecursiveMessage().MakeReadOnly();

@@ -10841,8 +10759,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -11057,8 +10973,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMutualRecursionA() { }

     private static readonly TestMutualRecursionA defaultInstance = new TestMutualRecursionA().MakeReadOnly();

@@ -11167,8 +11081,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -11356,8 +11268,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMutualRecursionB() { }

     private static readonly TestMutualRecursionB defaultInstance = new TestMutualRecursionB().MakeReadOnly();

@@ -11482,8 +11392,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -11698,8 +11606,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestDupFieldNumber() { }

     private static readonly TestDupFieldNumber defaultInstance = new TestDupFieldNumber().MakeReadOnly();

@@ -11727,12 +11633,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private Foo() { }

         private static readonly Foo defaultInstance = new Foo().MakeReadOnly();

@@ -11841,8 +11743,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -12005,8 +11905,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private Bar() { }

         private static readonly Bar defaultInstance = new Bar().MakeReadOnly();

@@ -12115,8 +12013,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -12396,8 +12292,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -12664,8 +12558,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestNestedMessageHasBits() { }

     private static readonly TestNestedMessageHasBits defaultInstance = new TestNestedMessageHasBits().MakeReadOnly();

@@ -12693,12 +12585,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private NestedMessage() { }

         private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly();

@@ -12834,8 +12722,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -13145,8 +13031,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -13334,8 +13218,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestCamelCaseFieldNames() { }

     private static readonly TestCamelCaseFieldNames defaultInstance = new TestCamelCaseFieldNames().MakeReadOnly();

@@ -13665,8 +13547,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -14253,8 +14133,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestFieldOrderings() { }

     private static readonly TestFieldOrderings defaultInstance = new TestFieldOrderings().MakeReadOnly();

@@ -14400,8 +14278,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -14620,8 +14496,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestExtremeDefaultValues() { }

     private static readonly TestExtremeDefaultValues defaultInstance = new TestExtremeDefaultValues().MakeReadOnly();

@@ -15036,8 +14910,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -15720,8 +15592,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SparseEnumMessage() { }

     private static readonly SparseEnumMessage defaultInstance = new SparseEnumMessage().MakeReadOnly();

@@ -15830,8 +15700,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilder<SparseEnumMessage, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -16002,8 +15870,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private OneString() { }

     private static readonly OneString defaultInstance = new OneString().MakeReadOnly();

@@ -16112,8 +15978,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -16277,8 +16141,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private OneBytes() { }

     private static readonly OneBytes defaultInstance = new OneBytes().MakeReadOnly();

@@ -16387,8 +16249,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -16552,8 +16412,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestPackedTypes() { }

     private static readonly TestPackedTypes defaultInstance = new TestPackedTypes().MakeReadOnly();

@@ -17033,8 +16891,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -17731,8 +17587,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestUnpackedTypes() { }

     private static readonly TestUnpackedTypes defaultInstance = new TestUnpackedTypes().MakeReadOnly();

@@ -18157,8 +18011,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -18855,8 +18707,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestPackedExtensions() { }

     private static readonly TestPackedExtensions defaultInstance = new TestPackedExtensions().MakeReadOnly();

@@ -18953,8 +18803,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -19091,8 +18939,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestDynamicExtensions() { }

     private static readonly TestDynamicExtensions defaultInstance = new TestDynamicExtensions().MakeReadOnly();

@@ -19120,11 +18966,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum DynamicEnumType {

         DYNAMIC_FOO = 2200,

         DYNAMIC_BAR = 2201,

@@ -19132,8 +18974,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private DynamicMessageType() { }

         private static readonly DynamicMessageType defaultInstance = new DynamicMessageType().MakeReadOnly();

@@ -19242,8 +19082,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -19608,8 +19446,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -20025,8 +19861,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestRepeatedScalarDifferentTagSizes() { }

     private static readonly TestRepeatedScalarDifferentTagSizes defaultInstance = new TestRepeatedScalarDifferentTagSizes().MakeReadOnly();

@@ -20263,8 +20097,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -20643,8 +20475,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private FooRequest() { }

     private static readonly FooRequest defaultInstance = new FooRequest().MakeReadOnly();

@@ -20737,8 +20567,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -20874,8 +20702,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private FooResponse() { }

     private static readonly FooResponse defaultInstance = new FooResponse().MakeReadOnly();

@@ -20968,8 +20794,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -21105,8 +20929,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private BarRequest() { }

     private static readonly BarRequest defaultInstance = new BarRequest().MakeReadOnly();

@@ -21199,8 +21021,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -21336,8 +21156,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private BarResponse() { }

     private static readonly BarResponse defaultInstance = new BarResponse().MakeReadOnly();

@@ -21430,8 +21248,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs
index 6f8200c3..8830b82d 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestRpcInterop {

   

     #region Extension registration

@@ -80,8 +78,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SearchRequest() { }

     private static readonly SearchRequest defaultInstance = new SearchRequest().MakeReadOnly();

@@ -198,8 +194,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -374,8 +368,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SearchResponse() { }

     private static readonly SearchResponse defaultInstance = new SearchResponse().MakeReadOnly();

@@ -403,12 +395,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private ResultItem() { }

         private static readonly ResultItem defaultInstance = new ResultItem().MakeReadOnly();

@@ -534,8 +522,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -818,8 +804,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1006,8 +990,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private RefineSearchRequest() { }

     private static readonly RefineSearchRequest defaultInstance = new RefineSearchRequest().MakeReadOnly();

@@ -1142,8 +1124,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1373,8 +1353,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   #region Services

   [global::System.Runtime.InteropServices.GuidAttribute("a65f0925-fd11-4f94-b166-89ac4f027205")]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public partial interface ISearchService {

     [global::System.Runtime.InteropServices.DispId(5)]

     global::Google.ProtocolBuffers.TestProtos.SearchResponse Search(global::Google.ProtocolBuffers.TestProtos.SearchRequest searchRequest);

@@ -1383,8 +1361,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   [global::System.CLSCompliant(false)]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public partial class SearchService : ISearchService, pb::IRpcDispatch, global::System.IDisposable {

     private readonly bool dispose;

     private readonly pb::IRpcDispatch dispatch;

@@ -1413,8 +1389,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.CLSCompliant(false)]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public partial class Dispatch : pb::IRpcDispatch, global::System.IDisposable {

       private readonly bool dispose;

       private readonly ISearchService implementation;

@@ -1441,8 +1415,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     [global::System.CLSCompliant(false)]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public partial class ServerStub : pb::IRpcServerStub, global::System.IDisposable {

       private readonly bool dispose;

       private readonly pb::IRpcDispatch implementation;

diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs
index 43373e52..2fab8e09 100644
--- a/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestXmlSerializerTestProtoFile {

   

     #region Extension registration

@@ -123,8 +121,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum EnumOptions {

     ONE = 0,

     TWO = 1,

@@ -136,8 +132,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   #region Messages

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestXmlChild() { }

     private static readonly TestXmlChild defaultInstance = new TestXmlChild().MakeReadOnly();

@@ -273,8 +267,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -486,8 +478,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestXmlNoFields() { }

     private static readonly TestXmlNoFields defaultInstance = new TestXmlNoFields().MakeReadOnly();

@@ -581,8 +571,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -719,8 +707,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestXmlRescursive() { }

     private static readonly TestXmlRescursive defaultInstance = new TestXmlRescursive().MakeReadOnly();

@@ -830,8 +816,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1020,8 +1004,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestXmlMessage() { }

     private static readonly TestXmlMessage defaultInstance = new TestXmlMessage().MakeReadOnly();

@@ -1049,13 +1031,9 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.SerializableAttribute()]

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private Children() { }

         private static readonly Children defaultInstance = new Children().MakeReadOnly();

@@ -1191,8 +1169,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         

         [global::System.SerializableAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1608,8 +1584,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2009,8 +1983,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestXmlExtension() { }

     private static readonly TestXmlExtension defaultInstance = new TestXmlExtension().MakeReadOnly();

@@ -2121,8 +2093,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
index edf35f09..003c1ed6 100644
--- a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
+++ b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.DescriptorProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class CSharpOptions {

   

     #region Extension registration

@@ -52,7 +50,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       byte[] descriptorData = global::System.Convert.FromBase64String(

           "CiRnb29nbGUvcHJvdG9idWYvY3NoYXJwX29wdGlvbnMucHJvdG8SD2dvb2ds" + 

           "ZS5wcm90b2J1ZhogZ29vZ2xlL3Byb3RvYnVmL2Rlc2NyaXB0b3IucHJvdG8i" + 

-          "/AMKEUNTaGFycEZpbGVPcHRpb25zEhEKCW5hbWVzcGFjZRgBIAEoCRIaChJ1" + 

+          "pwQKEUNTaGFycEZpbGVPcHRpb25zEhEKCW5hbWVzcGFjZRgBIAEoCRIaChJ1" + 

           "bWJyZWxsYV9jbGFzc25hbWUYAiABKAkSHAoOcHVibGljX2NsYXNzZXMYAyAB" + 

           "KAg6BHRydWUSFgoObXVsdGlwbGVfZmlsZXMYBCABKAgSFAoMbmVzdF9jbGFz" + 

           "c2VzGAUgASgIEhYKDmNvZGVfY29udHJhY3RzGAYgASgIEiQKHGV4cGFuZF9u" + 

@@ -63,26 +61,27 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
           "ASABKAkSHAoQb3V0cHV0X2RpcmVjdG9yeRjfASABKAk6AS4SJgoWaWdub3Jl" + 

           "X2dvb2dsZV9wcm90b2J1ZhjgASABKAg6BWZhbHNlEkkKFnNlcnZpY2VfZ2Vu" + 

           "ZXJhdG9yX3R5cGUY4QEgASgOMiIuZ29vZ2xlLnByb3RvYnVmLkNTaGFycFNl" + 

-          "cnZpY2VUeXBlOgROT05FIisKEkNTaGFycEZpZWxkT3B0aW9ucxIVCg1wcm9w" + 

-          "ZXJ0eV9uYW1lGAEgASgJIiwKFENTaGFycFNlcnZpY2VPcHRpb25zEhQKDGlu" + 

-          "dGVyZmFjZV9pZBgBIAEoCSIqChNDU2hhcnBNZXRob2RPcHRpb25zEhMKC2Rp" + 

-          "c3BhdGNoX2lkGAEgASgFKksKEUNTaGFycFNlcnZpY2VUeXBlEggKBE5PTkUQ" + 

-          "ABILCgdHRU5FUklDEAESDQoJSU5URVJGQUNFEAISEAoMSVJQQ0RJU1BBVENI" + 

-          "EAM6XgoTY3NoYXJwX2ZpbGVfb3B0aW9ucxIcLmdvb2dsZS5wcm90b2J1Zi5G" + 

-          "aWxlT3B0aW9ucxjoByABKAsyIi5nb29nbGUucHJvdG9idWYuQ1NoYXJwRmls" + 

-          "ZU9wdGlvbnM6YQoUY3NoYXJwX2ZpZWxkX29wdGlvbnMSHS5nb29nbGUucHJv" + 

-          "dG9idWYuRmllbGRPcHRpb25zGOgHIAEoCzIjLmdvb2dsZS5wcm90b2J1Zi5D" + 

-          "U2hhcnBGaWVsZE9wdGlvbnM6ZwoWY3NoYXJwX3NlcnZpY2Vfb3B0aW9ucxIf" + 

-          "Lmdvb2dsZS5wcm90b2J1Zi5TZXJ2aWNlT3B0aW9ucxjoByABKAsyJS5nb29n" + 

-          "bGUucHJvdG9idWYuQ1NoYXJwU2VydmljZU9wdGlvbnM6ZAoVY3NoYXJwX21l" + 

-          "dGhvZF9vcHRpb25zEh4uZ29vZ2xlLnByb3RvYnVmLk1ldGhvZE9wdGlvbnMY" + 

-          "6AcgASgLMiQuZ29vZ2xlLnByb3RvYnVmLkNTaGFycE1ldGhvZE9wdGlvbnM=");

+          "cnZpY2VUeXBlOgROT05FEikKGWdlbmVyYXRlZF9jb2RlX2F0dHJpYnV0ZXMY" + 

+          "4gEgASgIOgVmYWxzZSIrChJDU2hhcnBGaWVsZE9wdGlvbnMSFQoNcHJvcGVy" + 

+          "dHlfbmFtZRgBIAEoCSIsChRDU2hhcnBTZXJ2aWNlT3B0aW9ucxIUCgxpbnRl" + 

+          "cmZhY2VfaWQYASABKAkiKgoTQ1NoYXJwTWV0aG9kT3B0aW9ucxITCgtkaXNw" + 

+          "YXRjaF9pZBgBIAEoBSpLChFDU2hhcnBTZXJ2aWNlVHlwZRIICgROT05FEAAS" + 

+          "CwoHR0VORVJJQxABEg0KCUlOVEVSRkFDRRACEhAKDElSUENESVNQQVRDSBAD" + 

+          "Ol4KE2NzaGFycF9maWxlX29wdGlvbnMSHC5nb29nbGUucHJvdG9idWYuRmls" + 

+          "ZU9wdGlvbnMY6AcgASgLMiIuZ29vZ2xlLnByb3RvYnVmLkNTaGFycEZpbGVP" + 

+          "cHRpb25zOmEKFGNzaGFycF9maWVsZF9vcHRpb25zEh0uZ29vZ2xlLnByb3Rv" + 

+          "YnVmLkZpZWxkT3B0aW9ucxjoByABKAsyIy5nb29nbGUucHJvdG9idWYuQ1No" + 

+          "YXJwRmllbGRPcHRpb25zOmcKFmNzaGFycF9zZXJ2aWNlX29wdGlvbnMSHy5n" + 

+          "b29nbGUucHJvdG9idWYuU2VydmljZU9wdGlvbnMY6AcgASgLMiUuZ29vZ2xl" + 

+          "LnByb3RvYnVmLkNTaGFycFNlcnZpY2VPcHRpb25zOmQKFWNzaGFycF9tZXRo" + 

+          "b2Rfb3B0aW9ucxIeLmdvb2dsZS5wcm90b2J1Zi5NZXRob2RPcHRpb25zGOgH" + 

+          "IAEoCzIkLmdvb2dsZS5wcm90b2J1Zi5DU2hhcnBNZXRob2RPcHRpb25z");

       pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {

         descriptor = root;

         internal__static_google_protobuf_CSharpFileOptions__Descriptor = Descriptor.MessageTypes[0];

         internal__static_google_protobuf_CSharpFileOptions__FieldAccessorTable = 

             new pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.DescriptorProtos.CSharpFileOptions, global::Google.ProtocolBuffers.DescriptorProtos.CSharpFileOptions.Builder>(internal__static_google_protobuf_CSharpFileOptions__Descriptor,

-                new string[] { "Namespace", "UmbrellaClassname", "PublicClasses", "MultipleFiles", "NestClasses", "CodeContracts", "ExpandNamespaceDirectories", "ClsCompliance", "AddSerializable", "GeneratePrivateCtor", "FileExtension", "UmbrellaNamespace", "OutputDirectory", "IgnoreGoogleProtobuf", "ServiceGeneratorType", });

+                new string[] { "Namespace", "UmbrellaClassname", "PublicClasses", "MultipleFiles", "NestClasses", "CodeContracts", "ExpandNamespaceDirectories", "ClsCompliance", "AddSerializable", "GeneratePrivateCtor", "FileExtension", "UmbrellaNamespace", "OutputDirectory", "IgnoreGoogleProtobuf", "ServiceGeneratorType", "GeneratedCodeAttributes", });

         internal__static_google_protobuf_CSharpFieldOptions__Descriptor = Descriptor.MessageTypes[1];

         internal__static_google_protobuf_CSharpFieldOptions__FieldAccessorTable = 

             new pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.DescriptorProtos.CSharpFieldOptions, global::Google.ProtocolBuffers.DescriptorProtos.CSharpFieldOptions.Builder>(internal__static_google_protobuf_CSharpFieldOptions__Descriptor,

@@ -110,8 +109,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum CSharpServiceType {

     NONE = 0,

     GENERIC = 1,

@@ -123,13 +120,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private CSharpFileOptions() { }

     private static readonly CSharpFileOptions defaultInstance = new CSharpFileOptions().MakeReadOnly();

-    private static readonly string[] _cSharpFileOptionsFieldNames = new string[] { "add_serializable", "cls_compliance", "code_contracts", "expand_namespace_directories", "file_extension", "generate_private_ctor", "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, 80, 1792, 32, 10, 40, 1786, 24, 1800, 18, 1778 };

+    private static readonly string[] _cSharpFileOptionsFieldNames = new string[] { "add_serializable", "cls_compliance", "code_contracts", "expand_namespace_directories", "file_extension", "generate_private_ctor", "generated_code_attributes", "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, 80, 1808, 1792, 32, 10, 40, 1786, 24, 1800, 18, 1778 };

     public static CSharpFileOptions DefaultInstance {

       get { return defaultInstance; }

     }

@@ -300,6 +295,16 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       get { return serviceGeneratorType_; }

     }

     

+    public const int GeneratedCodeAttributesFieldNumber = 226;

+    private bool hasGeneratedCodeAttributes;

+    private bool generatedCodeAttributes_;

+    public bool HasGeneratedCodeAttributes {

+      get { return hasGeneratedCodeAttributes; }

+    }

+    public bool GeneratedCodeAttributes {

+      get { return generatedCodeAttributes_; }

+    }

+    

     public override bool IsInitialized {

       get {

         return true;

@@ -310,19 +315,19 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       int size = SerializedSize;

       string[] field_names = _cSharpFileOptionsFieldNames;

       if (hasNamespace) {

-        output.WriteString(1, field_names[8], Namespace);

+        output.WriteString(1, field_names[9], Namespace);

       }

       if (hasUmbrellaClassname) {

-        output.WriteString(2, field_names[13], UmbrellaClassname);

+        output.WriteString(2, field_names[14], UmbrellaClassname);

       }

       if (hasPublicClasses) {

-        output.WriteBool(3, field_names[11], PublicClasses);

+        output.WriteBool(3, field_names[12], PublicClasses);

       }

       if (hasMultipleFiles) {

-        output.WriteBool(4, field_names[7], MultipleFiles);

+        output.WriteBool(4, field_names[8], MultipleFiles);

       }

       if (hasNestClasses) {

-        output.WriteBool(5, field_names[9], NestClasses);

+        output.WriteBool(5, field_names[10], NestClasses);

       }

       if (hasCodeContracts) {

         output.WriteBool(6, field_names[2], CodeContracts);

@@ -343,16 +348,19 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         output.WriteString(221, field_names[4], FileExtension);

       }

       if (hasUmbrellaNamespace) {

-        output.WriteString(222, field_names[14], UmbrellaNamespace);

+        output.WriteString(222, field_names[15], UmbrellaNamespace);

       }

       if (hasOutputDirectory) {

-        output.WriteString(223, field_names[10], OutputDirectory);

+        output.WriteString(223, field_names[11], OutputDirectory);

       }

       if (hasIgnoreGoogleProtobuf) {

-        output.WriteBool(224, field_names[6], IgnoreGoogleProtobuf);

+        output.WriteBool(224, field_names[7], IgnoreGoogleProtobuf);

       }

       if (hasServiceGeneratorType) {

-        output.WriteEnum(225, field_names[12], (int) ServiceGeneratorType, ServiceGeneratorType);

+        output.WriteEnum(225, field_names[13], (int) ServiceGeneratorType, ServiceGeneratorType);

+      }

+      if (hasGeneratedCodeAttributes) {

+        output.WriteBool(226, field_names[6], GeneratedCodeAttributes);

       }

       UnknownFields.WriteTo(output);

     }

@@ -409,6 +417,9 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         if (hasServiceGeneratorType) {

           size += pb::CodedOutputStream.ComputeEnumSize(225, (int) ServiceGeneratorType);

         }

+        if (hasGeneratedCodeAttributes) {

+          size += pb::CodedOutputStream.ComputeBoolSize(226, GeneratedCodeAttributes);

+        }

         size += UnknownFields.SerializedSize;

         memoizedSerializedSize = size;

         return size;

@@ -457,8 +468,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -580,6 +589,9 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         if (other.HasServiceGeneratorType) {

           ServiceGeneratorType = other.ServiceGeneratorType;

         }

+        if (other.HasGeneratedCodeAttributes) {

+          GeneratedCodeAttributes = other.GeneratedCodeAttributes;

+        }

         this.MergeUnknownFields(other.UnknownFields);

         return this;

       }

@@ -691,6 +703,10 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
               }

               break;

             }

+            case 1808: {

+              result.hasGeneratedCodeAttributes = input.ReadBool(ref result.generatedCodeAttributes_);

+              break;

+            }

           }

         }

         

@@ -1005,6 +1021,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         result.serviceGeneratorType_ = global::Google.ProtocolBuffers.DescriptorProtos.CSharpServiceType.NONE;

         return this;

       }

+      

+      public bool HasGeneratedCodeAttributes {

+        get { return result.hasGeneratedCodeAttributes; }

+      }

+      public bool GeneratedCodeAttributes {

+        get { return result.GeneratedCodeAttributes; }

+        set { SetGeneratedCodeAttributes(value); }

+      }

+      public Builder SetGeneratedCodeAttributes(bool value) {

+        PrepareBuilder();

+        result.hasGeneratedCodeAttributes = true;

+        result.generatedCodeAttributes_ = value;

+        return this;

+      }

+      public Builder ClearGeneratedCodeAttributes() {

+        PrepareBuilder();

+        result.hasGeneratedCodeAttributes = false;

+        result.generatedCodeAttributes_ = false;

+        return this;

+      }

     }

     static CSharpFileOptions() {

       object.ReferenceEquals(global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor, null);

@@ -1012,8 +1048,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private CSharpFieldOptions() { }

     private static readonly CSharpFieldOptions defaultInstance = new CSharpFieldOptions().MakeReadOnly();

@@ -1122,8 +1156,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1287,8 +1319,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private CSharpServiceOptions() { }

     private static readonly CSharpServiceOptions defaultInstance = new CSharpServiceOptions().MakeReadOnly();

@@ -1397,8 +1427,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1562,8 +1590,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private CSharpMethodOptions() { }

     private static readonly CSharpMethodOptions defaultInstance = new CSharpMethodOptions().MakeReadOnly();

@@ -1672,8 +1698,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs b/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
index 9b96a646..4ef591c6 100644
--- a/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
+++ b/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.DescriptorProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class DescriptorProtoFile {

   

     #region Extension registration

@@ -248,8 +246,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private FileDescriptorSet() { }

     private static readonly FileDescriptorSet defaultInstance = new FileDescriptorSet().MakeReadOnly();

@@ -364,8 +360,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -552,8 +546,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private FileDescriptorProto() { }

     private static readonly FileDescriptorProto defaultInstance = new FileDescriptorProto().MakeReadOnly();

@@ -825,8 +817,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1365,8 +1355,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private DescriptorProto() { }

     private static readonly DescriptorProto defaultInstance = new DescriptorProto().MakeReadOnly();

@@ -1394,12 +1382,8 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private ExtensionRange() { }

         private static readonly ExtensionRange defaultInstance = new ExtensionRange().MakeReadOnly();

@@ -1524,8 +1508,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1926,8 +1908,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2398,8 +2378,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private FieldDescriptorProto() { }

     private static readonly FieldDescriptorProto defaultInstance = new FieldDescriptorProto().MakeReadOnly();

@@ -2427,11 +2405,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum Type {

         TYPE_DOUBLE = 1,

         TYPE_FLOAT = 2,

@@ -2453,8 +2427,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         TYPE_SINT64 = 18,

       }

       

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum Label {

         LABEL_OPTIONAL = 1,

         LABEL_REQUIRED = 2,

@@ -2662,8 +2634,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -3060,8 +3030,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private EnumDescriptorProto() { }

     private static readonly EnumDescriptorProto defaultInstance = new EnumDescriptorProto().MakeReadOnly();

@@ -3211,8 +3179,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -3479,8 +3445,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private EnumValueDescriptorProto() { }

     private static readonly EnumValueDescriptorProto defaultInstance = new EnumValueDescriptorProto().MakeReadOnly();

@@ -3624,8 +3588,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -3868,8 +3830,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ServiceDescriptorProto() { }

     private static readonly ServiceDescriptorProto defaultInstance = new ServiceDescriptorProto().MakeReadOnly();

@@ -4019,8 +3979,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -4287,8 +4245,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private MethodDescriptorProto() { }

     private static readonly MethodDescriptorProto defaultInstance = new MethodDescriptorProto().MakeReadOnly();

@@ -4448,8 +4404,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -4721,8 +4675,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private FileOptions() { }

     private static readonly FileOptions defaultInstance = new FileOptions().MakeReadOnly();

@@ -4750,11 +4702,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum OptimizeMode {

         SPEED = 1,

         CODE_SIZE = 2,

@@ -4985,8 +4933,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -5400,8 +5346,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private MessageOptions() { }

     private static readonly MessageOptions defaultInstance = new MessageOptions().MakeReadOnly();

@@ -5552,8 +5496,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -5795,8 +5737,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private FieldOptions() { }

     private static readonly FieldOptions defaultInstance = new FieldOptions().MakeReadOnly();

@@ -5824,11 +5764,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum CType {

         STRING = 0,

         CORD = 1,

@@ -5995,8 +5931,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6301,8 +6235,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private EnumOptions() { }

     private static readonly EnumOptions defaultInstance = new EnumOptions().MakeReadOnly();

@@ -6421,8 +6353,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6610,8 +6540,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private EnumValueOptions() { }

     private static readonly EnumValueOptions defaultInstance = new EnumValueOptions().MakeReadOnly();

@@ -6730,8 +6658,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6919,8 +6845,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ServiceOptions() { }

     private static readonly ServiceOptions defaultInstance = new ServiceOptions().MakeReadOnly();

@@ -7039,8 +6963,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -7228,8 +7150,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private MethodOptions() { }

     private static readonly MethodOptions defaultInstance = new MethodOptions().MakeReadOnly();

@@ -7348,8 +7268,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -7537,8 +7455,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private UninterpretedOption() { }

     private static readonly UninterpretedOption defaultInstance = new UninterpretedOption().MakeReadOnly();

@@ -7566,12 +7482,8 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private NamePart() { }

         private static readonly NamePart defaultInstance = new NamePart().MakeReadOnly();

@@ -7698,8 +7610,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -8078,8 +7988,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -8433,8 +8341,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private SourceCodeInfo() { }

     private static readonly SourceCodeInfo defaultInstance = new SourceCodeInfo().MakeReadOnly();

@@ -8462,12 +8368,8 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private Location() { }

         private static readonly Location defaultInstance = new Location().MakeReadOnly();

@@ -8616,8 +8518,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

         public sealed partial class Builder : pb::GeneratedBuilder<Location, Builder> {

           protected override Builder ThisBuilder {

             get { return this; }

@@ -8917,8 +8817,6 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilder<SourceCodeInfo, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffers/ProtocolBuffers.csproj b/src/ProtocolBuffers/ProtocolBuffers.csproj
index 9dbb37ae..a325992c 100644
--- a/src/ProtocolBuffers/ProtocolBuffers.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffers.csproj
@@ -106,6 +106,7 @@
     <Compile Include="FieldAccess\FieldAccessorTable.cs" />

     <Compile Include="FieldAccess\RepeatedMessageAccessor.cs" />

     <Compile Include="FieldSet.cs" />

+    <Compile Include="FrameworkPortability.cs" />

     <Compile Include="GeneratedBuilder.cs" />

     <Compile Include="GeneratedBuilderLite.cs" />

     <Compile Include="GeneratedExtensionLite.cs" />

@@ -131,7 +132,6 @@
     <Compile Include="NameHelpers.cs" />

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

     <Compile Include="RpcUtil.cs" />

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

     <Compile Include="SortedList.cs" />

     <Compile Include="TextFormat.cs" />

     <Compile Include="TextGenerator.cs" />

diff --git a/src/ProtocolBuffers/ProtocolBuffersLite.csproj b/src/ProtocolBuffers/ProtocolBuffersLite.csproj
index d3bd1f84..51aad864 100644
--- a/src/ProtocolBuffers/ProtocolBuffersLite.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffersLite.csproj
@@ -65,6 +65,7 @@
     <Compile Include="ExtendableBuilderLite.cs" />

     <Compile Include="ExtendableMessageLite.cs" />

     <Compile Include="FieldSet.cs" />

+    <Compile Include="FrameworkPortability.cs" />

     <Compile Include="GeneratedBuilderLite.cs" />

     <Compile Include="GeneratedExtensionLite.cs" />

     <Compile Include="GeneratedMessageLite.cs" />

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasFullProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasFullProtoFile.cs
index f41d0847..7c3b8091 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasFullProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasFullProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestExtrasFullProtoFile {

   

     #region Extension registration

@@ -125,8 +123,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestInteropPerson() { }

     private static readonly TestInteropPerson defaultInstance = new TestInteropPerson().MakeReadOnly();

@@ -152,11 +148,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum PhoneType {

         MOBILE = 0,

         HOME = 1,

@@ -164,8 +156,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private PhoneNumber() { }

         private static readonly PhoneNumber defaultInstance = new PhoneNumber().MakeReadOnly();

@@ -251,8 +241,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -365,8 +353,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private Addresses() { }

         private static readonly Addresses defaultInstance = new Addresses().MakeReadOnly();

@@ -483,8 +469,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -775,8 +759,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1028,8 +1010,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestInteropEmployeeId() { }

     private static readonly TestInteropEmployeeId defaultInstance = new TestInteropEmployeeId().MakeReadOnly();

@@ -1105,8 +1085,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1199,8 +1177,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMissingFieldsA() { }

     private static readonly TestMissingFieldsA defaultInstance = new TestMissingFieldsA().MakeReadOnly();

@@ -1226,12 +1202,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private SubA() { }

         private static readonly SubA defaultInstance = new SubA().MakeReadOnly();

@@ -1320,8 +1292,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1529,8 +1499,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1704,8 +1672,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMissingFieldsB() { }

     private static readonly TestMissingFieldsB defaultInstance = new TestMissingFieldsB().MakeReadOnly();

@@ -1731,12 +1697,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private SubB() { }

         private static readonly SubB defaultInstance = new SubB().MakeReadOnly();

@@ -1815,8 +1777,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -2004,8 +1964,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs
index b9f27a28..719e2a84 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestExtrasLiteProtoFile {

   

     #region Extension registration

@@ -215,8 +213,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum ExtraEnum {

     DEFAULT = 10,

     EXLITE_FOO = 7,

@@ -224,8 +220,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     EXLITE_BAZ = 9,

   }

   

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum UnpackedTypesForeignEnumLite {

     FOREIGN_LITE_FOO = 4,

     FOREIGN_LITE_BAR = 5,

@@ -237,8 +231,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   #region Messages

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestRequiredLite() { }

     private static readonly TestRequiredLite defaultInstance = new TestRequiredLite().MakeReadOnly();

@@ -378,8 +370,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -556,8 +546,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public sealed partial class TestInteropPersonLite : pb::ExtendableMessageLite<TestInteropPersonLite, TestInteropPersonLite.Builder> {

     private TestInteropPersonLite() { }

     private static readonly TestInteropPersonLite defaultInstance = new TestInteropPersonLite().MakeReadOnly();

@@ -577,11 +565,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum PhoneType {

         MOBILE = 0,

         HOME = 1,

@@ -590,8 +574,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       

       [global::System.SerializableAttribute()]

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private PhoneNumber() { }

         private static readonly PhoneNumber defaultInstance = new PhoneNumber().MakeReadOnly();

@@ -730,8 +712,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         

         [global::System.SerializableAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -909,8 +889,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       

       [global::System.SerializableAttribute()]

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private Addresses() { }

         private static readonly Addresses defaultInstance = new Addresses().MakeReadOnly();

@@ -1110,8 +1088,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         

         [global::System.SerializableAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1607,8 +1583,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::ExtendableBuilderLite<TestInteropPersonLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1951,8 +1925,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestInteropEmployeeIdLite() { }

     private static readonly TestInteropEmployeeIdLite defaultInstance = new TestInteropEmployeeIdLite().MakeReadOnly();

@@ -2072,8 +2044,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilderLite<TestInteropEmployeeIdLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2220,8 +2190,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public sealed partial class TestUnpackedExtensionsLite : pb::ExtendableMessageLite<TestUnpackedExtensionsLite, TestUnpackedExtensionsLite.Builder> {

     private TestUnpackedExtensionsLite() { }

     private static readonly TestUnpackedExtensionsLite defaultInstance = new TestUnpackedExtensionsLite().MakeReadOnly();

@@ -2328,8 +2296,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::ExtendableBuilderLite<TestUnpackedExtensionsLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -2449,8 +2415,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   [global::System.SerializableAttribute()]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestUnpackedTypesLite() { }

     private static readonly TestUnpackedTypesLite defaultInstance = new TestUnpackedTypesLite().MakeReadOnly();

@@ -2966,8 +2930,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.SerializableAttribute()]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilderLite<TestUnpackedTypesLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs
index 072da5a1..45410fd6 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestImportLiteProtoFile {

   

     #region Extension registration

@@ -28,8 +26,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum ImportEnumLite {

     IMPORT_LITE_FOO = 7,

     IMPORT_LITE_BAR = 8,

@@ -40,8 +36,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ImportMessageLite() { }

     private static readonly ImportMessageLite defaultInstance = new ImportMessageLite().MakeReadOnly();

@@ -159,8 +153,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs
index 1803b625..dd6e9669 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestImportProtoFile {

   

     #region Extension registration

@@ -56,8 +54,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum ImportEnum {

     IMPORT_FOO = 7,

     IMPORT_BAR = 8,

@@ -68,8 +64,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ImportMessage() { }

     private static readonly ImportMessage defaultInstance = new ImportMessage().MakeReadOnly();

@@ -178,8 +172,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs
index 8985e33d..82805d41 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestLiteImportNonLiteProtoFile {

   

     #region Extension registration

@@ -29,8 +27,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestLiteImportsNonlite() { }

     private static readonly TestLiteImportsNonlite defaultInstance = new TestLiteImportsNonlite().MakeReadOnly();

@@ -148,8 +144,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilderLite<TestLiteImportsNonlite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs
index 3e5f5fed..e0329b70 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestLiteProtoFile {

   

     #region Extension registration

@@ -1041,8 +1039,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum ForeignEnumLite {

     FOREIGN_LITE_FOO = 4,

     FOREIGN_LITE_BAR = 5,

@@ -1053,8 +1049,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestAllTypesLite() { }

     private static readonly TestAllTypesLite defaultInstance = new TestAllTypesLite().MakeReadOnly();

@@ -1074,11 +1068,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum NestedEnum {

         FOO = 1,

         BAR = 2,

@@ -1086,8 +1076,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private NestedMessage() { }

         private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly();

@@ -1205,8 +1193,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1351,8 +1337,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private OptionalGroup() { }

         private static readonly OptionalGroup defaultInstance = new OptionalGroup().MakeReadOnly();

@@ -1470,8 +1454,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1616,8 +1598,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private RepeatedGroup() { }

         private static readonly RepeatedGroup defaultInstance = new RepeatedGroup().MakeReadOnly();

@@ -1735,8 +1715,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -3508,8 +3486,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilderLite<TestAllTypesLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -5954,8 +5930,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ForeignMessageLite() { }

     private static readonly ForeignMessageLite defaultInstance = new ForeignMessageLite().MakeReadOnly();

@@ -6073,8 +6047,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilderLite<ForeignMessageLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6219,8 +6191,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestPackedTypesLite() { }

     private static readonly TestPackedTypesLite defaultInstance = new TestPackedTypesLite().MakeReadOnly();

@@ -6790,8 +6760,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilderLite<TestPackedTypesLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -7462,8 +7430,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public sealed partial class TestAllExtensionsLite : pb::ExtendableMessageLite<TestAllExtensionsLite, TestAllExtensionsLite.Builder> {

     private TestAllExtensionsLite() { }

     private static readonly TestAllExtensionsLite defaultInstance = new TestAllExtensionsLite().MakeReadOnly();

@@ -7569,8 +7535,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::ExtendableBuilderLite<TestAllExtensionsLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -7689,8 +7653,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   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 OptionalGroup_extension_lite().MakeReadOnly();

@@ -7808,8 +7770,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilderLite<OptionalGroup_extension_lite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -7954,8 +7914,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   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 RepeatedGroup_extension_lite().MakeReadOnly();

@@ -8073,8 +8031,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilderLite<RepeatedGroup_extension_lite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -8219,8 +8175,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public sealed partial class TestPackedExtensionsLite : pb::ExtendableMessageLite<TestPackedExtensionsLite, TestPackedExtensionsLite.Builder> {

     private TestPackedExtensionsLite() { }

     private static readonly TestPackedExtensionsLite defaultInstance = new TestPackedExtensionsLite().MakeReadOnly();

@@ -8326,8 +8280,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::ExtendableBuilderLite<TestPackedExtensionsLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -8446,8 +8398,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestNestedExtensionLite() { }

     private static readonly TestNestedExtensionLite defaultInstance = new TestNestedExtensionLite().MakeReadOnly();

@@ -8548,8 +8498,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilderLite<TestNestedExtensionLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -8667,8 +8615,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestDeprecatedLite() { }

     private static readonly TestDeprecatedLite defaultInstance = new TestDeprecatedLite().MakeReadOnly();

@@ -8788,8 +8734,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public sealed partial class Builder : pb::GeneratedBuilderLite<TestDeprecatedLite, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs
index be3592dd..931563a5 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public static partial class UnitTestProtoFile {

   

     #region Extension registration

@@ -1002,16 +1000,12 @@ namespace Google.ProtocolBuffers.TestProtos {
     

   }

   #region Enums

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum ForeignEnum {

     FOREIGN_FOO = 4,

     FOREIGN_BAR = 5,

     FOREIGN_BAZ = 6,

   }

   

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum TestEnumWithDupValue {

     FOO1 = 1,

     BAR1 = 2,

@@ -1020,8 +1014,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     BAR2 = 2,

   }

   

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public enum TestSparseEnum {

     SPARSE_A = 123,

     SPARSE_B = 62374,

@@ -1036,8 +1028,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestAllTypes() { }

     private static readonly TestAllTypes defaultInstance = new TestAllTypes().MakeReadOnly();

@@ -1065,11 +1055,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

       public enum NestedEnum {

         FOO = 1,

         BAR = 2,

@@ -1077,8 +1063,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private NestedMessage() { }

         private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly();

@@ -1187,8 +1171,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1351,8 +1333,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private OptionalGroup() { }

         private static readonly OptionalGroup defaultInstance = new OptionalGroup().MakeReadOnly();

@@ -1461,8 +1441,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -1625,8 +1603,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

         private RepeatedGroup() { }

         private static readonly RepeatedGroup defaultInstance = new RepeatedGroup().MakeReadOnly();

@@ -1735,8 +1711,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

           protected override Builder ThisBuilder {

             get { return this; }

@@ -3236,8 +3210,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -5748,8 +5720,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestDeprecatedFields() { }

     private static readonly TestDeprecatedFields defaultInstance = new TestDeprecatedFields().MakeReadOnly();

@@ -5860,8 +5830,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6028,8 +5996,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private ForeignMessage() { }

     private static readonly ForeignMessage defaultInstance = new ForeignMessage().MakeReadOnly();

@@ -6138,8 +6104,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6302,8 +6266,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestAllExtensions() { }

     private static readonly TestAllExtensions defaultInstance = new TestAllExtensions().MakeReadOnly();

@@ -6400,8 +6362,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6538,8 +6498,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private OptionalGroup_extension() { }

     private static readonly OptionalGroup_extension defaultInstance = new OptionalGroup_extension().MakeReadOnly();

@@ -6648,8 +6606,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -6812,8 +6768,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private RepeatedGroup_extension() { }

     private static readonly RepeatedGroup_extension defaultInstance = new RepeatedGroup_extension().MakeReadOnly();

@@ -6922,8 +6876,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -7086,8 +7038,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestNestedExtension() { }

     private static readonly TestNestedExtension defaultInstance = new TestNestedExtension().MakeReadOnly();

@@ -7182,8 +7132,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -7319,8 +7267,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestRequired() { }

     private static readonly TestRequired defaultInstance = new TestRequired().MakeReadOnly();

@@ -7948,8 +7894,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -8976,8 +8920,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestRequiredForeign() { }

     private static readonly TestRequiredForeign defaultInstance = new TestRequiredForeign().MakeReadOnly();

@@ -9127,8 +9069,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -9394,8 +9334,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestForeignNested() { }

     private static readonly TestForeignNested defaultInstance = new TestForeignNested().MakeReadOnly();

@@ -9504,8 +9442,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -9693,8 +9629,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestEmptyMessage() { }

     private static readonly TestEmptyMessage defaultInstance = new TestEmptyMessage().MakeReadOnly();

@@ -9787,8 +9721,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -9924,8 +9856,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestEmptyMessageWithExtensions() { }

     private static readonly TestEmptyMessageWithExtensions defaultInstance = new TestEmptyMessageWithExtensions().MakeReadOnly();

@@ -10022,8 +9952,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -10160,8 +10088,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMultipleExtensionRanges() { }

     private static readonly TestMultipleExtensionRanges defaultInstance = new TestMultipleExtensionRanges().MakeReadOnly();

@@ -10260,8 +10186,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -10398,8 +10322,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestReallyLargeTagNumber() { }

     private static readonly TestReallyLargeTagNumber defaultInstance = new TestReallyLargeTagNumber().MakeReadOnly();

@@ -10524,8 +10446,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -10715,8 +10635,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestRecursiveMessage() { }

     private static readonly TestRecursiveMessage defaultInstance = new TestRecursiveMessage().MakeReadOnly();

@@ -10841,8 +10759,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -11057,8 +10973,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

     private TestMutualRecursionA() { }

     private static readonly TestMutualRecursionA defaultInstance = new TestMutualRecursionA().MakeReadOnly();

@@ -11167,8 +11081,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

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

       protected override Builder ThisBuilder {

         get { return this; }

@@ -11356,8 +11268,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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

   public sealed partial class TestMutualRecursionB : pb::GeneratedMessage<TestMutualRecursionB, TestMutualRecursionB.Builder> {

     private TestMutualRecursionB() { }

     private static readonly TestMutualRecursionB defaultInstance = new TestMutualRecursionB().MakeReadOnly();

@@ -11482,8 +11392,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<TestMutualRecursionB, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -11698,8 +11606,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class TestDupFieldNumber : pb::GeneratedMessage<TestDupFieldNumber, TestDupFieldNumber.Builder> {

     private TestDupFieldNumber() { }

     private static readonly TestDupFieldNumber defaultInstance = new TestDupFieldNumber().MakeReadOnly();

@@ -11727,12 +11633,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-      [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

       public sealed partial class Foo : pb::GeneratedMessage<Foo, Foo.Builder> {

         private Foo() { }

         private static readonly Foo defaultInstance = new Foo().MakeReadOnly();

@@ -11841,8 +11743,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

         public sealed partial class Builder : pb::GeneratedBuilder<Foo, Builder> {

           protected override Builder ThisBuilder {

             get { return this; }

@@ -12005,8 +11905,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-      [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

       public sealed partial class Bar : pb::GeneratedMessage<Bar, Bar.Builder> {

         private Bar() { }

         private static readonly Bar defaultInstance = new Bar().MakeReadOnly();

@@ -12115,8 +12013,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

         public sealed partial class Builder : pb::GeneratedBuilder<Bar, Builder> {

           protected override Builder ThisBuilder {

             get { return this; }

@@ -12396,8 +12292,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<TestDupFieldNumber, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -12664,8 +12558,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class TestNestedMessageHasBits : pb::GeneratedMessage<TestNestedMessageHasBits, TestNestedMessageHasBits.Builder> {

     private TestNestedMessageHasBits() { }

     private static readonly TestNestedMessageHasBits defaultInstance = new TestNestedMessageHasBits().MakeReadOnly();

@@ -12693,12 +12585,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-      [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

       public sealed partial class NestedMessage : pb::GeneratedMessage<NestedMessage, NestedMessage.Builder> {

         private NestedMessage() { }

         private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly();

@@ -12834,8 +12722,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

         public sealed partial class Builder : pb::GeneratedBuilder<NestedMessage, Builder> {

           protected override Builder ThisBuilder {

             get { return this; }

@@ -13145,8 +13031,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<TestNestedMessageHasBits, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -13334,8 +13218,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class TestCamelCaseFieldNames : pb::GeneratedMessage<TestCamelCaseFieldNames, TestCamelCaseFieldNames.Builder> {

     private TestCamelCaseFieldNames() { }

     private static readonly TestCamelCaseFieldNames defaultInstance = new TestCamelCaseFieldNames().MakeReadOnly();

@@ -13665,8 +13547,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<TestCamelCaseFieldNames, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -14253,8 +14133,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class TestFieldOrderings : pb::ExtendableMessage<TestFieldOrderings, TestFieldOrderings.Builder> {

     private TestFieldOrderings() { }

     private static readonly TestFieldOrderings defaultInstance = new TestFieldOrderings().MakeReadOnly();

@@ -14400,8 +14278,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::ExtendableBuilder<TestFieldOrderings, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -14620,8 +14496,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class TestExtremeDefaultValues : pb::GeneratedMessage<TestExtremeDefaultValues, TestExtremeDefaultValues.Builder> {

     private TestExtremeDefaultValues() { }

     private static readonly TestExtremeDefaultValues defaultInstance = new TestExtremeDefaultValues().MakeReadOnly();

@@ -15036,8 +14910,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<TestExtremeDefaultValues, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -15720,8 +15592,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class SparseEnumMessage : pb::GeneratedMessage<SparseEnumMessage, SparseEnumMessage.Builder> {

     private SparseEnumMessage() { }

     private static readonly SparseEnumMessage defaultInstance = new SparseEnumMessage().MakeReadOnly();

@@ -15830,8 +15700,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<SparseEnumMessage, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -16002,8 +15870,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class OneString : pb::GeneratedMessage<OneString, OneString.Builder> {

     private OneString() { }

     private static readonly OneString defaultInstance = new OneString().MakeReadOnly();

@@ -16112,8 +15978,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<OneString, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -16277,8 +16141,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class OneBytes : pb::GeneratedMessage<OneBytes, OneBytes.Builder> {

     private OneBytes() { }

     private static readonly OneBytes defaultInstance = new OneBytes().MakeReadOnly();

@@ -16387,8 +16249,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<OneBytes, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -16552,8 +16412,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class TestPackedTypes : pb::GeneratedMessage<TestPackedTypes, TestPackedTypes.Builder> {

     private TestPackedTypes() { }

     private static readonly TestPackedTypes defaultInstance = new TestPackedTypes().MakeReadOnly();

@@ -17033,8 +16891,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<TestPackedTypes, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -17731,8 +17587,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class TestUnpackedTypes : pb::GeneratedMessage<TestUnpackedTypes, TestUnpackedTypes.Builder> {

     private TestUnpackedTypes() { }

     private static readonly TestUnpackedTypes defaultInstance = new TestUnpackedTypes().MakeReadOnly();

@@ -18157,8 +18011,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<TestUnpackedTypes, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -18855,8 +18707,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class TestPackedExtensions : pb::ExtendableMessage<TestPackedExtensions, TestPackedExtensions.Builder> {

     private TestPackedExtensions() { }

     private static readonly TestPackedExtensions defaultInstance = new TestPackedExtensions().MakeReadOnly();

@@ -18953,8 +18803,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::ExtendableBuilder<TestPackedExtensions, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -19091,8 +18939,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class TestDynamicExtensions : pb::GeneratedMessage<TestDynamicExtensions, TestDynamicExtensions.Builder> {

     private TestDynamicExtensions() { }

     private static readonly TestDynamicExtensions defaultInstance = new TestDynamicExtensions().MakeReadOnly();

@@ -19120,11 +18966,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public static partial class Types {

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-      [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

       public enum DynamicEnumType {

         DYNAMIC_FOO = 2200,

         DYNAMIC_BAR = 2201,

@@ -19132,8 +18974,6 @@ namespace Google.ProtocolBuffers.TestProtos {
       }

       

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-      [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

       public sealed partial class DynamicMessageType : pb::GeneratedMessage<DynamicMessageType, DynamicMessageType.Builder> {

         private DynamicMessageType() { }

         private static readonly DynamicMessageType defaultInstance = new DynamicMessageType().MakeReadOnly();

@@ -19242,8 +19082,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

         public sealed partial class Builder : pb::GeneratedBuilder<DynamicMessageType, Builder> {

           protected override Builder ThisBuilder {

             get { return this; }

@@ -19608,8 +19446,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<TestDynamicExtensions, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -20025,8 +19861,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class TestRepeatedScalarDifferentTagSizes : pb::GeneratedMessage<TestRepeatedScalarDifferentTagSizes, TestRepeatedScalarDifferentTagSizes.Builder> {

     private TestRepeatedScalarDifferentTagSizes() { }

     private static readonly TestRepeatedScalarDifferentTagSizes defaultInstance = new TestRepeatedScalarDifferentTagSizes().MakeReadOnly();

@@ -20263,8 +20097,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<TestRepeatedScalarDifferentTagSizes, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -20643,8 +20475,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class FooRequest : pb::GeneratedMessage<FooRequest, FooRequest.Builder> {

     private FooRequest() { }

     private static readonly FooRequest defaultInstance = new FooRequest().MakeReadOnly();

@@ -20737,8 +20567,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<FooRequest, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -20874,8 +20702,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class FooResponse : pb::GeneratedMessage<FooResponse, FooResponse.Builder> {

     private FooResponse() { }

     private static readonly FooResponse defaultInstance = new FooResponse().MakeReadOnly();

@@ -20968,8 +20794,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<FooResponse, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -21105,8 +20929,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class BarRequest : pb::GeneratedMessage<BarRequest, BarRequest.Builder> {

     private BarRequest() { }

     private static readonly BarRequest defaultInstance = new BarRequest().MakeReadOnly();

@@ -21199,8 +21021,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<BarRequest, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -21336,8 +21156,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class BarResponse : pb::GeneratedMessage<BarResponse, BarResponse.Builder> {

     private BarResponse() { }

     private static readonly BarResponse defaultInstance = new BarResponse().MakeReadOnly();

@@ -21430,8 +21248,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilder<BarResponse, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

diff --git a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestRpcInteropLite.cs b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestRpcInteropLite.cs
index 2cc6203a..85f562b4 100644
--- a/src/ProtocolBuffersLite.Test/TestProtos/UnitTestRpcInteropLite.cs
+++ b/src/ProtocolBuffersLite.Test/TestProtos/UnitTestRpcInteropLite.cs
@@ -9,8 +9,6 @@ using scg = global::System.Collections.Generic;
 namespace Google.ProtocolBuffers.TestProtos {

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public static partial class UnitTestRpcInteropLite {

   

     #region Extension registration

@@ -29,8 +27,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   #region Messages

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class SearchRequest : pb::GeneratedMessageLite<SearchRequest, SearchRequest.Builder> {

     private SearchRequest() { }

     private static readonly SearchRequest defaultInstance = new SearchRequest().MakeReadOnly();

@@ -159,8 +155,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilderLite<SearchRequest, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -317,8 +311,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class SearchResponse : pb::GeneratedMessageLite<SearchResponse, SearchResponse.Builder> {

     private SearchResponse() { }

     private static readonly SearchResponse defaultInstance = new SearchResponse().MakeReadOnly();

@@ -338,12 +330,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     #region Nested types

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public static partial class Types {

       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-      [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-      [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

       public sealed partial class ResultItem : pb::GeneratedMessageLite<ResultItem, ResultItem.Builder> {

         private ResultItem() { }

         private static readonly ResultItem defaultInstance = new ResultItem().MakeReadOnly();

@@ -481,8 +469,6 @@ namespace Google.ProtocolBuffers.TestProtos {
         }

         

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

         public sealed partial class Builder : pb::GeneratedBuilderLite<ResultItem, Builder> {

           protected override Builder ThisBuilder {

             get { return this; }

@@ -767,8 +753,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilderLite<SearchResponse, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -937,8 +921,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   }

   

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public sealed partial class RefineSearchRequest : pb::GeneratedMessageLite<RefineSearchRequest, RefineSearchRequest.Builder> {

     private RefineSearchRequest() { }

     private static readonly RefineSearchRequest defaultInstance = new RefineSearchRequest().MakeReadOnly();

@@ -1088,8 +1070,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public sealed partial class Builder : pb::GeneratedBuilderLite<RefineSearchRequest, Builder> {

       protected override Builder ThisBuilder {

         get { return this; }

@@ -1301,8 +1281,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   #region Services

   [global::System.Runtime.InteropServices.GuidAttribute("a65f0925-fd11-4f94-b166-89ac4f027205")]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public partial interface ISearchService {

     [global::System.Runtime.InteropServices.DispId(5)]

     global::Google.ProtocolBuffers.TestProtos.SearchResponse Search(global::Google.ProtocolBuffers.TestProtos.SearchRequest searchRequest);

@@ -1311,8 +1289,6 @@ namespace Google.ProtocolBuffers.TestProtos {
   

   [global::System.CLSCompliant(false)]

   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

   public partial class SearchService : ISearchService, pb::IRpcDispatch, global::System.IDisposable {

     private readonly bool dispose;

     private readonly pb::IRpcDispatch dispatch;

@@ -1341,8 +1317,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     

     [global::System.CLSCompliant(false)]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public partial class Dispatch : pb::IRpcDispatch, global::System.IDisposable {

       private readonly bool dispose;

       private readonly ISearchService implementation;

@@ -1369,8 +1343,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     }

     [global::System.CLSCompliant(false)]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("ProtoGen", "2.4.1.473")]

     public partial class ServerStub : pb::IRpcServerStub, global::System.IDisposable {

       private readonly bool dispose;

       private readonly pb::IRpcDispatch implementation;