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.2, release 1
Browse files Browse the repository at this point in the history
  • Loading branch information
applejag committed May 5, 2020
1 parent 35a2470 commit 7fde756
Show file tree
Hide file tree
Showing 13 changed files with 62 additions and 6 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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 <https://forum.unity.com/threads/solved-httputility-in-il2cpp.802368/#post-5333634>

- 🔄 Change: Custom StringAssert.StartsWith to get better error messages in
tests.

- 🐛 Fix: AotHelper.EnsureDictionary was not generating constructor for
`DefaultContractResolver.EnumerableDictionaryWrapper<TKey, TValue>`

## 12.0.102

- ✨ New: Moved some documentation to the new wiki. All markdown files in the
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -33,7 +33,7 @@
}
},
"libraries": {
"Newtonsoft.Json/12.0.102": {
"Newtonsoft.Json/12.0.201": {
"type": "project",
"serviceable": false,
"sha512": ""
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.
12 changes: 12 additions & 0 deletions Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2162,6 +2162,12 @@
</summary>
<value>The member serialization.</value>
</member>
<member name="P:Newtonsoft.Json.JsonObjectAttribute.MissingMemberHandling">
<summary>
Gets or sets the missing member handling used when deserializing this object.
</summary>
<value>The missing member handling.</value>
</member>
<member name="P:Newtonsoft.Json.JsonObjectAttribute.ItemNullValueHandling">
<summary>
Gets or sets how the object's properties with null values are handled during serialization and deserialization.
Expand Down Expand Up @@ -10308,6 +10314,12 @@
</summary>
<value>The member object serialization.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.MissingMemberHandling">
<summary>
Gets or sets the missing member handling used when deserializing this object.
</summary>
<value>The missing member handling.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.ItemRequired">
<summary>
Gets or sets a value that indicates whether the object's properties are required.
Expand Down
4 changes: 2 additions & 2 deletions Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -33,7 +33,7 @@
}
},
"libraries": {
"Newtonsoft.Json/12.0.102": {
"Newtonsoft.Json/12.0.201": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file modified Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.dll
Binary file not shown.
Binary file modified Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.pdb
Binary file not shown.
12 changes: 12 additions & 0 deletions Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2162,6 +2162,12 @@
</summary>
<value>The member serialization.</value>
</member>
<member name="P:Newtonsoft.Json.JsonObjectAttribute.MissingMemberHandling">
<summary>
Gets or sets the missing member handling used when deserializing this object.
</summary>
<value>The missing member handling.</value>
</member>
<member name="P:Newtonsoft.Json.JsonObjectAttribute.ItemNullValueHandling">
<summary>
Gets or sets how the object's properties with null values are handled during serialization and deserialization.
Expand Down Expand Up @@ -10333,6 +10339,12 @@
</summary>
<value>The member object serialization.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.MissingMemberHandling">
<summary>
Gets or sets the missing member handling used when deserializing this object.
</summary>
<value>The missing member handling.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.ItemRequired">
<summary>
Gets or sets a value that indicates whether the object's properties are required.
Expand Down
Binary file modified Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.dll
Binary file not shown.
Binary file modified Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.pdb
Binary file not shown.
12 changes: 12 additions & 0 deletions Plugins/Newtonsoft.Json Portable/Newtonsoft.Json.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1986,6 +1986,12 @@
</summary>
<value>The member serialization.</value>
</member>
<member name="P:Newtonsoft.Json.JsonObjectAttribute.MissingMemberHandling">
<summary>
Gets or sets the missing member handling used when deserializing this object.
</summary>
<value>The missing member handling.</value>
</member>
<member name="P:Newtonsoft.Json.JsonObjectAttribute.ItemNullValueHandling">
<summary>
Gets or sets how the object's properties with null values are handled during serialization and deserialization.
Expand Down Expand Up @@ -9932,6 +9938,12 @@
</summary>
<value>The member object serialization.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.MissingMemberHandling">
<summary>
Gets or sets the missing member handling used when deserializing this object.
</summary>
<value>The missing member handling.</value>
</member>
<member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.ItemRequired">
<summary>
Gets or sets a value that indicates whether the object's properties are required.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 7fde756

Please sign in to comment.