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

Commit

Permalink
Feature: Properly embed link.xml into package (#72)
Browse files Browse the repository at this point in the history
- Moved link.xml into Newtonsoft.Json.csproj as embedded resource

- Fixed LogicalName

- Added preservations for the NullableAttribute and NullableContextAttribute to resolve #54

- Added some more preservations for some converters to resolve #8 and #65

- Updated CHANGELOG.md
  • Loading branch information
applejag authored Jan 10, 2021
1 parent bae1b83 commit bfd8ab8
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 38 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Newtonsoft.Json for Unity changelog

## 12.0.302

- ✨ New: Properly embed the link.xml into the DLLs. ([#54][#54])

- 🐛 Fix: Preserve `NullableAttribute` and `NullableContextAttribute`.
([#54][#54])

- 🐛 Fix: Preserve all JSON converters. ([#8][#8], [#65][#65])

## 12.0.301

- ✨ New: Merged changes from
Expand Down Expand Up @@ -73,10 +82,13 @@

[#3]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/3
[#7]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/7
[#8]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/8
[#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
[#37]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/pull/37
[#54]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/54
[#65]: https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/65
[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
Expand Down
29 changes: 0 additions & 29 deletions Src/Newtonsoft.Json-for-Unity/link.xml

This file was deleted.

7 changes: 0 additions & 7 deletions Src/Newtonsoft.Json-for-Unity/link.xml.meta

This file was deleted.

5 changes: 4 additions & 1 deletion Src/Newtonsoft.Json/Newtonsoft.Json.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@
</PropertyGroup>
<ItemGroup>
<None Remove="**\*.orig" />
<EmbeddedResource Include="Resources\link.xml">
<LogicalName>Newtonsoft.Json.xml</LogicalName>
</EmbeddedResource>
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="$(MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion)" PrivateAssets="All" />
Expand Down
18 changes: 18 additions & 0 deletions Src/Newtonsoft.Json/Resources/link.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<linker>
<assembly fullname="System">
<!-- No issue on these, though they are quite commonly used. -->
<type fullname="System.ComponentModel.*Converter" preserve="all"/>
</assembly>
<assembly fullname="Newtonsoft.Json">
<!-- https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/54 -->
<type fullname="System.Runtime.CompilerServices.NullableAttribute"/>
<type fullname="System.Runtime.CompilerServices.NullableContextAttribute"/>

<!-- https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/8 -->
<!-- https://github.com/jilleJr/Newtonsoft.Json-for-Unity/issues/65 -->
<type fullname="Newtonsoft.Json.Converters.*Converter" preserve="all" />

<!-- No issue on these, though they are quite commonly used. -->
<type fullname="Newtonsoft.Json.Serialization.*NamingStrategy" preserve="all" />
</assembly>
</linker>
2 changes: 1 addition & 1 deletion ci/version.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Minor": 0,
"Patch": 3,

"Release": 1,
"Release": 2,

"AutoDeployLiveRun": false
}

0 comments on commit bfd8ab8

Please sign in to comment.