Skip to content

Commit 2982909

Browse files
keylime-unicornkeylime-unicorn
authored
Merge pull request #103 from NuGet/newtonsoftjson-update
Update Newtonsoft.Json to 13.0.1
2 parents 08b08b1 + 051cc69 commit 2982909

21 files changed

Lines changed: 28 additions & 35 deletions

‎samples/NuGet.Server.V2.Samples.OwinHost/NuGet.Server.V2.Samples.OwinHost.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@
7171
<HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
74-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
76-
<Private>True</Private>
74+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
75+
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7776
</Reference>
7877
<Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7978
<HintPath>..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>

‎samples/NuGet.Server.V2.Samples.OwinHost/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</dependentAssembly>
2626
<dependentAssembly>
2727
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
28-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
28+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
2929
</dependentAssembly>
3030
<dependentAssembly>
3131
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎samples/NuGet.Server.V2.Samples.OwinHost/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
1818
<package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
1919
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
20-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
20+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net46" />
2121
<package id="NuGet.Core" version="2.14.0" targetFramework="net46" />
2222
<package id="Owin" version="1.0" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.8.4" targetFramework="net46" />

‎src/NuGet.Server.Core/NuGet.Server.Core.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@
4343
<HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
48-
<Private>True</Private>
46+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
47+
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
4948
</Reference>
5049
<Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5150
<HintPath>..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>

‎src/NuGet.Server.Core/NuGet.Server.Core.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<dependencies>
1717
<group targetFramework="net46">
1818
<dependency id="Microsoft.Web.Xdt" version="2.1.1" />
19-
<dependency id="Newtonsoft.Json" version="9.0.1" />
19+
<dependency id="Newtonsoft.Json" version="13.0.1" />
2020
<dependency id="NuGet.Core" version="2.14.0" />
2121
</group>
2222
</dependencies>

‎src/NuGet.Server.Core/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<package id="Microsoft.NetCore.Analyzers" version="3.3.0" targetFramework="net46" developmentDependency="true" />
88
<package id="Microsoft.NetFramework.Analyzers" version="3.3.0" targetFramework="net46" developmentDependency="true" />
99
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net46" />
10-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
10+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net46" />
1111
<package id="NuGet.Core" version="2.14.0" targetFramework="net46" />
1212
</packages>

‎src/NuGet.Server.V2/NuGet.Server.V2.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@
5151
<HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
54-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
56-
<Private>True</Private>
54+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5756
</Reference>
5857
<Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5958
<HintPath>..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>

‎src/NuGet.Server.V2/NuGet.Server.V2.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<dependencies>
1717
<group targetFramework="net46">
1818
<dependency id="Microsoft.Web.Xdt" version="2.1.1" />
19-
<dependency id="Newtonsoft.Json" version="9.0.1" />
19+
<dependency id="Newtonsoft.Json" version="13.0.1" />
2020
<dependency id="NuGet.Core" version="2.14.0" />
2121
<dependency id="NuGet.Server.Core" version="$version$" />
2222

‎src/NuGet.Server.V2/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎src/NuGet.Server.V2/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Microsoft.NetCore.Analyzers" version="3.3.0" targetFramework="net46" developmentDependency="true" />
1313
<package id="Microsoft.NetFramework.Analyzers" version="3.3.0" targetFramework="net46" developmentDependency="true" />
1414
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
15-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
15+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net46" />
1616
<package id="NuGet.Core" version="2.14.0" targetFramework="net46" />
1717
<package id="System.Spatial" version="5.8.4" targetFramework="net46" />
1818
</packages>

0 commit comments

Comments
 (0)