Upadte NewtonSoft.Json to 13.0.2 (Azure#21479)

azure-sdk · Apr 11, 2023 · 402e27a · 402e27a
1 parent c146d29
commit 402e27a
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 25 deletions.
diff --git a/src/Az.autorest.hybrid.props b/src/Az.autorest.hybrid.props
@@ -65,9 +65,6 @@
   </ItemGroup>
 
   <!-- Assets -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
-  </ItemGroup>
 
   <ItemGroup>
         <ModuleCustomFiles Include="$(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\custom\**\*.*"/>

diff --git a/src/Az.autorest.hybrid.v2.props b/src/Az.autorest.hybrid.v2.props
@@ -50,7 +50,6 @@
   <!-- Assets -->
   <ItemGroup>
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Az.autorest.props b/src/Az.autorest.props
@@ -60,9 +60,6 @@
   </ItemGroup>
 
   <!-- Assets -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
-  </ItemGroup>
 
   <ItemGroup>
         <ModuleCustomFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\custom\**\*.*"/>

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/Resources/ResourceManager/ResourceManager.csproj b/src/Resources/ResourceManager/ResourceManager.csproj
@@ -14,7 +14,6 @@
   <ItemGroup>
 
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.17.3-preview" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
   </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/lib/Newtonsoft.Json.9.dll b/src/lib/Newtonsoft.Json.9.dll
diff --git a/src/lib/netfx/Newtonsoft.Json.dll b/src/lib/netfx/Newtonsoft.Json.dll
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.2" />
     <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.2" />
     <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.73-preview"/>
     <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.73-preview"/>
     <PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.73-preview"/>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Azure.Core" Version="1.30.0"/>
@@ -39,6 +40,6 @@
     <StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.73-preview\tools\</StorageToolsPath>
   </PropertyGroup>
   <ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3"/>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2"/>
   </ItemGroup>
 </Project>