Skip to content
This repository has been archived by the owner on Oct 6, 2023. It is now read-only.

Release 12.0.102 #21

Merged
merged 81 commits into from
Dec 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
ea77ea8
Feature: Fix assembly version (#19)
applejag Dec 1, 2019
6132928
Merge from 'master'
applejag Dec 1, 2019
2f235cf
Merge pull request #22 from jilleJr/feature/merge-#21
applejag Dec 1, 2019
68bc22a
Merge from master
applejag Dec 1, 2019
0736294
Merge pull request #23 from jilleJr/feature/merge-#21-2
applejag Dec 1, 2019
288e842
Changed all builds to .NET 4.5
applejag Dec 2, 2019
d928aa6
Hotfixed local docker run when logging in to Unity
applejag Dec 2, 2019
023454c
Changed all builds to use .NET Standard 2.0
applejag Dec 8, 2019
1c91ab7
Added test-only build
applejag Dec 8, 2019
d220587
Updated builds scripts to support Tests build
applejag Dec 8, 2019
c64384e
Updated CircleCI build to utilize the Tests build
applejag Dec 8, 2019
c8fa6a6
Updated the local_test_in_unity script to utilize the Tests build
applejag Dec 8, 2019
b45b2cd
Fixed scripts to only use Tests build in local_test script
applejag Dec 8, 2019
8f70267
Changed tests project to use local Packages link
applejag Dec 8, 2019
b9276de
Updated changelog
applejag Dec 8, 2019
28120bf
Added meta files for test package
applejag Dec 8, 2019
8dfaa51
Ok then splash screen option
applejag Dec 8, 2019
53b8540
Sorted items in link.xml
applejag Dec 20, 2019
010ff75
Newline in csproj
applejag Dec 20, 2019
e97a0df
Changed Newtonsoft.Json to always delay sign as strong named assemblies
applejag Dec 20, 2019
d7d9f77
Added public key
applejag Dec 20, 2019
608d346
Switched to using IdentityPublicKey.snk and removed Dynamic.snk
applejag Dec 29, 2019
4814995
Fixed typo in AssemblyInfo.cs
applejag Dec 29, 2019
82c131b
Added SIGNING constant to not sign in testing build
applejag Dec 29, 2019
e44f7e3
Readded TargetFrameworkVersion
applejag Dec 29, 2019
5b3371a
Fixed portable build stage to trigger on targetframework or UnityBuil…
applejag Dec 29, 2019
e532a38
Fixed stage name in circleci windows test
applejag Dec 29, 2019
5dec6bb
Fixed targetframework appending to output path
applejag Dec 29, 2019
1d9c2ab
Fixed net45 tests being built in portable tests build
applejag Dec 29, 2019
417a93d
Added *.deps.json files to package because they're netstandard now
applejag Dec 29, 2019
1390620
Formatting fix in Changelog
applejag Dec 29, 2019
ff97392
CircleCI setup & switching to CloudSmith registry (#13)
applejag Nov 26, 2019
b397085
Updated changelog
applejag Nov 26, 2019
8ece256
Moved .editorconfig to correct folder
applejag Nov 26, 2019
3f8524b
Update README.md
applejag Nov 26, 2019
5b922f9
Update README.md
applejag Nov 26, 2019
4942abc
Fixing links
applejag Nov 29, 2019
fb25cb9
Added Installation guide section
applejag Nov 29, 2019
3ad3872
Added code of conduct
applejag Nov 30, 2019
54327be
Added "development" section
applejag Nov 30, 2019
026abd3
Added code of conduct notice in issue templates
applejag Nov 30, 2019
73a0779
Wrong usage of et.al
applejag Nov 30, 2019
3d4ce5a
Fixed links
applejag Nov 30, 2019
572e2f2
Formatted the Coming soon messages
applejag Nov 30, 2019
6bc20bb
Added UniGet to list of installation providers
applejag Nov 30, 2019
c4bd369
Added Edit & Build docs
applejag Nov 30, 2019
89ec0c4
Increased heading size in issue templates
applejag Dec 1, 2019
7fe7bde
Feature: Fix assembly version (#19)
applejag Dec 1, 2019
8f219aa
Merge from 'master'
applejag Dec 1, 2019
5db057a
Merge from master
applejag Dec 1, 2019
4da3349
Soften up the issue templates
applejag Dec 9, 2019
825ce71
Changed "Alternatives" section in feature request to "inspiration"
applejag Dec 13, 2019
40043d0
Removed NuGet from list of future providers in README
applejag Dec 14, 2019
608b65b
Cleaned up CONTRIBUTING.md
applejag Dec 18, 2019
8f820d8
Moved CHANGELOG.md to repo root
applejag Dec 18, 2019
d3355e8
Removed excess header from CHANGELOG.md
applejag Dec 20, 2019
097ab6f
Fixed circleci workflow to copy-replace the CHANGELOG.md
applejag Dec 20, 2019
2d2df7f
Formatted CHANGELOG.md
applejag Dec 29, 2019
2cdc047
Reformat in changelog again. Added prefix on all items and emojies
applejag Dec 29, 2019
6af1eb0
Added remark config files
applejag Dec 29, 2019
6fb9069
Tidied up all markdown files, mostly 80 char limit fixing
applejag Dec 29, 2019
3dd6266
Added "moved docs" to changelog
applejag Dec 29, 2019
93f61b6
Added space to not trigger setext headings
applejag Dec 29, 2019
17703ef
Updated some branches in readme and contrib guides
applejag Dec 29, 2019
a34ee37
Smallfix docs
applejag Dec 29, 2019
f2326c5
Merge pull request #30 from jilleJr/feature/12.0.102/docs-fixing
applejag Dec 29, 2019
edd5334
Merge branch 'release/12.0.102' into feature/target-frameworks
applejag Dec 29, 2019
682e8af
Added missing markdown reference
applejag Dec 29, 2019
ff9c43f
Merge pull request #29 from jilleJr/feature/target-frameworks
applejag Dec 29, 2019
a53bab1
Updated format in Changelog
applejag Dec 30, 2019
e0929ed
Merge branch 'release/12.0.102' into feature/12.0.102/strong-name-ass…
applejag Dec 30, 2019
545dbdf
Removed SIGNING from defineconstants, and removed duplicate
applejag Dec 30, 2019
bb441b1
Reverted AssemblyInfo changes, now back to using the strong name refe…
applejag Dec 30, 2019
c0bd2a2
Fixed the build script to support passing additional build constants
applejag Dec 30, 2019
a3cafa6
Fixed define constants for editor build
applejag Dec 30, 2019
1546000
Disabled signing to local testing script
applejag Dec 30, 2019
2b77b01
Ignored IdentityPublicKey in unity testing project
applejag Dec 30, 2019
9db99cd
Fixed check-deploy-ready to check the new CHANGELOG.md at repo root
applejag Dec 30, 2019
e2f2244
Merge pull request #31 from jilleJr/feature/12.0.102/strong-name-asse…
applejag Dec 30, 2019
90a99fb
Added changelog of the strong named assembly builds
applejag Dec 30, 2019
373791c
Merge branch 'master' into release/12.0.102
applejag Dec 30, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down
53 changes: 19 additions & 34 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
36 changes: 22 additions & 14 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
50 changes: 16 additions & 34 deletions .github/ISSUE_TEMPLATE/not-working-as-expected.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
-->

Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ _ReSharper.*
# License files
*.ulf
*.ilf
*.alf
*.alf

# NPM packages used in local dev environment
node_modules/
/package-lock.json
31 changes: 31 additions & 0 deletions .remarkignore
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions .remarkrc
Original file line number Diff line number Diff line change
@@ -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-_"]
]
}
Loading