Skip to content

Commit 6f254da

Browse files
markcowlmarkcowl
authored
Merge pull request #89 from maddieclayton/nsround2
Update to newtonsoft json 10
2 parents 6d45113 + f9955a9 commit 6f254da

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

‎src/Authentication.Abstractions/Authentication.Abstractions.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</PropertyGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.4" />
41+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.5" />
4242
</ItemGroup>
4343

4444
<ItemGroup>

‎src/Authentication.Abstractions/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
99
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1010
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
11-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.16" targetFramework="net452" />
12-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.17" targetFramework="net452" />
11+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.17" targetFramework="net452" />
12+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.18" targetFramework="net452" />
1313
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net452" />
1414
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net40" />
@@ -19,8 +19,8 @@
1919
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net40" />
2020
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
2121
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
22-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.13.0" targetFramework="net452" />
23-
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.4" targetFramework="net452" />
22+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.13.1" targetFramework="net452" />
23+
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.5" targetFramework="net452" />
2424
<package id="Microsoft.WindowsAzure.Management.Compute" version="14.0.0" targetFramework="net45" />
2525
<package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.1" targetFramework="net45" />
2626
<package id="Moq" version="4.2.1510.2205" targetFramework="net40" />

‎src/Dependencies.Netcore.targets

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<IncludeSymbols>True</IncludeSymbols>
66
</PropertyGroup>
77
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
8-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
8+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.16" />
12-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.17" />
11+
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.17" />
12+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.18" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1515
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06" PrivateAssets="All" />
1616
</ItemGroup>
1717
<ItemGroup Condition="'$(IncludeHyak)' == 'true'">
1818
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0" />
19-
<PackageReference Include="Microsoft.Azure.Common" Version="2.2.0" />
20-
<PackageReference Include="Hyak.Common" Version="1.2.1" />
19+
<PackageReference Include="Microsoft.Azure.Common" Version="2.2.1" />
20+
<PackageReference Include="Hyak.Common" Version="1.2.2" />
2121
</ItemGroup>
2222
</Project>

‎src/Dependencies.Runtime.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<HintPath>$(PackagesDirectory)Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
1616
</Reference>
1717
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
18-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.2.3.16\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
18+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.2.3.17\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
1919
</Reference>
2020
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
21-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.3.3.17\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
21+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.3.3.18\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
2222
</Reference>
2323
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
2424
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
@@ -51,10 +51,10 @@
5151
<HintPath>$(PackagesDirectory)Microsoft.Azure.Test.Framework.3.0.0\lib\net452\Microsoft.Azure.Test.Framework.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54-
<HintPath>$(PackagesDirectory)Microsoft.Azure.Test.HttpRecorder.1.13.0\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
54+
<HintPath>$(PackagesDirectory)Microsoft.Azure.Test.HttpRecorder.1.13.1\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.4\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
57+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.5\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
6060
<HintPath>$(PackagesDirectory)Microsoft.WindowsAzure.Management.Storage.6.0.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

‎src/Dependencies.Test.Netcore.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<ItemGroup>
88
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.9.0-preview" />
99
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.14.1" />
10-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.4" />
10+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.5" />
1111
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.8.1" />
1212
<PackageReference Include="xunit" Version="2.4.0" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
16-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
16+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1717
</ItemGroup>
1818
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
1919
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />

0 commit comments

Comments
 (0)