uppercutbuild 1.2.0.0 → 1.3.0.0

data/docs/README

@@ -59,6 +59,10 @@ It helps keep to the product updated, pays for site hosting, etc. https://www.pa
 * Adding in support for xUnit.  
 * Adding in support for StorEvil.  
   
+==1.3.0.0==  
+* Fix for spaces in the path when trying to resolve the revision for SVN - see http://code.google.com/p/uppercut/issues/detail?id=25 for details. (385)  
+* xUnit Support for automated testing. Will handle multiple test assemblies for you. (384)  
+  
 =1.2.0.0=  
 * NuGet Support. New settings have been added to the uppercut.config: <property name="app.nuget" value="..${path.separator}${folder.references}${path.separator}NuGet${path.separator}NuGet.exe" overwrite="false" /> and a tool that goes under the lib folder: NuGet  - see http://code.google.com/p/uppercut/issues/detail?id=20 for details. (378)  
   

data/lib/build/UppercuT.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
 <uppercut>
-  <version>1.2.0.0</version>
+  <version>1.3.0.0</version>
 </uppercut>
 

data/lib/build/analyzers/nunit.test.step

@@ -28,8 +28,8 @@
   <property name="nunit.separator" value="/" if="${platform::is-windows()}" />
   <property name="test.args.framework" value="" if="${platform::is-unix()}" />
   <property name="test.args.framework" value="${nunit.separator}framework=${microsoft.framework}" if="${platform::is-windows()}" />
-  <property name="test.args" value="${nunit.separator}xml=&quot;${dirs.test_results}${path.separator}nunit-results.xml&quot; ${nunit.separator}nologo " />
-  <!--property name="test.args" value="${nunit.separator}xml=&quot;${dirs.test_results}${path.separator}nunit-results.xml&quot; ${nunit.separator}nologo ${test.args.framework}" /-->
+  <!--property name="test.args" value="${nunit.separator}xml=&quot;${dirs.test_results}${path.separator}nunit-results.xml&quot; ${nunit.separator}nologo " /-->
+  <property name="test.args" value="${nunit.separator}xml=&quot;${dirs.test_results}${path.separator}nunit-results.xml&quot; ${nunit.separator}nologo ${test.args.framework}" />
   <property name="test.args.exclude" value="${nunit.separator}exclude=&quot;${tests.excluded_categories.comma_separated}&quot;" />
   <property name="app.nunit.console" value="${path::get-full-path(dirs.lib)}${path.separator}NUnit${path.separator}nunit-console.exe" overwrite="false" if="${platform::is-windows()}" />
   <property name="app.nunit.console" value="nunit-console" overwrite="false" if="${platform::is-unix()}"/>

data/lib/build/analyzers/test.step

@@ -66,6 +66,7 @@
     <nant buildfile="${dirs.current}${path.separator}mbunit2.test.step" inheritall="true" if="${test.framework=='mbunit2'}" />
     <nant buildfile="${dirs.current}${path.separator}gallio.test.step" inheritall="true" if="${test.framework=='gallio'}" />
     <nant buildfile="${dirs.current}${path.separator}nunit.test.step" inheritall="true" if="${test.framework=='nunit'}" />
+    <nant buildfile="${dirs.current}${path.separator}xunit.test.step" inheritall="true" if="${test.framework=='xunit'}" />
     <call target="set_normal_failure_mode" />
   </target>
 
@@ -73,6 +74,7 @@
     <nant buildfile="${dirs.current}${path.separator}mbunit2.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='mbunit2'}" />
     <nant buildfile="${dirs.current}${path.separator}gallio.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='gallio'}" />
     <nant buildfile="${dirs.current}${path.separator}nunit.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='nunit'}" />
+    <nant buildfile="${dirs.current}${path.separator}xunit.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='xunit'}" />
     <call target="set_normal_failure_mode" />
   </target>
 
@@ -80,6 +82,7 @@
     <nant buildfile="${dirs.current}${path.separator}mbunit2.test.step" target="open_results" inheritall="true" if="${test.framework=='mbunit2'}" />
     <nant buildfile="${dirs.current}${path.separator}gallio.test.step" target="open_results" inheritall="true" if="${test.framework=='gallio'}" />
     <nant buildfile="${dirs.current}${path.separator}nunit.test.step" target="open_results" inheritall="true" if="${test.framework=='nunit'}" />
