Generate *all* protos in the script, applying fixups.

We still have some protos which aren't generated how we want them to be:

- Until we have an option to specify the "umbrella" class, DescriptorProtoFile
  will be broken. (The change of name here affects the reflection descriptor,
  which accounts for most of the change. That's easier than trying to work out
  exactly which occurrences of Descriptor need changing though.)
- That change affects UnittestCustomOptions
- Issue #307 breaks Unittest.cs

After this commit, we don't have the record of the fixups in the files themselves
any more, but one centralized record in the shell script.

1 files changed, 0 insertions, 171 deletions

diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/Unittest.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/Unittest.cs
index d39c9345..083523c0 100644
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/Unittest.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestProtos/Unittest.cs
@@ -1,6 +1,3 @@
-// Manual changes:
-// - Search and replace of RepeatedFieldsGenerator.Group to RepeatedFieldsGenerator.Types.Group
-//
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/unittest.proto
 #pragma warning disable 1591, 0612, 3021
@@ -136,20 +133,16 @@ namespace Google.ProtocolBuffers.TestProtos {
     public const int OptionalInt64ExtensionFieldNumber = 2;
     public static pb::GeneratedExtensionBase<long> OptionalInt64Extension;
     public const int OptionalUint32ExtensionFieldNumber = 3;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<uint> OptionalUint32Extension;
     public const int OptionalUint64ExtensionFieldNumber = 4;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<ulong> OptionalUint64Extension;
     public const int OptionalSint32ExtensionFieldNumber = 5;
     public static pb::GeneratedExtensionBase<int> OptionalSint32Extension;
     public const int OptionalSint64ExtensionFieldNumber = 6;
     public static pb::GeneratedExtensionBase<long> OptionalSint64Extension;
     public const int OptionalFixed32ExtensionFieldNumber = 7;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<uint> OptionalFixed32Extension;
     public const int OptionalFixed64ExtensionFieldNumber = 8;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<ulong> OptionalFixed64Extension;
     public const int OptionalSfixed32ExtensionFieldNumber = 9;
     public static pb::GeneratedExtensionBase<int> OptionalSfixed32Extension;
@@ -192,20 +185,16 @@ namespace Google.ProtocolBuffers.TestProtos {
     public const int RepeatedInt64ExtensionFieldNumber = 32;
     public static pb::GeneratedExtensionBase<scg::IList<long>> RepeatedInt64Extension;
     public const int RepeatedUint32ExtensionFieldNumber = 33;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<uint>> RepeatedUint32Extension;
     public const int RepeatedUint64ExtensionFieldNumber = 34;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<ulong>> RepeatedUint64Extension;
     public const int RepeatedSint32ExtensionFieldNumber = 35;
     public static pb::GeneratedExtensionBase<scg::IList<int>> RepeatedSint32Extension;
     public const int RepeatedSint64ExtensionFieldNumber = 36;
     public static pb::GeneratedExtensionBase<scg::IList<long>> RepeatedSint64Extension;
     public const int RepeatedFixed32ExtensionFieldNumber = 37;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<uint>> RepeatedFixed32Extension;
     public const int RepeatedFixed64ExtensionFieldNumber = 38;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<ulong>> RepeatedFixed64Extension;
     public const int RepeatedSfixed32ExtensionFieldNumber = 39;
     public static pb::GeneratedExtensionBase<scg::IList<int>> RepeatedSfixed32Extension;
@@ -246,20 +235,16 @@ namespace Google.ProtocolBuffers.TestProtos {
     public const int DefaultInt64ExtensionFieldNumber = 62;
     public static pb::GeneratedExtensionBase<long> DefaultInt64Extension;
     public const int DefaultUint32ExtensionFieldNumber = 63;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<uint> DefaultUint32Extension;
     public const int DefaultUint64ExtensionFieldNumber = 64;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<ulong> DefaultUint64Extension;
     public const int DefaultSint32ExtensionFieldNumber = 65;
     public static pb::GeneratedExtensionBase<int> DefaultSint32Extension;
     public const int DefaultSint64ExtensionFieldNumber = 66;
     public static pb::GeneratedExtensionBase<long> DefaultSint64Extension;
     public const int DefaultFixed32ExtensionFieldNumber = 67;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<uint> DefaultFixed32Extension;
     public const int DefaultFixed64ExtensionFieldNumber = 68;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<ulong> DefaultFixed64Extension;
     public const int DefaultSfixed32ExtensionFieldNumber = 69;
     public static pb::GeneratedExtensionBase<int> DefaultSfixed32Extension;
@@ -286,7 +271,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public const int DefaultCordExtensionFieldNumber = 85;
     public static pb::GeneratedExtensionBase<string> DefaultCordExtension;
     public const int OneofUint32ExtensionFieldNumber = 111;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<uint> OneofUint32Extension;
     public const int OneofNestedMessageExtensionFieldNumber = 112;
     public static pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage> OneofNestedMessageExtension;
@@ -303,20 +287,16 @@ namespace Google.ProtocolBuffers.TestProtos {
     public const int PackedInt64ExtensionFieldNumber = 91;
     public static pb::GeneratedExtensionBase<scg::IList<long>> PackedInt64Extension;
     public const int PackedUint32ExtensionFieldNumber = 92;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<uint>> PackedUint32Extension;
     public const int PackedUint64ExtensionFieldNumber = 93;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<ulong>> PackedUint64Extension;
     public const int PackedSint32ExtensionFieldNumber = 94;
     public static pb::GeneratedExtensionBase<scg::IList<int>> PackedSint32Extension;
     public const int PackedSint64ExtensionFieldNumber = 95;
     public static pb::GeneratedExtensionBase<scg::IList<long>> PackedSint64Extension;
     public const int PackedFixed32ExtensionFieldNumber = 96;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<uint>> PackedFixed32Extension;
     public const int PackedFixed64ExtensionFieldNumber = 97;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<ulong>> PackedFixed64Extension;
     public const int PackedSfixed32ExtensionFieldNumber = 98;
     public static pb::GeneratedExtensionBase<scg::IList<int>> PackedSfixed32Extension;
@@ -335,20 +315,16 @@ namespace Google.ProtocolBuffers.TestProtos {
     public const int UnpackedInt64ExtensionFieldNumber = 91;
     public static pb::GeneratedExtensionBase<scg::IList<long>> UnpackedInt64Extension;
     public const int UnpackedUint32ExtensionFieldNumber = 92;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<uint>> UnpackedUint32Extension;
     public const int UnpackedUint64ExtensionFieldNumber = 93;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<ulong>> UnpackedUint64Extension;
     public const int UnpackedSint32ExtensionFieldNumber = 94;
     public static pb::GeneratedExtensionBase<scg::IList<int>> UnpackedSint32Extension;
     public const int UnpackedSint64ExtensionFieldNumber = 95;
     public static pb::GeneratedExtensionBase<scg::IList<long>> UnpackedSint64Extension;
     public const int UnpackedFixed32ExtensionFieldNumber = 96;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<uint>> UnpackedFixed32Extension;
     public const int UnpackedFixed64ExtensionFieldNumber = 97;
-    [global::System.CLSCompliant(false)]
     public static pb::GeneratedExtensionBase<scg::IList<ulong>> UnpackedFixed64Extension;
     public const int UnpackedSfixed32ExtensionFieldNumber = 98;
     public static pb::GeneratedExtensionBase<scg::IList<int>> UnpackedSfixed32Extension;
@@ -2331,7 +2307,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasOptionalUint32 {
       get { return hasOptionalUint32; }
     }
-    [global::System.CLSCompliant(false)]
     public uint OptionalUint32 {
       get { return optionalUint32_; }
     }
@@ -2342,7 +2317,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasOptionalUint64 {
       get { return hasOptionalUint64; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong OptionalUint64 {
       get { return optionalUint64_; }
     }
@@ -2373,7 +2347,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasOptionalFixed32 {
       get { return hasOptionalFixed32; }
     }
-    [global::System.CLSCompliant(false)]
     public uint OptionalFixed32 {
       get { return optionalFixed32_; }
     }
@@ -2384,7 +2357,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasOptionalFixed64 {
       get { return hasOptionalFixed64; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong OptionalFixed64 {
       get { return optionalFixed64_; }
     }
@@ -2595,28 +2567,24 @@ namespace Google.ProtocolBuffers.TestProtos {
 
     public const int RepeatedUint32FieldNumber = 33;
     private pbc::PopsicleList<uint> repeatedUint32_ = new pbc::PopsicleList<uint>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<uint> RepeatedUint32List {
       get { return pbc::Lists.AsReadOnly(repeatedUint32_); }
     }
     public int RepeatedUint32Count {
       get { return repeatedUint32_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public uint GetRepeatedUint32(int index) {
       return repeatedUint32_[index];
     }
 
     public const int RepeatedUint64FieldNumber = 34;
     private pbc::PopsicleList<ulong> repeatedUint64_ = new pbc::PopsicleList<ulong>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<ulong> RepeatedUint64List {
       get { return pbc::Lists.AsReadOnly(repeatedUint64_); }
     }
     public int RepeatedUint64Count {
       get { return repeatedUint64_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong GetRepeatedUint64(int index) {
       return repeatedUint64_[index];
     }
@@ -2647,28 +2615,24 @@ namespace Google.ProtocolBuffers.TestProtos {
 
     public const int RepeatedFixed32FieldNumber = 37;
     private pbc::PopsicleList<uint> repeatedFixed32_ = new pbc::PopsicleList<uint>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<uint> RepeatedFixed32List {
       get { return pbc::Lists.AsReadOnly(repeatedFixed32_); }
     }
     public int RepeatedFixed32Count {
       get { return repeatedFixed32_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public uint GetRepeatedFixed32(int index) {
       return repeatedFixed32_[index];
     }
 
     public const int RepeatedFixed64FieldNumber = 38;
     private pbc::PopsicleList<ulong> repeatedFixed64_ = new pbc::PopsicleList<ulong>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<ulong> RepeatedFixed64List {
       get { return pbc::Lists.AsReadOnly(repeatedFixed64_); }
     }
     public int RepeatedFixed64Count {
       get { return repeatedFixed64_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong GetRepeatedFixed64(int index) {
       return repeatedFixed64_[index];
     }
@@ -2903,7 +2867,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasDefaultUint32 {
       get { return hasDefaultUint32; }
     }
-    [global::System.CLSCompliant(false)]
     public uint DefaultUint32 {
       get { return defaultUint32_; }
     }
@@ -2914,7 +2877,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasDefaultUint64 {
       get { return hasDefaultUint64; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong DefaultUint64 {
       get { return defaultUint64_; }
     }
@@ -2945,7 +2907,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasDefaultFixed32 {
       get { return hasDefaultFixed32; }
     }
-    [global::System.CLSCompliant(false)]
     public uint DefaultFixed32 {
       get { return defaultFixed32_; }
     }
@@ -2956,7 +2917,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasDefaultFixed64 {
       get { return hasDefaultFixed64; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong DefaultFixed64 {
       get { return defaultFixed64_; }
     }
@@ -3087,7 +3047,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasOneofUint32 {
       get { return hasOneofUint32; }
     }
-    [global::System.CLSCompliant(false)]
     public uint OneofUint32 {
       get { return oneofUint32_; }
     }
@@ -4584,12 +4543,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalUint32 {
         get { return result.hasOptionalUint32; }
       }
-      [global::System.CLSCompliant(false)]
       public uint OptionalUint32 {
         get { return result.OptionalUint32; }
         set { SetOptionalUint32(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetOptionalUint32(uint value) {
         PrepareBuilder();
         result.hasOptionalUint32 = true;
@@ -4606,12 +4563,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalUint64 {
         get { return result.hasOptionalUint64; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong OptionalUint64 {
         get { return result.OptionalUint64; }
         set { SetOptionalUint64(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetOptionalUint64(ulong value) {
         PrepareBuilder();
         result.hasOptionalUint64 = true;
@@ -4668,12 +4623,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalFixed32 {
         get { return result.hasOptionalFixed32; }
       }
-      [global::System.CLSCompliant(false)]
       public uint OptionalFixed32 {
         get { return result.OptionalFixed32; }
         set { SetOptionalFixed32(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetOptionalFixed32(uint value) {
         PrepareBuilder();
         result.hasOptionalFixed32 = true;
@@ -4690,12 +4643,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalFixed64 {
         get { return result.hasOptionalFixed64; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong OptionalFixed64 {
         get { return result.OptionalFixed64; }
         set { SetOptionalFixed64(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetOptionalFixed64(ulong value) {
         PrepareBuilder();
         result.hasOptionalFixed64 = true;
@@ -5253,30 +5204,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<uint> RepeatedUint32List {
         get { return PrepareBuilder().repeatedUint32_; }
       }
       public int RepeatedUint32Count {
         get { return result.RepeatedUint32Count; }
       }
-      [global::System.CLSCompliant(false)]
       public uint GetRepeatedUint32(int index) {
         return result.GetRepeatedUint32(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetRepeatedUint32(int index, uint value) {
         PrepareBuilder();
         result.repeatedUint32_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRepeatedUint32(uint value) {
         PrepareBuilder();
         result.repeatedUint32_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeRepeatedUint32(scg::IEnumerable<uint> values) {
         PrepareBuilder();
         result.repeatedUint32_.Add(values);
@@ -5288,30 +5234,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<ulong> RepeatedUint64List {
         get { return PrepareBuilder().repeatedUint64_; }
       }
       public int RepeatedUint64Count {
         get { return result.RepeatedUint64Count; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong GetRepeatedUint64(int index) {
         return result.GetRepeatedUint64(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetRepeatedUint64(int index, ulong value) {
         PrepareBuilder();
         result.repeatedUint64_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRepeatedUint64(ulong value) {
         PrepareBuilder();
         result.repeatedUint64_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeRepeatedUint64(scg::IEnumerable<ulong> values) {
         PrepareBuilder();
         result.repeatedUint64_.Add(values);
@@ -5383,30 +5324,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<uint> RepeatedFixed32List {
         get { return PrepareBuilder().repeatedFixed32_; }
       }
       public int RepeatedFixed32Count {
         get { return result.RepeatedFixed32Count; }
       }
-      [global::System.CLSCompliant(false)]
       public uint GetRepeatedFixed32(int index) {
         return result.GetRepeatedFixed32(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetRepeatedFixed32(int index, uint value) {
         PrepareBuilder();
         result.repeatedFixed32_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRepeatedFixed32(uint value) {
         PrepareBuilder();
         result.repeatedFixed32_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeRepeatedFixed32(scg::IEnumerable<uint> values) {
         PrepareBuilder();
         result.repeatedFixed32_.Add(values);
@@ -5418,30 +5354,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<ulong> RepeatedFixed64List {
         get { return PrepareBuilder().repeatedFixed64_; }
       }
       public int RepeatedFixed64Count {
         get { return result.RepeatedFixed64Count; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong GetRepeatedFixed64(int index) {
         return result.GetRepeatedFixed64(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetRepeatedFixed64(int index, ulong value) {
         PrepareBuilder();
         result.repeatedFixed64_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRepeatedFixed64(ulong value) {
         PrepareBuilder();
         result.repeatedFixed64_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeRepeatedFixed64(scg::IEnumerable<ulong> values) {
         PrepareBuilder();
         result.repeatedFixed64_.Add(values);
@@ -6084,12 +6015,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasDefaultUint32 {
         get { return result.hasDefaultUint32; }
       }
-      [global::System.CLSCompliant(false)]
       public uint DefaultUint32 {
         get { return result.DefaultUint32; }
         set { SetDefaultUint32(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetDefaultUint32(uint value) {
         PrepareBuilder();
         result.hasDefaultUint32 = true;
@@ -6106,12 +6035,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasDefaultUint64 {
         get { return result.hasDefaultUint64; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong DefaultUint64 {
         get { return result.DefaultUint64; }
         set { SetDefaultUint64(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetDefaultUint64(ulong value) {
         PrepareBuilder();
         result.hasDefaultUint64 = true;
@@ -6168,12 +6095,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasDefaultFixed32 {
         get { return result.hasDefaultFixed32; }
       }
-      [global::System.CLSCompliant(false)]
       public uint DefaultFixed32 {
         get { return result.DefaultFixed32; }
         set { SetDefaultFixed32(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetDefaultFixed32(uint value) {
         PrepareBuilder();
         result.hasDefaultFixed32 = true;
@@ -6190,12 +6115,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasDefaultFixed64 {
         get { return result.hasDefaultFixed64; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong DefaultFixed64 {
         get { return result.DefaultFixed64; }
         set { SetDefaultFixed64(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetDefaultFixed64(ulong value) {
         PrepareBuilder();
         result.hasDefaultFixed64 = true;
@@ -6456,12 +6379,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOneofUint32 {
         get { return result.hasOneofUint32; }
       }
-      [global::System.CLSCompliant(false)]
       public uint OneofUint32 {
         get { return result.OneofUint32; }
         set { SetOneofUint32(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetOneofUint32(uint value) {
         PrepareBuilder();
         result.hasOneofUint32 = true;
@@ -16857,7 +16778,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasLargeUint32 {
       get { return hasLargeUint32; }
     }
-    [global::System.CLSCompliant(false)]
     public uint LargeUint32 {
       get { return largeUint32_; }
     }
@@ -16868,7 +16788,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasLargeUint64 {
       get { return hasLargeUint64; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong LargeUint64 {
       get { return largeUint64_; }
     }
@@ -17689,12 +17608,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasLargeUint32 {
         get { return result.hasLargeUint32; }
       }
-      [global::System.CLSCompliant(false)]
       public uint LargeUint32 {
         get { return result.LargeUint32; }
         set { SetLargeUint32(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetLargeUint32(uint value) {
         PrepareBuilder();
         result.hasLargeUint32 = true;
@@ -17711,12 +17628,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasLargeUint64 {
         get { return result.hasLargeUint64; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong LargeUint64 {
         get { return result.LargeUint64; }
         set { SetLargeUint64(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetLargeUint64(ulong value) {
         PrepareBuilder();
         result.hasLargeUint64 = true;
@@ -19954,7 +19869,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasData {
       get { return hasData; }
     }
-    [global::System.CLSCompliant(false)]
     public uint Data {
       get { return data_; }
     }
@@ -20176,12 +20090,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasData {
         get { return result.hasData; }
       }
-      [global::System.CLSCompliant(false)]
       public uint Data {
         get { return result.Data; }
         set { SetData(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetData(uint value) {
         PrepareBuilder();
         result.hasData = true;
@@ -20507,7 +20419,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasData {
       get { return hasData; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong Data {
       get { return data_; }
     }
@@ -20729,12 +20640,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasData {
         get { return result.hasData; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong Data {
         get { return result.Data; }
         set { SetData(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetData(ulong value) {
         PrepareBuilder();
         result.hasData = true;
@@ -25046,14 +24955,12 @@ namespace Google.ProtocolBuffers.TestProtos {
     public const int PackedUint32FieldNumber = 92;
     private int packedUint32MemoizedSerializedSize;
     private pbc::PopsicleList<uint> packedUint32_ = new pbc::PopsicleList<uint>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<uint> PackedUint32List {
       get { return pbc::Lists.AsReadOnly(packedUint32_); }
     }
     public int PackedUint32Count {
       get { return packedUint32_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public uint GetPackedUint32(int index) {
       return packedUint32_[index];
     }
@@ -25061,14 +24968,12 @@ namespace Google.ProtocolBuffers.TestProtos {
     public const int PackedUint64FieldNumber = 93;
     private int packedUint64MemoizedSerializedSize;
     private pbc::PopsicleList<ulong> packedUint64_ = new pbc::PopsicleList<ulong>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<ulong> PackedUint64List {
       get { return pbc::Lists.AsReadOnly(packedUint64_); }
     }
     public int PackedUint64Count {
       get { return packedUint64_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong GetPackedUint64(int index) {
       return packedUint64_[index];
     }
@@ -25102,14 +25007,12 @@ namespace Google.ProtocolBuffers.TestProtos {
     public const int PackedFixed32FieldNumber = 96;
     private int packedFixed32MemoizedSerializedSize;
     private pbc::PopsicleList<uint> packedFixed32_ = new pbc::PopsicleList<uint>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<uint> PackedFixed32List {
       get { return pbc::Lists.AsReadOnly(packedFixed32_); }
     }
     public int PackedFixed32Count {
       get { return packedFixed32_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public uint GetPackedFixed32(int index) {
       return packedFixed32_[index];
     }
@@ -25117,14 +25020,12 @@ namespace Google.ProtocolBuffers.TestProtos {
     public const int PackedFixed64FieldNumber = 97;
     private int packedFixed64MemoizedSerializedSize;
     private pbc::PopsicleList<ulong> packedFixed64_ = new pbc::PopsicleList<ulong>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<ulong> PackedFixed64List {
       get { return pbc::Lists.AsReadOnly(packedFixed64_); }
     }
     public int PackedFixed64Count {
       get { return packedFixed64_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong GetPackedFixed64(int index) {
       return packedFixed64_[index];
     }
@@ -25786,30 +25687,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<uint> PackedUint32List {
         get { return PrepareBuilder().packedUint32_; }
       }
       public int PackedUint32Count {
         get { return result.PackedUint32Count; }
       }
-      [global::System.CLSCompliant(false)]
       public uint GetPackedUint32(int index) {
         return result.GetPackedUint32(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetPackedUint32(int index, uint value) {
         PrepareBuilder();
         result.packedUint32_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddPackedUint32(uint value) {
         PrepareBuilder();
         result.packedUint32_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangePackedUint32(scg::IEnumerable<uint> values) {
         PrepareBuilder();
         result.packedUint32_.Add(values);
@@ -25821,30 +25717,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<ulong> PackedUint64List {
         get { return PrepareBuilder().packedUint64_; }
       }
       public int PackedUint64Count {
         get { return result.PackedUint64Count; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong GetPackedUint64(int index) {
         return result.GetPackedUint64(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetPackedUint64(int index, ulong value) {
         PrepareBuilder();
         result.packedUint64_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddPackedUint64(ulong value) {
         PrepareBuilder();
         result.packedUint64_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangePackedUint64(scg::IEnumerable<ulong> values) {
         PrepareBuilder();
         result.packedUint64_.Add(values);
@@ -25916,30 +25807,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<uint> PackedFixed32List {
         get { return PrepareBuilder().packedFixed32_; }
       }
       public int PackedFixed32Count {
         get { return result.PackedFixed32Count; }
       }
-      [global::System.CLSCompliant(false)]
       public uint GetPackedFixed32(int index) {
         return result.GetPackedFixed32(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetPackedFixed32(int index, uint value) {
         PrepareBuilder();
         result.packedFixed32_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddPackedFixed32(uint value) {
         PrepareBuilder();
         result.packedFixed32_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangePackedFixed32(scg::IEnumerable<uint> values) {
         PrepareBuilder();
         result.packedFixed32_.Add(values);
@@ -25951,30 +25837,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<ulong> PackedFixed64List {
         get { return PrepareBuilder().packedFixed64_; }
       }
       public int PackedFixed64Count {
         get { return result.PackedFixed64Count; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong GetPackedFixed64(int index) {
         return result.GetPackedFixed64(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetPackedFixed64(int index, ulong value) {
         PrepareBuilder();
         result.packedFixed64_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddPackedFixed64(ulong value) {
         PrepareBuilder();
         result.packedFixed64_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangePackedFixed64(scg::IEnumerable<ulong> values) {
         PrepareBuilder();
         result.packedFixed64_.Add(values);
@@ -26223,28 +26104,24 @@ namespace Google.ProtocolBuffers.TestProtos {
 
     public const int UnpackedUint32FieldNumber = 92;
     private pbc::PopsicleList<uint> unpackedUint32_ = new pbc::PopsicleList<uint>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<uint> UnpackedUint32List {
       get { return pbc::Lists.AsReadOnly(unpackedUint32_); }
     }
     public int UnpackedUint32Count {
       get { return unpackedUint32_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public uint GetUnpackedUint32(int index) {
       return unpackedUint32_[index];
     }
 
     public const int UnpackedUint64FieldNumber = 93;
     private pbc::PopsicleList<ulong> unpackedUint64_ = new pbc::PopsicleList<ulong>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<ulong> UnpackedUint64List {
       get { return pbc::Lists.AsReadOnly(unpackedUint64_); }
     }
     public int UnpackedUint64Count {
       get { return unpackedUint64_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong GetUnpackedUint64(int index) {
       return unpackedUint64_[index];
     }
@@ -26275,28 +26152,24 @@ namespace Google.ProtocolBuffers.TestProtos {
 
     public const int UnpackedFixed32FieldNumber = 96;
     private pbc::PopsicleList<uint> unpackedFixed32_ = new pbc::PopsicleList<uint>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<uint> UnpackedFixed32List {
       get { return pbc::Lists.AsReadOnly(unpackedFixed32_); }
     }
     public int UnpackedFixed32Count {
       get { return unpackedFixed32_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public uint GetUnpackedFixed32(int index) {
       return unpackedFixed32_[index];
     }
 
     public const int UnpackedFixed64FieldNumber = 97;
     private pbc::PopsicleList<ulong> unpackedFixed64_ = new pbc::PopsicleList<ulong>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<ulong> UnpackedFixed64List {
       get { return pbc::Lists.AsReadOnly(unpackedFixed64_); }
     }
     public int UnpackedFixed64Count {
       get { return unpackedFixed64_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong GetUnpackedFixed64(int index) {
       return unpackedFixed64_[index];
     }
@@ -26911,30 +26784,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<uint> UnpackedUint32List {
         get { return PrepareBuilder().unpackedUint32_; }
       }
       public int UnpackedUint32Count {
         get { return result.UnpackedUint32Count; }
       }
-      [global::System.CLSCompliant(false)]
       public uint GetUnpackedUint32(int index) {
         return result.GetUnpackedUint32(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetUnpackedUint32(int index, uint value) {
         PrepareBuilder();
         result.unpackedUint32_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddUnpackedUint32(uint value) {
         PrepareBuilder();
         result.unpackedUint32_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeUnpackedUint32(scg::IEnumerable<uint> values) {
         PrepareBuilder();
         result.unpackedUint32_.Add(values);
@@ -26946,30 +26814,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<ulong> UnpackedUint64List {
         get { return PrepareBuilder().unpackedUint64_; }
       }
       public int UnpackedUint64Count {
         get { return result.UnpackedUint64Count; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong GetUnpackedUint64(int index) {
         return result.GetUnpackedUint64(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetUnpackedUint64(int index, ulong value) {
         PrepareBuilder();
         result.unpackedUint64_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddUnpackedUint64(ulong value) {
         PrepareBuilder();
         result.unpackedUint64_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeUnpackedUint64(scg::IEnumerable<ulong> values) {
         PrepareBuilder();
         result.unpackedUint64_.Add(values);
@@ -27041,30 +26904,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<uint> UnpackedFixed32List {
         get { return PrepareBuilder().unpackedFixed32_; }
       }
       public int UnpackedFixed32Count {
         get { return result.UnpackedFixed32Count; }
       }
-      [global::System.CLSCompliant(false)]
       public uint GetUnpackedFixed32(int index) {
         return result.GetUnpackedFixed32(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetUnpackedFixed32(int index, uint value) {
         PrepareBuilder();
         result.unpackedFixed32_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddUnpackedFixed32(uint value) {
         PrepareBuilder();
         result.unpackedFixed32_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeUnpackedFixed32(scg::IEnumerable<uint> values) {
         PrepareBuilder();
         result.unpackedFixed32_.Add(values);
@@ -27076,30 +26934,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<ulong> UnpackedFixed64List {
         get { return PrepareBuilder().unpackedFixed64_; }
       }
       public int UnpackedFixed64Count {
         get { return result.UnpackedFixed64Count; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong GetUnpackedFixed64(int index) {
         return result.GetUnpackedFixed64(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetUnpackedFixed64(int index, ulong value) {
         PrepareBuilder();
         result.unpackedFixed64_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddUnpackedFixed64(ulong value) {
         PrepareBuilder();
         result.unpackedFixed64_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeUnpackedFixed64(scg::IEnumerable<ulong> values) {
         PrepareBuilder();
         result.unpackedFixed64_.Add(values);
@@ -28089,7 +27942,6 @@ namespace Google.ProtocolBuffers.TestProtos {
     public bool HasScalarExtension {
       get { return hasScalarExtension; }
     }
-    [global::System.CLSCompliant(false)]
     public uint ScalarExtension {
       get { return scalarExtension_; }
     }
@@ -28496,12 +28348,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasScalarExtension {
         get { return result.hasScalarExtension; }
       }
-      [global::System.CLSCompliant(false)]
       public uint ScalarExtension {
         get { return result.ScalarExtension; }
         set { SetScalarExtension(value); }
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetScalarExtension(uint value) {
         PrepareBuilder();
         result.hasScalarExtension = true;
@@ -28730,14 +28580,12 @@ namespace Google.ProtocolBuffers.TestProtos {
 
     public const int RepeatedFixed32FieldNumber = 12;
     private pbc::PopsicleList<uint> repeatedFixed32_ = new pbc::PopsicleList<uint>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<uint> RepeatedFixed32List {
       get { return pbc::Lists.AsReadOnly(repeatedFixed32_); }
     }
     public int RepeatedFixed32Count {
       get { return repeatedFixed32_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public uint GetRepeatedFixed32(int index) {
       return repeatedFixed32_[index];
     }
@@ -28756,14 +28604,12 @@ namespace Google.ProtocolBuffers.TestProtos {
 
     public const int RepeatedFixed64FieldNumber = 2046;
     private pbc::PopsicleList<ulong> repeatedFixed64_ = new pbc::PopsicleList<ulong>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<ulong> RepeatedFixed64List {
       get { return pbc::Lists.AsReadOnly(repeatedFixed64_); }
     }
     public int RepeatedFixed64Count {
       get { return repeatedFixed64_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong GetRepeatedFixed64(int index) {
       return repeatedFixed64_[index];
     }
@@ -28794,14 +28640,12 @@ namespace Google.ProtocolBuffers.TestProtos {
 
     public const int RepeatedUint64FieldNumber = 262143;
     private pbc::PopsicleList<ulong> repeatedUint64_ = new pbc::PopsicleList<ulong>();
-    [global::System.CLSCompliant(false)]
     public scg::IList<ulong> RepeatedUint64List {
       get { return pbc::Lists.AsReadOnly(repeatedUint64_); }
     }
     public int RepeatedUint64Count {
       get { return repeatedUint64_.Count; }
     }
-    [global::System.CLSCompliant(false)]
     public ulong GetRepeatedUint64(int index) {
       return repeatedUint64_[index];
     }
@@ -29121,30 +28965,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
 
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<uint> RepeatedFixed32List {
         get { return PrepareBuilder().repeatedFixed32_; }
       }
       public int RepeatedFixed32Count {
         get { return result.RepeatedFixed32Count; }
       }
-      [global::System.CLSCompliant(false)]
       public uint GetRepeatedFixed32(int index) {
         return result.GetRepeatedFixed32(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetRepeatedFixed32(int index, uint value) {
         PrepareBuilder();
         result.repeatedFixed32_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRepeatedFixed32(uint value) {
         PrepareBuilder();
         result.repeatedFixed32_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeRepeatedFixed32(scg::IEnumerable<uint> values) {
         PrepareBuilder();
         result.repeatedFixed32_.Add(values);
@@ -29186,30 +29025,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<ulong> RepeatedFixed64List {
         get { return PrepareBuilder().repeatedFixed64_; }
       }
       public int RepeatedFixed64Count {
         get { return result.RepeatedFixed64Count; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong GetRepeatedFixed64(int index) {
         return result.GetRepeatedFixed64(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetRepeatedFixed64(int index, ulong value) {
         PrepareBuilder();
         result.repeatedFixed64_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRepeatedFixed64(ulong value) {
         PrepareBuilder();
         result.repeatedFixed64_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeRepeatedFixed64(scg::IEnumerable<ulong> values) {
         PrepareBuilder();
         result.repeatedFixed64_.Add(values);
@@ -29281,30 +29115,25 @@ namespace Google.ProtocolBuffers.TestProtos {
         return this;
       }
 
-      [global::System.CLSCompliant(false)]
       public pbc::IPopsicleList<ulong> RepeatedUint64List {
         get { return PrepareBuilder().repeatedUint64_; }
       }
       public int RepeatedUint64Count {
         get { return result.RepeatedUint64Count; }
       }
-      [global::System.CLSCompliant(false)]
       public ulong GetRepeatedUint64(int index) {
         return result.GetRepeatedUint64(index);
       }
-      [global::System.CLSCompliant(false)]
       public Builder SetRepeatedUint64(int index, ulong value) {
         PrepareBuilder();
         result.repeatedUint64_[index] = value;
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRepeatedUint64(ulong value) {
         PrepareBuilder();
         result.repeatedUint64_.Add(value);
         return this;
       }
-      [global::System.CLSCompliant(false)]
       public Builder AddRangeRepeatedUint64(scg::IEnumerable<ulong> values) {
         PrepareBuilder();
         result.repeatedUint64_.Add(values);