uppercutbuild 1.4.0.0 → 1.4.1.0

data/docs/CREDITS

@@ -4,6 +4,7 @@ Committers
 ----------
 Rob Reynolds, Committer - lead developer and manager of the framework
 Dru Sellers, Committer - thought leader on direction
+David Keaveny, Committer
 
 Other Credits
 -------------

data/lib/build.bat

@@ -8,11 +8,12 @@ if '%1' == '-?' goto usage
 if '%1' == '?' goto usage
 if '%1' == '/help' goto usage
 
-SET DIR=%~d0%~p0%
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\settings\UppercuT.config"
 
-%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:.\build\default.build -D:build.config.settings=%build.config.settings% %*
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:%BUILD_DIR%build\default.build -D:build.config.settings=%build.config.settings% %*
 
 if %ERRORLEVEL% NEQ 0 goto errors
 

data/lib/build/UppercuT.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <uppercut>
-  <version>1.4.0.0</version>
+  <version>1.4.1.0</version>
 </uppercut>

data/lib/build/analyze.step

@@ -6,11 +6,11 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="analyze" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
   <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}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
@@ -33,12 +33,12 @@
           description="Analyzing project for quality indicators." />
 
   <target name="run_analyzers">
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}test.step" inheritall="true" />
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}ncover.step" inheritall="true" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}ndepend.step" inheritall="true" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}nitriq.step" inheritall="true" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}metrics.step" inheritall="true" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}moma.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}test.step" inheritall="true" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}ncover.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}ndepend.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}nitriq.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}metrics.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}moma.step" inheritall="true" failonerror="false" />
   </target>
 
 </project>

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

@@ -7,13 +7,13 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="gallio.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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.build_artifacts" value="build_artifacts" overwrite="false" />

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

@@ -7,13 +7,13 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="mbunit2.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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.build_artifacts" value="build_artifacts" overwrite="false" />

data/lib/build/analyzers/metrics.step

@@ -6,13 +6,13 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="metrics" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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.build_artifacts" value="build_artifacts" overwrite="false" />
@@ -20,7 +20,7 @@
   <property name="folder.program_files" value="${environment::get-folder-path('ProgramFiles')}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" 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="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="dirs.metrics_results" value="${path::get-full-path(dirs.build_artifacts)}${path.separator}metrics" />
   <property name="app.metrics" value="${path::get-full-path(folder.program_files)}${path.separator}Microsoft Visual Studio 10.0${path.separator}Team Tools${path.separator}Static Analysis Tools${path.separator}FxCop${path.separator}Metrics.exe" overwrite="false" />
   <property name="file.metrics_results" value="${project.name}.Metrics.xml" />

data/lib/build/analyzers/moma.step

@@ -7,20 +7,20 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="moma" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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.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="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" 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="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="dirs.moma_results" value="${path::get-full-path(dirs.build_artifacts)}${path.separator}monoMigrationAnalyzer" />
   <property name="app.moma" value="${path::get-full-path(dirs.lib)}${path.separator}MoMA${path.separator}MoMA.exe" overwrite="false" />
   <property name="file.moma_results" value="${project.name}.MoMAReport.html" />

data/lib/build/analyzers/ncover.step

@@ -7,13 +7,13 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="ncover" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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.build_artifacts" value="build_artifacts" overwrite="false" />
@@ -24,7 +24,7 @@
   <property name="number.satisfactory_coverage" value="85" overwrite="false" />
   <property name="fail.if_ncover_fails" value="false" 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="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="dirs.ncover_results" value="${path::get-full-path(dirs.build_artifacts)}${path.separator}ncover" />
   <property name="app.ncover.tester" value="${path::get-full-path(dirs.lib)}${path.separator}MbUnit2${path.separator}MbUnit.Cons.exe" overwrite="false" />
   <property name="app.ncover" value="${path::get-full-path(dirs.lib)}${path.separator}NCover${path.separator}NCover.Console.exe" overwrite="false" />

data/lib/build/analyzers/ndepend.step

