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.1, release 2
Browse files Browse the repository at this point in the history
  • Loading branch information
applejag committed May 5, 2020
1 parent 834f9cb commit 35a2470
Show file tree
Hide file tree
Showing 15 changed files with 239 additions and 47 deletions.
66 changes: 52 additions & 14 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,62 @@
# Newtonsoft.Json for Unity changelog

## 12.0.102

- ✨ New: Moved some documentation to the new wiki. All markdown files in the
repository has been tidied.

- 🐛 Fix: Only use major version in assembly version (ex: `12.0.0.0`, instead of
`12.0.1.0`) ([#18][#18])

- 🐛 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: 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]

## 12.0.101

## Changes
- ✨ New: Setup CircleCI integration for build automation
[![CircleCI badge][circleci-badge]][circleci-url]

- Setup CircleCI integration
- Setup Codacy integration
- Switched to [cloudsmith.com][cloudsmith-url] as registry provider
- New versioning format. For more info see [the readme in the repository][readme-url]. Changes are based of off `12.0.1-patch-001` version _(in previous format)._
- ✨ New: Setup Codacy integration for automated code reviews
[![Codacy badge][codacy-badge]][codacy-url]

## 12.0.1-patch-001
- 🔄 Change: Switched to [cloudsmith.com][cloudsmith-url] as registry provider
instead of [npmjs.com][npmjs-url]
[![Latest Version @ Cloudsmith][cloudsmith-badge]][cloudsmith-url]

- Fixed building on standalone ([Issue #3][issue3])
- 🔄 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)._

## 12.0.1
- 🐛 Fix: Building on standalone causes plugin collision ([#3][#3])

- Initial release
- Deployed to [npmjs.com][npm-url]
## 12.0.1

[readme-url]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity#readme
[cloudsmith-url]: https://cloudsmith.io/~jillejr/repos/newtonsoft-json-for-unity
[npm-url]: https://www.npmjs.com/package/jillejr.newtonsoft.json-for-unity
[issue3]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/3
- ✨ 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
[#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
[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
[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-12.0.1]: https://github.com/JamesNK/Newtonsoft.Json/releases/12.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
77 changes: 77 additions & 0 deletions Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"runtimeTarget": {
"name": ".NETStandard,Version=v2.0/",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETStandard,Version=v2.0": {},
".NETStandard,Version=v2.0/": {
"Newtonsoft.Json/12.0.102": {
"dependencies": {
"Microsoft.SourceLink.GitHub": "1.0.0-beta2-19367-01",
"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": {
"dependencies": {
"Microsoft.Build.Tasks.Git": "1.0.0-beta2-19367-01",
"Microsoft.SourceLink.Common": "1.0.0-beta2-19367-01"
}
},
"NETStandard.Library/2.0.3": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
}
}
}
},
"libraries": {
"Newtonsoft.Json/12.0.102": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"Microsoft.Build.Tasks.Git/1.0.0-beta2-19367-01": {
"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"
},
"Microsoft.NETCore.Platforms/1.1.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
"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": {
"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"
},
"NETStandard.Library/2.0.3": {
"type": "package",
"serviceable": true,
"sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"path": "netstandard.library/2.0.3",
"hashPath": "netstandard.library.2.0.3.nupkg.sha512"
}
}
}
10 changes: 10 additions & 0 deletions Plugins/Newtonsoft.Json AOT/Newtonsoft.Json.deps.json.meta
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

fileFormatVersion: 2
guid: f38361229b98405e8509995e7cfb1334

TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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.
77 changes: 77 additions & 0 deletions Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.deps.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"runtimeTarget": {
"name": ".NETStandard,Version=v2.0/",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETStandard,Version=v2.0": {},
".NETStandard,Version=v2.0/": {
"Newtonsoft.Json/12.0.102": {
"dependencies": {
"Microsoft.SourceLink.GitHub": "1.0.0-beta2-19367-01",
"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": {
"dependencies": {
"Microsoft.Build.Tasks.Git": "1.0.0-beta2-19367-01",
"Microsoft.SourceLink.Common": "1.0.0-beta2-19367-01"
}
},
"NETStandard.Library/2.0.3": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
}
}
}
},
"libraries": {
"Newtonsoft.Json/12.0.102": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"Microsoft.Build.Tasks.Git/1.0.0-beta2-19367-01": {
"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"
},
"Microsoft.NETCore.Platforms/1.1.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
"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": {
"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"
},
"NETStandard.Library/2.0.3": {
"type": "package",
"serviceable": true,
"sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"path": "netstandard.library/2.0.3",
"hashPath": "netstandard.library.2.0.3.nupkg.sha512"
}
}
}
10 changes: 10 additions & 0 deletions Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.deps.json.meta
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

fileFormatVersion: 2
guid: 8c0442cd4937413486e0c35d9584302d

TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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.
25 changes: 0 additions & 25 deletions Plugins/Newtonsoft.Json Editor/Newtonsoft.Json.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9833,31 +9833,6 @@
<param name="message">The trace message.</param>
<param name="ex">The trace exception. This parameter is optional.</param>
</member>
<member name="T:Newtonsoft.Json.Serialization.DynamicValueProvider">
<summary>
Get and set values for a <see cref="T:System.Reflection.MemberInfo"/> using dynamic methods.
</summary>
</member>
<member name="M:Newtonsoft.Json.Serialization.DynamicValueProvider.#ctor(System.Reflection.MemberInfo)">
<summary>
Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.DynamicValueProvider"/> class.
</summary>
<param name="memberInfo">The member info.</param>
</member>
<member name="M:Newtonsoft.Json.Serialization.DynamicValueProvider.SetValue(System.Object,System.Object)">
<summary>
Sets the value.
</summary>
<param name="target">The target to set the value on.</param>
<param name="value">The value to set on the target.</param>
</member>
<member name="M:Newtonsoft.Json.Serialization.DynamicValueProvider.GetValue(System.Object)">
<summary>
Gets the value.
</summary>
<param name="target">The target to get the value from.</param>
<returns>The value.</returns>
</member>
<member name="T:Newtonsoft.Json.Serialization.ErrorContext">
<summary>
Provides information surrounding an error.
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.
17 changes: 11 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@

Json.NET is a popular high-performance JSON framework for .NET

This 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).
This 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).

## Versioning format

_Staying with JamesNK's version syntax, but with a twist :dizzy:_

Based off JamesNK's versioning, but with the addition of two digits on the last segment.
This is for Newtonsoft.Json-for-Unity to be able to have independent releases,
at the same time still being easy to see which version of Json.NET it's based of.
Based off JamesNK's versioning, but with the addition of two digits on the last
segment. This is for Newtonsoft.Json-for-Unity to be able to have independent
releases, at the same time still being easy to see which version of Json.NET
it's based of.

![explanation of version][version-explanation.png]

Expand All @@ -22,7 +25,8 @@ 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.
Open `<project>/Packages/manifest.json`, add scope for `jillejr`, then add the
package in the list of dependencies.

À la:

Expand Down Expand Up @@ -57,7 +61,8 @@ Open the Package Manager UI `Window > Package Manager`

![preview of where window button is](https://i.imgur.com/0FvA5W6.png)

Followed by pressing the update button on the `jillejr.newtonsoft.json-for-unity` package
Followed by pressing the update button on the `jillejr.newtonsoft.json-for-unity`
package

![preview of update button](https://i.imgur.com/H6LhK2n.png)

Expand Down
2 changes: 1 addition & 1 deletion link.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<linker>
<assembly fullname="System">
<type fullname="System.ComponentModel.TypeConverter" preserve="all"/>
<type fullname="System.ComponentModel.ArrayConverter" preserve="all"/>
<type fullname="System.ComponentModel.BaseNumberConverter" preserve="all"/>
<type fullname="System.ComponentModel.BooleanConverter" preserve="all"/>
Expand All @@ -22,6 +21,7 @@
<type fullname="System.ComponentModel.SingleConverter" preserve="all"/>
<type fullname="System.ComponentModel.StringConverter" preserve="all"/>
<type fullname="System.ComponentModel.TimeSpanConverter" preserve="all"/>
<type fullname="System.ComponentModel.TypeConverter" preserve="all"/>
<type fullname="System.ComponentModel.UInt16Converter" preserve="all"/>
<type fullname="System.ComponentModel.UInt32Converter" preserve="all"/>
<type fullname="System.ComponentModel.UInt64Converter" preserve="all"/>
Expand Down
2 changes: 1 addition & 1 deletion 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.101",
"version": "12.0.102",
"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 35a2470

Please sign in to comment.