+    <nant buildfile="${dirs.current}${path.separator}xunit.test.step" target="open_results" inheritall="true" if="${test.framework=='xunit'}" />
   </target>
 
   <target name="set_normal_failure_mode">

data/lib/build/analyzers/xunit.test.step

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="XUnitTester" default="go">
+  <!-- Project UppercuT - http://projectuppercut.org -->
+  <!-- DO NOT EDIT THIS FILE - This follows a convention for testing with Integration tests being separated from Unit tests - find out more at http://uppercut.pbwiki.com -->
+  <property name="build.config.settings" value="__NONE__" overwrite="false" />
+  <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
+  <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
+  <include buildfile="..${path.separator}csharp.functions" />
+  <property name="file.current.no_extension" value="xunit.test" />
+  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="folder.build_scripts" value="build" overwrite="false" />
+  <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="folder.code_build" value="build_output" overwrite="false" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="folder.app.drop" value="${project.name}" overwrite="false" />
+  <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
+  <property name="folder.references" value="lib" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="microsoft.framework" value="net-3.5" overwrite="false" />
+  <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
+  <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
+  
+  <property name="dirs.test_results" value="${dirs.build_artifacts}${path.separator}xunit" overwrite="false" />
+  <property name="file.test_results" value="index" overwrite="false" />
+  <property name="tests.excluded_categories.comma_separated" value="Database,Integration,Slow,NotWorking,Ignore,database,integration,slow,notworking,ignore" overwrite="false" />
+  <property name="xunit.separator" value="--" if="${platform::is-unix()}" />
+  <property name="xunit.separator" value="/" if="${platform::is-windows()}" />
+  <property name="test.args" value="${xunit.separator}xml &quot;${dirs.test_results}${path.separator}xunit-results.xml&quot; ${xunit.separator}html &quot;${dirs.test_results}${path.separator}xunit-results.html&quot; ${xunit.separator}nunit &quot;${dirs.test_results}${path.separator}nunit-nresults.xml&quot; " />
+  <property name="test.args.exclude" value="${xunit.separator}exclude=&quot;${tests.excluded_categories.comma_separated}&quot;" />
+  <property name="app.xunit.console" value="${path::get-full-path(dirs.lib)}${path.separator}xUnit${path.separator}xunit.console.clr4.exe" overwrite="false" if="${platform::is-windows()}" />
+  <property name="app.xunit.console" value="${path::get-full-path(dirs.lib)}${path.separator}xUnit${path.separator}xunit-console" overwrite="false" if="${platform::is-unix()}"/>
+  <property name="dlls.test" value="" />
+  <property name="tests.ran" value="false" />
+  <property name="tests.run_all" value="false" />
+  
+  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
+  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
+  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
+  <property name="is.replaced" value="false" />
+  <property name="fail.build.on.error" value="true" />
+ 
+  <target name="go" depends="run_tasks" />
+
+  <target name="run_all_tests" depends="prepare, set_run_all_flag, run_tests, generate_report" description="Like go but runs all tests" />
+  
+  <target name="run_tasks">
+    <echo message="Running ${project::get-name()} tasks." />
+    <call target="prepare" if="${target::exists('prepare')}" />
+    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
+    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <call target="run_normal_tasks" if="${not is.replaced}" />
+    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+  </target>
+
+  <target name="run_normal_tasks"
+          depends="run_tests, generate_report"
+          description="Testing with NUnit." />
+
+  <target name="custom_tasks_before">
+    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
+    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
+    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
+      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
+    </exec>
+    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
+      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
+    </exec>
+  </target>
+
+  <target name="custom_tasks_replace">
+    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
+    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
+    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
+    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
+    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
+      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
+    </exec>
+    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
+    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
+      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
+    </exec>
+  </target>
+
+  <target name="prepare">
+    <echo message="Removing and adding ${dirs.test_results}."/>
+    <delete dir="${dirs.test_results}" failonerror="false" />
+    <mkdir dir="${dirs.test_results}" />
+  </target>
+
+  <target name="set_run_all_flag">
+    <echo message="Running ALL test assemblies including integration and database tests with xUnit." />
+    <property name="tests.run_all" value="true" />
+  </target>
+  
+  <target name="run_tests" depends="prepare" description="Running Unit Tests">
+    <foreach item="File" property="dll.filename">
+      <in>
+        <items>
+          <exclude name="${dirs.build.code}${path.separator}lib${path.separator}**" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}*Database*dll" if="${not tests.run_all}" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}*.Integration*dll" if="${not tests.run_all}" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}TestFu.dll" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}Microsoft.*.dll" />
+          <include name="${dirs.build.code}${path.separator}**${path.separator}*Test*dll" />
+          <include name="${dirs.build.code}${path.separator}**${path.separator}*Spec*dll" />
+        </items>
+      </in>
+      <do>
+        <if test="${dll.filename !=''}">
+          <property name="dll.name" value="${string::replace(string::replace(dll.filename,path::get-full-path(dirs.build.code) + '\',''),'\',path.separator)}" />
+          <property name="test.args" value="${xunit.separator}xml &quot;${dirs.test_results}${path.separator}${dll.name}-results.xml&quot; ${xunit.separator}html &quot;${dirs.test_results}${path.separator}${dll.name}-results.html&quot; ${xunit.separator}nunit &quot;${dirs.test_results}${path.separator}${dll.name}-nresults.xml&quot; " />
+          <property name="args.test_runner" value="${dll.name} ${test.args} " />
+          <echo message="Running tests using xUnit with args '${args.test_runner}' and putting results in ${dirs.test_results}."/>
+          <exec 
+            program="${app.xunit.console}" 
+            workingdir="${dirs.build.code}"
+            failonerror="true">
+          <arg value="${args.test_runner}" />
+          </exec>
+          <property name="tests.ran" value="true" />
+        </if>
+      </do>
+    </foreach>
+  </target>
+
+  <target name="generate_report">
+    <if test="${tests.ran}">
+      <nunit2report todir="${dirs.test_results}" failonerror="false" >
+        <fileset>
+        <include name="${dirs.test_results}${path.separator}*-nresults.xml"/>
+        </fileset>
+      </nunit2report>
+    </if>
+  </target>
+  
+  <target name="open_results">
+    <echo message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
+    <results display="${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
+  </target>
+
+  <target name="custom_tasks_after">
+    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
+    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
+    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
+      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
+    </exec>
+    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
+      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
+    </exec>
+  </target>
+
+</project>

