Skip to content

Commit 402e27a

Browse files
authored
Upadte NewtonSoft.Json to 13.0.2 (#21479)
1 parent c146d29 commit 402e27a

File tree

12 files changed

+8
-25
lines changed

12 files changed

+8
-25
lines changed

src/Az.autorest.hybrid.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@
6565
</ItemGroup>
6666

6767
<!-- Assets -->
68-
<ItemGroup>
69-
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
70-
</ItemGroup>
7168

7269
<ItemGroup>
7370
<ModuleCustomFiles Include="$(MSBuildThisFileDirectory)$(PsRootModuleName)\$(PsModuleFolder)\custom\**\*.*"/>

src/Az.autorest.hybrid.v2.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<!-- Assets -->
5151
<ItemGroup>
5252
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
53-
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
5453
</ItemGroup>
5554

5655
<ItemGroup>

src/Az.autorest.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@
6060
</ItemGroup>
6161

6262
<!-- Assets -->
63-
<ItemGroup>
64-
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
65-
</ItemGroup>
6663

6764
<ItemGroup>
6865
<ModuleCustomFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\custom\**\*.*"/>

src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
<PackageReference Include="Microsoft.Azure.Management.DeviceProvisioningServices" Version="0.10.0-preview" />
1616
</ItemGroup>
1717

18-
<ItemGroup>
19-
<PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
20-
</ItemGroup>
21-
2218
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
2319

2420
</Project>

src/IotHub/IotHub/IotHub.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
1818
</ItemGroup>
1919

20-
<ItemGroup>
21-
<PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
22-
</ItemGroup>
23-
2420
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
2521

2622
</Project>

src/Resources/ResourceManager/Extensions/JsonExtensions.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions
1818
using Newtonsoft.Json;
1919
using Newtonsoft.Json.Converters;
2020
using Newtonsoft.Json.Linq;
21+
using Newtonsoft.Json.Serialization;
22+
2123
using System;
2224
using System.Collections;
2325
using System.Collections.Generic;
@@ -49,7 +51,7 @@ public static class JsonExtensions
4951
Converters = new List<JsonConverter>
5052
{
5153
new TimeSpanConverter(),
52-
new StringEnumConverter { CamelCaseText = false },
54+
new StringEnumConverter(new DefaultNamingStrategy()),
5355
new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AdjustToUniversal },
5456
},
5557
};
@@ -67,7 +69,7 @@ public static class JsonExtensions
6769
Converters = new List<JsonConverter>
6870
{
6971
new TimeSpanConverter(),
70-
new StringEnumConverter { CamelCaseText = false },
72+
new StringEnumConverter(new DefaultNamingStrategy()),
7173
new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AdjustToUniversal },
7274
},
7375
};

src/Resources/ResourceManager/ResourceManager.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<ItemGroup>
1515

1616
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.17.3-preview" />
17-
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
1817
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
1918
</ItemGroup>
2019

src/Sql/Sql.LegacySdk/Sql.LegacySdk.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<RootNamespace>Microsoft.Azure.Management.$(PsModuleName).Legacy</RootNamespace>
1313
</PropertyGroup>
1414

15-
<ItemGroup>
16-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" PrivateAssets="all" />
17-
</ItemGroup>
18-
1915
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
2016

2117
</Project>

src/lib/Newtonsoft.Json.9.dll

-514 KB
Binary file not shown.

src/lib/netfx/Newtonsoft.Json.dll

11.3 KB
Binary file not shown.

tools/Common.Netcore.Dependencies.Test.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="xunit.runner.console" Version="2.4.0" />
1717
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0" />
1818
<Reference Include="System.Net.Http" />
19-
<PackageReference Include="Newtonsoft.Json" version="10.0.3" />
19+
<PackageReference Include="Newtonsoft.Json" version="13.0.2" />
2020
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.2.0" />
2121
</ItemGroup>
2222

@@ -34,7 +34,7 @@
3434
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
3535
<!-- version of SDK should reference https://docs.microsoft.com/en-us/powershell/azure/what-is-azure-powershell -->
3636
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.4" IncludeAssets="All" />
37-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
37+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
3838
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
3939
</ItemGroup>
4040

tools/Common.Netcore.Dependencies.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.3.73-preview"/>
2020
<PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.73-preview"/>
2121
<PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.73-preview"/>
22+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
2223
</ItemGroup>
2324
<ItemGroup>
2425
<PackageReference Include="Azure.Core" Version="1.30.0"/>
@@ -39,6 +40,6 @@
3940
<StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.73-preview\tools\</StorageToolsPath>
4041
</PropertyGroup>
4142
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
42-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3"/>
43+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2"/>
4344
</ItemGroup>
4445
</Project>

0 commit comments

Comments
 (0)