Merge pull request #21 from jilleJr/release/12.0.102

Release 12.0.102
applejag · Dec 30, 2019 · 1764c8c · 1764c8c
2 parents b84965c + 373791c
commit 1764c8c
Show file tree

Hide file tree

Showing 46 changed files with 1,104 additions and 417 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -27,6 +27,7 @@ jobs:
       SCRIPTS: /root/repo/ci/scripts
       BUILD_SOLUTION: /root/repo/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
       BUILD_DESTINATION_BASE: /root/repo/Src/Newtonsoft.Json-for-Unity/Plugins
+      BUILD_ADDITIONAL_CONSTANTS: SIGNING
 
     docker:
       - image: applejag/newtonsoft.json-for-unity.package-builder:v1
@@ -55,6 +56,7 @@ jobs:
             env VERSION "$($SCRIPTS/get_json_version.sh ./ci/version.json FULL)"
             env VERSION_SUFFIX "$($SCRIPTS/get_json_version.sh ./ci/version.json SUFFIX)"
             env VERSION_JSON_NET "$($SCRIPTS/get_json_version.sh ./ci/version.json JSON_NET)"
+            env VERSION_ASSEMBLY "$($SCRIPTS/get_json_version.sh ./ci/version.json ASSEMBLY)"
             echo
 
             echo ">>> UPDATING VERSION IN $(pwd)/Src/Newtonsoft.Json-for-Unity/package.json"
@@ -89,13 +91,14 @@ jobs:
 
       - run:
           name: Build Testing library
-          command: BUILD_CONFIGURATION=Debug BUILD_DESTINATION=/workspace/testlib $SCRIPTS/build.sh Editor "$BUILD_SOLUTION"
+          command: BUILD_CONFIGURATION=Debug BUILD_DESTINATION=/workspace/testlib BUILD_ADDITIONAL_CONSTANTS= $SCRIPTS/build.sh Tests "$BUILD_SOLUTION"
 
       - run:
           name: Move resulting package into workspace
           command: |
             mkdir -pv /workspace/package
             cp -rv Src/Newtonsoft.Json-for-Unity/. /workspace/package/
+            cp -vf CHANGELOG.md /workspace/package/
 
       - run:
           name: Fix meta files
@@ -141,14 +144,14 @@ jobs:
             &$msbuild -t:build -restore -p:Configuration=Debug Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj
 
       - run:
