Merge branch 'develop' into md

.gitignore

@@ -1,5 +1,5 @@
+build_artifacts/*
 build_output/*
-code_drop/*
 
 **/*.suo
 **/**/*.suo
@@ -11,9 +11,7 @@ _ReSharper*
 
 *.csproj.user
 *.resharper.user
-*.resharper
 *.ReSharper.user
-*.ReSharper
 *.cache
 *~
 *.swp
@@ -26,4 +24,3 @@ src/tests/*
 tests/*
 doc/*
 SolutionVersion.cs
-gems/lib/**/*

Magnum.nuspec

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata> 
+    <id>Magnum</id> 
+    <version>1.1.1.0</version> 
+    <authors>Chris Patterson, Dru Sellers</authors>
+    <description>Magnum is a library for the larger than average developer</description> 
+    <language>en-US</language>
+    <licenseUrl>https://github.com/phatboyg/Magnum/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/phatboyg/Magnum</projectUrl>
+  </metadata> 
+  <files>
+    <file src="build_output\net-3.5\Magnum.dll" target="lib\NET35" />
+    <file src="build_output\net-3.5\Magnum.xml" target="lib\NET35" />
+    <file src="build_output\net-3.5\Magnum.pdb" target="lib\NET35" />
+    <file src="build_output\net-4.0\Magnum.dll" target="lib\NET40" />
+    <file src="build_output\net-4.0\Magnum.xml" target="lib\NET40" />
+    <file src="build_output\net-4.0\Magnum.pdb" target="lib\NET40" />
+  </files>
+</package>
+

build.bat

@@ -1,32 +1,20 @@
 @echo off
 
-::Project UppercuT - http://uppercut.googlecode.com
-::No edits to this file are required - http://uppercut.pbwiki.com
+@echo Environment details
+ruby --version
+call rake --version
+call gem --version
+call gem list albacore
 
-if '%2' NEQ '' goto usage
-if '%3' NEQ '' goto usage
-if '%1' == '/?' goto usage
-if '%1' == '-?' goto usage
-if '%1' == '?' goto usage
-if '%1' == '/help' goto usage
+echo Building for .NET 3.5
+call rake BUILD_CONFIG_KEY=NET35
+IF NOT %ERRORLEVEL% == 0 goto FAILED
 
-SET DIR=%~d0%~p0%
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
+echo Building for .NET 4.0
+call rake unclean
+IF NOT %ERRORLEVEL% == 0 goto FAILED
 
-%NANT% %1 /f:.\build\default.build -D:build.config.settings=%build.config.settings%
+echo Create ZIP package
+call rake package
 
-if %ERRORLEVEL% NEQ 0 goto errors
-
-goto finish
-
-:usage
-echo.
-echo Usage: build.bat
-echo.
-goto finish
-
-:errors
-EXIT /B %ERRORLEVEL%
-
-:finish
+:FAILED