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

Merge pull request #29435 from protocolbuffers/tonyliaoss-csharp-cherrypick-3
Some checks failed
Tests / Apply Safe for Tests Label (push) Failing after 0s
Details
Tests / Validate YAML (push) Has been skipped
Details
Tests / Bazel (push) Has been skipped
Details
Tests / C++ (push) Has been skipped
Details
Tests / Java (push) Has been skipped
Details
Tests / Python (push) Has been skipped
Details
Tests / Ruby (push) Has been skipped
Details
Tests / PHP (push) Has been skipped
Details
Tests / PHP Extension (push) Has been skipped
Details
Tests / C# (push) Has been skipped
Details
Tests / Objective-C (push) Has been skipped
Details
Tests / Rust (push) Has been skipped
Details
Tests / μpb (push) Has been skipped
Details
Tests / hpb (push) Has been skipped
Details
Tests / Remove safety tag (push) Failing after 0s
Details
Tests / Staleness (push) Has been cancelled
Details
Tests / All Blocking Tests (push) Has been cancelled
Details

Browse source 
Allow later enum aliases to overwrite in C# custom JSON enum mapping.
This commit is contained in:
Tony Liao 2026-08-25 21:35:18 -04:00 • committed by GitHub
commit 9798e2b874
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
csharp/src/Google.Protobuf/JsonParser.cs
View file

@ -774,8 +774,7 @@ namespace Google.Protobuf
{
var jsonOptions = value.GetOptions()?.GetExtension(
Pb.Enumvalue.JsonEnumvalueOptionsExtensions.Json);
if (jsonOptions != null && jsonOptions.HasString &&
!map.ContainsKey(jsonOptions.String))
if (jsonOptions != null && jsonOptions.HasString)
{
map[jsonOptions.String] = value;
}