Rebuilt dependencies, fixed merge, added latest Spark for 3.5/4.0

lurongkai · Apr 6, 2011 · d3fa630 · d3fa630
1 parent 103769a
commit d3fa630
Show file tree

Hide file tree

Showing 74 changed files with 43,882 additions and 32,650 deletions.
diff --git a/NDepend.xml b/NDepend.xml
diff --git a/Topshelf.nuspec b/Topshelf.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?> 
-<package> 
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> 
   <metadata> 
     <id>Topshelf</id> 
-    <version>2.2.1.0</version> 
+    <version>2.2.1.1</version> 
     <authors>Chris Patterson, Dru Sellers, Travis Smith</authors>
     <description>Topshelf is a service library and hosting framework for .NET</description> 
     <language>en-US</language>

diff --git a/build.bat b/build.bat
@@ -2,12 +2,13 @@
 
 echo Building for .NET 3.5
 call rake BUILD_CONFIG_KEY=NET35
+IF NOT %ERRORLEVEL% == 0 goto FAILED
 
 echo Building for .NET 4.0
 call rake unclean
-
-echo Creating NU package
-lib\nuget pack Topshelf.nuspec /OutputDirectory build_artifacts 
+IF NOT %ERRORLEVEL% == 0 goto FAILED
 
 echo Create ZIP package
 call rake package
+
+:FAILED
diff --git a/build_support/ilmerge.rb b/build_support/ilmerge.rb
@@ -6,12 +6,14 @@ class ILMerge
   include Albacore::RunCommand
   include Configuration::ILMerge
 
-  attr_accessor :assembly, :output, :debug, :target, :allow_dupes, :log, :internalize
+  attr_accessor :assembly, :output, :debug, :target, :allow_dupes, :log, :internalize, :no_docs, :union
   attr_array :references
 
   def initialize
 	@debug = true
 	@allow_dupes = true
+	@no_docs = false
+	@union = false
 
 	self.use :net4
 #	@platform_version = "v4"
@@ -27,7 +29,9 @@ def execute
 	params << "/log:#{@log}" unless @log.nil?
 	params << "/internalize:#{@internalize}" unless @internalize.nil?
     params << "/target:#{@target}" unless @target.nil?
-    params << "/allowDup" unless @allow_dupes.nil?
+    params << "/allowDup" if @allow_dupes
+    params << "/xmldocs" unless @no_docs
+    params << "/union" if @union
     params << "/ndebug" unless @debug
 	params << "/targetplatform:#{@platform_version},#{@platform_directory}" unless @platform_version.nil?
 	#params << @platform_version unless @platform_version.nil?

diff --git a/lib/Magnum/Ionic.Zip.dll b/lib/Magnum/Ionic.Zip.dll
diff --git a/lib/Magnum/Magnum.FileSystem.dll b/lib/Magnum/Magnum.FileSystem.dll
diff --git a/lib/Magnum/Magnum.FileSystem.pdb b/lib/Magnum/Magnum.FileSystem.pdb
diff --git a/lib/Magnum/Magnum.TestFramework.dll b/lib/Magnum/Magnum.TestFramework.dll
diff --git a/lib/Magnum/Magnum.TestFramework.pdb b/lib/Magnum/Magnum.TestFramework.pdb
diff --git a/lib/Magnum/Magnum.XML b/lib/Magnum/Magnum.XML
diff --git a/lib/Magnum/Magnum.dll b/lib/Magnum/Magnum.dll
diff --git a/lib/Magnum/Magnum.pdb b/lib/Magnum/Magnum.pdb
diff --git a/lib/Magnum/System.Threading.dll b/lib/Magnum/System.Threading.dll
diff --git a/lib/Magnum/System.Threading.xml b/lib/Magnum/System.Threading.xml
diff --git a/lib/Magnum/net-3.5/DebugVisualizer/Magnum.Visualizers.dll b/lib/Magnum/net-3.5/DebugVisualizer/Magnum.Visualizers.dll
diff --git a/lib/Magnum/net-3.5/DebugVisualizer/Microsoft.GLEE.Drawing.dll b/lib/Magnum/net-3.5/DebugVisualizer/Microsoft.GLEE.Drawing.dll
diff --git a/lib/Magnum/net-3.5/DebugVisualizer/Microsoft.GLEE.GraphViewerGDI.dll b/lib/Magnum/net-3.5/DebugVisualizer/Microsoft.GLEE.GraphViewerGDI.dll
diff --git a/lib/Magnum/net-3.5/DebugVisualizer/Microsoft.GLEE.dll b/lib/Magnum/net-3.5/DebugVisualizer/Microsoft.GLEE.dll
diff --git a/lib/Magnum/net-3.5/DebugVisualizer/QuickGraph.Glee.dll b/lib/Magnum/net-3.5/DebugVisualizer/QuickGraph.Glee.dll
diff --git a/lib/Magnum/net-3.5/DebugVisualizer/QuickGraph.dll b/lib/Magnum/net-3.5/DebugVisualizer/QuickGraph.dll
diff --git a/lib/Magnum/net-3.5/Magnum.Routing.dll b/lib/Magnum/net-3.5/Magnum.Routing.dll
diff --git a/lib/Magnum/net-3.5/Magnum.Routing.pdb b/lib/Magnum/net-3.5/Magnum.Routing.pdb
diff --git a/lib/Magnum/net-3.5/Magnum.Routing.xml b/lib/Magnum/net-3.5/Magnum.Routing.xml
diff --git a/lib/Magnum/net-3.5/Magnum.dll b/lib/Magnum/net-3.5/Magnum.dll
diff --git a/lib/Magnum/net-3.5/Magnum.pdb b/lib/Magnum/net-3.5/Magnum.pdb