-          name: Run tests (profile 1)
+          name: Run tests (#1, .NET 4.6)
           command: |
             .'Temp/profile.ps1'
             New-Item Tests/NUnit -ItemType Directory -ErrorAction SilentlyContinue
             &$nunit3console Src/Newtonsoft.Json.Tests/bin/Debug/net46/Newtonsoft.Json.Tests.dll --framework=net-4.0 --result=Tests/NUnit/net46.xml
 
       - run:
-          name: Run tests (profile 2, portable)
+          name: Run tests (#2, portable, Profile259)
           command: |
             .'Temp/profile.ps1'
             &$nunit3console Src/Newtonsoft.Json.Tests/bin/Debug/net452/Newtonsoft.Json.Tests.dll --framework=net-4.0 --result=Tests/NUnit/net452.xml
@@ -172,7 +175,7 @@ jobs:
 
     environment:
       SCRIPTS: /root/repo/ci/scripts
-      PACKAGE_FOLDER: /root/repo/Src/Newtonsoft.Json-for-Unity
+      PACKAGE_FOLDER: /root/repo/Src/Newtonsoft.Json-for-Unity.Tests/Packages/Newtonsoft.Json-for-Unity.Tests/
       TEST_PROJECT: /root/repo/Src/Newtonsoft.Json-for-Unity.Tests
       PLATFORMS: playmode
 
@@ -405,13 +408,13 @@ jobs:
               echo "> Tag $VERSION is available for publishing, all ok!"
             fi
             
-            if cat Src/Newtonsoft.Json-for-Unity/CHANGELOG.md | egrep -q "^## $VERSION$"
+            if cat CHANGELOG.md | egrep -q "^## $VERSION$"
             then
               echo "> Changelog has been updated, all ok!"
             else
               echo
-              echo "[!] Changelog in Src/Newtonsoft.Json-for-Unity/CHANGELOG.md is missing line '## $VERSION'."
-              echo "[!] Make sure to update the Src/Newtonsoft.Json-for-Unity/CHANGELOG.md"
+              echo "[!] Changelog in CHANGELOG.md is missing line '## $VERSION'."
+              echo "[!] Make sure to update the CHANGELOG.md"
               exit 3
             fi
 

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,37 +10,28 @@ assignees: ''
 <!--
 
 If you have questions about how to use Json.NET, please read the Json.NET documentation or ask on Stack Overflow.
+There are thousands of Json.NET questions on Stack Overflow with the json.net tag.
 
 https://www.newtonsoft.com/json/help
 https://stackoverflow.com/questions/tagged/json.net
 
-There are thousands of Json.NET questions on Stack Overflow with the json.net tag.
-
 These GitHub issues are only for reporting bugs with the package itself.
 
--->
-
-### Source/destination types
-
-```csharp
-// Put the types you are serializing or deserializing here, if applicable
-```
-
-### Source/destination JSON
+⚠ Please note that this project is released with a Contributor Code of Conduct.
+By participating in this project you agree to abide by its terms.
+Read more: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/blob/master/CODE_OF_CONDUCT.md
 
-```javascript
-{"message":"Place your serialized or deserialized JSON here, if applicable"}
-```
+-->
 
-### Expected behavior
+## Expected behavior
 
-<!-- What did you expect to happen? -->
+<!-- Ex: To read this json on iOS: /followed by code block/ -->
 
-### Actual behavior
+## Actual behavior
 
-<!-- What happened instead? -->
+<!-- Crash at runtime? Did it work in the Editor? Fails to compile? -->
 
-### Steps to reproduce
+## Steps to reproduce
 
 - New project
 - Import `jillejr.newtonsoft.json-for-unity` via UPM
@@ -54,32 +45,26 @@ void Start() {
 
 - Run the game
 
-### Details
+## Details
 
 <!-- Windows/Mac/Linux? What dialect and version? -->
 Host machine OS running Unity Editor 👉 SPECIFY
 
-<!-- Unity build target. Windows/Mac/Linux/Android/iOS/WebGL/et.al -->
-Target platform running build 👉 SPECIFY
+<!-- Windows/Mac/Linux/Android/iOS/WebGL/etc. -->
+Unity build target 👉 SPECIFY
 
-<!-- Found in manifest.json & Package Manager window. -->
+<!-- Found in manifest.json & Package Manager window. Ex: 12.0.101 -->
 Newtonsoft.Json-for-Unity package version 👉 SPECIFY
 
-<!-- Version of Unity where bug is found. Specify multiple if applicable -->
-❗️ Problem found in Unity versions 👉 SPECIFY
-
-<!-- Version of Unity where bug cannot be reproduced. Specify multiple if applicable -->
-❕ Problem not found in Unity versions 👉 -
+<!-- Ex: 2019.1.11f1. Specify multiple if applicable. -->
+I was using Unity version 👉 SPECIFY
 
-### Checklist
+## Checklist
 
 <!--
-Fill in with "x" between the brackets to confirm you've completed the task. Like so:
+Replace the space between the brackets with "x" to mark it as acknowledged. Like so:
 - [x] Completed task
 -->
 
 - [ ] Shutdown Unity, deleted the /Library folder, opened project again in Unity, and problem still remains.
-- [ ] Checked to be using latest minor Unity version, ex: 2019.1, 2019.2, 2019.3.
-- [ ] Reproduced in new project with minimal required code and assets.
-- [ ] Tested IL2CPP vs Mono on same platform, on example: Windows.
-- [ ] Tested .NET 4.x Equivalent vs .NET Standard 2.x Equivalent on same platform, on example: Windows.
+- [ ] Checked to be using latest version of the package.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,40 +4,48 @@ about: Suggest an idea for this project
 title: "Suggestion: "
 labels: enhancement
 assignees: ""
+
 ---
 
-### Description
+<!--
+
+⚠ Please note that this project is released with a Contributor Code of Conduct.
+By participating in this project you agree to abide by its terms.
+Read more: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/blob/master/CODE_OF_CONDUCT.md
+
+All sections are just template. Remove if they don't help your case.
+
+-->
+
+## Description
 
 <!--
 Is your feature request related to a problem? Please describe.
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+Ex. I'm always frustrated when [...]
 -->
 
-### Why we need this
+## Motivation
 
 <!--
-Why should we put in time and effort for this?
-Do we gain time, style, or ease of use from this?
+Why do we need this?
+Ex: Would make builds faster.
 -->
 
-### Suggested solution
+## Suggested solution
 
 <!--
-Describe the solution you'd like
-A clear and concise description of what you want to happen.
+How do you think this could be solved?
 -->
 
-### Possible alternatives
+## Inspiration sources
 
 <!--
-Describe alternatives you've considered
-A clear and concise description of any alternative solutions or features you've considered.
+Describe alternatives you've considered, such as other projects solving the same
+or a similar issue.
 -->
 
-### Media
+## Media
 
 <!--
-Additional context
 Add any other context or screenshots about the feature request here.
-Remove this section if it's not applicable
 -->
diff --git a/.github/ISSUE_TEMPLATE/not-working-as-expected.md b/.github/ISSUE_TEMPLATE/not-working-as-expected.md
@@ -10,39 +10,21 @@ assignees: ''
 
 <!--
 
-If you have questions about how to use Json.NET, please read the Json.NET documentation or ask on Stack Overflow.
-
-https://www.newtonsoft.com/json/help
-https://stackoverflow.com/questions/tagged/json.net
-
-There are thousands of Json.NET questions on Stack Overflow with the json.net tag.
-
-These GitHub issues are only for reporting issues with the package itself. Try evaluate if the problem relates to Newtonsoft.Json or this fork that delivers it for Unity. If it is, report it at JamesNK's repository:
-https://github.com/JamesNK/Newtonsoft.Json/issues
+⚠ Please note that this project is released with a Contributor Code of Conduct.
+By participating in this project you agree to abide by its terms.
+Read more: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/blob/master/CODE_OF_CONDUCT.md
 
 -->
 
-### Source/destination types
-
-```csharp
-// Put the types you are serializing or deserializing here, if applicable
-```
-
-### Source/destination JSON
-
-```javascript
-{"message":"Place your serialized or deserialized JSON here, if applicable"}
-```
-
-### Expected behavior
+## Expected behavior
 
-<!-- What did you expect to happen? -->
+<!-- Ex: To read this json on iOS: /followed by code block/ -->
 
-### Actual behavior
+## Actual behavior
 
-<!-- What happened instead? -->
+<!-- Crash at runtime? Did it work in the Editor? Fails to compile? -->
 
-### Steps to reproduce
+## Steps to reproduce
 
 - New project
 - Import `jillejr.newtonsoft.json-for-unity` via UPM
@@ -56,24 +38,24 @@ void Start() {
 
 - Run the game
 
-### Details
+## Details
 
 <!-- Windows/Mac/Linux? What dialect and version? -->
 Host machine OS running Unity Editor 👉 SPECIFY
 
-<!-- Unity build target. Windows/Mac/Linux/Android/iOS/WebGL/et.al -->
-Target platform running build 👉 SPECIFY
+<!-- Windows/Mac/Linux/Android/iOS/WebGL/etc. -->
+Unity build target 👉 SPECIFY
 
-<!-- Found in manifest.json & Package Manager window. -->
+<!-- Found in manifest.json & Package Manager window. Ex: 12.0.101 -->
 Newtonsoft.Json-for-Unity package version 👉 SPECIFY
 
-<!-- Easiest taken from window header -->
-Using Unity version 👉 SPECIFY
+<!-- Ex: 2019.1.11f1. -->
+I was using Unity version 👉 SPECIFY
 
-### Checklist
+## Checklist
 
 <!--
-Fill in with "x" between the brackets to confirm you've completed the task. Like so:
+Replace the space between the brackets with "x" to mark it as acknowledged. Like so:
 - [x] Completed task
 -->
 

diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,8 @@ _ReSharper.*
 # License files
 *.ulf
 *.ilf
-*.alf
+*.alf
+
+# NPM packages used in local dev environment
+node_modules/
+/package-lock.json
diff --git a/.remarkignore b/.remarkignore
@@ -0,0 +1,31 @@
+[Bb]in/
+[Oo]bj/
+[Ww]orking*/
+Build/Temp/
+Temp/
+Doc/doc.shfbproj_*
+TestResults/
+AppPackages/
+BenchmarkDotNet.Artifacts/
+*.suo
+*.user
+*.userprefs
+_ReSharper.*
+*.ReSharper.user
+*.resharper.user
+.vs/
+.vscode/
+*.lock.json
+*.nuget.props
+*.nuget.targets
+*.orig
+.DS_Store
+
+# License files
+*.ulf
+*.ilf
+*.alf
+
+# NPM packages used in local dev environment
+node_modules/
+/package-lock.json
diff --git a/.remarkrc b/.remarkrc
@@ -0,0 +1,9 @@
+{
+    "plugins": [
+        "preset-lint-markdown-style-guide",
+        ["lint-emphasis-marker", "_"],
+        ["lint-list-item-indent", "space"],
+        ["lint-ordered-list-marker-value", "ordered"],
+        ["lint-no-file-name-irregular-characters", "\\.a-zA-Z0-9-_"]
+    ]
+}