Revert "Upadte NewtonSoft.Json to 13.0.1 (Azure#18997)" (Azure#19168)

This reverts commit 7eb9625.
azure-sdk · Aug 8, 2022 · a389635 · a389635
1 parent eafad56
commit a389635
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 11 deletions.
diff --git a/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj b/src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj
@@ -15,6 +15,10 @@
     <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,6 +17,10 @@
     <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,8 +18,6 @@ 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;
@@ -51,7 +49,7 @@ public static class JsonExtensions
             Converters = new List<JsonConverter>
             {
                 new TimeSpanConverter(),
-                new StringEnumConverter(new DefaultNamingStrategy()),
+                new StringEnumConverter { CamelCaseText = false },
                 new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AdjustToUniversal },
             },
         };
@@ -69,7 +67,7 @@ public static class JsonExtensions
             Converters = new List<JsonConverter>
             {
                 new TimeSpanConverter(),
-                new StringEnumConverter(new DefaultNamingStrategy()),
+                new StringEnumConverter { CamelCaseText = false },
                 new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AdjustToUniversal },
             },
         };

diff --git a/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj b/src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj
@@ -12,6 +12,10 @@
     <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/Websites/Websites.Helper/Websites.Helper.csproj b/src/Websites/Websites.Helper/Websites.Helper.csproj
@@ -12,6 +12,10 @@
     <RootNamespace>Microsoft.Azure.PowerShell.Cmdlets.Websites.Helper</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/lib/NetFxPreloadAssemblies/Newtonsoft.Json.dll b/src/lib/NetFxPreloadAssemblies/Newtonsoft.Json.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="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.3" 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="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" version="10.0.3" />
     <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="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <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,7 +19,6 @@
     <PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.3.59-preview"/>
     <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.59-preview"/>
     <PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.59-preview"/>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Azure.Core" Version="1.24.0"/>
@@ -40,6 +39,6 @@
     <StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.59-preview\tools\</StorageToolsPath>
   </PropertyGroup>
   <ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3"/>
   </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="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <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="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0-preview1-26216-02" />
   </ItemGroup>