data/lib/build/package.step

@@ -25,6 +25,7 @@
   <property name="folder.settings" value="settings" overwrite="false" />
   <property name="folder.documentation" value="docs" overwrite="false" />
   <property name="file.build_info" value="${dirs.build}${path.separator}_BuildInfo.xml" />
+  <property name="file.build_log" value="${dirs.build}${path.separator}build.log" />
   <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
   <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
   <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
@@ -202,6 +203,11 @@
      file="${file.build_info}"
      todir="${dirs.drop}${path.separator}${folder.build_artifacts}"
       />
+      
+    <copy
+     file="${file.build_log}"
+     todir="${dirs.drop}${path.separator}${folder.build_artifacts}"
+      />
 
     <copy
      file="${file.build_info}"

data/lib/build/versionBuilder.step

@@ -139,7 +139,7 @@
         <attribute type="AssemblyProductAttribute" value="${project.name}" />
         <attribute type="AssemblyDescriptionAttribute" value="${assembly.description}" />
         <attribute type="AssemblyTrademarkAttribute" value="${project.name} - ${company.name}" />
-        <attribute type="AssemblyCopyrightAttribute" value="Copyright ${datetime::get-year(datetime::now())} ${company.name}, - Original author or authors" />
+        <attribute type="AssemblyCopyrightAttribute" value="Copyright ©  ${datetime::get-year(datetime::now())} ${company.name}, - Original author or authors" />
         <attribute type="AllowPartiallyTrustedCallers" if="${allow.partially_trusted_callers}" asis="true" />
         <attribute type="AssemblyKeyFileAttribute" value="${file.key.name.private}" if="${sign.project_with_key and not sign.key.use_relative_pathing}" />
         <attribute type="AssemblyKeyFileAttribute" value="${sign.key.relative_path_from_projects}${path.separator}${path::get-file-name(file.key.name.private)}" if="${sign.project_with_key and sign.key.use_relative_pathing}" />

data/lib/build/versioners/svn.step

@@ -60,13 +60,14 @@
   </target>
 
   <target name="get_revision">
