Canged CodedInputStream.ReadTag to use boolean result with out params to

support reading a field name rather than a field tag.

src/AddressBook/AddressBookProtos.cs

@@ -292,7 +292,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -590,7 +590,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -910,7 +910,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtoGen/MessageGenerator.cs

@@ -629,7 +629,7 @@ namespace Google.ProtocolBuffers.ProtoGen
             //    writer.WriteLine("  }");
             //}
             //writer.WriteLine("  return this;");
-            writer.WriteLine("  throw InvalidProtocolBufferException.InvalidTag();");
+            writer.WriteLine("  throw pb::InvalidProtocolBufferException.InvalidTag();");
             writer.WriteLine("}");
             writer.WriteLine("default: {");
             writer.WriteLine("  if (pb::WireFormat.IsEndGroupTag(tag)) {");

src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs

@@ -264,7 +264,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs

@@ -581,7 +581,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -787,7 +787,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -970,7 +970,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1168,7 +1168,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1351,7 +1351,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1534,7 +1534,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1717,7 +1717,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1900,7 +1900,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -2083,7 +2083,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -2266,7 +2266,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -2511,7 +2511,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -2811,7 +2811,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3059,7 +3059,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3403,7 +3403,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3624,7 +3624,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3893,7 +3893,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -4098,7 +4098,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs

@@ -258,7 +258,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs

@@ -1074,7 +1074,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -2587,7 +2587,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3581,7 +3581,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -4750,7 +4750,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5855,7 +5855,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs

@@ -212,7 +212,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs

@@ -237,7 +237,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs

@@ -255,7 +255,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -457,7 +457,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -706,7 +706,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -932,7 +932,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1208,7 +1208,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1436,7 +1436,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs

@@ -252,7 +252,7 @@ namespace Google.ProtocolBuffers.TestProtos.NoGenericService {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs

@@ -1234,7 +1234,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1458,7 +1458,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1682,7 +1682,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3337,7 +3337,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5499,7 +5499,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5723,7 +5723,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5933,7 +5933,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -6135,7 +6135,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -6359,7 +6359,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -6566,7 +6566,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -7383,7 +7383,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -8358,7 +8358,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -8671,7 +8671,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -8899,7 +8899,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -9087,7 +9087,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -9277,7 +9277,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -9498,7 +9498,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -9763,7 +9763,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -10032,7 +10032,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -10298,7 +10298,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -10597,7 +10597,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -10821,7 +10821,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -11061,7 +11061,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -11435,7 +11435,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -11689,7 +11689,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -12190,7 +12190,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -12810,7 +12810,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -13423,7 +13423,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -14049,7 +14049,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -14274,7 +14274,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -14909,7 +14909,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -15984,7 +15984,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -16620,7 +16620,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -16860,7 +16860,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -17197,7 +17197,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -17783,7 +17783,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -18161,7 +18161,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -18344,7 +18344,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -18527,7 +18527,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -18710,7 +18710,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs

@@ -257,7 +257,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -541,7 +541,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -773,7 +773,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1048,7 +1048,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs

@@ -325,7 +325,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -569,7 +569,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -830,7 +830,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1209,7 +1209,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1630,7 +1630,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs

@@ -519,7 +519,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1020,7 +1020,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1245,7 +1245,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1470,7 +1470,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs

@@ -405,7 +405,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -819,7 +819,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1369,7 +1369,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1737,7 +1737,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -2402,7 +2402,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -2870,7 +2870,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3225,7 +3225,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3564,7 +3564,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3938,7 +3938,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -4414,7 +4414,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -4873,7 +4873,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5266,7 +5266,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5620,7 +5620,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5877,7 +5877,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -6134,7 +6134,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -6391,7 +6391,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -6688,7 +6688,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -7015,7 +7015,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs

@@ -252,7 +252,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -549,7 +549,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -887,7 +887,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1335,7 +1335,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1723,7 +1723,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs

@@ -212,7 +212,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs

@@ -237,7 +237,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs

@@ -201,7 +201,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs

@@ -1255,7 +1255,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1473,7 +1473,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1691,7 +1691,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3621,7 +3621,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5741,7 +5741,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -6450,7 +6450,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -7146,7 +7146,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -7342,7 +7342,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -7560,7 +7560,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -7764,7 +7764,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -7940,7 +7940,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -8136,7 +8136,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {

src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs

@@ -1234,7 +1234,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1458,7 +1458,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -1682,7 +1682,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -3337,7 +3337,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5499,7 +5499,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5723,7 +5723,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -5933,7 +5933,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -6135,7 +6135,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -6359,7 +6359,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -6566,7 +6566,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -7383,7 +7383,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -8358,7 +8358,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -8671,7 +8671,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -8899,7 +8899,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -9087,7 +9087,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -9277,7 +9277,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -9498,7 +9498,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -9763,7 +9763,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -10032,7 +10032,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -10298,7 +10298,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -10597,7 +10597,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -10821,7 +10821,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -11061,7 +11061,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -11435,7 +11435,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -11689,7 +11689,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -12190,7 +12190,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -12810,7 +12810,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -13423,7 +13423,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -14049,7 +14049,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -14274,7 +14274,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -14909,7 +14909,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -15984,7 +15984,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -16620,7 +16620,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -16860,7 +16860,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             while (input.ReadTag(out tag, out field_name)) {
               switch (tag) {
                 case 0: {
-                  throw InvalidProtocolBufferException.InvalidTag();
+                  throw pb::InvalidProtocolBufferException.InvalidTag();
                 }
                 default: {
                   if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -17197,7 +17197,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -17783,7 +17783,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -18161,7 +18161,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -18344,7 +18344,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -18527,7 +18527,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {
@@ -18710,7 +18710,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         while (input.ReadTag(out tag, out field_name)) {
           switch (tag) {
             case 0: {
-              throw InvalidProtocolBufferException.InvalidTag();
+              throw pb::InvalidProtocolBufferException.InvalidTag();
             }
             default: {
               if (pb::WireFormat.IsEndGroupTag(tag)) {