Skip to content

Commit 4933ad0

Browse files
sacOO7sacOO7
authored
Merge pull request #1309 from ably/fix/upgrade-newtonsoft-dep
[ECO-5584] Upgrade NewtonSoft from 9.0.1 to 13.0.1
2 parents 905b19f + 5db8186 commit 4933ad0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+152
-1060
lines changed

‎cake-build/helpers/utils.cake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,12 @@ public void RestoreSolution(FilePath solutionPath)
4949
try
5050
{
5151
Information("Running dotnet restore...");
52-
// Suppress NU1903 vulnerability warning for Newtonsoft.Json 9.0.1 (known issue, accepted risk)
53-
// Also suppress restore warning as errors NU1503 for xamarin/old style projects
52+
// Suppress restore warning as errors NU1503 for xamarin/old style projects
5453
var restoreSettings = new DotNetRestoreSettings
5554
{
5655
MSBuildSettings = new DotNetMSBuildSettings()
57-
.WithProperty("WarningsNotAsErrors", "NU1903;NU1503")
58-
.WithProperty("NoWarn", "NU1903;NU1503")
56+
.WithProperty("WarningsNotAsErrors", "NU1503")
57+
.WithProperty("NoWarn", "NU1503")
5958
};
6059
DotNetRestore(solutionPath.FullPath, restoreSettings);
6160
Information($"✓ dotnet restore completed");

‎cake-build/tasks/build.cake‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,8 @@ Task("_NetStandard_Build")
6464
Configuration = configuration,
6565
NoRestore = true
6666
};
67+
var msbuildSettings = new DotNetMSBuildSettings();
6768

68-
// Suppress NU1903 vulnerability warning for Newtonsoft.Json 9.0.1 (known issue, accepted risk)
69-
var msbuildSettings = new DotNetMSBuildSettings()
70-
.WithProperty("WarningsNotAsErrors", "NU1903")
71-
.WithProperty("NoWarn", "NU1903");
7269

7370
if (!string.IsNullOrEmpty(defineConstants))
7471
{

‎examples/AndroidSample/AndroidSample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
6666
<HintPath>..\..\src\packages\MsgPack.Cli.0.9.1\lib\MonoAndroid10\MsgPack.dll</HintPath>
6767
</Reference>
68-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
69-
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
68+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
69+
<HintPath>..\..\src\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
7070
</Reference>
7171
<Reference Include="System" />
7272
<Reference Include="System.Core" />

‎examples/AndroidSample/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid80" />
66
<package id="MsgPack.Cli" version="0.9.1" targetFramework="monoandroid60" />
77
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid80" />
8-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="monoandroid80" />
8+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="monoandroid80" />
99
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid80" />
1010
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid80" />
1111
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid80" />

‎nuget/io.ably.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
</group>
3333
<group targetFramework="netstandard2.0">
3434
<dependency id="System.Threading.Channels" version="4.6.0" />
35-
<dependency id="Newtonsoft.Json" version="9.0.1" />
35+
<dependency id="Newtonsoft.Json" version="13.0.1" />
3636
</group>
3737
<group targetFramework="net6.0">
3838
<dependency id="System.Threading.Channels" version="4.6.0" />
39-
<dependency id="Newtonsoft.Json" version="9.0.1" />
39+
<dependency id="Newtonsoft.Json" version="13.0.1" />
4040
</group>
4141
<group targetFramework="net7.0">
4242
<dependency id="System.Threading.Channels" version="4.6.0" />
43-
<dependency id="Newtonsoft.Json" version="9.0.1" />
43+
<dependency id="Newtonsoft.Json" version="13.0.1" />
4444
</group>
4545
</dependencies>
4646
</metadata>

‎src/.nuget/NuGet.Config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/.nuget/packages.config‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/IO.Ably.Android/IO.Ably.Android.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
6969
<HintPath>..\packages\MsgPack.Cli.0.9.2\lib\MonoAndroid10\MsgPack.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
71+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
7373
</Reference>
7474
<Reference Include="System" />
7575
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/IO.Ably.Android/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid403" />
88
<package id="MsgPack.Cli" version="0.9.2" targetFramework="monoandroid403" />
99
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid71" />
10-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid71" />
10+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="monoandroid71" />
1111
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid403" />
1212
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid403" />
1313
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid403" />

‎src/IO.Ably.NETFramework/IO.Ably.NETFramework.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<SourceRoot Include="$(MSBuildThisFileDirectory)..\..\"/>
6161
</ItemGroup>
6262
<ItemGroup>
63-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
63+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
6565
</Reference>
6666
<Reference Include="System" />
6767
<Reference Include="System.Core" />

0 commit comments

Comments
 (0)