mmo-ref/dep-protobuf
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf synced 2026-08-26 02:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Advertise that C# supports Edition 2026, and move C# Nullable Reference Type support into that edition.

Browse source 
PiperOrigin-RevId: 928390507
This commit is contained in:
Protobuf Team Bot 2026-06-08 00:53:48 -07:00 • committed by Copybara-Service
parent f5e654b534
commit a1f718cdd7
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
csharp/BUILD.bazel
View file

@ -127,7 +127,7 @@ compile_edition_defaults(
srcs = [ srcs = [
"//:descriptor_proto", "//:descriptor_proto",
], ],
maximum_edition = "2024", maximum_edition = "2026",
minimum_edition = "PROTO2", minimum_edition = "PROTO2",
) )

2
csharp/google/protobuf/c_sharp_features.proto
View file

@ -29,7 +29,7 @@ message CSharpFeatures {
targets = TARGET_TYPE_MESSAGE, targets = TARGET_TYPE_MESSAGE,
targets = TARGET_TYPE_FILE, targets = TARGET_TYPE_FILE,
feature_support = { feature_support = {
edition_introduced: EDITION_UNSTABLE, edition_introduced: EDITION_2026,
}, },
edition_defaults = { edition: EDITION_LEGACY, value: "false" } edition_defaults = { edition: EDITION_LEGACY, value: "false" }
]; ];

2
csharp/protos/nrt.proto
View file

@ -5,7 +5,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
edition = "UNSTABLE"; edition = "2026";
package protobuf_editionstesting; package protobuf_editionstesting;

2
csharp/src/Google.Protobuf.Test/Reflection/FeatureSetDescriptorTest.cs
View file

@ -56,7 +56,7 @@ public class FeatureSetDescriptorTest
// a new edition. It should only be changed when you're sure that all the features in the new // a new edition. It should only be changed when you're sure that all the features in the new
// edition are supported. Just changing the configuration for feature set default generation // edition are supported. Just changing the configuration for feature set default generation
// will *advertise* that we support the new edition, but that isn't sufficient. // will *advertise* that we support the new edition, but that isn't sufficient.
Edition maxSupportedEdition = Edition._2024; Edition maxSupportedEdition = Edition._2026;
// These lines should not need to be changed. // These lines should not need to be changed.
FeatureSetDescriptor.GetEditionDefaults(maxSupportedEdition); FeatureSetDescriptor.GetEditionDefaults(maxSupportedEdition);

2
src/google/protobuf/compiler/csharp/c_sharp_features.pb.cc
View file

@ -204,7 +204,7 @@ const char descriptor_table_protodef_google_2fprotobuf_2fcompiler_2fcsharp_2fc_5
"p_features.proto\022\002pb\032 google/protobuf/de" "p_features.proto\022\002pb\032 google/protobuf/de"
"scriptor.proto\"S\n\016CSharpFeatures\022A\n\030null" "scriptor.proto\"S\n\016CSharpFeatures\022A\n\030null"
"able_reference_types\030\001 \001(\010B\037\210\001\001\230\001\004\230\001\003\230\001\001" "able_reference_types\030\001 \001(\010B\037\210\001\001\230\001\004\230\001\003\230\001\001"
"\242\001\n\022\005false\030\204\007\262\001\003\010\217N:@\n\006csharp\022\033.google.p" "\242\001\n\022\005false\030\204\007\262\001\003\010\352\007:@\n\006csharp\022\033.google.p"
"rotobuf.FeatureSet\030\354\007 \001(\0132\022.pb.CSharpFea" "rotobuf.FeatureSet\030\354\007 \001(\0132\022.pb.CSharpFea"
"turesB9B\030CSharpFeaturesOuterClassP\001\252\002\032Go" "turesB9B\030CSharpFeaturesOuterClassP\001\252\002\032Go"
"ogle.Protobuf.Reflection" "ogle.Protobuf.Reflection"

2
src/google/protobuf/compiler/csharp/c_sharp_features.pb.h
View file

@ -60,7 +60,7 @@ namespace protobuf {
namespace internal { namespace internal {
template <> template <>
inline ::absl::string_view GetFeatureSetDefaultsData<::pb::CSharpFeatures>() { inline ::absl::string_view GetFeatureSetDefaultsData<::pb::CSharpFeatures>() {
static constexpr char kDefaults[] = "CiEYhAciA+I+ACoXCAEQAhgCIAMoATACOAJAAUgB4j4CCAAKIRjnByID4j4AKhcIAhABGAEgAigBMAE4AkABSAHiPgIIAAohGOgHIg8IARABGAEgAigBMAHiPgAqCzgCQAFIAeI+AggACiEY6QciEwgBEAEYASACKAEwATgBQALiPgAqB0gB4j4CCAAKIRjqByIVCAEQARgBIAIoATABOANAAkgC4j4AKgXiPgIIAAohGI9OIhcIARABGAEgAigBMAE4A0ACSALiPgIIACoD4j4AIOYHKOoH"; static constexpr char kDefaults[] = "CiEYhAciA+I+ACoXCAEQAhgCIAMoATACOAJAAUgB4j4CCAAKIRjnByID4j4AKhcIAhABGAEgAigBMAE4AkABSAHiPgIIAAohGOgHIg8IARABGAEgAigBMAHiPgAqCzgCQAFIAeI+AggACiEY6QciEwgBEAEYASACKAEwATgBQALiPgAqB0gB4j4CCAAKIRjqByIXCAEQARgBIAIoATABOANAAkgC4j4CCAAqA+I+ACDmByjqBw==";
return kDefaults; return kDefaults;
} }
} // namespace internal } // namespace internal