Automated rollback of commit 5b4bc33.

PiperOrigin-RevId: 505964551
protocolbuffers · Jan 31, 2023 · 4d76f12 · 4d76f12
1 parent 232fadb
commit 4d76f12
Show file tree

Hide file tree

Showing 14 changed files with 1,139 additions and 1,220 deletions.
diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.pb.cs
diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/Unittest.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/Unittest.pb.cs
diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.pb.cs
diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.pb.cs
@@ -1,6 +1,6 @@
 // <auto-generated>
 //     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: csharp/protos/unittest_import.proto
+//     source: unittest_import.proto
 // </auto-generated>
 #pragma warning disable 1591, 0612, 3021, 8981
 #region Designer generated code
@@ -11,11 +11,11 @@
 using scg = global::System.Collections.Generic;
 namespace Google.Protobuf.TestProtos.Proto2 {
 
-  /// <summary>Holder for reflection information generated from csharp/protos/unittest_import.proto</summary>
+  /// <summary>Holder for reflection information generated from unittest_import.proto</summary>
   public static partial class UnittestImportReflection {
 
     #region Descriptor
-    /// <summary>File descriptor for csharp/protos/unittest_import.proto</summary>
+    /// <summary>File descriptor for unittest_import.proto</summary>
     public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
@@ -24,13 +24,13 @@ public static partial class UnittestImportReflection {
     static UnittestImportReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "CiNjc2hhcnAvcHJvdG9zL3VuaXR0ZXN0X2ltcG9ydC5wcm90bxIfcHJvdG9i",
-            "dWZfdW5pdHRlc3RfaW1wb3J0X3Byb3RvMhoqY3NoYXJwL3Byb3Rvcy91bml0",
-            "dGVzdF9pbXBvcnRfcHVibGljLnByb3RvIhoKDUltcG9ydE1lc3NhZ2USCQoB",
-            "ZBgBIAEoBSo8CgpJbXBvcnRFbnVtEg4KCklNUE9SVF9GT08QBxIOCgpJTVBP",
-            "UlRfQkFSEAgSDgoKSU1QT1JUX0JBWhAJKjEKEEltcG9ydEVudW1Gb3JNYXAS",
-            "CwoHVU5LTk9XThAAEgcKA0ZPTxABEgcKA0JBUhACQilIAfgBAaoCIUdvb2ds",
-            "ZS5Qcm90b2J1Zi5UZXN0UHJvdG9zLlByb3RvMlAA"));
+            "ChV1bml0dGVzdF9pbXBvcnQucHJvdG8SH3Byb3RvYnVmX3VuaXR0ZXN0X2lt",
+            "cG9ydF9wcm90bzIaHHVuaXR0ZXN0X2ltcG9ydF9wdWJsaWMucHJvdG8iGgoN",
+            "SW1wb3J0TWVzc2FnZRIJCgFkGAEgASgFKjwKCkltcG9ydEVudW0SDgoKSU1Q",
+            "T1JUX0ZPTxAHEg4KCklNUE9SVF9CQVIQCBIOCgpJTVBPUlRfQkFaEAkqMQoQ",
+            "SW1wb3J0RW51bUZvck1hcBILCgdVTktOT1dOEAASBwoDRk9PEAESBwoDQkFS",
+            "EAJCKUgB+AEBqgIhR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3MuUHJvdG8y",
+            "UAA="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.Proto2.UnittestImportPublicReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.TestProtos.Proto2.ImportEnum), typeof(global::Google.Protobuf.TestProtos.Proto2.ImportEnumForMap), }, null, new pbr::GeneratedClrTypeInfo[] {

diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.pb.cs
@@ -1,6 +1,6 @@
 // <auto-generated>
 //     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: csharp/protos/unittest_import_proto3.proto
+//     source: unittest_import_proto3.proto
 // </auto-generated>
 #pragma warning disable 1591, 0612, 3021, 8981
 #region Designer generated code
@@ -11,11 +11,11 @@
 using scg = global::System.Collections.Generic;
 namespace Google.Protobuf.TestProtos {
 
-  /// <summary>Holder for reflection information generated from csharp/protos/unittest_import_proto3.proto</summary>
+  /// <summary>Holder for reflection information generated from unittest_import_proto3.proto</summary>
   public static partial class UnittestImportProto3Reflection {
 
     #region Descriptor
-    /// <summary>File descriptor for csharp/protos/unittest_import_proto3.proto</summary>
+    /// <summary>File descriptor for unittest_import_proto3.proto</summary>
     public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
@@ -24,13 +24,12 @@ public static partial class UnittestImportProto3Reflection {
     static UnittestImportProto3Reflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "Cipjc2hhcnAvcHJvdG9zL3VuaXR0ZXN0X2ltcG9ydF9wcm90bzMucHJvdG8S",
-            "GHByb3RvYnVmX3VuaXR0ZXN0X2ltcG9ydBoxY3NoYXJwL3Byb3Rvcy91bml0",
-            "dGVzdF9pbXBvcnRfcHVibGljX3Byb3RvMy5wcm90byIaCg1JbXBvcnRNZXNz",
-            "YWdlEgkKAWQYASABKAUqWQoKSW1wb3J0RW51bRIbChdJTVBPUlRfRU5VTV9V",
-            "TlNQRUNJRklFRBAAEg4KCklNUE9SVF9GT08QBxIOCgpJTVBPUlRfQkFSEAgS",
-            "DgoKSU1QT1JUX0JBWhAJQh2qAhpHb29nbGUuUHJvdG9idWYuVGVzdFByb3Rv",
-            "c1AAYgZwcm90bzM="));
+            "Chx1bml0dGVzdF9pbXBvcnRfcHJvdG8zLnByb3RvEhhwcm90b2J1Zl91bml0",
+            "dGVzdF9pbXBvcnQaI3VuaXR0ZXN0X2ltcG9ydF9wdWJsaWNfcHJvdG8zLnBy",
+            "b3RvIhoKDUltcG9ydE1lc3NhZ2USCQoBZBgBIAEoBSpZCgpJbXBvcnRFbnVt",
+            "EhsKF0lNUE9SVF9FTlVNX1VOU1BFQ0lGSUVEEAASDgoKSU1QT1JUX0ZPTxAH",
+            "Eg4KCklNUE9SVF9CQVIQCBIOCgpJTVBPUlRfQkFaEAlCHaoCGkdvb2dsZS5Q",
+            "cm90b2J1Zi5UZXN0UHJvdG9zUABiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.UnittestImportPublicProto3Reflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.TestProtos.ImportEnum), }, null, new pbr::GeneratedClrTypeInfo[] {

diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.pb.cs
@@ -1,6 +1,6 @@
 // <auto-generated>
 //     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: csharp/protos/unittest_import_public.proto
+//     source: unittest_import_public.proto
 // </auto-generated>
 #pragma warning disable 1591, 0612, 3021, 8981
 #region Designer generated code
@@ -11,11 +11,11 @@
 using scg = global::System.Collections.Generic;
 namespace Google.Protobuf.TestProtos.Proto2 {
 
-  /// <summary>Holder for reflection information generated from csharp/protos/unittest_import_public.proto</summary>
+  /// <summary>Holder for reflection information generated from unittest_import_public.proto</summary>
   public static partial class UnittestImportPublicReflection {
 
     #region Descriptor
-    /// <summary>File descriptor for csharp/protos/unittest_import_public.proto</summary>
+    /// <summary>File descriptor for unittest_import_public.proto</summary>
     public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
@@ -24,10 +24,9 @@ public static partial class UnittestImportPublicReflection {
     static UnittestImportPublicReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "Cipjc2hhcnAvcHJvdG9zL3VuaXR0ZXN0X2ltcG9ydF9wdWJsaWMucHJvdG8S",
-            "H3Byb3RvYnVmX3VuaXR0ZXN0X2ltcG9ydF9wcm90bzIiIAoTUHVibGljSW1w",
-            "b3J0TWVzc2FnZRIJCgFlGAEgASgFQiSqAiFHb29nbGUuUHJvdG9idWYuVGVz",
-            "dFByb3Rvcy5Qcm90bzI="));
+            "Chx1bml0dGVzdF9pbXBvcnRfcHVibGljLnByb3RvEh9wcm90b2J1Zl91bml0",
+            "dGVzdF9pbXBvcnRfcHJvdG8yIiAKE1B1YmxpY0ltcG9ydE1lc3NhZ2USCQoB",
+            "ZRgBIAEoBUIkqgIhR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3MuUHJvdG8y"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {

diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.pb.cs
@@ -1,6 +1,6 @@
 // <auto-generated>
 //     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: csharp/protos/unittest_import_public_proto3.proto
+//     source: unittest_import_public_proto3.proto
 // </auto-generated>
 #pragma warning disable 1591, 0612, 3021, 8981
 #region Designer generated code
@@ -11,11 +11,11 @@
 using scg = global::System.Collections.Generic;
 namespace Google.Protobuf.TestProtos {
 
-  /// <summary>Holder for reflection information generated from csharp/protos/unittest_import_public_proto3.proto</summary>
+  /// <summary>Holder for reflection information generated from unittest_import_public_proto3.proto</summary>
   public static partial class UnittestImportPublicProto3Reflection {
 
     #region Descriptor
-    /// <summary>File descriptor for csharp/protos/unittest_import_public_proto3.proto</summary>
+    /// <summary>File descriptor for unittest_import_public_proto3.proto</summary>
     public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
@@ -24,10 +24,10 @@ public static partial class UnittestImportPublicProto3Reflection {
     static UnittestImportPublicProto3Reflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "CjFjc2hhcnAvcHJvdG9zL3VuaXR0ZXN0X2ltcG9ydF9wdWJsaWNfcHJvdG8z",
-            "LnByb3RvEhhwcm90b2J1Zl91bml0dGVzdF9pbXBvcnQiIAoTUHVibGljSW1w",
-            "b3J0TWVzc2FnZRIJCgFlGAEgASgFQh2qAhpHb29nbGUuUHJvdG9idWYuVGVz",
-            "dFByb3Rvc2IGcHJvdG8z"));
+            "CiN1bml0dGVzdF9pbXBvcnRfcHVibGljX3Byb3RvMy5wcm90bxIYcHJvdG9i",
+            "dWZfdW5pdHRlc3RfaW1wb3J0IiAKE1B1YmxpY0ltcG9ydE1lc3NhZ2USCQoB",
+            "ZRgBIAEoBUIdqgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3Rv",
+            "Mw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {

diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.pb.cs
@@ -1,6 +1,6 @@
 // <auto-generated>
 //     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: csharp/protos/unittest_issue6936_a.proto
+//     source: unittest_issue6936_a.proto
 // </auto-generated>
 #pragma warning disable 1591, 0612, 3021, 8981
 #region Designer generated code
@@ -11,11 +11,11 @@
 using scg = global::System.Collections.Generic;
 namespace UnitTest.Issues.TestProtos {
 
-  /// <summary>Holder for reflection information generated from csharp/protos/unittest_issue6936_a.proto</summary>
+  /// <summary>Holder for reflection information generated from unittest_issue6936_a.proto</summary>
   public static partial class UnittestIssue6936AReflection {
 
     #region Descriptor
-    /// <summary>File descriptor for csharp/protos/unittest_issue6936_a.proto</summary>
+    /// <summary>File descriptor for unittest_issue6936_a.proto</summary>
     public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
@@ -24,18 +24,18 @@ public static partial class UnittestIssue6936AReflection {
     static UnittestIssue6936AReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "Cihjc2hhcnAvcHJvdG9zL3VuaXR0ZXN0X2lzc3VlNjkzNl9hLnByb3RvEg91",
-            "bml0dGVzdF9pc3N1ZXMaIGdvb2dsZS9wcm90b2J1Zi9kZXNjcmlwdG9yLnBy",
-            "b3RvOi4KA29wdBIfLmdvb2dsZS5wcm90b2J1Zi5NZXNzYWdlT3B0aW9ucxjQ",
-            "hgMgASgJQh2qAhpVbml0VGVzdC5Jc3N1ZXMuVGVzdFByb3Rvc2IGcHJvdG8z"));
+            "Chp1bml0dGVzdF9pc3N1ZTY5MzZfYS5wcm90bxIPdW5pdHRlc3RfaXNzdWVz",
+            "GiBnb29nbGUvcHJvdG9idWYvZGVzY3JpcHRvci5wcm90bzouCgNvcHQSHy5n",
+            "b29nbGUucHJvdG9idWYuTWVzc2FnZU9wdGlvbnMY0IYDIAEoCUIdqgIaVW5p",
+            "dFRlc3QuSXNzdWVzLlRlc3RQcm90b3NiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pb::Extension[] { UnittestIssue6936AExtensions.Opt }, null));
     }
     #endregion
 
   }
-  /// <summary>Holder for extension identifiers generated from the top level of csharp/protos/unittest_issue6936_a.proto</summary>
+  /// <summary>Holder for extension identifiers generated from the top level of unittest_issue6936_a.proto</summary>
   public static partial class UnittestIssue6936AExtensions {
     public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, string> Opt =
       new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, string>(50000, pb::FieldCodec.ForString(400002, ""));

diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.pb.cs
@@ -1,6 +1,6 @@
 // <auto-generated>
 //     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: csharp/protos/unittest_issue6936_b.proto
+//     source: unittest_issue6936_b.proto
 // </auto-generated>
 #pragma warning disable 1591, 0612, 3021, 8981
 #region Designer generated code
@@ -11,11 +11,11 @@
 using scg = global::System.Collections.Generic;
 namespace UnitTest.Issues.TestProtos {
 
-  /// <summary>Holder for reflection information generated from csharp/protos/unittest_issue6936_b.proto</summary>
+  /// <summary>Holder for reflection information generated from unittest_issue6936_b.proto</summary>
   public static partial class UnittestIssue6936BReflection {
 
     #region Descriptor
-    /// <summary>File descriptor for csharp/protos/unittest_issue6936_b.proto</summary>
+    /// <summary>File descriptor for unittest_issue6936_b.proto</summary>
     public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
@@ -24,10 +24,9 @@ public static partial class UnittestIssue6936BReflection {
     static UnittestIssue6936BReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "Cihjc2hhcnAvcHJvdG9zL3VuaXR0ZXN0X2lzc3VlNjkzNl9iLnByb3RvEg91",
-            "bml0dGVzdF9pc3N1ZXMaKGNzaGFycC9wcm90b3MvdW5pdHRlc3RfaXNzdWU2",
-            "OTM2X2EucHJvdG8iDgoDRm9vOgeCtRgDZm9vQh2qAhpVbml0VGVzdC5Jc3N1",
-            "ZXMuVGVzdFByb3Rvc2IGcHJvdG8z"));
+            "Chp1bml0dGVzdF9pc3N1ZTY5MzZfYi5wcm90bxIPdW5pdHRlc3RfaXNzdWVz",
+            "Ghp1bml0dGVzdF9pc3N1ZTY5MzZfYS5wcm90byIOCgNGb286B4K1GANmb29C",
+            "HaoCGlVuaXRUZXN0Lklzc3Vlcy5UZXN0UHJvdG9zYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::UnitTest.Issues.TestProtos.UnittestIssue6936AReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {

diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.pb.cs
@@ -1,6 +1,6 @@
 // <auto-generated>
 //     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: csharp/protos/unittest_issue6936_c.proto
+//     source: unittest_issue6936_c.proto
 // </auto-generated>
 #pragma warning disable 1591, 0612, 3021, 8981
 #region Designer generated code
@@ -11,11 +11,11 @@
 using scg = global::System.Collections.Generic;
 namespace UnitTest.Issues.TestProtos {
 
-  /// <summary>Holder for reflection information generated from csharp/protos/unittest_issue6936_c.proto</summary>
+  /// <summary>Holder for reflection information generated from unittest_issue6936_c.proto</summary>
   public static partial class UnittestIssue6936CReflection {
 
     #region Descriptor
-    /// <summary>File descriptor for csharp/protos/unittest_issue6936_c.proto</summary>
+    /// <summary>File descriptor for unittest_issue6936_c.proto</summary>
     public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
@@ -24,12 +24,11 @@ public static partial class UnittestIssue6936CReflection {
     static UnittestIssue6936CReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "Cihjc2hhcnAvcHJvdG9zL3VuaXR0ZXN0X2lzc3VlNjkzNl9jLnByb3RvEg91",
-            "bml0dGVzdF9pc3N1ZXMaKGNzaGFycC9wcm90b3MvdW5pdHRlc3RfaXNzdWU2",
-            "OTM2X2EucHJvdG8aKGNzaGFycC9wcm90b3MvdW5pdHRlc3RfaXNzdWU2OTM2",
-            "X2IucHJvdG8iMQoDQmFyEiEKA2ZvbxgBIAEoCzIULnVuaXR0ZXN0X2lzc3Vl",
-            "cy5Gb286B4K1GANiYXJCHaoCGlVuaXRUZXN0Lklzc3Vlcy5UZXN0UHJvdG9z",
-            "YgZwcm90bzM="));
+            "Chp1bml0dGVzdF9pc3N1ZTY5MzZfYy5wcm90bxIPdW5pdHRlc3RfaXNzdWVz",
+            "Ghp1bml0dGVzdF9pc3N1ZTY5MzZfYS5wcm90bxoadW5pdHRlc3RfaXNzdWU2",
+            "OTM2X2IucHJvdG8iMQoDQmFyEiEKA2ZvbxgBIAEoCzIULnVuaXR0ZXN0X2lz",
+            "c3Vlcy5Gb286B4K1GANiYXJCHaoCGlVuaXRUZXN0Lklzc3Vlcy5UZXN0UHJv",
+            "dG9zYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::UnitTest.Issues.TestProtos.UnittestIssue6936AReflection.Descriptor, global::UnitTest.Issues.TestProtos.UnittestIssue6936BReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {