Skip to content

Revert "Upgrade NewtonSoftJson to 13.0.0" #19523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2022
Merged

Revert "Upgrade NewtonSoftJson to 13.0.0" #19523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/DevSpaces/DevSpaces/DevSpaces.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

<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" />
Expand Down
4 changes: 4 additions & 0 deletions src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 4 additions & 0 deletions src/IotHub/IotHub/IotHub.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 2 additions & 4 deletions src/Resources/ResourceManager/Extensions/JsonExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 },
},
};
Expand All @@ -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 },
},
};
Expand Down
1 change: 0 additions & 1 deletion src/ServiceFabric/ServiceFabric/ServiceFabric.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<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>
Expand Down
4 changes: 4 additions & 0 deletions src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 0 additions & 1 deletion src/Sql/Sql/Sql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<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" />
Expand Down
1 change: 0 additions & 1 deletion src/Synapse/Synapse/Synapse.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<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>
Expand Down
1 change: 0 additions & 1 deletion src/Websites/Websites/Websites.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<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>
Expand Down
Binary file modified src/lib/NetFxPreloadAssemblies/Newtonsoft.Json.dll
View file
Open in desktop
Binary file not shown.
Binary file added src/lib/Newtonsoft.Json.9.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tools/BuildPackagesTask/Microsoft.Azure.Build.Tasks/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions tools/Common.Netcore.Dependencies.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions tools/Common.Netcore.Dependencies.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<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"/>
Expand All @@ -40,6 +39,6 @@
<StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.61-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>
2 changes: 1 addition & 1 deletion tools/NetCoreCsProjSync/NetCoreCsProjSync/NetCoreCsProjSync.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tools/NetCorePsd1Sync/NetCorePsd1Sync/NetCorePsd1Sync.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down