Skip to content

Add JsonObject ordering and extension data support #51717

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

Merged
steveharter merged 4 commits into from
Apr 28, 2021
Merged

Add JsonObject ordering and extension data support #51717

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aad9629
Add JsonObject ordering and extension data support
steveharter Apr 16, 2021
f40e87b
Update XML Doc, add tests, feedback
steveharter Apr 23, 2021
cbacac3
Change from StringComparer.Compare() to Equals()
steveharter Apr 23, 2021
aa53dd5
Combine List.cs and IDictionary.cs; other feedback
steveharter Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Combine List.cs and IDictionary.cs; other feedback
  • Loading branch information
@steveharter
steveharter committed Apr 27, 2021
commit aa53dd5fc5c0e70a23ac4f3979d236108286de4b
3 changes: 3 additions & 0 deletions src/libraries/System.Text.Json/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,4 +617,7 @@
<data name="NodeArrayTooSmall" xml:space="preserve">
<value>Destination array was not long enough.</value>
</data>
<data name="NodeJsonObjectCustomConverterNotAllowedOnExtensionProperty" xml:space="preserve">
<value>A custom converter for JsonObject is not allowed on an extension property.</value>
</data>
</root>
3 changes: 1 addition & 2 deletions src/libraries/System.Text.Json/src/System.Text.Json.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461</TargetFrameworks>
Expand Down Expand Up @@ -58,7 +58,6 @@
<Compile Include="System\Text\Json\Node\JsonObject.Dynamic.cs" />
<Compile Include="System\Text\Json\Node\JsonObject.IDictionary.cs" />
<Compile Include="System\Text\Json\Node\JsonObject.KeyCollection.cs" />
<Compile Include="System\Text\Json\Node\JsonObject.List.cs" />
<Compile Include="System\Text\Json\Node\JsonObject.ValueCollection.cs" />
<Compile Include="System\Text\Json\Node\JsonValue.cs" />
<Compile Include="System\Text\Json\Node\JsonValueOfT.cs" />
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Text.Json/src/System/Text/Json/Node/JsonNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ namespace System.Text.Json.Node
/// <summary>
/// The base class that represents a single node within a mutable JSON document.
/// </summary>
/// <seealso cref="JsonSerializerOptions.UnknownTypeHandling"/> to specify how a type
/// declared as an <see cref="object"/> can be deserialized as a <see cref="JsonNode"/>.
/// <seealso cref="JsonSerializerOptions.UnknownTypeHandling"/> to specify that a type
/// declared as an <see cref="object"/> should be deserialized as a <see cref="JsonNode"/>.
public abstract partial class JsonNode
{
private JsonNode? _parent;
Expand Down
Loading