Skip to content
This repository has been archived by the owner on Oct 6, 2023. It is now read-only.

Commit

Permalink
Json.NET 12.0.3, release 1
Browse files Browse the repository at this point in the history
  • Loading branch information
applejag committed May 5, 2020
1 parent 7fde756 commit 486af8b
Show file tree
Hide file tree
Showing 14 changed files with 421 additions and 87 deletions.
14 changes: 12 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Newtonsoft.Json for Unity changelog

## 12.0.301

- ✨ New: Merged changes from
[JamesNK/Newtonsoft.Json version `12.0.3`][json.net-12.0.3]

- 🔄 Change: Testing libraries are precompiled to be able to use the nullable
reference types, as Unity does not yet support them. ([#37][#37])

## 12.0.201

- ✨ New: Merged changes from
Expand Down Expand Up @@ -29,11 +37,11 @@

- 🐛 Fix: Package targets .NET 4.5 & .NET 4.6.1 instead of recommended
.NET Standard 2.0. Portable should still target the [PCL profile 259
(`portable-net45+win8+wpa81+wp8`)][portable-class-library]. [#29][#29]
(`portable-net45+win8+wpa81+wp8`)][portable-class-library]. ([#29][#29])

- 🐛 Fix: Assembly not found due to unsigned and not strong named assembly.
The packaged DLL's are now signed with the public key of Newtonsoft.Json.
[#7][#7], [#10][#10]
([#7][#7], [#10][#10])

## 12.0.101

Expand Down Expand Up @@ -68,6 +76,7 @@
[#10]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/10
[#18]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/18
[#29]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/pull/29
[#37]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/pull/37
[circleci-badge]: https://img.shields.io/circleci/build/gh/jilleJr/Newtonsoft.Json-for-Unity/master?logo=circleci&style=flat-square
[circleci-url]: https://circleci.com/gh/jilleJr/Newtonsoft.Json-for-Unity
[cloudsmith-badge]: https://api-prd.cloudsmith.io/badges/version/jillejr/newtonsoft-json-for-unity/npm/jillejr.newtonsoft.json-for-unity/latest/x/?render=true&badge_token=gAAAAABd0U7AyWhLGu6xjEAHz70w9zWbSk6ogsTrw3xvVpa2NXe7HJg_ua7r-G2cbWECxfM51y4uYgOdFOquHNoTQti080JM6w%3D%3D
Expand All @@ -76,6 +85,7 @@
[codacy-url]: https://www.codacy.com/manual/jilleJr/Newtonsoft.Json-for-Unity?utm_source=github.com&utm_medium=referral&utm_content=jilleJr/Newtonsoft.Json-for-Unity&utm_campaign=Badge_Grade
[json.net-12.0.1]: https://github.com/JamesNK/Newtonsoft.Json/releases/12.0.1
[json.net-12.0.2]: https://github.com/JamesNK/Newtonsoft.Json/releases/12.0.2
[json.net-12.0.3]: https://github.com/JamesNK/Newtonsoft.Json/releases/12.0.3
[npmjs-badge]: https://img.shields.io/npm/v/jillejr.newtonsoft.json-for-unity?logo=npm&style=flat-square
[npmjs-url]: https://www.npmjs.com/package/jillejr.newtonsoft.json-for-unity
[portable-class-library]: https://docs.microsoft.com/en-us/dotnet/standard/net-standard#pcl-compatibility
Expand Down
75 changes: 51 additions & 24 deletions Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,30 @@
"targets": {
".NETStandard,Version=v2.0": {},
".NETStandard,Version=v2.0/": {
"Newtonsoft.Json/12.0.201": {
"Newtonsoft.Json/12.0.301": {
"dependencies": {
"Microsoft.SourceLink.GitHub": "1.0.0-beta2-19367-01",
"Microsoft.CodeAnalysis.FxCopAnalyzers": "2.9.2",
"Microsoft.Net.Compilers.Toolset": "3.3.1",
"NETStandard.Library": "2.0.3"
},
"runtime": {
"Newtonsoft.Json.dll": {}
}
},
"Microsoft.Build.Tasks.Git/1.0.0-beta2-19367-01": {},
"Microsoft.NETCore.Platforms/1.1.0": {},
"Microsoft.SourceLink.Common/1.0.0-beta2-19367-01": {},
"Microsoft.SourceLink.GitHub/1.0.0-beta2-19367-01": {
"Microsoft.CodeAnalysis.FxCopAnalyzers/2.9.2": {
"dependencies": {
"Microsoft.Build.Tasks.Git": "1.0.0-beta2-19367-01",
"Microsoft.SourceLink.Common": "1.0.0-beta2-19367-01"
"Microsoft.CodeAnalysis.VersionCheckAnalyzer": "2.9.2",
"Microsoft.CodeQuality.Analyzers": "2.9.2",
"Microsoft.NetCore.Analyzers": "2.9.2",
"Microsoft.NetFramework.Analyzers": "2.9.2"
}
},
"Microsoft.CodeAnalysis.VersionCheckAnalyzer/2.9.2": {},
"Microsoft.CodeQuality.Analyzers/2.9.2": {},
"Microsoft.Net.Compilers.Toolset/3.3.1": {},
"Microsoft.NetCore.Analyzers/2.9.2": {},
"Microsoft.NETCore.Platforms/1.1.0": {},
"Microsoft.NetFramework.Analyzers/2.9.2": {},
"NETStandard.Library/2.0.3": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
Expand All @@ -33,17 +39,45 @@
}
},
"libraries": {
"Newtonsoft.Json/12.0.201": {
"Newtonsoft.Json/12.0.301": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"Microsoft.Build.Tasks.Git/1.0.0-beta2-19367-01": {
"Microsoft.CodeAnalysis.FxCopAnalyzers/2.9.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-/FET7my2lb3TfKZwP0VipAH19N8y2p7CRGLIxtRYXaBBpOoG0fDCWvF8IaOtipcgZ8/xFmFqVVxjmdEeZFEBBw==",
"path": "microsoft.codeanalysis.fxcopanalyzers/2.9.2",
"hashPath": "microsoft.codeanalysis.fxcopanalyzers.2.9.2.nupkg.sha512"
},
"Microsoft.CodeAnalysis.VersionCheckAnalyzer/2.9.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-3kbkb7aUF41YuJnQzoCJRbjb6bgYY3KHlJ9GGJZ30Y5ytdFusLAC5o3/kfE+Vm6slvu4EBgIwMUknL6U+Pu9uA==",
"path": "microsoft.build.tasks.git/1.0.0-beta2-19367-01",
"hashPath": "microsoft.build.tasks.git.1.0.0-beta2-19367-01.nupkg.sha512"
"sha512": "sha512-CqOQrIghQLgd+qS6fv/DcL1//9c142npvQ0VrdHFO30hA6zBs1M+alLXsNM2VzqKTvXhSOQbj8/pZ8Wel2itcw==",
"path": "microsoft.codeanalysis.versioncheckanalyzer/2.9.2",
"hashPath": "microsoft.codeanalysis.versioncheckanalyzer.2.9.2.nupkg.sha512"
},
"Microsoft.CodeQuality.Analyzers/2.9.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-RXI6ymLMEjxEFBaDFYDj0K5PdfEQETqxEv1Gum6ieL0BHPqsre2po+X8Dq2FnL/5b2mESxNtgRX/rhwGlD7MFQ==",
"path": "microsoft.codequality.analyzers/2.9.2",
"hashPath": "microsoft.codequality.analyzers.2.9.2.nupkg.sha512"
},
"Microsoft.Net.Compilers.Toolset/3.3.1": {
"type": "package",
"serviceable": true,
"sha512": "sha512-2AjN0WJfTnazrp9iTDhZjcEao5+4/HkKQ3PqM/gaQyWd+zXW9bub8B7NDTLfXllYBl+pICODo2C2peNTtBLPag==",
"path": "microsoft.net.compilers.toolset/3.3.1",
"hashPath": "microsoft.net.compilers.toolset.3.3.1.nupkg.sha512"
},
"Microsoft.NetCore.Analyzers/2.9.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-SLCvjexhfwWzlyHYDQ6zMAOgC0gXTLe4kc02LhZ4GTqx7HQ7FXwX1DZrcFZ4AGYLqjCAvJKPpxBF+4jxh1rdkQ==",
"path": "microsoft.netcore.analyzers/2.9.2",
"hashPath": "microsoft.netcore.analyzers.2.9.2.nupkg.sha512"
},
"Microsoft.NETCore.Platforms/1.1.0": {
"type": "package",
Expand All @@ -52,19 +86,12 @@
"path": "microsoft.netcore.platforms/1.1.0",
"hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
},
"Microsoft.SourceLink.Common/1.0.0-beta2-19367-01": {
"type": "package",
"serviceable": true,
"sha512": "sha512-T6ZEkbRgqcmDoTQDn0ES4FcXiq6uOiqPmbb+hCnKQ/i45W3WjM1+hfNGmsXvTK/e/AqEGiqtXJIi9ZtmbHnzHQ==",
"path": "microsoft.sourcelink.common/1.0.0-beta2-19367-01",
"hashPath": "microsoft.sourcelink.common.1.0.0-beta2-19367-01.nupkg.sha512"
},
"Microsoft.SourceLink.GitHub/1.0.0-beta2-19367-01": {
"Microsoft.NetFramework.Analyzers/2.9.2": {
"type": "package",
"serviceable": true,
"sha512": "sha512-+Zfc8EddeIPTy9w26xrMOqIL5k5fPICfoYGPMhvlCcmENVT0pslIvrOzRaEvv1UgUL1cjbGRO8SXa1HtoVEhPA==",
"path": "microsoft.sourcelink.github/1.0.0-beta2-19367-01",
"hashPath": "microsoft.sourcelink.github.1.0.0-beta2-19367-01.nupkg.sha512"
"sha512": "sha512-EPRERBljfESjfx/DFCzqAVwkVu2bqvbX79/CxcAEpQiVIFjfdqwC9wkdtg/3lM4xshG4DZfaUwH/RkR8hbchsQ==",
"path": "microsoft.netframework.analyzers/2.9.2",
"hashPath": "microsoft.netframework.analyzers.2.9.2.nupkg.sha512"
},
"NETStandard.Library/2.0.3": {
"type": "package",
Expand Down
Binary file modified Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.dll
Binary file not shown.
Binary file modified Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb
Binary file not shown.
112 changes: 101 additions & 11 deletions Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1010,12 +1010,12 @@
</member>
<member name="F:Newtonsoft.Json.DateParseHandling.DateTime">
<summary>
Date formatted strings, e.g. <c>"\/Date(1198908717056)\/"</c> and <c>"2012-03-21T05:40Z"</c>, are parsed to <see cref="F:Newtonsoft.Json.DateParseHandling.DateTime"/>.
Date formatted strings, e.g. <c>"\/Date(1198908717056)\/"</c> and <c>"2012-03-21T05:40Z"</c>, are parsed to <see cref="T:System.DateTime"/>.
</summary>
</member>
<member name="F:Newtonsoft.Json.DateParseHandling.DateTimeOffset">
<summary>
Date formatted strings, e.g. <c>"\/Date(1198908717056)\/"</c> and <c>"2012-03-21T05:40Z"</c>, are parsed to <see cref="F:Newtonsoft.Json.DateParseHandling.DateTimeOffset"/>.
Date formatted strings, e.g. <c>"\/Date(1198908717056)\/"</c> and <c>"2012-03-21T05:40Z"</c>, are parsed to <see cref="T:System.DateTimeOffset"/>.
</summary>
</member>
<member name="T:Newtonsoft.Json.DateTimeZoneHandling">
Expand Down Expand Up @@ -3102,7 +3102,7 @@
</member>
<member name="M:Newtonsoft.Json.JsonSerializer.Deserialize(System.IO.TextReader,System.Type)">
<summary>
Deserializes the JSON structure contained by the specified <see cref="T:System.IO.StringReader"/>
Deserializes the JSON structure contained by the specified <see cref="T:System.IO.TextReader"/>
into an instance of the specified type.
</summary>
<param name="reader">The <see cref="T:System.IO.TextReader"/> containing the object.</param>
Expand Down Expand Up @@ -7331,6 +7331,10 @@
<summary>
Returns the indented JSON for this token.
</summary>
<remarks>
<c>ToString()</c> returns a non-JSON string value for tokens with a type of <see cref="F:Newtonsoft.Json.Linq.JTokenType.String"/>.
If you want the JSON for all token types then you should use <see cref="M:Newtonsoft.Json.Linq.JToken.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.JsonConverter[])"/>.
</remarks>
<returns>
The indented JSON for this token.
</returns>
Expand Down Expand Up @@ -7964,38 +7968,38 @@
</member>
<member name="M:Newtonsoft.Json.Linq.JToken.SelectToken(System.String)">
<summary>
Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JPath expression. Selects the token that matches the object path.
Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JSONPath expression. Selects the token that matches the object path.
</summary>
<param name="path">
A <see cref="T:System.String"/> that contains a JPath expression.
A <see cref="T:System.String"/> that contains a JSONPath expression.
</param>
<returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/>, or <c>null</c>.</returns>
</member>
<member name="M:Newtonsoft.Json.Linq.JToken.SelectToken(System.String,System.Boolean)">
<summary>
Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JPath expression. Selects the token that matches the object path.
Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JSONPath expression. Selects the token that matches the object path.
</summary>
<param name="path">
A <see cref="T:System.String"/> that contains a JPath expression.
A <see cref="T:System.String"/> that contains a JSONPath expression.
</param>
<param name="errorWhenNoMatch">A flag to indicate whether an error should be thrown if no tokens are found when evaluating part of the expression.</param>
<returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</returns>
</member>
<member name="M:Newtonsoft.Json.Linq.JToken.SelectTokens(System.String)">
<summary>
Selects a collection of elements using a JPath expression.
Selects a collection of elements using a JSONPath expression.
</summary>
<param name="path">
A <see cref="T:System.String"/> that contains a JPath expression.
A <see cref="T:System.String"/> that contains a JSONPath expression.
</param>
<returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the selected elements.</returns>
</member>
<member name="M:Newtonsoft.Json.Linq.JToken.SelectTokens(System.String,System.Boolean)">
<summary>
Selects a collection of elements using a JPath expression.
Selects a collection of elements using a JSONPath expression.
</summary>
<param name="path">
A <see cref="T:System.String"/> that contains a JPath expression.
A <see cref="T:System.String"/> that contains a JSONPath expression.
</param>
<param name="errorWhenNoMatch">A flag to indicate whether an error should be thrown if no tokens are found when evaluating part of the expression.</param>
<returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the selected elements.</returns>
Expand Down Expand Up @@ -8629,6 +8633,10 @@
<summary>
Returns a <see cref="T:System.String"/> that represents this instance.
</summary>
<remarks>
<c>ToString()</c> returns a non-JSON string value for tokens with a type of <see cref="F:Newtonsoft.Json.Linq.JTokenType.String"/>.
If you want the JSON for all token types then you should use <see cref="M:Newtonsoft.Json.Linq.JValue.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.JsonConverter[])"/>.
</remarks>
<returns>
A <see cref="T:System.String"/> that represents this instance.
</returns>
Expand Down Expand Up @@ -10645,6 +10653,50 @@
<param name="args">Optional arguments to pass to an initializing constructor of the JsonConverter.
If <c>null</c>, the default constructor is used.</param>
</member>
<member name="T:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy">
<summary>
A kebab case naming strategy.
</summary>
</member>
<member name="M:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy.#ctor(System.Boolean,System.Boolean)">
<summary>
Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy"/> class.
</summary>
<param name="processDictionaryKeys">
A flag indicating whether dictionary keys should be processed.
</param>
<param name="overrideSpecifiedNames">
A flag indicating whether explicitly specified property names should be processed,
e.g. a property name customized with a <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/>.
</param>
</member>
<member name="M:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy.#ctor(System.Boolean,System.Boolean,System.Boolean)">
<summary>
Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy"/> class.
</summary>
<param name="processDictionaryKeys">
A flag indicating whether dictionary keys should be processed.
</param>
<param name="overrideSpecifiedNames">
A flag indicating whether explicitly specified property names should be processed,
e.g. a property name customized with a <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/>.
</param>
<param name="processExtensionDataNames">
A flag indicating whether extension data names should be processed.
</param>
</member>
<member name="M:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy.#ctor">
<summary>
Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy"/> class.
</summary>
</member>
<member name="M:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy.ResolvePropertyName(System.String)">
<summary>
Resolves the specified property name.
</summary>
<param name="name">The property name to resolve.</param>
<returns>The resolved property name.</returns>
</member>
<member name="T:Newtonsoft.Json.Serialization.MemoryTraceWriter">
<summary>
Represents a trace writer that writes to memory. When the trace message limit is
Expand Down Expand Up @@ -11152,5 +11204,43 @@
A <see cref="T:Newtonsoft.Json.JsonWriter"/> write method has not been called.
</summary>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.NotNullAttribute">
<summary>Specifies that an output will not be null even if the corresponding type allows it.</summary>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute">
<summary>Specifies that when a method returns <see cref="P:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute.ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute.#ctor(System.Boolean)">
<summary>Initializes the attribute with the specified return value condition.</summary>
<param name="returnValue">
The return value condition. If the method returns this value, the associated parameter will not be null.
</param>
</member>
<member name="P:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute.ReturnValue">
<summary>Gets the return value condition.</summary>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.MaybeNullAttribute">
<summary>Specifies that an output may be null even if the corresponding type disallows it.</summary>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.AllowNullAttribute">
<summary>Specifies that null is allowed as an input even if the corresponding type disallows it.</summary>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute">
<summary>
Specifies that the method will not return if the associated Boolean parameter is passed the specified value.
</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute.#ctor(System.Boolean)">
<summary>
Initializes a new instance of the <see cref="T:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute"/> class.
</summary>
<param name="parameterValue">
The condition parameter value. Code after the method will be considered unreachable by diagnostics if the argument to
the associated parameter matches this value.
</param>
</member>
<member name="P:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute.ParameterValue">
<summary>Gets the condition parameter value.</summary>
</member>
</members>
</doc>
Loading

0 comments on commit 486af8b

Please sign in to comment.