From 960b5baecaf0d96ca7f12b27a28a93b3ac925fbd Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Mon, 9 Sep 2024 23:32:05 +0000 Subject: [PATCH] Auto-generate files after cl/672710484 --- .../UnittestFeatures.pb.cs | 101 +++++++++++++++--- csharp/src/Google.Protobuf.Test/testprotos.pb | Bin 454107 -> 454864 bytes 2 files changed, 86 insertions(+), 15 deletions(-) diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestFeatures.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestFeatures.pb.cs index e764623f52..25ea351cd3 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestFeatures.pb.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestFeatures.pb.cs @@ -29,7 +29,7 @@ namespace Pb { "c3NhZ2UaTQoGTmVzdGVkMkMKC3Rlc3RfbmVzdGVkEhsuZ29vZ2xlLnByb3Rv", "YnVmLkZlYXR1cmVTZXQYjU4gASgLMhAucGIuVGVzdEZlYXR1cmVzMkQKDHRl", "c3RfbWVzc2FnZRIbLmdvb2dsZS5wcm90b2J1Zi5GZWF0dXJlU2V0GI5OIAEo", - "CzIQLnBiLlRlc3RGZWF0dXJlcyLbCgoMVGVzdEZlYXR1cmVzEnsKDGZpbGVf", + "CzIQLnBiLlRlc3RGZWF0dXJlcyKsDAoMVGVzdEZlYXR1cmVzEnsKDGZpbGVf", "ZmVhdHVyZRgBIAEoDjIPLnBiLkVudW1GZWF0dXJlQlSIAQGYAQGiAQsSBlZB", "TFVFMRiEB6IBCxIGVkFMVUUyGOcHogELEgZWQUxVRTMY6AeiAQwSBlZBTFVF", "NBidjQaiAQwSBlZBTFVFNRiejQayAQMI6AcSTAoXZXh0ZW5zaW9uX3Jhbmdl", @@ -59,21 +59,32 @@ namespace Pb { "IOkHElQKDmZ1dHVyZV9mZWF0dXJlGBIgASgOMg8ucGIuRW51bUZlYXR1cmVC", "K4gBAZgBAZgBBKIBCxIGVkFMVUUxGIQHogELEgZWQUxVRTIY6QeyAQMI6QcS", "VwoObGVnYWN5X2ZlYXR1cmUYEyABKA4yDy5wYi5FbnVtRmVhdHVyZUIuiAEB", - "mAEBmAEEogELEgZWQUxVRTEYhAeiAQsSBlZBTFVFMhjoB7IBBgjnByDoByrJ", - "AgoLRW51bUZlYXR1cmUSHQoZVEVTVF9FTlVNX0ZFQVRVUkVfVU5LTk9XThAA", - "EgoKBlZBTFVFMRABEgoKBlZBTFVFMhACEgoKBlZBTFVFMxADEgoKBlZBTFVF", - "NBAEEgoKBlZBTFVFNRAFEgoKBlZBTFVFNhAGEgoKBlZBTFVFNxAHEgoKBlZB", - "TFVFOBAIEgoKBlZBTFVFORAJEgsKB1ZBTFVFMTAQChILCgdWQUxVRTExEAsS", - "CwoHVkFMVUUxMhAMEgsKB1ZBTFVFMTMQDRILCgdWQUxVRTE0EA4SCwoHVkFM", - "VUUxNRAPEhsKE1ZBTFVFX0VNUFRZX1NVUFBPUlQQYhoCIgASRAoMVkFMVUVf", - "RlVUVVJFEGMaMiIwCJ2NBhCejQYaIkN1c3RvbSBmZWF0dXJlIGRlcHJlY2F0", - "aW9uIHdhcm5pbmcgn40GOjwKBHRlc3QSGy5nb29nbGUucHJvdG9idWYuRmVh", - "dHVyZVNldBiPTiABKAsyEC5wYi5UZXN0RmVhdHVyZXM=")); + "mAEBmAEEogELEgZWQUxVRTEYhAeiAQsSBlZBTFVFMhjoB7IBBgjnByDoBxLO", + "AQoWdmFsdWVfbGlmZXRpbWVfZmVhdHVyZRgUIAEoDjIYLnBiLlZhbHVlTGlm", + "ZXRpbWVGZWF0dXJlQpMBiAEBmAEBogEdEhhWQUxVRV9MSUZFVElNRV9JTkhF", + "UklURUQYhAeiARoSFVZBTFVFX0xJRkVUSU1FX0ZVVFVSRRjoB6IBGxIVVkFM", + "VUVfTElGRVRJTUVfRlVUVVJFGJ+NBrIBLwjoBxCejQYaIkN1c3RvbSBmZWF0", + "dXJlIGRlcHJlY2F0aW9uIHdhcm5pbmcgn40GKuYBCgtFbnVtRmVhdHVyZRId", + "ChlURVNUX0VOVU1fRkVBVFVSRV9VTktOT1dOEAASCgoGVkFMVUUxEAESCgoG", + "VkFMVUUyEAISCgoGVkFMVUUzEAMSCgoGVkFMVUU0EAQSCgoGVkFMVUU1EAUS", + "CgoGVkFMVUU2EAYSCgoGVkFMVUU3EAcSCgoGVkFMVUU4EAgSCgoGVkFMVUU5", + "EAkSCwoHVkFMVUUxMBAKEgsKB1ZBTFVFMTEQCxILCgdWQUxVRTEyEAwSCwoH", + "VkFMVUUxMxANEgsKB1ZBTFVFMTQQDhILCgdWQUxVRTE1EA8q4AIKFFZhbHVl", + "TGlmZXRpbWVGZWF0dXJlEh8KG1RFU1RfVkFMVUVfTElGRVRJTUVfVU5LTk9X", + "ThAAEhwKGFZBTFVFX0xJRkVUSU1FX0lOSEVSSVRFRBABEk4KFlZBTFVFX0xJ", + "RkVUSU1FX1NVUFBPUlQQAhoyIjAInY0GEJ6NBhoiQ3VzdG9tIGZlYXR1cmUg", + "ZGVwcmVjYXRpb24gd2FybmluZyCfjQYSJAocVkFMVUVfTElGRVRJTUVfRU1Q", + "VFlfU1VQUE9SVBADGgIiABIhChVWQUxVRV9MSUZFVElNRV9GVVRVUkUQBBoG", + "IgQInY0GEkkKGVZBTFVFX0xJRkVUSU1FX0RFUFJFQ0FURUQQBRoqIigQnY0G", + "GiJDdXN0b20gZmVhdHVyZSBkZXByZWNhdGlvbiB3YXJuaW5nEiUKFlZBTFVF", + "X0xJRkVUSU1FX1JFTU9WRUQQBhoJIgcQ6AcgnY0GOjwKBHRlc3QSGy5nb29n", + "bGUucHJvdG9idWYuRmVhdHVyZVNldBiPTiABKAsyEC5wYi5UZXN0RmVhdHVy", + "ZXNiCGVkaXRpb25zcOgH")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Pb.EnumFeature), }, new pb::Extension[] { UnittestFeaturesExtensions.Test }, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Pb.EnumFeature), typeof(global::Pb.ValueLifetimeFeature), }, new pb::Extension[] { UnittestFeaturesExtensions.Test }, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Pb.TestMessage), global::Pb.TestMessage.Parser, null, null, null, new pb::Extension[] { global::Pb.TestMessage.Extensions.TestMessage }, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Pb.TestMessage.Types.Nested), global::Pb.TestMessage.Types.Nested.Parser, null, null, null, new pb::Extension[] { global::Pb.TestMessage.Types.Nested.Extensions.TestNested }, null)}), - new pbr::GeneratedClrTypeInfo(typeof(global::Pb.TestFeatures), global::Pb.TestFeatures.Parser, new[]{ "FileFeature", "ExtensionRangeFeature", "MessageFeature", "FieldFeature", "OneofFeature", "EnumFeature", "EnumEntryFeature", "ServiceFeature", "MethodFeature", "MultipleFeature", "BoolFieldFeature", "SourceFeature", "SourceFeature2", "RemovedFeature", "FutureFeature", "LegacyFeature" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Pb.TestFeatures), global::Pb.TestFeatures.Parser, new[]{ "FileFeature", "ExtensionRangeFeature", "MessageFeature", "FieldFeature", "OneofFeature", "EnumFeature", "EnumEntryFeature", "ServiceFeature", "MethodFeature", "MultipleFeature", "BoolFieldFeature", "SourceFeature", "SourceFeature2", "RemovedFeature", "FutureFeature", "LegacyFeature", "ValueLifetimeFeature" }, null, null, null, null) })); } #endregion @@ -103,8 +114,16 @@ namespace Pb { [pbr::OriginalName("VALUE13")] Value13 = 13, [pbr::OriginalName("VALUE14")] Value14 = 14, [pbr::OriginalName("VALUE15")] Value15 = 15, - [pbr::OriginalName("VALUE_EMPTY_SUPPORT")] ValueEmptySupport = 98, - [pbr::OriginalName("VALUE_FUTURE")] ValueFuture = 99, + } + + public enum ValueLifetimeFeature { + [pbr::OriginalName("TEST_VALUE_LIFETIME_UNKNOWN")] TestValueLifetimeUnknown = 0, + [pbr::OriginalName("VALUE_LIFETIME_INHERITED")] ValueLifetimeInherited = 1, + [pbr::OriginalName("VALUE_LIFETIME_SUPPORT")] ValueLifetimeSupport = 2, + [pbr::OriginalName("VALUE_LIFETIME_EMPTY_SUPPORT")] ValueLifetimeEmptySupport = 3, + [pbr::OriginalName("VALUE_LIFETIME_FUTURE")] ValueLifetimeFuture = 4, + [pbr::OriginalName("VALUE_LIFETIME_DEPRECATED")] ValueLifetimeDeprecated = 5, + [pbr::OriginalName("VALUE_LIFETIME_REMOVED")] ValueLifetimeRemoved = 6, } #endregion @@ -513,6 +532,7 @@ namespace Pb { removedFeature_ = other.removedFeature_; futureFeature_ = other.futureFeature_; legacyFeature_ = other.legacyFeature_; + valueLifetimeFeature_ = other.valueLifetimeFeature_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -954,6 +974,33 @@ namespace Pb { _hasBits0 &= ~32768; } + /// Field number for the "value_lifetime_feature" field. + public const int ValueLifetimeFeatureFieldNumber = 20; + private readonly static global::Pb.ValueLifetimeFeature ValueLifetimeFeatureDefaultValue = global::Pb.ValueLifetimeFeature.TestValueLifetimeUnknown; + + private global::Pb.ValueLifetimeFeature valueLifetimeFeature_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public global::Pb.ValueLifetimeFeature ValueLifetimeFeature { + get { if ((_hasBits0 & 65536) != 0) { return valueLifetimeFeature_; } else { return ValueLifetimeFeatureDefaultValue; } } + set { + _hasBits0 |= 65536; + valueLifetimeFeature_ = value; + } + } + /// Gets whether the "value_lifetime_feature" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasValueLifetimeFeature { + get { return (_hasBits0 & 65536) != 0; } + } + /// Clears the value of the "value_lifetime_feature" field + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearValueLifetimeFeature() { + _hasBits0 &= ~65536; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -985,6 +1032,7 @@ namespace Pb { if (RemovedFeature != other.RemovedFeature) return false; if (FutureFeature != other.FutureFeature) return false; if (LegacyFeature != other.LegacyFeature) return false; + if (ValueLifetimeFeature != other.ValueLifetimeFeature) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1008,6 +1056,7 @@ namespace Pb { if (HasRemovedFeature) hash ^= RemovedFeature.GetHashCode(); if (HasFutureFeature) hash ^= FutureFeature.GetHashCode(); if (HasLegacyFeature) hash ^= LegacyFeature.GetHashCode(); + if (HasValueLifetimeFeature) hash ^= ValueLifetimeFeature.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1090,6 +1139,10 @@ namespace Pb { output.WriteRawTag(152, 1); output.WriteEnum((int) LegacyFeature); } + if (HasValueLifetimeFeature) { + output.WriteRawTag(160, 1); + output.WriteEnum((int) ValueLifetimeFeature); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -1164,6 +1217,10 @@ namespace Pb { output.WriteRawTag(152, 1); output.WriteEnum((int) LegacyFeature); } + if (HasValueLifetimeFeature) { + output.WriteRawTag(160, 1); + output.WriteEnum((int) ValueLifetimeFeature); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -1222,6 +1279,9 @@ namespace Pb { if (HasLegacyFeature) { size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) LegacyFeature); } + if (HasValueLifetimeFeature) { + size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) ValueLifetimeFeature); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -1282,6 +1342,9 @@ namespace Pb { if (other.HasLegacyFeature) { LegacyFeature = other.LegacyFeature; } + if (other.HasValueLifetimeFeature) { + ValueLifetimeFeature = other.ValueLifetimeFeature; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -1365,6 +1428,10 @@ namespace Pb { LegacyFeature = (global::Pb.EnumFeature) input.ReadEnum(); break; } + case 160: { + ValueLifetimeFeature = (global::Pb.ValueLifetimeFeature) input.ReadEnum(); + break; + } } } #endif @@ -1448,6 +1515,10 @@ namespace Pb { LegacyFeature = (global::Pb.EnumFeature) input.ReadEnum(); break; } + case 160: { + ValueLifetimeFeature = (global::Pb.ValueLifetimeFeature) input.ReadEnum(); + break; + } } } } diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb index 97f279d92ea0286466fea7ed16a9202c87819148..a7e2e5950f87789a6813bf1014475ed849ad59a5 100644 GIT binary patch delta 4302 zcmZ{nYit}>70379xpQYc_Rem`uI;Q}>$P1HOKEH)6hEX`v9oU7I<|3amo^3yQ>Qj0 zPH60whQ|ajr3I|Cq}7&3QV4B$BqV8z2?z<=5}s8cNI(^W1Vs=cgdi24k@%lGGk3hE z{kG@Kx##@O|D1cBT)S3t<@K7Q%WRo18_QzZ{EmF+IdQhfd0XMokLAX~lh4Wj@R!|- zkDZqHO5gh{b1EO)yMJkRdjI^s*~R$-v(x)#_bx6yFk4-bWt-fN>e~*@+%`!OLt(%` z@V)Oidz7)K89T-5yz0pvLlgPwp}~Rt_~5Sm^x*Iv`LV(A{LboS>lDj)x2*d}jrS7hN&XJkt)Tw@iAcO6aZbym23R$lj8|ID3=H{R}Q>LLr_<=N)K(goSYZY`X@AT#XT*n z<7UDWwTUeko#*9A?vsOgVr!zG5sJxBX{))>DRqR&c)~N$V9rA?c(c zVApRm!jkBylXr(F4dm(MRD?(kOxjZV<3&u+1!ax@c0}_yLfj#JSmW; zi&sS!@^octA`5xCQ!Q}o9+&Ht{o4)ix9cEkZFze^0oHikD0JLm(8JIW`h z4}xQ8V^p_69gn&#(KqB7-LyGugQ1Pl)(N!Xt3H^GKHjPOV5*NXu{kWuR3E!_AIzpc z#(^DRV5cYfo(O{jV^U*qU`)Ef&7~cNg-a8t$!*UUles;SoSZQ3))-u2ylah3a^9mc zxWc$sV_+Gk_}&P^0LGNYp!+f9s(pk~bR(wJKC1Z}kYg&lH^MLow z!kE<Ln1nH}F-(Q=e!b(S z!uWv3Fcrprje*O&zz;_l5*P~_16SKO7Tj#Oqqxn+LQ`|N91<7{Er%lvNf-w;hEy1b zL~}S4sW3jMF{HwHKx0^*SmX~!7#1)V6^82Hf*gx_M=fA1>K(O!v6y=}!mtQqNn={AVOEz$oGEr*SxN8H*_4I3Co8nU4pHl1wrBMh4`KCH{y z3gaUp8>(R|H9o2_Y=!YLV7Ti2EAiw}##fkd{NN^*U`+5N!)hgXSdKC`di6?hvyQUH zCMTudnG&0hH?J@Q>F60O0gd=L15OHme#yo=C_cfkB-(+DpJZ5G?ZBh4%!I$@461yp z=nQVsBMc+fXRy4dB+cV7v!kSWLL>S(LP(#F zksL*IoQb}W5e`H=$;6%E_)0xlVEkE)SPB{7h^AMH=mNtc1r3w}vA`NgXhJLnVu9tJ z4G?|h0pruLjHQb43-Ku6K*}#_Xyhoz_`Vdk1qZ5px#$R{cOsr1A|T|+q9efepDC(~ z@qMMJ4954>czmTwt5dO7rAn)>#nUVEF1Pxl2O(B|7k zXTW`~s4k>AUsMLtT!^J9Q_?&iOH-z#c_Ef2>B&{bU(wPeQDW7PwMn9p)mWP(s8?fY zl8|PVHNB#xNs=_*jhT~5nu~Fta3JINh&ipEiKJcW$?r4qLuQ7XowR+reLo_|;65hR zuD`_aPay4po-dOlc)MIrUSj-J-G+-c;D{#dqUNP|`CW8zDPDdTU0h_tr#yL?@z*qR3dnE}vikdz zLipvFIR)m+F>?ycms##L&730SU&Y8Nh5YLn84hH;5-Xn~<$uG(Z?*C%1^qkbYvtj= zq2I^UX-{5d{HCT(gBp&?@b2LMvoNc+L?)oGvbGM0La$63&{x^pZ))f?LH{9!PAlkZ zdx$z%k2FF4k%`vtde#I}`s{>*AjLClmi>=8Qdi-~8hI!G*(z NZde!FUXo|F{12py)p`H` delta 3618 zcmY+H+jA5}6vnrEdU|JPZ^7M4RX$qsyI7k0mD&nz4}CI91pCB_ep$gR?{YsD zoAa&R&ArWS?Oi>+o!#y2n>xBmwpZ}E5pTVlD1O|~-PPUET(YB3eOfMaRyDa|U*Fz+ zh3lu}titLua(3+EJU8mu(a6=KNB-?7oIfM4ubJ<R$rcw5jLM2U7H4G2O}SAKu}~VzGwDhbqd=yr+QcZ4sjUYawRN#2jsx z`dk+Atd(LG#nVx2l~_)3IlkX4)|nXJS5JdA=c3 z#qcptsu)z|NtJRVpD7+F#u>`ymn;obF{sKnY=9~)ia8L~M534$wN7LM2<9kJ{(4fy z9HpumDvDNfPqgsX5Q+n;g`hZ~S_q1xP)nwGS{dhnYRT3HP#jP#b*&*3S5UVR6!$gN z?IxkAHWC!qPvOUqmw}ntPpn3?(22_uR^3`>)LDfT7#fDWqbX9CX z_0((&p=<@Um7r`5br0PXTSMJTP_~A;kD#O{dil-}N($)jB`OK3Ub0F8syCAj`X>R^ zyC@g*PXem9erE_J71aF%B{kFoVt&v*siC$Ll+;i=G?cF%m8d8B_^yyD3ak1EDhjAR zf{FsFk4}0NP^tU|SZz9)oo0M$=W z4xsu8%0Z$2%!0rv2T=Vr*}y4Bm8snmLOBX*H$ga#uU@)G#SMW~j<)JCf^sy};{+A+ z!~lOGgo*)bfS_W48X%|`pawG40aOf71GS3+s2HFIaxW+-Up>DuMfC(x#k5s>=};j? zv3+#%5#xD%a`JqXe`@l4fbFOLW4`TKPfwl?)MvD4KdSdHi+a|xlQ(cY>p6NVW7?Gi zF3+^{9iqSLi5(93Sz)=z}Gw_88yyRkti6)c4j8~Z07!b!j zIn4NRCj0;@4rF9PiLL+c$n24C*rswKEz;f zkteQ+Ut{PHB~bBoNbpStzc+6fl~{va4o_JF#y1(-N=0Dokts`n{nnIyakbwzPN67{ z-a8DP4QlwRwc@DpF0OhjjxlO(!jlEYPf~LepgHeQLs#03jxKV`!N?uT^iqAm`s>F9ptO|frTGK_N2??zD-Y7_Wa)R+I zq#z9iNN5E