Skip to content

Commit a3c95c4

Browse files
RoemerRoemer
authored
Merge pull request #10 from zahariaconstantin/master
Updated to Newtonsoft.JSON 12.0.2
2 parents 477f4cd + 9fb2025 commit a3c95c4

16 files changed

+21
-26
lines changed

‎src/NetDist.Client.WebApi/NetDist.Client.WebApi.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
35-
<Private>True</Private>
33+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34+
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
3635
</Reference>
3736
<Reference Include="System" />
3837
<Reference Include="System.Core" />

‎src/NetDist.Client.WebApi/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎src/NetDist.Client.WebApi/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
4-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
4+
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
55
</packages>

‎src/NetDist.Core/NetDist.Core.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
35-
<Private>True</Private>
33+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34+
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
3635
</Reference>
3736
<Reference Include="System" />
3837
<Reference Include="System.Core" />

‎src/NetDist.Core/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
44
</packages>

‎src/NetDist.Server.WebApi/NetDist.Server.WebApi.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@
3939
<Reference Include="Microsoft.Owin.Hosting">
4040
<HintPath>..\packages\Microsoft.Owin.Hosting.3.0.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
4141
</Reference>
42-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
44-
<Private>True</Private>
42+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4544
</Reference>
4645
<Reference Include="Owin">
4746
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>

‎src/NetDist.Server.WebApi/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎src/NetDist.Server.WebApi/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<package id="Microsoft.Owin" version="3.0.0" targetFramework="net45" />
88
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.0" targetFramework="net45" />
99
<package id="Microsoft.Owin.Hosting" version="3.0.0" targetFramework="net45" />
10-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
10+
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
1111
<package id="Owin" version="1.0" targetFramework="net45" />
1212
</packages>

‎src/NetDist.ServerAdmin.WebApi/NetDist.ServerAdmin.WebApi.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
35-
<Private>True</Private>
33+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34+
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
3635
</Reference>
3736
<Reference Include="System" />
3837
<Reference Include="System.Core" />

‎src/NetDist.ServerAdmin.WebApi/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎src/NetDist.ServerAdmin.WebApi/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
4-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
4+
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
55
</packages>

‎src/Wpf.Shared/Wpf.Shared.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
<PlatformTarget>AnyCPU</PlatformTarget>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
38-
<Private>True</Private>
36+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
3938
</Reference>
4039
<Reference Include="PresentationCore" />
4140
<Reference Include="PresentationFramework" />

‎src/Wpf.Shared/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
3+
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net451" />
44
</packages>

‎src/WpfClient/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<probing privatePath="Libs" />
99
<dependentAssembly>
1010
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎src/WpfServer/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
15+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
1616
</dependentAssembly>
1717
</assemblyBinding>
1818
</runtime>

‎src/WpfServerAdmin/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<probing privatePath="Libs" />
99
<dependentAssembly>
1010
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

0 commit comments

Comments
 (0)