@@ -7,20 +7,20 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="ndepend" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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.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="app.ndepend" value="C:${path.separator}Program Files${path.separator}NDepend${path.separator}NDepend.Console.exe" overwrite="false" />
   <property name="dirs.ndepend_results" value="${dirs.build_artifacts}${path.separator}ndepend" />
-  <property name="files.ndepend_config" value="${path::get-full-path(dirs.current)}${path.separator}${path.to.toplevel}${path.separator}NDepend.xml" />
+  <property name="files.ndepend_config" value="${path::get-full-path(dirs.current)}${path.separator}NDepend.xml" />
 
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />

data/lib/build/analyzers/nitriq.step

@@ -7,14 +7,14 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="nitriq" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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.build_artifacts" value="build_artifacts" overwrite="false" />
@@ -22,8 +22,8 @@
   
   <property name="app.nitriq" value="C:${path.separator}Program Files (x86)${path.separator}NimblePros${path.separator}Nitriq Console + Pro${path.separator}Nitriq.Console.exe" overwrite="false" />
   <property name="dirs.nitriq_results" value="${dirs.build_artifacts}${path.separator}nitriq" />
-  <property name="files.nitriq_project" value="${path::get-full-path(dirs.current)}${path.separator}${path.to.toplevel}${path.separator}nitriq.nitriqProj" />
-  <property name="files.nitriq_queries" value="${path::get-full-path(dirs.current)}${path.separator}${path.to.toplevel}${path.separator}nitriq.nq" />
+  <property name="files.nitriq_project" value="${path::get-full-path(dirs.current)}${path.separator}nitriq.nitriqProj" />
+  <property name="files.nitriq_queries" value="${path::get-full-path(dirs.current)}${path.separator}nitriq.nq" />
   <property name="file.html.nitriq_results" value="${dirs.nitriq_results}${path.separator}${project.name}.nitriq-results.html" />
   
   <property name="is.replaced" value="false" />

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

@@ -7,17 +7,17 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="nunit.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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="dirs.lib" value="${dirs.current.file}${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}" />

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

@@ -7,17 +7,17 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="storevil.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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="dirs.lib" value="${dirs.current}${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}" />

data/lib/build/analyzers/test.step

@@ -6,13 +6,13 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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="test.framework" value="mbunit" overwrite="false" />
@@ -24,7 +24,7 @@
     <target name="go" depends="load_uppercut_assemblies, run_tasks" />
   
   <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
-  <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts}${path.separator}${file.uppercut.assembly}" />
+  <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}..${path.separator}${file.uppercut.assembly}" />
   <target name="load_uppercut_assemblies">
     <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
   </target>
@@ -46,26 +46,26 @@
           description="Testing project for quality." />
 
   <target name="run_tests">
-    <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'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}mbunit2.test.step" inheritall="true" if="${test.framework=='mbunit2'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}gallio.test.step" inheritall="true" if="${test.framework=='gallio'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}nunit.test.step" inheritall="true" if="${test.framework=='nunit'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}xunit.test.step" inheritall="true" if="${test.framework=='xunit'}" />
     <call target="set_normal_failure_mode" />
   </target>
 
   <target name="all">
-    <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'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}mbunit2.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='mbunit2'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}gallio.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='gallio'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}nunit.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='nunit'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}xunit.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='xunit'}" />
     <call target="set_normal_failure_mode" />
   </target>
 
   <target name="open_results">
-    <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'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}mbunit2.test.step" target="open_results" inheritall="true" if="${test.framework=='mbunit2'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}gallio.test.step" target="open_results" inheritall="true" if="${test.framework=='gallio'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}nunit.test.step" target="open_results" inheritall="true" if="${test.framework=='nunit'}" />
+    <nant buildfile="${dirs.current.file}${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

@@ -7,17 +7,17 @@
   <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="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${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="dirs.build" value="${dirs.current}${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="dirs.lib" value="${dirs.current}${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}" />

data/lib/build/compile.step

@@ -6,22 +6,22 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="compile" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
-  <property name="folder.build_scripts" value="build" overwrite="false" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
+  <property name="W" 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}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <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="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="dirs.build.windows.mono" value="${string::replace(dirs.build,'\','/')}" />
   <property name="folder.documentation" value="docs" overwrite="false" />
-  <property name="dirs.docs" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.documentation}" />
+  <property name="dirs.docs" value="${dirs.current}${path.separator}${folder.documentation}" />
   <property name="folder.database" value="__DATABASE_FOLDER_NAME__" overwrite="false" />
-  <property name="dirs.db" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.database}" />
+  <property name="dirs.db" value="${dirs.current}${path.separator}${folder.database}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" 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="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" 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.build_results" value="${dirs.build_artifacts}${path.separator}compile" overwrite="false" />
@@ -33,9 +33,9 @@
   <property name="msbuild.override_output_path" value="true" overwrite="false" />
   <property name="msbuild.outputpath" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="msbuild.outputpath.windows.mono" value="${string::replace(msbuild.outputpath,'\','/')}" />
-  <property name="solution.path" value="${directory::get-parent-directory(dirs.current)}${path.separator}${path_to_solution}${path.separator}${project.name}.sln" />
-  <property name="solution.path.windows.mono" value="${string::replace(directory::get-parent-directory(dirs.current),'\','/')}/${string::replace(path_to_solution,'\','/')}/${project.name}.sln" />
-  <property name="solution.path" value="${directory::get-parent-directory(dirs.current)}${path.separator}${path_to_solution}${path.separator}${project.name}.vbp" if="${microsoft.framework =='vb6'}" />
+  <property name="solution.path" value="${dirs.current}${path.separator}${path_to_solution}${path.separator}${project.name}.sln" />
+  <property name="solution.path.windows.mono" value="${string::replace(dirs.current,'\','/')}/${string::replace(path_to_solution,'\','/')}/${project.name}.sln" />
+  <property name="solution.path" value="${dirs.current}${path.separator}${path_to_solution}${path.separator}${project.name}.vbp" if="${microsoft.framework =='vb6'}" />
   <property name="nant.settings.currentframework" value="mono-2.0" if="${platform::is-unix()}" />
   <property name="nant.settings.currentframework" value="net-3.5" if="${microsoft.framework !='vb6' and platform::is-windows()}" />
   <property name="app.xbuild" value="C:\Program Files (x86)\Mono-2.8\bin\xbuild.bat" overwrite="false" if="${platform::is-windows() and file::exists('C:\Program Files (x86)\Mono-2.8\bin\xbuild.bat')}" />
@@ -43,9 +43,6 @@
   <property name="app.xbuild" value="xbuild" overwrite="false" if="${platform::is-unix()}" />
   <property name="framework.multitargeting" value="false" />
   <property name="framework.multitargeting.delimiter" value="," />
-  <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" />
   <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
@@ -54,7 +51,7 @@
   <target name="go" depends="load_uppercut_assemblies, run_tasks" />
   
   <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
-    <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts}${path.separator}${file.uppercut.assembly}" />
+    <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}${file.uppercut.assembly}" />
   <target name="load_uppercut_assemblies">
     <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
   </target>

data/lib/build/customize.build

@@ -6,10 +6,10 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="customize" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="customize.step.name" value="__REPLACE__" overwrite="false" />
   <property name="customize.step.type" value="__REPLACE__" overwrite="false" />
   <property name="customize.step.type.lowered" value="${string::to-lower(customize.step.type)}" />
@@ -67,10 +67,6 @@
       file="${dirs.build_scripts_custom}${path.separator}${file.customized}"
       xpath="/project/@name"
       value="CUSTOM ${string::to-upper(customize.step.type)} ${string::to-upper(path::get-file-name-without-extension(customize.step.name))}" />
-    <xmlpoke
-      file="${dirs.build_scripts_custom}${path.separator}${file.customized}"
-      xpath="/project/property[@name = 'path.to.toplevel']/@value"
-      value="..${path.separator}.." if="${path.to.custom_file !=''}" />
   </target>
 
   <target name="report_finish_time">