Json.NET 12.0.3, release 2

Based on commit 8fb87a8 Created by CircleCI job Build JamesNK#861 https://circleci.com/gh/jilleJr/Newtonsoft.Json-for-Unity/861
applejag · Feb 19, 2021 · 49626d2 · 49626d2
1 parent 486af8b
commit 49626d2
Show file tree

Hide file tree

Showing 36 changed files with 37 additions and 93 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Newtonsoft.Json for Unity changelog
 
+## 12.0.302
+
+- ✨ New: Properly embed the link.xml into the DLLs. ([#54][#54])
+
+- 🐛 Fix: Preserve `NullableAttribute` and `NullableContextAttribute`.
+  ([#54][#54])
+
+- 🐛 Fix: Preserve all JSON converters. ([#8][#8], [#65][#65])
+
 ## 12.0.301
 
 - ✨ New: Merged changes from
@@ -73,10 +82,13 @@
 
 [#3]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/3
 [#7]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/7
+[#8]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/8
 [#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
+[#54]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/54
+[#65]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/65
 [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

diff --git a/CHANGELOG.md.meta b/CHANGELOG.md.meta
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/LICENSE.md.meta b/LICENSE.md.meta
diff --git a/Plugins.meta b/Plugins.meta
diff --git a/Plugins/Newtonsoft.Json AOT.meta b/Plugins/Newtonsoft.Json AOT.meta
diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETStandard,Version=v2.0": {},
     ".NETStandard,Version=v2.0/": {
-      "Newtonsoft.Json/12.0.301": {
+      "Newtonsoft.Json/12.0.302": {
         "dependencies": {
           "Microsoft.CodeAnalysis.FxCopAnalyzers": "2.9.2",
           "Microsoft.Net.Compilers.Toolset": "3.3.1",
@@ -39,7 +39,7 @@
     }
   },
   "libraries": {
-    "Newtonsoft.Json/12.0.301": {
+    "Newtonsoft.Json/12.0.302": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json.meta b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json.meta
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.dll.meta b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.dll.meta
diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb
diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb.meta b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb.meta
diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.xml b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.xml
diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.xml.meta b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.xml.meta
diff --git a/Plugins/Newtonsoft.Json Editor.meta b/Plugins/Newtonsoft.Json Editor.meta
diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.deps.json b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETStandard,Version=v2.0": {},
     ".NETStandard,Version=v2.0/": {
-      "Newtonsoft.Json/12.0.301": {
+      "Newtonsoft.Json/12.0.302": {
         "dependencies": {
           "Microsoft.CodeAnalysis.FxCopAnalyzers": "2.9.2",
           "Microsoft.Net.Compilers.Toolset": "3.3.1",
@@ -39,7 +39,7 @@
     }
   },
   "libraries": {
-    "Newtonsoft.Json/12.0.301": {
+    "Newtonsoft.Json/12.0.302": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.deps.json.meta b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.deps.json.meta
diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.dll b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.dll
diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.dll.meta b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.dll.meta
diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.pdb b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.pdb
diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.pdb.meta b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.pdb.meta
diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.xml b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.xml
diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.xml.meta b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.xml.meta
diff --git a/Plugins/Newtonsoft.Json Portable.meta b/Plugins/Newtonsoft.Json Portable.meta
diff --git a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.dll b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.dll
diff --git a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.dll.meta b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.dll.meta
diff --git a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.pdb b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.pdb
diff --git a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.pdb.meta b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.pdb.meta
diff --git a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.xml b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.xml
diff --git a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.xml.meta b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.xml.meta
diff --git a/README.md b/README.md
@@ -17,42 +17,27 @@ it's based of.
 
 ![explanation of version][version-explanation.png]
 
-Where official Json.NET 12.0.1 becomes Newtonsoft.Json-for-Unity 12.0.1_xx_.
+Where official Json.NET 12.0.1 becomes Newtonsoft.Json-for-Unity 12.0.1*xx*.
 
 ## Changelog
 
 Please see the [CHANGELOG.md][changelog.md] file inside this package.
 
-## Installation via Unity Package Manager
-
-Open `<project>/Packages/manifest.json`, add scope for `jillejr`, then add the
-package in the list of dependencies.
-
-À la:
-
-```json
-{
-  "scopedRegistries": [
-    {
-      "name": "Packages from jillejr",
-      "url": "https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity/",
-      "scopes": ["jillejr"]
-    }
-  ],
-  "dependencies": {
-    "jillejr.newtonsoft.json-for-unity": "12.0.101",
-
-    "com.unity.modules.ai": "1.0.0",
-    "com.unity.modules.animation": "1.0.0",
-    "com.unity.modules.assetbundle": "1.0.0",
-    "com.unity.modules.audio": "1.0.0",
-    "com.unity.modules.cloth": "1.0.0",
-    "com.unity.modules.director": "1.0.0",
-    "com.unity.modules.imageconversion": "1.0.0"
-  }
-}
+## Installation via [OpenUPM][openupm] ![OpenUPM icon][openupm-icon.png]
+
+```sh
+openupm add jillejr.newtonsoft.json-for-unity
 ```
 
+## Other installation options
+
+- [Installation via OpenUPM
+  ![OpenUPM icon][openupm-icon.png]][wiki-installation-via-openupm]
+
+- [Installation via pure UPM][wiki-installation-via-upm]
+
+- [Installation via Git in UPM][wiki-installation-via-git-in-upm]
+
 ## Updating the package
 
 ### Updating via the UI
@@ -68,29 +53,7 @@ package
 
 ### Updating via the manifest file
 
-Change the version field. You have to know the new version beforehand.
-
-> Example, with this as old:
->
-> ```json
-> {
->   "dependencies": {
->     "jillejr.newtonsoft.json-for-unity": "12.0.101"
->   }
-> }
-> ```
->
-> New, updated:
->
-> ```json
-> {
->   "dependencies": {
->     "jillejr.newtonsoft.json-for-unity": "12.0.201"
->   }
-> }
-> ```
->
-> _Omitted `scopedRegistries` and Unity packages for readability_
+Visit the wiki: [Installation via UPM][wiki-installation-via-upm]
 
 ---
 
@@ -104,3 +67,8 @@ See full copyrights in [LICENSE.md][license.md] inside repository
 [license.md]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/blob/master/LICENSE.md
 [changelog.md]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/blob/master/CHANGELOG.md
 [version-explanation.png]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/raw/ce23d98230673744d73656b4c4f6bc1f9989c37a/Doc/version-explanation.png
+[openupm]: https://openupm.com/packages/jillejr.newtonsoft.json-for-unity/
+[openupm-icon.png]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/raw/c43046bc4763c0a5d3b0164a4f0a92e40de9d10e/Doc/icons/openupm-icon-16.png
+[wiki-installation-via-openupm]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/wiki/Installation-via-OpenUPM
+[wiki-installation-via-upm]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/wiki/Installation-via-UPM
+[wiki-installation-via-git-in-upm]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/wiki/Installation-via-Git-in-UPM
diff --git a/README.md.meta b/README.md.meta
diff --git a/link.xml b/link.xml
diff --git a/link.xml.meta b/link.xml.meta
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jillejr.newtonsoft.json-for-unity",
   "displayName": "Json.NET 12.0.3 for Unity",
-  "version": "12.0.301",
+  "version": "12.0.302",
   "unity": "2018.1",
   "description": "Json.NET is a popular high-performance JSON framework for .NET\n\nThis package is a fork of Newtonsoft.Json containing custom builds targeting standalone, portable (UWP, WP8), and AOT targets such as all IL2CPP builds (iOS, WebGL, Android, Windows, Mac OS X, et.al).\n\nThis package is licensed under The MIT License (MIT)\n\nCopyright © 2019 Kalle Jillheden (jilleJr)\nhttps://github.com/jilleJr/Newtonsoft.Json-for-Unity\n\nCopyright © 2016 SaladLab\nhttps://github.com/SaladLab/Json.Net.Unity3D\n\nCopyright © 2007 James Newton-King\nhttps://github.com/JamesNK/Newtonsoft.Json\n\nSee full copyrights in LICENSE.md inside package",
   "main": "index.js",

diff --git a/package.json.meta b/package.json.meta