Updated package, deployment

davidmohara · Apr 13, 2011 · 063d950 · 063d950
1 parent d3fa630
commit 063d950
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/Topshelf.nuspec b/Topshelf.nuspec
@@ -8,9 +8,17 @@
     <language>en-US</language>
     <licenseUrl>https://github.com/Topshelf/Topshelf/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://github.com/Topshelf/Topshelf</projectUrl>
+    <dependencies>
+      <dependency id="log4net" version="1.2.10" />
+    </dependencies>
   </metadata> 
   <files>
-    <file src="build_output\**\*" target="lib" />
+    <file src="build_output\NET35\Topshelf.dll" target="lib\NET35" />
+    <file src="build_output\NET35\Topshelf.xml" target="lib\NET35" />
+    <file src="build_output\NET35\Topshelf.pdb" target="lib\NET35" />
+    <file src="build_output\NET40\Topshelf.dll" target="lib\NET40" />
+    <file src="build_output\NET40\Topshelf.xml" target="lib\NET40" />
+    <file src="build_output\NET40\Topshelf.pdb" target="lib\NET40" />
   </files>
 </package>
 
diff --git a/lib/NuGet.exe b/lib/NuGet.exe
diff --git a/rakefile.rb b/rakefile.rb
@@ -16,7 +16,7 @@
 BUILD_PLATFORM = ENV['BUILD_PLATFORM'] || 'x86' # we might want to vary this a little
 TARGET_FRAMEWORK_VERSION = (BUILD_CONFIG_KEY == "NET40" ? "v4.0" : "v3.5")
 MSB_USE = (BUILD_CONFIG_KEY == "NET40" ? :net4 : :net35)
-OUTPUT_PATH = (BUILD_CONFIG_KEY == "NET40" ? 'net-4.0' : 'net-3.5')
+OUTPUT_PATH = (BUILD_CONFIG_KEY == "NET40" ? 'NET40' : 'NET35')
 
 props = { 
   :src => File.expand_path("src"),

diff --git a/src/Topshelf/Dashboard/DashboardConnectionHandler.cs b/src/Topshelf/Dashboard/DashboardConnectionHandler.cs
@@ -63,7 +63,7 @@ public void Send(ConnectionContext context)
 								context.Complete();
 							}, 30.Seconds(), () =>
 								{
-									context.Response.StatusCode = (int)HttpStatusCode.RequestTimeout;
+									context.Response.StatusCode = (int)HttpStatusCode.ServiceUnavailable;
 									context.Complete();
 								});
 					});