Issue kevinobee#33 - fix for broken cmd line tests with Newtonsoft.Js…

…on 6.0.0.0 not being able to be resolved.
Prashantkp · Dec 12, 2014 · 53b6434 · 53b6434
1 parent a9bb5bd
commit 53b6434
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 15 deletions.
diff --git a/Packages.dgml b/Packages.dgml
@@ -24,14 +24,14 @@
     <Node Id="Moq 4.2.1402.2112" Label="Moq 4.2.1402.2112" Category="Package" />
     <Node Id="Nancy 0.23.2" Label="Nancy 0.23.2" Category="Package" />
     <Node Id="Nancy.Testing 0.23.2" Label="Nancy.Testing 0.23.2" Category="Package" />
-    <Node Id="Newtonsoft.Json 5.0.6" Label="Newtonsoft.Json 5.0.6" Category="Package" />
+    <Node Id="Newtonsoft.Json 6.0.6" Label="Newtonsoft.Json 6.0.6" Category="Package" />
     <Node Id="Should 1.1.20" Label="Should 1.1.20" Category="Package" />
     <Node Id="xunit 1.9.2" Label="xunit 1.9.2" Category="Package" />
     <Node Id="src\Sitecore.Ship" Label="Sitecore.Ship" Category="Project" />
     <Node Id="Nancy 0.23.2" Label="Nancy 0.23.2" Category="Package" />
     <Node Id="Nancy.Hosting.Aspnet 0.23.2" Label="Nancy.Hosting.Aspnet 0.23.2" Category="Package" />
     <Node Id="Nancy.Serialization.JsonNet 0.23.2" Label="Nancy.Serialization.JsonNet 0.23.2" Category="Package" />
-    <Node Id="Newtonsoft.Json 5.0.6" Label="Newtonsoft.Json 5.0.6" Category="Package" />
+    <Node Id="Newtonsoft.Json 6.0.6" Label="Newtonsoft.Json 6.0.6" Category="Package" />
   </Nodes>
   <Links>
     <Link Source="tests\acceptance test\Sitecore.Ship.AspNet.Web.Accept.Test" Target="Sitecore.Ship.AspNet 0.3.4" Category="Installed Package" />
@@ -52,12 +52,12 @@
     <Link Source="Nancy.Testing 0.23.2" Target="CsQuery 1.3.4" Category="Package Dependency" />
     <Link Source="tests\unit test\Sitecore.Ship.Test" Target="Moq 4.2.1402.2112" Category="Installed Package" />
     <Link Source="tests\unit test\Sitecore.Ship.Test" Target="Nancy.Testing 0.23.2" Category="Installed Package" />
-    <Link Source="tests\unit test\Sitecore.Ship.Test" Target="Newtonsoft.Json 5.0.6" Category="Installed Package" />
+    <Link Source="tests\unit test\Sitecore.Ship.Test" Target="Newtonsoft.Json 6.0.6" Category="Installed Package" />
     <Link Source="tests\unit test\Sitecore.Ship.Test" Target="Should 1.1.20" Category="Installed Package" />
     <Link Source="tests\unit test\Sitecore.Ship.Test" Target="xunit 1.9.2" Category="Installed Package" />
     <Link Source="Nancy.Hosting.Aspnet 0.23.2" Target="Nancy 0.23.2" Category="Package Dependency" />
     <Link Source="Nancy.Serialization.JsonNet 0.23.2" Target="Nancy 0.23.2" Category="Package Dependency" />
-    <Link Source="Nancy.Serialization.JsonNet 0.23.2" Target="Newtonsoft.Json 5.0.6" Category="Package Dependency" />
+    <Link Source="Nancy.Serialization.JsonNet 0.23.2" Target="Newtonsoft.Json 6.0.6" Category="Package Dependency" />
     <Link Source="src\Sitecore.Ship" Target="Nancy.Hosting.Aspnet 0.23.2" Category="Installed Package" />
     <Link Source="src\Sitecore.Ship" Target="Nancy.Serialization.JsonNet 0.23.2" Category="Installed Package" />
   </Links>

diff --git a/src/Sitecore.Ship.AspNet/app.config b/src/Sitecore.Ship.AspNet/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/Sitecore.Ship/Sitecore.Ship.csproj b/src/Sitecore.Ship/Sitecore.Ship.csproj
@@ -44,8 +44,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Nancy.Serialization.JsonNet.0.23.2\lib\net40\Nancy.Serialization.JsonNet.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/Sitecore.Ship/app.config b/src/Sitecore.Ship/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/Sitecore.Ship/packages.config b/src/Sitecore.Ship/packages.config
@@ -3,5 +3,5 @@
   <package id="Nancy" version="0.23.2" targetFramework="net40" />
   <package id="Nancy.Hosting.Aspnet" version="0.23.2" targetFramework="net40" />
   <package id="Nancy.Serialization.JsonNet" version="0.23.2" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
 </packages>
diff --git a/tests/acceptance-test/Sitecore.Ship.AspNet.Web.Accept.Test/Web.config b/tests/acceptance-test/Sitecore.Ship.AspNet.Web.Accept.Test/Web.config
@@ -33,7 +33,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/tests/unit-test/Sitecore.Ship.AspNet.Test/app.config b/tests/unit-test/Sitecore.Ship.AspNet.Test/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/tests/unit-test/Sitecore.Ship.Test/Sitecore.Ship.Test.csproj b/tests/unit-test/Sitecore.Ship.Test/Sitecore.Ship.Test.csproj
@@ -48,9 +48,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Nancy.Testing.0.23.2\lib\net40\Nancy.Testing.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Should">
       <HintPath>..\..\..\packages\Should.1.1.20\lib\Should.dll</HintPath>

diff --git a/tests/unit-test/Sitecore.Ship.Test/app.config b/tests/unit-test/Sitecore.Ship.Test/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/tests/unit-test/Sitecore.Ship.Test/packages.config b/tests/unit-test/Sitecore.Ship.Test/packages.config
@@ -4,7 +4,7 @@
   <package id="Moq" version="4.2.1402.2112" targetFramework="net40" />
   <package id="Nancy" version="0.23.2" targetFramework="net40" />
   <package id="Nancy.Testing" version="0.23.2" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
   <package id="Should" version="1.1.20" targetFramework="net40" />
   <package id="xunit" version="1.9.2" targetFramework="net40" />
 </packages>