-    <echo message="Getting revision number from working directory ${directory::get-parent-directory(dirs.current)} or remotely at ${repository.path}."/>
+    <echo message="Getting revision number from working directory '${dirs.current}${path.separator}${path.to.toplevel}${path.separator}' or remotely at ${repository.path}."/>
     <!-- try to update the revision -->
     <exec
       program="svn"
-      commandline="info ${dirs.current}${path.separator}${path.to.toplevel}${path.separator} --xml"
+      workingdir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}"
+      commandline="info .\ --xml"
       output="_revision.xml"
-      failonerror="false"/>
+      failonerror="false" />
     <xmlpeek
       file="_revision.xml"
       xpath="/info/entry/commit/@revision"
@@ -74,7 +75,7 @@
       failonerror="false"/>
     <exec
       program="svn"
-      commandline="info ${repository.path} --xml"
+      commandline='info "${repository.path}" --xml'
       output="_revision.xml"
       failonerror="false"
       if="${version.revision == '0'}"

data/lib/build/versioners/tfs.step

@@ -63,7 +63,8 @@
   <target name="get_revision">
     <exec
        program="tf"
-       commandline="history ${dirs.current}${path.separator}${path.to.toplevel}${path.separator} /r /noprompt /stopafter:1 /version:W"
+       workingdir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}"
+       commandline="history .\ /r /noprompt /stopafter:1 /version:W"
        output="_revision.xml"
        failonerror="false"/>
     <loadfile

data/lib/deployment/templates/DBDeployment.RESTORE.bat

@@ -2,8 +2,15 @@
 
 SET DIR=%~d0%~p0%
 
-SET deploy.settings="%DIR%..\settings\${environment}.settings"
+SET database.name="${database.name}"
+SET sql.files.directory="${dirs.db}"
+SET backup.file="${restore.from.path}"
+SET server.database="${server.database}"
+SET repository.path="${repository.path}"
+SET version.file="_BuildInfo.xml"
+SET version.xpath="//buildInfo/version"
+SET environment="${environment}"
 
-"%DIR%NAnt\nant.exe" /f:"%DIR%scripts\database.deploy" -D:deploy.settings=%deploy.settings% -D:restore=true
+"%DIR%rh\rh.exe" /d=%database.name% /f=%sql.files.directory% /s=%server.database% /vf=%version.file% /vx=%version.xpath% /r=%repository.path% /env=%environment% /simple /restore /rfp=%backup.file% /rt=1200
 
 pause

data/lib/deployment/templates/DBDeployment.bat

@@ -2,8 +2,15 @@
 
 SET DIR=%~d0%~p0%
 
-SET deploy.settings="%DIR%..\settings\${environment}.settings"
+SET database.name="${database.name}"
+SET sql.files.directory="${dirs.db}"
+SET backup.file="${restore.from.path}"
+SET server.database="${server.database}"
+SET repository.path="${repository.path}"
+SET version.file="_BuildInfo.xml"
+SET version.xpath="//buildInfo/version"
+SET environment="${environment}"
 
-"%DIR%NAnt\nant.exe" /f:"%DIR%scripts\database.deploy" -D:deploy.settings=%deploy.settings%
+"%DIR%rh\rh.exe" /d=%database.name% /f=%sql.files.directory% /s=%server.database% /vf=%version.file% /vx=%version.xpath% /r=%repository.path% /env=%environment% /simple 
 
 pause

