Projects now built against NET 4.5. Platform assemblies tested from S…

…itecore 8.0 rev. 141212 (8.0 RTM).
kevinobee · Jul 27, 2015 · 132b2bc · 132b2bc
1 parent 4ff8891
commit 132b2bc
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/lib/Readme.md b/lib/Readme.md
@@ -7,4 +7,6 @@ The following files need to be placed in the folder:
 * Sitecore.Update.dll
 * Sitecore.Zip.dll
 
-These files should be from a 6.x solution, NOT Sitecore 7
+These files should be from a 8.x solution.
+
+Current testing based on Sitecore 8.0 rev. 141212 (8.0 RTM).
diff --git a/src/Sitecore.Ship.AspNet/Sitecore.Ship.AspNet.csproj b/src/Sitecore.Ship.AspNet/Sitecore.Ship.AspNet.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Ship.AspNet</RootNamespace>
     <AssemblyName>Sitecore.Ship.AspNet</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/src/Sitecore.Ship.AspNet/app.config b/src/Sitecore.Ship.AspNet/app.config
@@ -3,9 +3,9 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/src/Sitecore.Ship.Core/Sitecore.Ship.Core.csproj b/src/Sitecore.Ship.Core/Sitecore.Ship.Core.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Ship.Core</RootNamespace>
     <AssemblyName>Sitecore.Ship.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/src/Sitecore.Ship.Infrastructure/Sitecore.Ship.Infrastructure.csproj b/src/Sitecore.Ship.Infrastructure/Sitecore.Ship.Infrastructure.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Ship.Infrastructure</RootNamespace>
     <AssemblyName>Sitecore.Ship.Infrastructure</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/src/Sitecore.Ship/Sitecore.Ship.csproj b/src/Sitecore.Ship/Sitecore.Ship.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.Ship</RootNamespace>
     <AssemblyName>Sitecore.Ship</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>

diff --git a/src/Sitecore.Ship/app.config b/src/Sitecore.Ship/app.config
@@ -3,9 +3,9 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
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="6.0.6" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" requireReinstallation="True" />
 </packages>