diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c08a9af5..b713075df 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Newtonsoft.Json for Unity changelog +## 12.0.201 + +- ✨ New: Merged changes from + [JamesNK/Newtonsoft.Json version `12.0.2`][json.net-12.0.2] + +- ✨ New: Downgrade script for .asmdef to be able to test in Unity 2018.x. + +- ✨ New: Now testing in both Unity 2019.x and 2018.x in CircleCI workflow. + +- ✨ New: Added `System.Web.HttpUtility` polyfill to test project due to it's + not included in IL2CPP builds. + See + +- 🔄 Change: Custom StringAssert.StartsWith to get better error messages in + tests. + +- 🐛 Fix: AotHelper.EnsureDictionary was not generating constructor for + `DefaultContractResolver.EnumerableDictionaryWrapper` + ## 12.0.102 - ✨ New: Moved some documentation to the new wiki. All markdown files in the @@ -56,6 +75,7 @@ [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-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 [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 diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json index 4a685c1c2..2d1b30b96 100755 --- 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.102": { + "Newtonsoft.Json/12.0.201": { "dependencies": { "Microsoft.SourceLink.GitHub": "1.0.0-beta2-19367-01", "NETStandard.Library": "2.0.3" @@ -33,7 +33,7 @@ } }, "libraries": { - "Newtonsoft.Json/12.0.102": { + "Newtonsoft.Json/12.0.201": { "type": "project", "serviceable": false, "sha512": "" diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.dll b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.dll index 1d35e57a0..1dda218ff 100755 Binary files a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.dll and b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.dll differ diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb index d3afbd0ed..a5a0d0385 100755 Binary files a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb and b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.pdb differ diff --git a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.xml b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.xml index 91fac1a24..16a62b24a 100755 --- a/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.xml +++ b/Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.xml @@ -2162,6 +2162,12 @@ The member serialization. + + + Gets or sets the missing member handling used when deserializing this object. + + The missing member handling. + Gets or sets how the object's properties with null values are handled during serialization and deserialization. @@ -10308,6 +10314,12 @@ The member object serialization. + + + Gets or sets the missing member handling used when deserializing this object. + + The missing member handling. + Gets or sets a value that indicates whether the object's properties are required. diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.deps.json b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.deps.json index 4a685c1c2..2d1b30b96 100755 --- 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.102": { + "Newtonsoft.Json/12.0.201": { "dependencies": { "Microsoft.SourceLink.GitHub": "1.0.0-beta2-19367-01", "NETStandard.Library": "2.0.3" @@ -33,7 +33,7 @@ } }, "libraries": { - "Newtonsoft.Json/12.0.102": { + "Newtonsoft.Json/12.0.201": { "type": "project", "serviceable": false, "sha512": "" diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.dll b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.dll index 34697f4cb..3e77da178 100755 Binary files a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.dll and b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.dll differ diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.pdb b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.pdb index 3a7793b3d..8cc5ce8cd 100755 Binary files a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.pdb and b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.pdb differ diff --git a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.xml b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.xml index e675dded6..64007228d 100755 --- a/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.xml +++ b/Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.xml @@ -2162,6 +2162,12 @@ The member serialization. + + + Gets or sets the missing member handling used when deserializing this object. + + The missing member handling. + Gets or sets how the object's properties with null values are handled during serialization and deserialization. @@ -10333,6 +10339,12 @@ The member object serialization. + + + Gets or sets the missing member handling used when deserializing this object. + + The missing member handling. + Gets or sets a value that indicates whether the object's properties are required. diff --git a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.dll b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.dll index f7059697b..33b6c73ff 100755 Binary files a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.dll and b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.dll differ diff --git a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.pdb b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.pdb index 49b1a4ff3..e00598a5a 100755 Binary files a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.pdb and b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.pdb differ diff --git a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.xml b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.xml index 3dd4bc21c..17fbf02dc 100755 --- a/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.xml +++ b/Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.xml @@ -1986,6 +1986,12 @@ The member serialization. + + + Gets or sets the missing member handling used when deserializing this object. + + The missing member handling. + Gets or sets how the object's properties with null values are handled during serialization and deserialization. @@ -9932,6 +9938,12 @@ The member object serialization. + + + Gets or sets the missing member handling used when deserializing this object. + + The missing member handling. + Gets or sets a value that indicates whether the object's properties are required. diff --git a/package.json b/package.json index e136a447c..5e38be1ca 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jillejr.newtonsoft.json-for-unity", - "displayName": "Json.NET 12.0.1 for Unity", - "version": "12.0.102", + "displayName": "Json.NET 12.0.2 for Unity", + "version": "12.0.201", "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 © 2007 James Newton-King\nhttps://github.com/JamesNK/Newtonsoft.Json\n\nSee full copyrights in LICENSE.md inside package", "main": "index.js",