From 29f1b5259ea224abcaa9a4eb5e28f804ea8d5097 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Wed, 12 Jun 2024 18:32:39 -0700 Subject: [PATCH] Regenerate stale files --- .../TestMessagesEdition2023.pb.cs | 315 +++++++++--------- .../UnittestFeatures.pb.cs | 2 +- csharp/src/Google.Protobuf.Test/testprotos.pb | Bin 453451 -> 453634 bytes php/ext/google/protobuf/php-upb.c | 22 +- ruby/ext/google/protobuf_c/ruby-upb.c | 22 +- 5 files changed, 181 insertions(+), 180 deletions(-) diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesEdition2023.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesEdition2023.pb.cs index fa91760cc6..f68c8ea3ee 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesEdition2023.pb.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesEdition2023.pb.cs @@ -26,7 +26,7 @@ namespace ProtobufTestMessages.Editions { string.Concat( "Cjdjb25mb3JtYW5jZS90ZXN0X3Byb3Rvcy90ZXN0X21lc3NhZ2VzX2VkaXRp", "b24yMDIzLnByb3RvEh9wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25z", - "Itw2ChdUZXN0QWxsVHlwZXNFZGl0aW9uMjAyMxIWCg5vcHRpb25hbF9pbnQz", + "Iv82ChdUZXN0QWxsVHlwZXNFZGl0aW9uMjAyMxIWCg5vcHRpb25hbF9pbnQz", "MhgBIAEoBRIWCg5vcHRpb25hbF9pbnQ2NBgCIAEoAxIXCg9vcHRpb25hbF91", "aW50MzIYAyABKA0SFwoPb3B0aW9uYWxfdWludDY0GAQgASgEEhcKD29wdGlv", "bmFsX3NpbnQzMhgFIAEoERIXCg9vcHRpb25hbF9zaW50NjQYBiABKBISGAoQ", @@ -34,167 +34,168 @@ namespace ProtobufTestMessages.Editions { "ASgGEhkKEW9wdGlvbmFsX3NmaXhlZDMyGAkgASgPEhkKEW9wdGlvbmFsX3Nm", "aXhlZDY0GAogASgQEhYKDm9wdGlvbmFsX2Zsb2F0GAsgASgCEhcKD29wdGlv", "bmFsX2RvdWJsZRgMIAEoARIVCg1vcHRpb25hbF9ib29sGA0gASgIEhcKD29w", - "dGlvbmFsX3N0cmluZxgOIAEoCRIWCg5vcHRpb25hbF9ieXRlcxgPIAEoDBJn", + "dGlvbmFsX3N0cmluZxgOIAEoCRIWCg5vcHRpb25hbF9ieXRlcxgPIAEoDBJu", "ChdvcHRpb25hbF9uZXN0ZWRfbWVzc2FnZRgSIAEoCzJGLnByb3RvYnVmX3Rl", "c3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMu", - "TmVzdGVkTWVzc2FnZRJcChhvcHRpb25hbF9mb3JlaWduX21lc3NhZ2UYEyAB", - "KAsyOi5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLkZvcmVpZ25N", - "ZXNzYWdlRWRpdGlvbjIwMjMSYQoUb3B0aW9uYWxfbmVzdGVkX2VudW0YFSAB", - "KA4yQy5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRlc3RBbGxU", - "eXBlc0VkaXRpb24yMDIzLk5lc3RlZEVudW0SVgoVb3B0aW9uYWxfZm9yZWln", - "bl9lbnVtGBYgASgOMjcucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9u", - "cy5Gb3JlaWduRW51bUVkaXRpb24yMDIzEiEKFW9wdGlvbmFsX3N0cmluZ19w", - "aWVjZRgYIAEoCUICCAISGQoNb3B0aW9uYWxfY29yZBgZIAEoCUICCAESUwoR", - "cmVjdXJzaXZlX21lc3NhZ2UYGyABKAsyOC5wcm90b2J1Zl90ZXN0X21lc3Nh", - "Z2VzLmVkaXRpb25zLlRlc3RBbGxUeXBlc0VkaXRpb24yMDIzEhYKDnJlcGVh", - "dGVkX2ludDMyGB8gAygFEhYKDnJlcGVhdGVkX2ludDY0GCAgAygDEhcKD3Jl", - "cGVhdGVkX3VpbnQzMhghIAMoDRIXCg9yZXBlYXRlZF91aW50NjQYIiADKAQS", - "FwoPcmVwZWF0ZWRfc2ludDMyGCMgAygREhcKD3JlcGVhdGVkX3NpbnQ2NBgk", - "IAMoEhIYChByZXBlYXRlZF9maXhlZDMyGCUgAygHEhgKEHJlcGVhdGVkX2Zp", - "eGVkNjQYJiADKAYSGQoRcmVwZWF0ZWRfc2ZpeGVkMzIYJyADKA8SGQoRcmVw", - "ZWF0ZWRfc2ZpeGVkNjQYKCADKBASFgoOcmVwZWF0ZWRfZmxvYXQYKSADKAIS", - "FwoPcmVwZWF0ZWRfZG91YmxlGCogAygBEhUKDXJlcGVhdGVkX2Jvb2wYKyAD", - "KAgSFwoPcmVwZWF0ZWRfc3RyaW5nGCwgAygJEhYKDnJlcGVhdGVkX2J5dGVz", - "GC0gAygMEmcKF3JlcGVhdGVkX25lc3RlZF9tZXNzYWdlGDAgAygLMkYucHJv", - "dG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0", - "aW9uMjAyMy5OZXN0ZWRNZXNzYWdlElwKGHJlcGVhdGVkX2ZvcmVpZ25fbWVz", - "c2FnZRgxIAMoCzI6LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMu", - "Rm9yZWlnbk1lc3NhZ2VFZGl0aW9uMjAyMxJhChRyZXBlYXRlZF9uZXN0ZWRf", - "ZW51bRgzIAMoDjJDLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMu", - "VGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMuTmVzdGVkRW51bRJWChVyZXBlYXRl", - "ZF9mb3JlaWduX2VudW0YNCADKA4yNy5wcm90b2J1Zl90ZXN0X21lc3NhZ2Vz", - "LmVkaXRpb25zLkZvcmVpZ25FbnVtRWRpdGlvbjIwMjMSIQoVcmVwZWF0ZWRf", - "c3RyaW5nX3BpZWNlGDYgAygJQgIIAhIZCg1yZXBlYXRlZF9jb3JkGDcgAygJ", - "QgIIARIbCgxwYWNrZWRfaW50MzIYSyADKAVCBaoBAhgBEhsKDHBhY2tlZF9p", - "bnQ2NBhMIAMoA0IFqgECGAESHAoNcGFja2VkX3VpbnQzMhhNIAMoDUIFqgEC", - "GAESHAoNcGFja2VkX3VpbnQ2NBhOIAMoBEIFqgECGAESHAoNcGFja2VkX3Np", - "bnQzMhhPIAMoEUIFqgECGAESHAoNcGFja2VkX3NpbnQ2NBhQIAMoEkIFqgEC", - "GAESHQoOcGFja2VkX2ZpeGVkMzIYUSADKAdCBaoBAhgBEh0KDnBhY2tlZF9m", - "aXhlZDY0GFIgAygGQgWqAQIYARIeCg9wYWNrZWRfc2ZpeGVkMzIYUyADKA9C", - "BaoBAhgBEh4KD3BhY2tlZF9zZml4ZWQ2NBhUIAMoEEIFqgECGAESGwoMcGFj", - "a2VkX2Zsb2F0GFUgAygCQgWqAQIYARIcCg1wYWNrZWRfZG91YmxlGFYgAygB", - "QgWqAQIYARIaCgtwYWNrZWRfYm9vbBhXIAMoCEIFqgECGAESZgoScGFja2Vk", - "X25lc3RlZF9lbnVtGFggAygOMkMucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5l", - "ZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5OZXN0ZWRFbnVtQgWq", - "AQIYARIdCg51bnBhY2tlZF9pbnQzMhhZIAMoBUIFqgECGAISHQoOdW5wYWNr", - "ZWRfaW50NjQYWiADKANCBaoBAhgCEh4KD3VucGFja2VkX3VpbnQzMhhbIAMo", - "DUIFqgECGAISHgoPdW5wYWNrZWRfdWludDY0GFwgAygEQgWqAQIYAhIeCg91", - "bnBhY2tlZF9zaW50MzIYXSADKBFCBaoBAhgCEh4KD3VucGFja2VkX3NpbnQ2", - "NBheIAMoEkIFqgECGAISHwoQdW5wYWNrZWRfZml4ZWQzMhhfIAMoB0IFqgEC", - "GAISHwoQdW5wYWNrZWRfZml4ZWQ2NBhgIAMoBkIFqgECGAISIAoRdW5wYWNr", - "ZWRfc2ZpeGVkMzIYYSADKA9CBaoBAhgCEiAKEXVucGFja2VkX3NmaXhlZDY0", - "GGIgAygQQgWqAQIYAhIdCg51bnBhY2tlZF9mbG9hdBhjIAMoAkIFqgECGAIS", - "HgoPdW5wYWNrZWRfZG91YmxlGGQgAygBQgWqAQIYAhIcCg11bnBhY2tlZF9i", - "b29sGGUgAygIQgWqAQIYAhJoChR1bnBhY2tlZF9uZXN0ZWRfZW51bRhmIAMo", - "DjJDLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5", - "cGVzRWRpdGlvbjIwMjMuTmVzdGVkRW51bUIFqgECGAISZAoPbWFwX2ludDMy", - "X2ludDMyGDggAygLMksucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9u", - "cy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5NYXBJbnQzMkludDMyRW50cnkS", - "ZAoPbWFwX2ludDY0X2ludDY0GDkgAygLMksucHJvdG9idWZfdGVzdF9tZXNz", - "YWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5NYXBJbnQ2", - "NEludDY0RW50cnkSaAoRbWFwX3VpbnQzMl91aW50MzIYOiADKAsyTS5wcm90", - "b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRlc3RBbGxUeXBlc0VkaXRp", - "b24yMDIzLk1hcFVpbnQzMlVpbnQzMkVudHJ5EmgKEW1hcF91aW50NjRfdWlu", - "dDY0GDsgAygLMk0ucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5U", - "ZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5NYXBVaW50NjRVaW50NjRFbnRyeRJo", - "ChFtYXBfc2ludDMyX3NpbnQzMhg8IAMoCzJNLnByb3RvYnVmX3Rlc3RfbWVz", - "c2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMuTWFwU2lu", - "dDMyU2ludDMyRW50cnkSaAoRbWFwX3NpbnQ2NF9zaW50NjQYPSADKAsyTS5w", - "cm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRlc3RBbGxUeXBlc0Vk", - "aXRpb24yMDIzLk1hcFNpbnQ2NFNpbnQ2NEVudHJ5EmwKE21hcF9maXhlZDMy", - "X2ZpeGVkMzIYPiADKAsyTy5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRp", - "b25zLlRlc3RBbGxUeXBlc0VkaXRpb24yMDIzLk1hcEZpeGVkMzJGaXhlZDMy", - "RW50cnkSbAoTbWFwX2ZpeGVkNjRfZml4ZWQ2NBg/IAMoCzJPLnByb3RvYnVm", - "X3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIw", - "MjMuTWFwRml4ZWQ2NEZpeGVkNjRFbnRyeRJwChVtYXBfc2ZpeGVkMzJfc2Zp", - "eGVkMzIYQCADKAsyUS5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25z", - "LlRlc3RBbGxUeXBlc0VkaXRpb24yMDIzLk1hcFNmaXhlZDMyU2ZpeGVkMzJF", - "bnRyeRJwChVtYXBfc2ZpeGVkNjRfc2ZpeGVkNjQYQSADKAsyUS5wcm90b2J1", - "Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRlc3RBbGxUeXBlc0VkaXRpb24y", - "MDIzLk1hcFNmaXhlZDY0U2ZpeGVkNjRFbnRyeRJkCg9tYXBfaW50MzJfZmxv", - "YXQYQiADKAsySy5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRl", - "c3RBbGxUeXBlc0VkaXRpb24yMDIzLk1hcEludDMyRmxvYXRFbnRyeRJmChBt", - "YXBfaW50MzJfZG91YmxlGEMgAygLMkwucHJvdG9idWZfdGVzdF9tZXNzYWdl", - "cy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5NYXBJbnQzMkRv", - "dWJsZUVudHJ5EmAKDW1hcF9ib29sX2Jvb2wYRCADKAsySS5wcm90b2J1Zl90", - "ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRlc3RBbGxUeXBlc0VkaXRpb24yMDIz", - "Lk1hcEJvb2xCb29sRW50cnkSaAoRbWFwX3N0cmluZ19zdHJpbmcYRSADKAsy", - "TS5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRlc3RBbGxUeXBl", - "c0VkaXRpb24yMDIzLk1hcFN0cmluZ1N0cmluZ0VudHJ5EmYKEG1hcF9zdHJp", - "bmdfYnl0ZXMYRiADKAsyTC5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRp", - "b25zLlRlc3RBbGxUeXBlc0VkaXRpb24yMDIzLk1hcFN0cmluZ0J5dGVzRW50", - "cnkSdwoZbWFwX3N0cmluZ19uZXN0ZWRfbWVzc2FnZRhHIAMoCzJULnByb3Rv", + "TmVzdGVkTWVzc2FnZUIFqgECKAESYwoYb3B0aW9uYWxfZm9yZWlnbl9tZXNz", + "YWdlGBMgASgLMjoucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5G", + "b3JlaWduTWVzc2FnZUVkaXRpb24yMDIzQgWqAQIoARJhChRvcHRpb25hbF9u", + "ZXN0ZWRfZW51bRgVIAEoDjJDLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRp", + "dGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMuTmVzdGVkRW51bRJWChVv", + "cHRpb25hbF9mb3JlaWduX2VudW0YFiABKA4yNy5wcm90b2J1Zl90ZXN0X21l", + "c3NhZ2VzLmVkaXRpb25zLkZvcmVpZ25FbnVtRWRpdGlvbjIwMjMSIQoVb3B0", + "aW9uYWxfc3RyaW5nX3BpZWNlGBggASgJQgIIAhIZCg1vcHRpb25hbF9jb3Jk", + "GBkgASgJQgIIARJaChFyZWN1cnNpdmVfbWVzc2FnZRgbIAEoCzI4LnByb3Rv", "YnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlv", - "bjIwMjMuTWFwU3RyaW5nTmVzdGVkTWVzc2FnZUVudHJ5EnkKGm1hcF9zdHJp", - "bmdfZm9yZWlnbl9tZXNzYWdlGEggAygLMlUucHJvdG9idWZfdGVzdF9tZXNz", - "YWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5NYXBTdHJp", - "bmdGb3JlaWduTWVzc2FnZUVudHJ5EnEKFm1hcF9zdHJpbmdfbmVzdGVkX2Vu", - "dW0YSSADKAsyUS5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRl", - "c3RBbGxUeXBlc0VkaXRpb24yMDIzLk1hcFN0cmluZ05lc3RlZEVudW1FbnRy", - "eRJzChdtYXBfc3RyaW5nX2ZvcmVpZ25fZW51bRhKIAMoCzJSLnByb3RvYnVm", + "bjIwMjNCBaoBAigBEhYKDnJlcGVhdGVkX2ludDMyGB8gAygFEhYKDnJlcGVh", + "dGVkX2ludDY0GCAgAygDEhcKD3JlcGVhdGVkX3VpbnQzMhghIAMoDRIXCg9y", + "ZXBlYXRlZF91aW50NjQYIiADKAQSFwoPcmVwZWF0ZWRfc2ludDMyGCMgAygR", + "EhcKD3JlcGVhdGVkX3NpbnQ2NBgkIAMoEhIYChByZXBlYXRlZF9maXhlZDMy", + "GCUgAygHEhgKEHJlcGVhdGVkX2ZpeGVkNjQYJiADKAYSGQoRcmVwZWF0ZWRf", + "c2ZpeGVkMzIYJyADKA8SGQoRcmVwZWF0ZWRfc2ZpeGVkNjQYKCADKBASFgoO", + "cmVwZWF0ZWRfZmxvYXQYKSADKAISFwoPcmVwZWF0ZWRfZG91YmxlGCogAygB", + "EhUKDXJlcGVhdGVkX2Jvb2wYKyADKAgSFwoPcmVwZWF0ZWRfc3RyaW5nGCwg", + "AygJEhYKDnJlcGVhdGVkX2J5dGVzGC0gAygMEm4KF3JlcGVhdGVkX25lc3Rl", + "ZF9tZXNzYWdlGDAgAygLMkYucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0", + "aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5OZXN0ZWRNZXNzYWdlQgWq", + "AQIoARJjChhyZXBlYXRlZF9mb3JlaWduX21lc3NhZ2UYMSADKAsyOi5wcm90", + "b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLkZvcmVpZ25NZXNzYWdlRWRp", + "dGlvbjIwMjNCBaoBAigBEmEKFHJlcGVhdGVkX25lc3RlZF9lbnVtGDMgAygO", + "MkMucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlw", + "ZXNFZGl0aW9uMjAyMy5OZXN0ZWRFbnVtElYKFXJlcGVhdGVkX2ZvcmVpZ25f", + "ZW51bRg0IAMoDjI3LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMu", + "Rm9yZWlnbkVudW1FZGl0aW9uMjAyMxIhChVyZXBlYXRlZF9zdHJpbmdfcGll", + "Y2UYNiADKAlCAggCEhkKDXJlcGVhdGVkX2NvcmQYNyADKAlCAggBEhsKDHBh", + "Y2tlZF9pbnQzMhhLIAMoBUIFqgECGAESGwoMcGFja2VkX2ludDY0GEwgAygD", + "QgWqAQIYARIcCg1wYWNrZWRfdWludDMyGE0gAygNQgWqAQIYARIcCg1wYWNr", + "ZWRfdWludDY0GE4gAygEQgWqAQIYARIcCg1wYWNrZWRfc2ludDMyGE8gAygR", + "QgWqAQIYARIcCg1wYWNrZWRfc2ludDY0GFAgAygSQgWqAQIYARIdCg5wYWNr", + "ZWRfZml4ZWQzMhhRIAMoB0IFqgECGAESHQoOcGFja2VkX2ZpeGVkNjQYUiAD", + "KAZCBaoBAhgBEh4KD3BhY2tlZF9zZml4ZWQzMhhTIAMoD0IFqgECGAESHgoP", + "cGFja2VkX3NmaXhlZDY0GFQgAygQQgWqAQIYARIbCgxwYWNrZWRfZmxvYXQY", + "VSADKAJCBaoBAhgBEhwKDXBhY2tlZF9kb3VibGUYViADKAFCBaoBAhgBEhoK", + "C3BhY2tlZF9ib29sGFcgAygIQgWqAQIYARJmChJwYWNrZWRfbmVzdGVkX2Vu", + "dW0YWCADKA4yQy5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRl", + "c3RBbGxUeXBlc0VkaXRpb24yMDIzLk5lc3RlZEVudW1CBaoBAhgBEh0KDnVu", + "cGFja2VkX2ludDMyGFkgAygFQgWqAQIYAhIdCg51bnBhY2tlZF9pbnQ2NBha", + "IAMoA0IFqgECGAISHgoPdW5wYWNrZWRfdWludDMyGFsgAygNQgWqAQIYAhIe", + "Cg91bnBhY2tlZF91aW50NjQYXCADKARCBaoBAhgCEh4KD3VucGFja2VkX3Np", + "bnQzMhhdIAMoEUIFqgECGAISHgoPdW5wYWNrZWRfc2ludDY0GF4gAygSQgWq", + "AQIYAhIfChB1bnBhY2tlZF9maXhlZDMyGF8gAygHQgWqAQIYAhIfChB1bnBh", + "Y2tlZF9maXhlZDY0GGAgAygGQgWqAQIYAhIgChF1bnBhY2tlZF9zZml4ZWQz", + "MhhhIAMoD0IFqgECGAISIAoRdW5wYWNrZWRfc2ZpeGVkNjQYYiADKBBCBaoB", + "AhgCEh0KDnVucGFja2VkX2Zsb2F0GGMgAygCQgWqAQIYAhIeCg91bnBhY2tl", + "ZF9kb3VibGUYZCADKAFCBaoBAhgCEhwKDXVucGFja2VkX2Jvb2wYZSADKAhC", + "BaoBAhgCEmgKFHVucGFja2VkX25lc3RlZF9lbnVtGGYgAygOMkMucHJvdG9i", + "dWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9u", + "MjAyMy5OZXN0ZWRFbnVtQgWqAQIYAhJkCg9tYXBfaW50MzJfaW50MzIYOCAD", + "KAsySy5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRlc3RBbGxU", + "eXBlc0VkaXRpb24yMDIzLk1hcEludDMySW50MzJFbnRyeRJkCg9tYXBfaW50", + "NjRfaW50NjQYOSADKAsySy5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRp", + "b25zLlRlc3RBbGxUeXBlc0VkaXRpb24yMDIzLk1hcEludDY0SW50NjRFbnRy", + "eRJoChFtYXBfdWludDMyX3VpbnQzMhg6IAMoCzJNLnByb3RvYnVmX3Rlc3Rf", + "bWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMuTWFw", + "VWludDMyVWludDMyRW50cnkSaAoRbWFwX3VpbnQ2NF91aW50NjQYOyADKAsy", + "TS5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRlc3RBbGxUeXBl", + "c0VkaXRpb24yMDIzLk1hcFVpbnQ2NFVpbnQ2NEVudHJ5EmgKEW1hcF9zaW50", + "MzJfc2ludDMyGDwgAygLMk0ucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0", + "aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5NYXBTaW50MzJTaW50MzJF", + "bnRyeRJoChFtYXBfc2ludDY0X3NpbnQ2NBg9IAMoCzJNLnByb3RvYnVmX3Rl", + "c3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMu", + "TWFwU2ludDY0U2ludDY0RW50cnkSbAoTbWFwX2ZpeGVkMzJfZml4ZWQzMhg+", + "IAMoCzJPLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFs", + "bFR5cGVzRWRpdGlvbjIwMjMuTWFwRml4ZWQzMkZpeGVkMzJFbnRyeRJsChNt", + "YXBfZml4ZWQ2NF9maXhlZDY0GD8gAygLMk8ucHJvdG9idWZfdGVzdF9tZXNz", + "YWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5NYXBGaXhl", + "ZDY0Rml4ZWQ2NEVudHJ5EnAKFW1hcF9zZml4ZWQzMl9zZml4ZWQzMhhAIAMo", + "CzJRLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5", + "cGVzRWRpdGlvbjIwMjMuTWFwU2ZpeGVkMzJTZml4ZWQzMkVudHJ5EnAKFW1h", + "cF9zZml4ZWQ2NF9zZml4ZWQ2NBhBIAMoCzJRLnByb3RvYnVmX3Rlc3RfbWVz", + "c2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMuTWFwU2Zp", + "eGVkNjRTZml4ZWQ2NEVudHJ5EmQKD21hcF9pbnQzMl9mbG9hdBhCIAMoCzJL", + "LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVz", + "RWRpdGlvbjIwMjMuTWFwSW50MzJGbG9hdEVudHJ5EmYKEG1hcF9pbnQzMl9k", + "b3VibGUYQyADKAsyTC5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25z", + "LlRlc3RBbGxUeXBlc0VkaXRpb24yMDIzLk1hcEludDMyRG91YmxlRW50cnkS", + "YAoNbWFwX2Jvb2xfYm9vbBhEIAMoCzJJLnByb3RvYnVmX3Rlc3RfbWVzc2Fn", + "ZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMuTWFwQm9vbEJv", + "b2xFbnRyeRJoChFtYXBfc3RyaW5nX3N0cmluZxhFIAMoCzJNLnByb3RvYnVm", "X3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIw", - "MjMuTWFwU3RyaW5nRm9yZWlnbkVudW1FbnRyeRIWCgxvbmVvZl91aW50MzIY", - "byABKA1IABJmChRvbmVvZl9uZXN0ZWRfbWVzc2FnZRhwIAEoCzJGLnByb3Rv", - "YnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlv", - "bjIwMjMuTmVzdGVkTWVzc2FnZUgAEhYKDG9uZW9mX3N0cmluZxhxIAEoCUgA", - "EhUKC29uZW9mX2J5dGVzGHIgASgMSAASFAoKb25lb2ZfYm9vbBhzIAEoCEgA", - "EhYKDG9uZW9mX3VpbnQ2NBh0IAEoBEgAEhUKC29uZW9mX2Zsb2F0GHUgASgC", - "SAASFgoMb25lb2ZfZG91YmxlGHYgASgBSAASWQoKb25lb2ZfZW51bRh3IAEo", - "DjJDLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5", - "cGVzRWRpdGlvbjIwMjMuTmVzdGVkRW51bUgAEmUKDWdyb3VwbGlrZXR5cGUY", - "yQEgASgLMkYucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5UZXN0", - "QWxsVHlwZXNFZGl0aW9uMjAyMy5Hcm91cExpa2VUeXBlQgWqAQIoAhJnCg9k", - "ZWxpbWl0ZWRfZmllbGQYygEgASgLMkYucHJvdG9idWZfdGVzdF9tZXNzYWdl", - "cy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5Hcm91cExpa2VU", - "eXBlQgWqAQIoAhppCg1OZXN0ZWRNZXNzYWdlEgkKAWEYASABKAUSTQoLY29y", - "ZWN1cnNpdmUYAiABKAsyOC5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRp", - "b25zLlRlc3RBbGxUeXBlc0VkaXRpb24yMDIzGjQKEk1hcEludDMySW50MzJF", - "bnRyeRILCgNrZXkYASABKAUSDQoFdmFsdWUYAiABKAU6AjgBGjQKEk1hcElu", - "dDY0SW50NjRFbnRyeRILCgNrZXkYASABKAMSDQoFdmFsdWUYAiABKAM6AjgB", - "GjYKFE1hcFVpbnQzMlVpbnQzMkVudHJ5EgsKA2tleRgBIAEoDRINCgV2YWx1", - "ZRgCIAEoDToCOAEaNgoUTWFwVWludDY0VWludDY0RW50cnkSCwoDa2V5GAEg", - "ASgEEg0KBXZhbHVlGAIgASgEOgI4ARo2ChRNYXBTaW50MzJTaW50MzJFbnRy", - "eRILCgNrZXkYASABKBESDQoFdmFsdWUYAiABKBE6AjgBGjYKFE1hcFNpbnQ2", - "NFNpbnQ2NEVudHJ5EgsKA2tleRgBIAEoEhINCgV2YWx1ZRgCIAEoEjoCOAEa", - "OAoWTWFwRml4ZWQzMkZpeGVkMzJFbnRyeRILCgNrZXkYASABKAcSDQoFdmFs", - "dWUYAiABKAc6AjgBGjgKFk1hcEZpeGVkNjRGaXhlZDY0RW50cnkSCwoDa2V5", - "GAEgASgGEg0KBXZhbHVlGAIgASgGOgI4ARo6ChhNYXBTZml4ZWQzMlNmaXhl", - "ZDMyRW50cnkSCwoDa2V5GAEgASgPEg0KBXZhbHVlGAIgASgPOgI4ARo6ChhN", - "YXBTZml4ZWQ2NFNmaXhlZDY0RW50cnkSCwoDa2V5GAEgASgQEg0KBXZhbHVl", - "GAIgASgQOgI4ARo0ChJNYXBJbnQzMkZsb2F0RW50cnkSCwoDa2V5GAEgASgF", - "Eg0KBXZhbHVlGAIgASgCOgI4ARo1ChNNYXBJbnQzMkRvdWJsZUVudHJ5EgsK", - "A2tleRgBIAEoBRINCgV2YWx1ZRgCIAEoAToCOAEaMgoQTWFwQm9vbEJvb2xF", - "bnRyeRILCgNrZXkYASABKAgSDQoFdmFsdWUYAiABKAg6AjgBGjYKFE1hcFN0", - "cmluZ1N0cmluZ0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToC", - "OAEaNQoTTWFwU3RyaW5nQnl0ZXNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFs", - "dWUYAiABKAw6AjgBGoUBChtNYXBTdHJpbmdOZXN0ZWRNZXNzYWdlRW50cnkS", - "CwoDa2V5GAEgASgJElUKBXZhbHVlGAIgASgLMkYucHJvdG9idWZfdGVzdF9t", + "MjMuTWFwU3RyaW5nU3RyaW5nRW50cnkSZgoQbWFwX3N0cmluZ19ieXRlcxhG", + "IAMoCzJMLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFs", + "bFR5cGVzRWRpdGlvbjIwMjMuTWFwU3RyaW5nQnl0ZXNFbnRyeRJ3ChltYXBf", + "c3RyaW5nX25lc3RlZF9tZXNzYWdlGEcgAygLMlQucHJvdG9idWZfdGVzdF9t", + "ZXNzYWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5NYXBT", + "dHJpbmdOZXN0ZWRNZXNzYWdlRW50cnkSeQoabWFwX3N0cmluZ19mb3JlaWdu", + "X21lc3NhZ2UYSCADKAsyVS5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRp", + "b25zLlRlc3RBbGxUeXBlc0VkaXRpb24yMDIzLk1hcFN0cmluZ0ZvcmVpZ25N", + "ZXNzYWdlRW50cnkScQoWbWFwX3N0cmluZ19uZXN0ZWRfZW51bRhJIAMoCzJR", + "LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVz", + "RWRpdGlvbjIwMjMuTWFwU3RyaW5nTmVzdGVkRW51bUVudHJ5EnMKF21hcF9z", + "dHJpbmdfZm9yZWlnbl9lbnVtGEogAygLMlIucHJvdG9idWZfdGVzdF9tZXNz", + "YWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5NYXBTdHJp", + "bmdGb3JlaWduRW51bUVudHJ5EhYKDG9uZW9mX3VpbnQzMhhvIAEoDUgAEm0K", + "FG9uZW9mX25lc3RlZF9tZXNzYWdlGHAgASgLMkYucHJvdG9idWZfdGVzdF9t", "ZXNzYWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9uMjAyMy5OZXN0", - "ZWRNZXNzYWdlOgI4ARp6ChxNYXBTdHJpbmdGb3JlaWduTWVzc2FnZUVudHJ5", - "EgsKA2tleRgBIAEoCRJJCgV2YWx1ZRgCIAEoCzI6LnByb3RvYnVmX3Rlc3Rf", - "bWVzc2FnZXMuZWRpdGlvbnMuRm9yZWlnbk1lc3NhZ2VFZGl0aW9uMjAyMzoC", - "OAEafwoYTWFwU3RyaW5nTmVzdGVkRW51bUVudHJ5EgsKA2tleRgBIAEoCRJS", - "CgV2YWx1ZRgCIAEoDjJDLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlv", - "bnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMuTmVzdGVkRW51bToCOAEadAoZ", - "TWFwU3RyaW5nRm9yZWlnbkVudW1FbnRyeRILCgNrZXkYASABKAkSRgoFdmFs", - "dWUYAiABKA4yNy5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLkZv", - "cmVpZ25FbnVtRWRpdGlvbjIwMjM6AjgBGjwKDUdyb3VwTGlrZVR5cGUSFAoL", - "Z3JvdXBfaW50MzIYygEgASgFEhUKDGdyb3VwX3VpbnQzMhjLASABKA0iOQoK", - "TmVzdGVkRW51bRIHCgNGT08QABIHCgNCQVIQARIHCgNCQVoQAhIQCgNORUcQ", - "////////////ASoFCHgQyQFCDQoLb25lb2ZfZmllbGQiJgoZRm9yZWlnbk1l", - "c3NhZ2VFZGl0aW9uMjAyMxIJCgFjGAEgASgFIhoKDUdyb3VwTGlrZVR5cGUS", - "CQoBYxgBIAEoBSpLChZGb3JlaWduRW51bUVkaXRpb24yMDIzEg8KC0ZPUkVJ", - "R05fRk9PEAASDwoLRk9SRUlHTl9CQVIQARIPCgtGT1JFSUdOX0JBWhACOlEK", - "D2V4dGVuc2lvbl9pbnQzMhI4LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRp", - "dGlvbnMuVGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMYeCABKAU6hgEKDWdyb3Vw", - "bGlrZXR5cGUSOC5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25zLlRl", - "c3RBbGxUeXBlc0VkaXRpb24yMDIzGHkgASgLMi4ucHJvdG9idWZfdGVzdF9t", - "ZXNzYWdlcy5lZGl0aW9ucy5Hcm91cExpa2VUeXBlQgWqAQIoAjqGAQoNZGVs", - "aW1pdGVkX2V4dBI4LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMu", - "VGVzdEFsbFR5cGVzRWRpdGlvbjIwMjMYeiABKAsyLi5wcm90b2J1Zl90ZXN0", - "X21lc3NhZ2VzLmVkaXRpb25zLkdyb3VwTGlrZVR5cGVCBaoBAigCQjwKLWNv", - "bS5nb29nbGUucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9uMjAyM1AB", - "ogIIRWRpdGlvbnNiCGVkaXRpb25zcOgH")); + "ZWRNZXNzYWdlQgWqAQIoAUgAEhYKDG9uZW9mX3N0cmluZxhxIAEoCUgAEhUK", + "C29uZW9mX2J5dGVzGHIgASgMSAASFAoKb25lb2ZfYm9vbBhzIAEoCEgAEhYK", + "DG9uZW9mX3VpbnQ2NBh0IAEoBEgAEhUKC29uZW9mX2Zsb2F0GHUgASgCSAAS", + "FgoMb25lb2ZfZG91YmxlGHYgASgBSAASWQoKb25lb2ZfZW51bRh3IAEoDjJD", + "LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuVGVzdEFsbFR5cGVz", + "RWRpdGlvbjIwMjMuTmVzdGVkRW51bUgAEl4KDWdyb3VwbGlrZXR5cGUYyQEg", + "ASgLMkYucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5UZXN0QWxs", + "VHlwZXNFZGl0aW9uMjAyMy5Hcm91cExpa2VUeXBlEmAKD2RlbGltaXRlZF9m", + "aWVsZBjKASABKAsyRi5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVkaXRpb25z", + "LlRlc3RBbGxUeXBlc0VkaXRpb24yMDIzLkdyb3VwTGlrZVR5cGUacAoNTmVz", + "dGVkTWVzc2FnZRIJCgFhGAEgASgFElQKC2NvcmVjdXJzaXZlGAIgASgLMjgu", + "cHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNF", + "ZGl0aW9uMjAyM0IFqgECKAEaNAoSTWFwSW50MzJJbnQzMkVudHJ5EgsKA2tl", + "eRgBIAEoBRINCgV2YWx1ZRgCIAEoBToCOAEaNAoSTWFwSW50NjRJbnQ2NEVu", + "dHJ5EgsKA2tleRgBIAEoAxINCgV2YWx1ZRgCIAEoAzoCOAEaNgoUTWFwVWlu", + "dDMyVWludDMyRW50cnkSCwoDa2V5GAEgASgNEg0KBXZhbHVlGAIgASgNOgI4", + "ARo2ChRNYXBVaW50NjRVaW50NjRFbnRyeRILCgNrZXkYASABKAQSDQoFdmFs", + "dWUYAiABKAQ6AjgBGjYKFE1hcFNpbnQzMlNpbnQzMkVudHJ5EgsKA2tleRgB", + "IAEoERINCgV2YWx1ZRgCIAEoEToCOAEaNgoUTWFwU2ludDY0U2ludDY0RW50", + "cnkSCwoDa2V5GAEgASgSEg0KBXZhbHVlGAIgASgSOgI4ARo4ChZNYXBGaXhl", + "ZDMyRml4ZWQzMkVudHJ5EgsKA2tleRgBIAEoBxINCgV2YWx1ZRgCIAEoBzoC", + "OAEaOAoWTWFwRml4ZWQ2NEZpeGVkNjRFbnRyeRILCgNrZXkYASABKAYSDQoF", + "dmFsdWUYAiABKAY6AjgBGjoKGE1hcFNmaXhlZDMyU2ZpeGVkMzJFbnRyeRIL", + "CgNrZXkYASABKA8SDQoFdmFsdWUYAiABKA86AjgBGjoKGE1hcFNmaXhlZDY0", + "U2ZpeGVkNjRFbnRyeRILCgNrZXkYASABKBASDQoFdmFsdWUYAiABKBA6AjgB", + "GjQKEk1hcEludDMyRmxvYXRFbnRyeRILCgNrZXkYASABKAUSDQoFdmFsdWUY", + "AiABKAI6AjgBGjUKE01hcEludDMyRG91YmxlRW50cnkSCwoDa2V5GAEgASgF", + "Eg0KBXZhbHVlGAIgASgBOgI4ARoyChBNYXBCb29sQm9vbEVudHJ5EgsKA2tl", + "eRgBIAEoCBINCgV2YWx1ZRgCIAEoCDoCOAEaNgoUTWFwU3RyaW5nU3RyaW5n", + "RW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ARo1ChNNYXBT", + "dHJpbmdCeXRlc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoDDoC", + "OAEahQEKG01hcFN0cmluZ05lc3RlZE1lc3NhZ2VFbnRyeRILCgNrZXkYASAB", + "KAkSVQoFdmFsdWUYAiABKAsyRi5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLmVk", + "aXRpb25zLlRlc3RBbGxUeXBlc0VkaXRpb24yMDIzLk5lc3RlZE1lc3NhZ2U6", + "AjgBGnoKHE1hcFN0cmluZ0ZvcmVpZ25NZXNzYWdlRW50cnkSCwoDa2V5GAEg", + "ASgJEkkKBXZhbHVlGAIgASgLMjoucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5l", + "ZGl0aW9ucy5Gb3JlaWduTWVzc2FnZUVkaXRpb24yMDIzOgI4ARp/ChhNYXBT", + "dHJpbmdOZXN0ZWRFbnVtRW50cnkSCwoDa2V5GAEgASgJElIKBXZhbHVlGAIg", + "ASgOMkMucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5UZXN0QWxs", + "VHlwZXNFZGl0aW9uMjAyMy5OZXN0ZWRFbnVtOgI4ARp0ChlNYXBTdHJpbmdG", + "b3JlaWduRW51bUVudHJ5EgsKA2tleRgBIAEoCRJGCgV2YWx1ZRgCIAEoDjI3", + "LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMuRm9yZWlnbkVudW1F", + "ZGl0aW9uMjAyMzoCOAEaPAoNR3JvdXBMaWtlVHlwZRIUCgtncm91cF9pbnQz", + "MhjKASABKAUSFQoMZ3JvdXBfdWludDMyGMsBIAEoDSI5CgpOZXN0ZWRFbnVt", + "EgcKA0ZPTxAAEgcKA0JBUhABEgcKA0JBWhACEhAKA05FRxD///////////8B", + "KgUIeBDJAUINCgtvbmVvZl9maWVsZCImChlGb3JlaWduTWVzc2FnZUVkaXRp", + "b24yMDIzEgkKAWMYASABKAUiGgoNR3JvdXBMaWtlVHlwZRIJCgFjGAEgASgF", + "KksKFkZvcmVpZ25FbnVtRWRpdGlvbjIwMjMSDwoLRk9SRUlHTl9GT08QABIP", + "CgtGT1JFSUdOX0JBUhABEg8KC0ZPUkVJR05fQkFaEAI6UQoPZXh0ZW5zaW9u", + "X2ludDMyEjgucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5UZXN0", + "QWxsVHlwZXNFZGl0aW9uMjAyMxh4IAEoBTp/Cg1ncm91cGxpa2V0eXBlEjgu", + "cHJvdG9idWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNF", + "ZGl0aW9uMjAyMxh5IAEoCzIuLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRp", + "dGlvbnMuR3JvdXBMaWtlVHlwZTp/Cg1kZWxpbWl0ZWRfZXh0EjgucHJvdG9i", + "dWZfdGVzdF9tZXNzYWdlcy5lZGl0aW9ucy5UZXN0QWxsVHlwZXNFZGl0aW9u", + "MjAyMxh6IAEoCzIuLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMuZWRpdGlvbnMu", + "R3JvdXBMaWtlVHlwZUJBCi1jb20uZ29vZ2xlLnByb3RvYnVmX3Rlc3RfbWVz", + "c2FnZXMuZWRpdGlvbjIwMjNQAaICCEVkaXRpb25zkgMCKAJiCGVkaXRpb25z", + "cOgH")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ProtobufTestMessages.Editions.ForeignEnumEdition2023), }, new pb::Extension[] { TestMessagesEdition2023Extensions.ExtensionInt32, TestMessagesEdition2023Extensions.GroupLikeType, TestMessagesEdition2023Extensions.DelimitedExt }, new pbr::GeneratedClrTypeInfo[] { diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestFeatures.pb.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestFeatures.pb.cs index 4f11d19d7f..e764623f52 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestFeatures.pb.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestFeatures.pb.cs @@ -59,7 +59,7 @@ namespace Pb { "IOkHElQKDmZ1dHVyZV9mZWF0dXJlGBIgASgOMg8ucGIuRW51bUZlYXR1cmVC", "K4gBAZgBAZgBBKIBCxIGVkFMVUUxGIQHogELEgZWQUxVRTIY6QeyAQMI6QcS", "VwoObGVnYWN5X2ZlYXR1cmUYEyABKA4yDy5wYi5FbnVtRmVhdHVyZUIuiAEB", - "mAEBmAEEogELEgZWQUxVRTEYhAeiAQsSBlZBTFVFMhjoB7IBBgjmByDoByrJ", + "mAEBmAEEogELEgZWQUxVRTEYhAeiAQsSBlZBTFVFMhjoB7IBBgjnByDoByrJ", "AgoLRW51bUZlYXR1cmUSHQoZVEVTVF9FTlVNX0ZFQVRVUkVfVU5LTk9XThAA", "EgoKBlZBTFVFMRABEgoKBlZBTFVFMhACEgoKBlZBTFVFMxADEgoKBlZBTFVF", "NBAEEgoKBlZBTFVFNRAFEgoKBlZBTFVFNhAGEgoKBlZBTFVFNxAHEgoKBlZB", diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb index dff0f368c6538ad83d3d2377c3849201e281d943..a0a648b11791afe158c12d32ba3b8cea8e06f03a 100644 GIT binary patch delta 9273 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 T)#_yE-&Wawd^Pk*C_4PVAb2!K delta 9078 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 F`hThl3oQTu diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index e32a6bf02a..96010883fa 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c @@ -13723,8 +13723,7 @@ bool _upb_FieldDef_ValidateUtf8(const upb_FieldDef* f) { bool _upb_FieldDef_IsGroupLike(const upb_FieldDef* f) { // Groups are always tag-delimited. - if (UPB_DESC(FeatureSet_message_encoding)(upb_FieldDef_ResolvedFeatures(f)) != - UPB_DESC(FeatureSet_DELIMITED)) { + if (f->type_ != kUpb_FieldType_Group) { return false; } @@ -14158,12 +14157,6 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix, UPB_DESC(FieldDescriptorProto_has_type_name)(field_proto); f->type_ = (int)UPB_DESC(FieldDescriptorProto_type)(field_proto); - if (f->type_ == kUpb_FieldType_Message && - // TODO: remove once we can deprecate kUpb_FieldType_Group. - UPB_DESC(FeatureSet_message_encoding)(f->resolved_features) == - UPB_DESC(FeatureSet_DELIMITED)) { - f->type_ = kUpb_FieldType_Group; - } if (has_type) { switch (f->type_) { @@ -14184,7 +14177,7 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix, } } - if (!has_type && has_type_name) { + if ((!has_type && has_type_name) || f->type_ == kUpb_FieldType_Message) { f->type_ = UPB_FIELD_TYPE_UNSPECIFIED; // We'll assign this in resolve_subdef() } else { @@ -14334,8 +14327,15 @@ static void resolve_subdef(upb_DefBuilder* ctx, const char* prefix, break; case UPB_DEFTYPE_MSG: f->sub.msgdef = def; - f->type_ = kUpb_FieldType_Message; // It appears there is no way of - // this being a group. + f->type_ = kUpb_FieldType_Message; + // TODO: remove once we can deprecate + // kUpb_FieldType_Group. + if (UPB_DESC(FeatureSet_message_encoding)(f->resolved_features) == + UPB_DESC(FeatureSet_DELIMITED) && + !upb_MessageDef_IsMapEntry(def) && + !(f->msgdef && upb_MessageDef_IsMapEntry(f->msgdef))) { + f->type_ = kUpb_FieldType_Group; + } f->has_presence = !upb_FieldDef_IsRepeated(f); break; default: diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index bf4728137c..21d6df7c9e 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c @@ -13212,8 +13212,7 @@ bool _upb_FieldDef_ValidateUtf8(const upb_FieldDef* f) { bool _upb_FieldDef_IsGroupLike(const upb_FieldDef* f) { // Groups are always tag-delimited. - if (UPB_DESC(FeatureSet_message_encoding)(upb_FieldDef_ResolvedFeatures(f)) != - UPB_DESC(FeatureSet_DELIMITED)) { + if (f->type_ != kUpb_FieldType_Group) { return false; } @@ -13647,12 +13646,6 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix, UPB_DESC(FieldDescriptorProto_has_type_name)(field_proto); f->type_ = (int)UPB_DESC(FieldDescriptorProto_type)(field_proto); - if (f->type_ == kUpb_FieldType_Message && - // TODO: remove once we can deprecate kUpb_FieldType_Group. - UPB_DESC(FeatureSet_message_encoding)(f->resolved_features) == - UPB_DESC(FeatureSet_DELIMITED)) { - f->type_ = kUpb_FieldType_Group; - } if (has_type) { switch (f->type_) { @@ -13673,7 +13666,7 @@ static void _upb_FieldDef_Create(upb_DefBuilder* ctx, const char* prefix, } } - if (!has_type && has_type_name) { + if ((!has_type && has_type_name) || f->type_ == kUpb_FieldType_Message) { f->type_ = UPB_FIELD_TYPE_UNSPECIFIED; // We'll assign this in resolve_subdef() } else { @@ -13823,8 +13816,15 @@ static void resolve_subdef(upb_DefBuilder* ctx, const char* prefix, break; case UPB_DEFTYPE_MSG: f->sub.msgdef = def; - f->type_ = kUpb_FieldType_Message; // It appears there is no way of - // this being a group. + f->type_ = kUpb_FieldType_Message; + // TODO: remove once we can deprecate + // kUpb_FieldType_Group. + if (UPB_DESC(FeatureSet_message_encoding)(f->resolved_features) == + UPB_DESC(FeatureSet_DELIMITED) && + !upb_MessageDef_IsMapEntry(def) && + !(f->msgdef && upb_MessageDef_IsMapEntry(f->msgdef))) { + f->type_ = kUpb_FieldType_Group; + } f->has_presence = !upb_FieldDef_IsRepeated(f); break; default: