Skip to content

Commit ef62f93

Browse files
carolynvscarolynvs
committed
Support json.net versions 6-8
1 parent e2b463d commit ef62f93

10 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎src/corelib/OpenStack.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="Microsoft.CSharp" />
64-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
65-
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
64+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
65+
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6666
<Private>True</Private>
6767
</Reference>
6868
<Reference Include="SimpleRESTServices, Version=1.3.0.0, Culture=neutral, PublicKeyToken=8965cea5c205d3a3, processorArchitecture=MSIL">

‎src/corelib/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-6.0.0.0" newVersion="6.0.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>

‎src/corelib/corelib.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<tags>openstack</tags>
1616
<dependencies>
1717
<group targetFramework="4.5">
18-
<dependency id="Newtonsoft.Json" version="[6.0.1,7.0)" />
18+
<dependency id="Newtonsoft.Json" version="[6.0.1,9.0)" />
1919
<dependency id="Flurl.Http.Signed" version="[0.7.0, 0.8)" />
2020
<dependency id="Marvin.JsonPatch.Signed" version="[0.7.0]" />
2121
</group>

‎src/corelib/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<package id="Flurl.Signed" version="1.0.10" targetFramework="net45" />
55
<package id="ILMerge" version="2.14.1208" targetFramework="net4" />
66
<package id="Marvin.JsonPatch.Signed" version="0.7.0" targetFramework="net45" />
7-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
7+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
88
<package id="SimpleRESTServices" version="1.3.0.1-json6" targetFramework="net4" />
99
</packages>

‎src/testing/integration/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-6.0.0.0" newVersion="6.0.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>

‎src/testing/integration/OpenStack.IntegrationTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
<Reference Include="Moq">
6868
<HintPath>..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
6969
</Reference>
70-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
70+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
71+
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
7474
<Reference Include="Security.Cryptography">

‎src/testing/integration/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Flurl.Signed" version="1.0.10" targetFramework="net45" />
55
<package id="Marvin.JsonPatch.Signed" version="0.7.0" targetFramework="net45" />
66
<package id="Moq" version="4.0.10827" targetFramework="net4" />
7-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
7+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
88
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
99
<package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net4" />
1010
<package id="xunit" version="2.0.0" targetFramework="net45" />

‎src/testing/unit/OpenStack.UnitTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<Reference Include="Moq">
6565
<HintPath>..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
68-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
67+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="SimpleRESTServices, Version=1.3.0.0, Culture=neutral, PublicKeyToken=8965cea5c205d3a3, processorArchitecture=MSIL">

‎src/testing/unit/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-6.0.0.0" newVersion="6.0.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>

‎src/testing/unit/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Flurl.Signed" version="1.0.10" targetFramework="net45" />
55
<package id="Marvin.JsonPatch.Signed" version="0.7.0" targetFramework="net45" />
66
<package id="Moq" version="4.0.10827" targetFramework="net4" />
7-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
7+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
88
<package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net4" />
99
<package id="xunit" version="2.0.0" targetFramework="net45" />
1010
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />

0 commit comments

Comments
 (0)