[ECO-5584] Implemented newtonsoft migration to 13.0.1 according to MIGRATION.md plan

sacOO7 · sacOO7 · commit 621551e0a4ef · 2025-10-15T16:18:04.000+05:30
diff --git a/IMPLEMENTATION.md b/IMPLEMENTATION.md
diff --git a/cake-build/helpers/utils.cake b/cake-build/helpers/utils.cake
@@ -49,13 +49,12 @@ public void RestoreSolution(FilePath solutionPath)
     try
     {
         Information("Running dotnet restore...");
-        // Suppress NU1903 vulnerability warning for Newtonsoft.Json 9.0.1 (known issue, accepted risk)
-        // Also suppress restore warning as errors NU1503 for xamarin/old style projects
+        // Suppress restore warning as errors NU1503 for xamarin/old style projects
         var restoreSettings = new DotNetRestoreSettings
         {
             MSBuildSettings = new DotNetMSBuildSettings()
-                .WithProperty("WarningsNotAsErrors", "NU1903;NU1503")
-                .WithProperty("NoWarn", "NU1903;NU1503")
+                .WithProperty("WarningsNotAsErrors", "NU1503")
+                .WithProperty("NoWarn", "NU1503")
         };
         DotNetRestore(solutionPath.FullPath, restoreSettings);
         Information($"✓ dotnet restore completed");
diff --git a/cake-build/tasks/build.cake b/cake-build/tasks/build.cake
@@ -64,11 +64,8 @@ Task("_NetStandard_Build")
         Configuration = configuration,
         NoRestore = true
     };
+    var msbuildSettings = new DotNetMSBuildSettings();
     
-    // Suppress NU1903 vulnerability warning for Newtonsoft.Json 9.0.1 (known issue, accepted risk)
-    var msbuildSettings = new DotNetMSBuildSettings()
-        .WithProperty("WarningsNotAsErrors", "NU1903")
-        .WithProperty("NoWarn", "NU1903");
     
     if (!string.IsNullOrEmpty(defineConstants))
     {
diff --git a/examples/AndroidSample/AndroidSample.csproj b/examples/AndroidSample/AndroidSample.csproj
@@ -65,8 +65,8 @@
     <Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\src\packages\MsgPack.Cli.0.9.1\lib\MonoAndroid10\MsgPack.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\src\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\src\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/examples/AndroidSample/packages.config b/examples/AndroidSample/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid80" />
   <package id="MsgPack.Cli" version="0.9.1" targetFramework="monoandroid60" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid80" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="monoandroid80" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="monoandroid80" />
   <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid80" />
   <package id="System.Collections" version="4.3.0" targetFramework="monoandroid80" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid80" />
diff --git a/nuget/io.ably.nuspec b/nuget/io.ably.nuspec
@@ -28,15 +28,15 @@
           </group>
           <group targetFramework="netstandard2.0">
             <dependency id="System.Threading.Channels" version="4.6.0" />
-            <dependency id="Newtonsoft.Json" version="9.0.1" />
+            <dependency id="Newtonsoft.Json" version="13.0.1" />
           </group>
           <group targetFramework="net6.0">
             <dependency id="System.Threading.Channels" version="4.6.0" />
-            <dependency id="Newtonsoft.Json" version="9.0.1" />
+            <dependency id="Newtonsoft.Json" version="13.0.1" />
           </group>
           <group targetFramework="net7.0">
             <dependency id="System.Threading.Channels" version="4.6.0" />
-            <dependency id="Newtonsoft.Json" version="9.0.1" />
+            <dependency id="Newtonsoft.Json" version="13.0.1" />
           </group>
         </dependencies>
     </metadata>
diff --git a/src/IO.Ably.Android/IO.Ably.Android.csproj b/src/IO.Ably.Android/IO.Ably.Android.csproj
@@ -68,8 +68,8 @@
     <Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MsgPack.Cli.0.9.2\lib\MonoAndroid10\MsgPack.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
diff --git a/src/IO.Ably.Android/packages.config b/src/IO.Ably.Android/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid403" />
   <package id="MsgPack.Cli" version="0.9.2" targetFramework="monoandroid403" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid71" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid71" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="monoandroid71" />
   <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid403" />
   <package id="System.Collections" version="4.3.0" targetFramework="monoandroid403" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid403" />
diff --git a/src/IO.Ably.NETFramework/IO.Ably.NETFramework.csproj b/src/IO.Ably.NETFramework/IO.Ably.NETFramework.csproj
@@ -60,8 +60,8 @@
     <SourceRoot Include="$(MSBuildThisFileDirectory)..\..\"/>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/src/IO.Ably.NETFramework/packages.config b/src/IO.Ably.NETFramework/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="ILRepack.Lib.MSBuild.Task" version="2.0.18" targetFramework="net461" />
   <package id="Microsoft.CodeQuality.Analyzers" version="2.9.6" targetFramework="net461" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net461" developmentDependency="true" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
   <package id="System.Threading.Channels" version="4.6.0" targetFramework="net461" />
diff --git a/src/IO.Ably.NETStandard20/IO.Ably.NETStandard20.csproj b/src/IO.Ably.NETStandard20/IO.Ably.NETStandard20.csproj
@@ -46,7 +46,7 @@
 
   <ItemGroup>
     <PackageReference Include="MsgPack.Cli" Version="0.9.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/IO.Ably.Shared/JsonHelper.cs b/src/IO.Ably.Shared/JsonHelper.cs
@@ -28,6 +28,7 @@ private static JsonSerializerSettings GetJsonSettings()
                 },
                 DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind,
                 NullValueHandling = NullValueHandling.Ignore,
