Json.NET 13.0.1, release 2

Based on commit 3cb3c7f Created by CircleCI job Build JamesNK#952 https://circleci.com/gh/jilleJr/Newtonsoft.Json-for-Unity/952
applejag · Mar 24, 2021 · 415da26 · 415da26
1 parent 77748af
commit 415da26
Show file tree

Hide file tree

Showing 18 changed files with 956 additions and 11,064 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,77 +1,92 @@
 # Newtonsoft.Json for Unity changelog
 
-## 11.0.202 (2021-02-25)
+## 13.0.102 (2021-03-24)
 
-- ✨ Initial release of 11.0.2 backport.
+- ✨ New: Merged changes from
+  [JamesNK/Newtonsoft.Json version `13.0.1`][json.net-13.0.1]
 
-- ✨ Based on [JamesNK/Newtonsoft.Json version `11.0.2`][json.net-11.0.2]
+- 🗑 Deprecated: Removed the Portable build target. This package now only ships
+  with the AOT and Editor builds.
 
-- ✨ New: Backport of all changes made from original Newtonsoft.Json 12.0.3 to
-  Newtonsoft.Json-for-Unity 12.0.302. Which includes:
+## 12.0.302 (2021-02-19)
 
-  - 12.0.302 (2021-02-19)
+- ✨ New: Properly embed the link.xml into the DLLs. ([#54][#54])
 
-    - ✨ New: Properly embed the link.xml into the DLLs. ([#54][#54])
+- 🐛 Fix: Preserve `NullableAttribute` and `NullableContextAttribute`.
+  ([#54][#54])
 
-    - 🐛 Fix: Preserve `NullableAttribute` and `NullableContextAttribute`.
-      ([#54][#54])
+- 🐛 Fix: Preserve all JSON converters. ([#8][#8], [#65][#65])
 
-    - 🐛 Fix: Preserve all JSON converters. ([#8][#8], [#65][#65])
+## 12.0.301 (2020-01-19)
 
-  - 12.0.301 (2020-01-19)
+- ✨ 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])
+- 🔄 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 (2020-01-03)
+## 12.0.201 (2020-01-03)
 
-    - ✨ New: Downgrade script for .asmdef to be able to test in Unity 2018.x.
+- ✨ New: Merged changes from
+  [JamesNK/Newtonsoft.Json version `12.0.2`][json.net-12.0.2]
 
-    - ✨ New: Now testing in both Unity 2019.x and 2018.x in CircleCI workflow.
+- ✨ New: Downgrade script for .asmdef to be able to test in Unity 2018.x.
 
-    - ✨ New: Added `System.Web.HttpUtility` polyfill to test project due to
-      it's not included in IL2CPP builds.
-      See <https://forum.unity.com/threads/solved-httputility-in-il2cpp.802368/#post-5333634>
+- ✨ New: Now testing in both Unity 2019.x and 2018.x in CircleCI workflow.
 
-    - 🔄 Change: Custom StringAssert.StartsWith to get better error messages in
-      tests.
+- ✨ New: Added `System.Web.HttpUtility` polyfill to test project due to it's
+  not included in IL2CPP builds.
+  See <https://forum.unity.com/threads/solved-httputility-in-il2cpp.802368/#post-5333634>
 
-    - 🐛 Fix: AotHelper.EnsureDictionary was not generating constructor for
-      `DefaultContractResolver.EnumerableDictionaryWrapper<TKey, TValue>`
+- 🔄 Change: Custom StringAssert.StartsWith to get better error messages in
+  tests.
 
-  - 12.0.102 (2019-12-30)
+- 🐛 Fix: AotHelper.EnsureDictionary was not generating constructor for
+  `DefaultContractResolver.EnumerableDictionaryWrapper<TKey, TValue>`
 
-    - ✨ New: Moved some documentation to the new wiki. All markdown files in
-      the repository has been tidied.
+## 12.0.102 (2019-12-30)
 
-    - 🐛 Fix: Only use major version in assembly version (ex: `12.0.0.0`,
-      instead of `12.0.1.0`) ([#18][#18])
+- ✨ New: Moved some documentation to the new wiki. All markdown files in the
+  repository has been tidied.
 
-    - 🐛 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])
+- 🐛 Fix: Only use major version in assembly version (ex: `12.0.0.0`, instead of
+  `12.0.1.0`) ([#18][#18])
 
-    - 🐛 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])
+- 🐛 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])
 
-  - 12.0.101 (2019-11-26)
+- 🐛 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])
 
-    - ✨ New: Setup CircleCI integration for build automation
-      [![CircleCI badge][circleci-badge]][circleci-url]
+## 12.0.101 (2019-11-26)
 
-    - ✨ New: Setup Codacy integration for automated code reviews
-      [![Codacy badge][codacy-badge]][codacy-url]
+- ✨ New: Setup CircleCI integration for build automation
+  [![CircleCI badge][circleci-badge]][circleci-url]
 
-    - 🔄 Change: Switched to [cloudsmith.com][cloudsmith-url] as registry
-      provider instead of [npmjs.com][npmjs-url]
-      [![Latest Version @ Cloudsmith][cloudsmith-badge]][cloudsmith-url]
+- ✨ New: Setup Codacy integration for automated code reviews
+  [![Codacy badge][codacy-badge]][codacy-url]
 
-    - 🔄 Change: Better versioning format. For more info see
-      [the wiki page][wiki-versioning]. Changes are based of off `12.0.1`
-      version _(in previous format)._
+- 🔄 Change: Switched to [cloudsmith.com][cloudsmith-url] as registry provider
+  instead of [npmjs.com][npmjs-url]
+  [![Latest Version @ Cloudsmith][cloudsmith-badge]][cloudsmith-url]
 
-    - 🐛 Fix: Building on standalone causes plugin collision ([#3][#3])
+- 🔄 Change: Better versioning format. For more info see
+  [the wiki page][wiki-versioning]. Changes are based of off `12.0.1`
+  version _(in previous format)._
+
+- 🐛 Fix: Building on standalone causes plugin collision ([#3][#3])
+
+## 12.0.1 (2019-07-18)
+
+- ✨ New: Package published as an Unity Package Manager package on
+  [npmjs.com][npmjs-url].
+  ![npm badge][npmjs-badge]
+
+- ✨ Initial release
+
+- ✨ Based on [JamesNK/Newtonsoft.Json version `12.0.1`][json.net-12.0.1]
 
 [#3]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/3
 [#7]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/7
@@ -88,7 +103,11 @@
 [cloudsmith-url]: https://cloudsmith.io/~jillejr/repos/newtonsoft-json-for-unity/packages/detail/npm/jillejr.newtonsoft.json-for-unity/latest/#readme
 [codacy-badge]: https://img.shields.io/codacy/grade/f91156e7066c484588f4dba263c8cf45?logo=codacy&style=flat-square
 [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-11.0.2]: https://github.com/JamesNK/Newtonsoft.Json/releases/11.0.2
+[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
+[json.net-13.0.1]: https://github.com/JamesNK/Newtonsoft.Json/releases/13.0.1
+[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
 [wiki-versioning]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/wiki/About-the-versioning
diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json
@@ -7,30 +7,17 @@
   "targets": {
     ".NETStandard,Version=v2.0": {},
     ".NETStandard,Version=v2.0/": {
-      "Newtonsoft.Json/11.0.202": {
+      "Newtonsoft.Json/13.0.102": {
         "dependencies": {
-          "Microsoft.CodeAnalysis.FxCopAnalyzers": "2.9.2",
-          "Microsoft.Net.Compilers.Toolset": "3.3.1",
+          "Microsoft.CodeAnalysis.NetAnalyzers": "5.0.3",
           "NETStandard.Library": "2.0.3"
         },
         "runtime": {
           "Newtonsoft.Json.dll": {}
         }
       },
-      "Microsoft.CodeAnalysis.FxCopAnalyzers/2.9.2": {
-        "dependencies": {
-          "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.CodeAnalysis.NetAnalyzers/5.0.3": {},
       "Microsoft.NETCore.Platforms/1.1.0": {},
-      "Microsoft.NetFramework.Analyzers/2.9.2": {},
       "NETStandard.Library/2.0.3": {
         "dependencies": {
           "Microsoft.NETCore.Platforms": "1.1.0"
@@ -39,45 +26,17 @@
     }
   },
   "libraries": {
-    "Newtonsoft.Json/11.0.202": {
+    "Newtonsoft.Json/13.0.102": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "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-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": {
+    "Microsoft.CodeAnalysis.NetAnalyzers/5.0.3": {
       "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"
+      "sha512": "sha512-7rw0JUPSAVGR0HPekQiQvwGPor44p/Ek21+wZABraG4bVYNrSkx98ZZsxSxG5jJ4oqjACJxea8E62UO0dsKDBw==",
+      "path": "microsoft.codeanalysis.netanalyzers/5.0.3",
+      "hashPath": "microsoft.codeanalysis.netanalyzers.5.0.3.nupkg.sha512"
     },
     "Microsoft.NETCore.Platforms/1.1.0": {
       "type": "package",
@@ -86,13 +45,6 @@
       "path": "microsoft.netcore.platforms/1.1.0",
       "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
     },
-    "Microsoft.NetFramework.Analyzers/2.9.2": {
-      "type": "package",
-      "serviceable": true,
-      "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",
       "serviceable": true,

diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.dll b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.dll
diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb