Upgrade NewtonSoftJson to 13.0.0 (#19445)

wyunchi-ms · web-flow · commit 66b26fdf8f16 · 2022-09-19T17:11:54.000+08:00
* Save

* Upgrade NewtonSoft

* Upgrade NewtonSoft

* Upgrade NewtonSoft

* update the Newtonsoft.Json.dll

* Add dependence of Microsoft.CSharp

* Move Microsoft.CSharp to each module dependence on it

* Add back NewtonSoft.Json.12.0.3

Co-authored-by: wyunchi-ms &lt;yunwang@microsoft.com&gt;
diff --git a/src/DevSpaces/DevSpaces/DevSpaces.csproj b/src/DevSpaces/DevSpaces/DevSpaces.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.DevSpaces" Version="0.10.0-preview" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
diff --git a/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj b/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj
@@ -15,10 +15,6 @@
     <PackageReference Include="Microsoft.Azure.Management.DeviceProvisioningServices" Version="0.10.0-preview" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
-  </ItemGroup>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/IotHub/IotHub/IotHub.csproj b/src/IotHub/IotHub/IotHub.csproj
@@ -17,10 +17,6 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
-  </ItemGroup>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/Resources/ResourceManager/Extensions/JsonExtensions.cs b/src/Resources/ResourceManager/Extensions/JsonExtensions.cs
@@ -18,6 +18,8 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions
     using Newtonsoft.Json;
     using Newtonsoft.Json.Converters;
     using Newtonsoft.Json.Linq;
+    using Newtonsoft.Json.Serialization;
+
     using System;
     using System.Collections;
     using System.Collections.Generic;
@@ -49,7 +51,7 @@ public static class JsonExtensions
             Converters = new List<JsonConverter>
             {
                 new TimeSpanConverter(),
-                new StringEnumConverter { CamelCaseText = false },
+                new StringEnumConverter(new DefaultNamingStrategy()),
                 new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AdjustToUniversal },
             },
         };
@@ -67,7 +69,7 @@ public static class JsonExtensions
             Converters = new List<JsonConverter>
             {
                 new TimeSpanConverter(),
-                new StringEnumConverter { CamelCaseText = false },
+                new StringEnumConverter(new DefaultNamingStrategy()),
                 new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AdjustToUniversal },
             },
         };
diff --git a/src/ServiceFabric/ServiceFabric/ServiceFabric.csproj b/src/ServiceFabric/ServiceFabric/ServiceFabric.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.Management.ServiceFabric" Version="1.3.0" />
     <PackageReference Include="Microsoft.Azure.Management.ServiceFabricManagedClusters" Version="1.0.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj b/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj
@@ -12,10 +12,6 @@
     <RootNamespace>Microsoft.Azure.Management.$(PsModuleName).Legacy</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" PrivateAssets="all" />
-  </ItemGroup>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/Sql/Sql/Sql.csproj b/src/Sql/Sql/Sql.csproj
@@ -23,6 +23,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Sql" Version="3.1.0-preview" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Sql.LegacySdk\Sql.LegacySdk.csproj" />
diff --git a/src/Synapse/Synapse/Synapse.csproj b/src/Synapse/Synapse/Synapse.csproj
@@ -18,6 +18,7 @@
     <PackageReference Include="Azure.Analytics.Synapse.Spark" Version="1.0.0-preview.7" />
     <PackageReference Include="Microsoft.Azure.Management.Synapse" Version="2.6.0-preview" />
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="4.14.7587.7" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Websites/Websites/Websites.csproj b/src/Websites/Websites/Websites.csproj
@@ -14,6 +14,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Websites" Version="3.1.2" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/lib/NetFxPreloadAssemblies/Newtonsoft.Json.dll b/src/lib/NetFxPreloadAssemblies/Newtonsoft.Json.dll
diff --git a/src/lib/Newtonsoft.Json.9.dll b/src/lib/Newtonsoft.Json.9.dll
diff --git a/tools/BuildPackagesTask/Microsoft.Azure.Build.Tasks/packages.config b/tools/BuildPackagesTask/Microsoft.Azure.Build.Tasks/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
 </packages>
diff --git a/tools/Common.Netcore.Dependencies.Test.targets b/tools/Common.Netcore.Dependencies.Test.targets
@@ -16,7 +16,7 @@
     <PackageReference Include="xunit.runner.console" Version="2.4.0" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0" />
     <Reference Include="System.Net.Http" />
-    <PackageReference Include="Newtonsoft.Json" version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" version="13.0.1" />
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.2.0" />
   </ItemGroup>
 
@@ -34,7 +34,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <!-- version of SDK should reference https://docs.microsoft.com/en-us/powershell/azure/what-is-azure-powershell -->
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.4" IncludeAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
diff --git a/tools/Common.Netcore.Dependencies.targets b/tools/Common.Netcore.Dependencies.targets
@@ -19,6 +19,7 @@
     <PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.3.61-preview"/>
     <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.61-preview"/>
     <PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.61-preview"/>
+    <!-- <PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> -->
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Azure.Core" Version="1.25.0"/>
@@ -39,6 +40,6 @@
     <StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.61-preview\tools\</StorageToolsPath>
   </PropertyGroup>
   <ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3"/>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
   </ItemGroup>
 </Project>
diff --git a/tools/NetCoreCsProjSync/NetCoreCsProjSync/NetCoreCsProjSync.csproj b/tools/NetCoreCsProjSync/NetCoreCsProjSync/NetCoreCsProjSync.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0-preview1-26216-02" />
   </ItemGroup>
 
diff --git a/tools/NetCorePsd1Sync/NetCorePsd1Sync/NetCorePsd1Sync.csproj b/tools/NetCorePsd1Sync/NetCorePsd1Sync/NetCorePsd1Sync.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0-preview1-26216-02" />
   </ItemGroup>
 
