Merge branch 'release/0.4.0' into develop

kulishch · Aug 6, 2016 · 2c8bc5e · 2c8bc5e
2 parents 0733b3e + 3a7467b
commit 2c8bc5e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/build/Build.proj b/build/Build.proj
@@ -16,6 +16,6 @@
         Condition="$(TestWebsitePath) == ''">C:\Websites\ship\Website</TestWebsitePath>
     <TestWebsiteUrl 
         Condition="$(TestWebsiteUrl) == ''">http://ship/</TestWebsiteUrl>
-  </PropertyGroup>
+    </PropertyGroup>
 
 </Project>
diff --git a/build/packaging/Sitecore.Ship.AspNet.nuspec b/build/packaging/Sitecore.Ship.AspNet.nuspec
@@ -7,12 +7,13 @@
     <owners>kevinobee</owners>
     <projectUrl>https://github.com/kevinobee/Sitecore.Ship</projectUrl>
     <iconUrl>https://secure.gravatar.com/avatar/dd3d0f6dd07cbf52325c74c293866410</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Sitecore package installer and remote publishing over HTTP. This package is built using native ASP.NET functionality and takes no dependency on the Nancy framework.</description>
-    <releaseNotes>0.5.0 pre-release</releaseNotes>
+    <releaseNotes>0.4.0 pre-release</releaseNotes>
     <copyright>Copyright 2016</copyright>
     <tags>Sitecore Package HTTP</tags>
     <language>en-GB</language>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
   </metadata>
   <files>
     <file src="..\..\artifacts\Build\lib\net45\Sitecore.Ship.AspNet.dll" target="lib\net45" />

diff --git a/build/packaging/Sitecore.Ship.nuspec b/build/packaging/Sitecore.Ship.nuspec
@@ -7,14 +7,15 @@
     <owners>kevinobee</owners>
     <projectUrl>https://github.com/kevinobee/Sitecore.Ship</projectUrl>
     <iconUrl>https://secure.gravatar.com/avatar/dd3d0f6dd07cbf52325c74c293866410</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Sitecore package installer and remote publishing over HTTP</description>
-    <releaseNotes>0.5.0 pre-release</releaseNotes>
+    <releaseNotes>0.4.0 pre-release</releaseNotes>
     <copyright>Copyright 2016</copyright>
     <tags>Sitecore Package HTTP</tags>
     <language>en-GB</language>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <dependencies>
-      <dependency id="Nancy.Hosting.Aspnet" version="1.4.1" />
+      <dependency id="Nancy.Hosting.Aspnet" version="0.17.1" />
     </dependencies>
   </metadata>
   <files>