data/lib/lib/xUnit/HTML.xslt

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="html"/>
+    <xsl:template match="/">
+        <xsl:text disable-output-escaping="yes"><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">]]></xsl:text>
+        <html>
+            <head>
+                <title>
+                    xUnit.net Test Results - <xsl:value-of select="@name"/>
+                </title>
+                <style type="text/css">
+                    body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
+                    h2,h3,h4,h5 { margin: 0; padding: 0; }
+                    h3 { font-weight: normal; }
+                    h5 { font-weight: normal; font-style: italic; margin-bottom: 0.75em; }
+                    pre { font-family: Consolas; font-size: 85%; margin: 0 0 0 1em; padding: 0; }
+                    .divided { border-top: solid 1px #f0f5fa; padding-top: 0.5em; }
+                    .row, .altrow { padding: 0.1em 0.3em; }
+                    .row { background-color: #f0f5fa; }
+                    .altrow { background-color: #e1ebf4; }
+                    .success, .failure, .skipped { font-family: Arial Unicode MS; font-weight: normal; float: left; width: 1em; display: block; }
+                    .success { color: #0c0; }
+                    .failure { color: #c00; }
+                    .skipped { color: #cc0; }
+                    .timing { float: right; }
+                    .indent { margin: 0.25em 0 0.5em 2em; }
+                    .clickable { cursor: pointer; }
+                    .testcount { font-size: 85%; }
+                </style>
+                <script language="javascript">
+                    function ToggleClass(id) {
+                        var elem = document.getElementById(id);
+                        if (elem.style.display == "none") {
+                            elem.style.display = "block";
+                        }
+                        else {
+                            elem.style.display = "none";
+                        }
+                    }
+                </script>
+            </head>
+            <body>
+                <xsl:apply-templates/>
+            </body>
+        </html>
+    </xsl:template>
+
+    <xsl:template match="assemblies">
+        <xsl:apply-templates/>
+    </xsl:template>
+
+    <xsl:template match="assembly">
+        <h3 class="divided"><b>Results for <xsl:value-of select="@name"/></b></h3>
+        <div>
+            Tests run: <a href="#all"><b><xsl:value-of select="@total"/></b></a> &#160;
+            Failures: <a href="#failures"><b><xsl:value-of select="@failed"/></b></a>,
+            Skipped: <a href="#skipped"><b><xsl:value-of select="@skipped"/></b></a>,
+            Run time: <b><xsl:value-of select="@time"/>s</b>
+        </div>
+        <xsl:if test="class/test[@result='Fail']">
+            <br />
+            <h2><a name="failures"></a>Failed tests</h2>
+            <xsl:apply-templates select="class/test[@result='Fail']"><xsl:sort select="@name"/></xsl:apply-templates>
+        </xsl:if>
+        <xsl:if test="class/failure">
+            <br />
+            <h2><a name="failures"></a>Failed fixtures</h2>
+            <xsl:apply-templates select="class/failure"><xsl:sort select="../@name"/></xsl:apply-templates>
+        </xsl:if>
+        <xsl:if test="@skipped > 0">
+            <br />
+            <h2><a name="skipped"></a>Skipped tests</h2>
+            <xsl:apply-templates select="class/test[@result='Skip']"><xsl:sort select="@name"/></xsl:apply-templates>
+        </xsl:if>
+        <br />
+        <h2><a name="all"></a>All tests</h2>
+        <h5>Click test class name to expand/collapse test details</h5>
+        <xsl:apply-templates select="class"><xsl:sort select="@name"/></xsl:apply-templates>
+        <br /><h5>Results generated <xsl:value-of select="@run-date"/> at <xsl:value-of select="@run-time"/></h5>
+    </xsl:template>
+
+    <xsl:template match="test">
+        <div>
+            <xsl:attribute name="class"><xsl:if test="(position() mod 2 = 0)">alt</xsl:if>row</xsl:attribute>
+            <xsl:if test="@result!='Skip'"><span class="timing"><xsl:value-of select="@time"/>s</span></xsl:if>
+            <xsl:if test="@result='Skip'"><span class="timing">Skipped</span><span class="skipped">&#x2762;</span></xsl:if>
+            <xsl:if test="@result='Fail'"><span class="failure">&#x2718;</span></xsl:if>
+            <xsl:if test="@result='Pass'"><span class="success">&#x2714;</span></xsl:if>
+            &#160;<xsl:value-of select="@name"/>
+            <xsl:if test="child::node()/message"> : <xsl:value-of select="child::node()/message"/></xsl:if>
+            <br clear="all" />
+            <xsl:if test="failure/stack-trace">
+                <pre><xsl:value-of select="failure/stack-trace"/></pre>
+            </xsl:if>
+            <xsl:if test="output">
+                <h4>Output</h4>
+                <pre><xsl:value-of select="output"/></pre>
+            </xsl:if>
+        </div>
+    </xsl:template>
+
+    <xsl:template match="failure">
+        <span class="failure">&#x2718;</span> <xsl:value-of select="../@name"/> : <xsl:value-of select="message"/><br clear="all"/>
+        Stack Trace:<br />
+        <pre><xsl:value-of select="stack-trace"/></pre>
+    </xsl:template>
+
+    <xsl:template match="class">
+        <h3>
+            <span class="timing"><xsl:value-of select="@time"/>s</span>
+            <span class="clickable">
+                <xsl:attribute name="onclick">ToggleClass('class<xsl:value-of select="position()"/>')</xsl:attribute>
+                <xsl:attribute name="ondblclick">ToggleClass('class<xsl:value-of select="position()"/>')</xsl:attribute>
+                <xsl:if test="@failed > 0"><span class="failure">&#x2718;</span></xsl:if>
+                <xsl:if test="@failed = 0"><span class="success">&#x2714;</span></xsl:if>
+                &#160;<xsl:value-of select="@name"/>
+                &#160;<span class="testcount">(<xsl:value-of select="@total"/>&#160;test<xsl:if test="@total > 1">s</xsl:if>)</span>
+            </span>
+            <br clear="all" />
+        </h3>
+        <div class="indent">
+            <xsl:if test="@failed = 0"><xsl:attribute name="style">display: none;</xsl:attribute></xsl:if>
+            <xsl:attribute name="id">class<xsl:value-of select="position()"/></xsl:attribute>
+            <xsl:apply-templates select="test"><xsl:sort select="@name"/></xsl:apply-templates>
+        </div>
+    </xsl:template>
+
+</xsl:stylesheet>

data/lib/lib/xUnit/NUnitXml.xslt

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output cdata-section-elements="message stack-trace"/>
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="assembly">
+    <test-results>
+      <xsl:attribute name="name">
+        <xsl:value-of select="@name"/>
+      </xsl:attribute>
+      <xsl:attribute name="date">
+        <xsl:value-of select="@run-date"/>
+      </xsl:attribute>
+      <xsl:attribute name="time">
+        <xsl:value-of select="@run-time"/>
+      </xsl:attribute>
+      <xsl:attribute name="total">
+        <xsl:value-of select="@total"/>
+      </xsl:attribute>
+      <xsl:attribute name="failures">
+        <xsl:value-of select="@failed"/>
+      </xsl:attribute>
+      <xsl:attribute name="not-run">
+        <xsl:value-of select="@skipped"/>
+      </xsl:attribute>
+      <test-suite>
+        <xsl:attribute name="name">
+          <xsl:value-of select="@name"/>
+        </xsl:attribute>
+        <xsl:attribute name="success">
+          <xsl:if test="@failed > 0">False</xsl:if>
+          <xsl:if test="@failed = 0">True</xsl:if>
+        </xsl:attribute>
+        <xsl:attribute name="time">
+          <xsl:value-of select="@time"/>
+        </xsl:attribute>
+        <results>
+          <xsl:apply-templates select="class"/>
+        </results>
+      </test-suite>
+    </test-results>
+  </xsl:template>
+
+  <xsl:template match="class">
+    <test-suite>
+      <xsl:attribute name="name">
+        <xsl:value-of select="@name"/>
+      </xsl:attribute>
+      <xsl:attribute name="success">
+        <xsl:if test="@failed > 0">False</xsl:if>
+        <xsl:if test="@failed = 0">True</xsl:if>
+      </xsl:attribute>
+      <xsl:attribute name="time">
+        <xsl:value-of select="@time"/>
+      </xsl:attribute>
+      <xsl:if test="failure">
+        <xsl:copy-of select="failure"/>
+      </xsl:if>
+      <xsl:if test="reason">
+        <reason>
+          <xsl:apply-templates select="reason"/>
+        </reason>
+      </xsl:if>
+      <results>
+        <xsl:apply-templates select="test"/>
+      </results>
+    </test-suite>
+  </xsl:template>
+
+  <xsl:template match="test">
+    <test-case>
+      <xsl:attribute name="name">
+        <xsl:value-of select="@name"/>
+      </xsl:attribute>
+      <xsl:attribute name="executed">
+        <xsl:if test="@result='Skip'">False</xsl:if>
+        <xsl:if test="@result!='Skip'">True</xsl:if>
+      </xsl:attribute>
+      <xsl:if test="@result!='Skip'">
+        <xsl:attribute name="success">
+          <xsl:if test="@result='Fail'">False</xsl:if>
+          <xsl:if test="@result='Pass'">True</xsl:if>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:if test="@time">
+        <xsl:attribute name="time">
+          <xsl:value-of select="@time"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:apply-templates select="traits"/>
+      <xsl:apply-templates select="failure"/>
+    </test-case>
+  </xsl:template>
+
+  <xsl:template match="traits">
+    <properties>
+      <xsl:apply-templates select="trait"/>
+    </properties>
+  </xsl:template>
+
+  <xsl:template match="trait">
+    <property>
+      <xsl:attribute name="name">
+        <xsl:value-of select="@name"/>
+      </xsl:attribute>
+      <xsl:attribute name="value">
+        <xsl:value-of select="@value"/>
+      </xsl:attribute>
+    </property>
+  </xsl:template>
+
+  <xsl:template match="failure">
+    <failure>
+      <xsl:copy-of select="node()"/>
+    </failure>
+  </xsl:template>
+
+</xsl:stylesheet>

data/lib/lib/xUnit/xunit.console.clr4.exe.config

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+  <configSections>
+    <section name="xunit" type="Xunit.ConsoleClient.XunitConsoleConfigurationSection, xunit.console.clr4"/>
+  </configSections>
+
+  <xunit>
+    <transforms>
+      <add
+        commandline="html"
+        xslfile="HTML.xslt"
+        description="output results to HTML file"/>
+      <add
+        commandline="nunit"
+        xslfile="NUnitXml.xslt"
+        description="output results to NUnit-style XML file"/>
+    </transforms>
+  </xunit>
+  
+</configuration>

data/lib/lib/xUnit/xunit.console.clr4.x86.exe.config

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+  <configSections>
+    <section name="xunit" type="Xunit.ConsoleClient.XunitConsoleConfigurationSection, xunit.console.clr4.x86"/>
+  </configSections>
+
+  <xunit>
+    <transforms>
+      <add
+        commandline="html"
+        xslfile="HTML.xslt"
+        description="output results to HTML file"/>
+      <add
+        commandline="nunit"
+        xslfile="NUnitXml.xslt"
+        description="output results to NUnit-style XML file"/>
+    </transforms>
+  </xunit>
+  
+</configuration>

data/lib/lib/xUnit/xunit.console.exe.config

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+  <configSections>
+    <section name="xunit" type="Xunit.ConsoleClient.XunitConsoleConfigurationSection, xunit.console"/>
+  </configSections>
+
+  <xunit>
+    <transforms>
+      <add
+        commandline="html"
+        xslfile="HTML.xslt"
+        description="output results to HTML file"/>
+      <add
+        commandline="nunit"
+        xslfile="NUnitXml.xslt"
+        description="output results to NUnit-style XML file"/>
+    </transforms>
+  </xunit>
+  
+</configuration>

data/lib/lib/xUnit/xunit.console.x86.exe.config

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+  <configSections>
+    <section name="xunit" type="Xunit.ConsoleClient.XunitConsoleConfigurationSection, xunit.console.x86"/>
+  </configSections>
+
+  <xunit>
+    <transforms>
+      <add
+        commandline="html"
+        xslfile="HTML.xslt"
+        description="output results to HTML file"/>
+      <add
+        commandline="nunit"
+        xslfile="NUnitXml.xslt"
+        description="output results to NUnit-style XML file"/>
+    </transforms>
+  </xunit>
+  
+</configuration>

data/lib/settings/UppercuT.config

@@ -25,15 +25,15 @@
 
   <!-- FRAMEWORKS -->
   <!-- microsoft.framework: vb6, net-1.0, net-1.1, net-2.0, net-3.5, net-4.0, netcf-1.0, netcf-2.0, silverlight-2.0, mono-1.0, mono-2.0, mono-3.5, moonlight-2.0 (Enter multiple ones with a "," to take advantage of multitargeting) -->
-  <property name="microsoft.framework" value="net-3.5" overwrite="false" />
+  <property name="microsoft.framework" value="net-4.0" overwrite="false" />
   <!-- language.short: vb,cs -->
   <property name="language.short" value="cs" overwrite="false" />
-  <!-- test.framework: none, mbunit2, nunit, gallio - with gallio it must be installed in program files on every computer. Alternatively you can add 26MB to your repo and put it there. Little much for my tastes. -->
+  <!-- test.framework: none, mbunit2, nunit, xunit, gallio - with gallio it must be installed in program files on every computer. Alternatively you can add 26MB to your repo and put it there. Little much for my tastes. -->
   <property name="test.framework" value="nunit" overwrite="false" />
   <!-- source_control_type: svn, vss, tfs, vault, git, hg -->
-  <property name="source_control_type" value="svn" overwrite="false" />
+  <property name="source_control_type" value="git" overwrite="false" />
   
-  <!-- Environment spesific variables -->
+  <!-- Environment specific variables -->
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   
   <!-- ASSEMBLY VARIABLES -->
@@ -70,11 +70,13 @@
   <!-- In example, if from the top level directory, you have an item that is in lib\NCover\NCover.Console.exe you should add it here as ..\..\lib\NCover\NCover.Console.exe  -->
   <!-- To not use the tool, change to a location that doesn't exist -->
   <property name="app.nunit.console" value="..${path.separator}..${path.separator}${folder.references}${path.separator}NUnit${path.separator}nunit-console.exe" overwrite="false" />
+  <property name="app.xunit.console" value="..${path.separator}..${path.separator}${folder.references}${path.separator}xUnit${path.separator}xunit.console.clr4.exe" overwrite="false" />
   <property name="app.storevil.console" value="..${path.separator}..${path.separator}${folder.references}${path.separator}StorEvil${path.separator}StorEvil.exe" overwrite="false" />
   <property name="app.ncover" value="..${path.separator}..${path.separator}${folder.references}${path.separator}NCover${path.separator}NCover.Console.exe" overwrite="false" />
   <property name="app.ncover_explorer" value="..${path.separator}..${path.separator}${folder.references}${path.separator}NCover${path.separator}NCoverExplorer.Console.exe" overwrite="false" />
   <property name="app.ncover.tester" value="..${path.separator}..${path.separator}${folder.references}${path.separator}MbUnit2${path.separator}MbUnit.Cons.exe" overwrite="false" if="${test.framework=='mbunit2'}" />
   <property name="app.ncover.tester" value="${app.nunit.console}" overwrite="false" if="${test.framework=='nunit'}" />
+  <property name="app.ncover.tester" value="${app.xunit.console}" overwrite="false" if="${test.framework=='xunit'}" />
   <property name="app.ncover.tester" value="C:\Program Files (x86)\Gallio\bin\Gallio.Host.exe" overwrite="false" if="${test.framework=='gallio'}" />
   <property name="app.ndepend" value="C:\Program Files\NDepend\NDepend.Console.exe" overwrite="false" />
   <property name="app.moma" value="..\..\${folder.references}\MoMA\MoMA.exe" overwrite="false" />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: uppercutbuild
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 71
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
   - 0
-  version: 1.2.0.0
+  version: 1.3.0.0
 platform: ruby
 authors: 
 - Rob "FerventCoder" Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 -06:00
+date: 2011-03-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - lib/build/analyzers/nunit.test.step
 - lib/build/analyzers/storevil.test.step
 - lib/build/analyzers/test.step
+- lib/build/analyzers/xunit.test.step
 - lib/build/Castle.Core.dll
 - lib/build/Castle.DynamicProxy2.dll
 - lib/build/Castle.MicroKernel.dll
@@ -339,6 +340,21 @@ files:
 - lib/lib/NUnit/tests/test-assembly.dll
 - lib/lib/NUnit/tests/test-utilities.dll
 - lib/lib/NUnit/tests/timing-tests.dll
+- lib/lib/xUnit/HTML.xslt
+- lib/lib/xUnit/NUnitXml.xslt
+- lib/lib/xUnit/xunit.console.clr4.exe
+- lib/lib/xUnit/xunit.console.clr4.exe.config
+- lib/lib/xUnit/xunit.console.clr4.x86.exe
+- lib/lib/xUnit/xunit.console.clr4.x86.exe.config
+- lib/lib/xUnit/xunit.console.exe
+- lib/lib/xUnit/xunit.console.exe.config
+- lib/lib/xUnit/xunit.console.x86.exe
+- lib/lib/xUnit/xunit.console.x86.exe.config
+- lib/lib/xUnit/xunit.dll
+- lib/lib/xUnit/xunit.extensions.dll
+- lib/lib/xUnit/xunit.runner.msbuild.dll
+- lib/lib/xUnit/xunit.runner.tdnet.dll
+- lib/lib/xUnit/xunit.runner.utility.dll
 - lib/NDepend.xml
 - lib/nuget/__NAME__.nuspec
 - lib/open.bat