+                MaxDepth = null, // Maintain unlimited depth behavior for backward compatibility
             };
             return res;
         }
@@ -106,8 +107,6 @@ private static string SerializeObject(object value, Type type)
         private static object DeserializeObject(string value, Type type)
         {
             JsonSerializer jsonSerializer = GetSerializer();
-            jsonSerializer.CheckAdditionalContent = true;
-
             using (JsonTextReader jsonTextReader = new JsonTextReader(new StringReader(value)))
             {
                 return jsonSerializer.Deserialize(jsonTextReader, type);
diff --git a/src/IO.Ably.Shared/TokenDetails.cs b/src/IO.Ably.Shared/TokenDetails.cs
@@ -48,6 +48,7 @@ public sealed class TokenDetails
         /// <summary>
         /// Initializes a new instance of the <see cref="TokenDetails"/> class.
         /// </summary>
+        [JsonConstructor]
         public TokenDetails()
         {
         }
diff --git a/src/IO.Ably.Shared/TokenRequest.cs b/src/IO.Ably.Shared/TokenRequest.cs
@@ -17,6 +17,7 @@ public class TokenRequest
         /// <summary>
         /// Initializes a new instance of the <see cref="TokenRequest"/> class.
         /// </summary>
+        [JsonConstructor]
         public TokenRequest()
             : this(Defaults.NowFunc())
         { }
diff --git a/src/IO.Ably.Shared/Types/ErrorInfo.cs b/src/IO.Ably.Shared/Types/ErrorInfo.cs
@@ -84,6 +84,7 @@ public class ErrorInfo
         /// <summary>
         /// Initializes a new instance of the <see cref="ErrorInfo"/> class.
         /// </summary>
+        [JsonConstructor]
         public ErrorInfo()
         {
         }
diff --git a/src/IO.Ably.Shared/Types/Message.cs b/src/IO.Ably.Shared/Types/Message.cs
@@ -17,6 +17,7 @@ public class Message : IMessage
         /// <summary>
         /// Initializes a new instance of the <see cref="Message"/> class.
         /// </summary>
+        [JsonConstructor]
         public Message()
         {
         }
diff --git a/src/IO.Ably.Shared/packages.config b/src/IO.Ably.Shared/packages.config
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MsgPack.Cli" version="0.6.8" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
   <package id="Nito.AsyncEx" version="3.0.1" targetFramework="net45" />
   <package id="WebSocket4Net" version="0.14.1" targetFramework="net45" />
-</packages>
+</packages>
diff --git a/src/IO.Ably.Tests.DotNET/IO.Ably.Tests.DotNET.csproj b/src/IO.Ably.Tests.DotNET/IO.Ably.Tests.DotNET.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Microsoft.Build" Version="15.5.180" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="MsgPack.Cli" Version="0.9.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="5.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
     <PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
diff --git a/src/IO.Ably.Tests.NETFramework/IO.Ably.Tests.NETFramework.csproj b/src/IO.Ably.Tests.NETFramework/IO.Ably.Tests.NETFramework.csproj
@@ -120,7 +120,7 @@
       <Version>4.10.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>9.0.1</Version>
+      <Version>13.0.1</Version>
     </PackageReference>
     <PackageReference Include="RichardSzalay.MockHttp">
       <Version>5.0.0</Version>
diff --git a/src/IO.Ably.iOS/IO.Ably.iOS.csproj b/src/IO.Ably.iOS/IO.Ably.iOS.csproj
@@ -70,8 +70,8 @@
     <Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MsgPack.Cli.0.9.2\lib\Xamarin.iOS10\MsgPack.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/IO.Ably.iOS/packages.config b/src/IO.Ably.iOS/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
   <package id="MsgPack.Cli" version="0.9.2" targetFramework="xamarinios10" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="xamarinios10" />
   <package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
   <package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="xamarinios10" />
