New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add IList<T> and related APIs to JsonObject. #103645

Merged

eiriktsarpalis merged 4 commits into dotnet:main from eiriktsarpalis:jsonnode-improvements

Jun 19, 2024

Member

eiriktsarpalis commented Jun 18, 2024

Fix #102932. For net9.0 the JsonObject replaces the bespoke JsonPropertyDictionary<T> with the newly added OrderedDictionary<TKey, TValue> collection.


          Add IList<T> and related APIs to JsonObject.

34fe1c5

dotnet-issue-labeler bot added area-System.Text.Json new-api-needs-documentation labels

dotnet-issue-labeler bot commented Jun 18, 2024

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

eiriktsarpalis requested a review from stephentoub

June 18, 2024 14:32

dotnet-policy-service bot assigned eiriktsarpalis

dotnet deleted a comment from dotnet-issue-labeler bot

eiriktsarpalis added this to the 9.0.0 milestone

eiriktsarpalis requested a review from Jozkee

June 18, 2024 14:33

eiriktsarpalis commented

View reviewed changes

...tem.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectDefaultConverter.cs Show resolved Hide resolved

eiriktsarpalis commented

View reviewed changes

src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs Show resolved Hide resolved

eiriktsarpalis commented

View reviewed changes

src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonTypeInfo.cs Show resolved Hide resolved

eiriktsarpalis commented

View reviewed changes

src/libraries/System.Text.Json/src/System/Text/Json/JsonPropertyDictionary.KeyCollection.cs Outdated Show resolved Hide resolved

eiriktsarpalis commented

View reviewed changes

src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonObjectTests.cs Outdated

+                          Assert.Equal(3, jObject.Count);
+                          Assert.DoesNotContain("Three", jObject);
+              #if !NET9_0_OR_GREATER // https://github.com/dotnet/runtime/issues/103637

Member Author

eiriktsarpalis Jun 18, 2024

To be removed once #103643 is merged.

stephentoub reviewed

View reviewed changes

src/libraries/System.Text.Json/ref/System.Text.Json.cs Show resolved Hide resolved

stephentoub reviewed

View reviewed changes

src/libraries/System.Text.Json/ref/System.Text.Json.cs Show resolved Hide resolved

stephentoub reviewed

View reviewed changes

src/libraries/System.Text.Json/src/System/Text/Json/ThrowHelper.Node.cs Show resolved Hide resolved

stephentoub approved these changes

View reviewed changes

stephentoub and others added 3 commits

June 18, 2024 21:28


          Fix missing hashcode set in OrderedDictionary.SetAt

35d1813


          Re-enable disabled tests

dcfa329


          Rename JsonPropertyDictionary<T> to OrderedDictionary<TKey, TValue>

417829e

This was referenced Jun 19, 2024

The Operation will be canceled. The next steps may not contain expected logs. dotnet/dnceng#3008

Open

LibraryTests (mostly) timing out #103674

Closed

Member Author

eiriktsarpalis commented Jun 19, 2024

/ba-g bypassing unrelated CI issues to merge for P6

eiriktsarpalis merged commit c6779ba into dotnet:main

71 of 83 checks passed

eiriktsarpalis deleted the jsonnode-improvements branch

June 19, 2024 08:16

This was referenced Jun 19, 2024

STJ NullPropertyNameFail test failing in CI #103715

Closed

System.Text.Json.Nodes.Tests.JsonObjectTests.NullPropertyNameFail [FAIL] #103784

Closed

matouskozak mentioned this pull request

[Perf] Linux/arm64: 4 Improvements on 6/19/2024 3:41:01 PM dotnet/perf-autofiling-issues#37023

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment