From b49745e19ba7dd4130569fdaa92d47b1afbcf76e Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Tue, 28 Jul 2009 16:20:23 +0000
Subject: [PATCH] undo call out to different NUnit console executables for .NET
 1.1 vs 2.0 - was already correct using just nunit-console-x86.exe with
 command line args for framework version.  oops.

---
 common-project.include | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/common-project.include b/common-project.include
index 338d6785..80667dc4 100644
--- a/common-project.include
+++ b/common-project.include
@@ -228,12 +228,9 @@ ${tool.dir}       : dir for tools
 
     <property name="test.assemblyname" value="${project::get-name()}" overwrite="false" />
     <property name="test.bin.dir" value="${current.bin.dir}" if="${not property::exists('test.bin.dir')}" />
-    <property name="nunit.console.exe" value="nunit-console.exe" if="${nant.settings.currentframework!='net-2.0'}"/>
-    <!-- to support use on x64 boxes -->
-    <property name="nunit.console.exe" value="nunit-console-x86.exe" if="${nant.settings.currentframework=='net-2.0'}"/>
-    <echo message="Unit Testing ${project.name} in ${test.bin.dir}" />
+    <echo message="Unit Testing ${project.name}, ${test.assemblyname} in ${test.bin.dir}" />
 
-    <exec program="${tool.dir}\nunit\${nant.settings.currentframework}\${nunit.console.exe}" workingdir="${test.bin.dir}" verbose="false">
+    <exec program="${tool.dir}\nunit\net-2.0\nunit-console-x86.exe" workingdir="${test.bin.dir}" verbose="false">
       <arg path="${test.bin.dir}/${test.assemblyname}.dll" />
       <arg value="/xml:${test.assemblyname}.dll-TestResults.xml" />
       <arg value="/framework:${nant.settings.currentframework}" />