Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix .NET 1.1 build - call out to different NUnit console executables for .NET 1.1 vs 2.0

Browse Source
This commit is contained in:
markpollack
2009-07-28 15:37:16 +00:00
parent c3ffd8bf72
commit cfc189ab43
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common-project.include
View File

@@ -102,7 +102,6 @@ ${current.build.defines}
<target name="common.compile-dll" description="compiles sources">
<property name="compile.bin.dir" value="${current.bin.dir}" if="${not property::exists('compile.bin.dir')}" />
<echo message="copying libs from ${lib.dir} to ${compile.bin.dir}" />
<property name="compile.lib.dir.tmp" value="${lib.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" />
@@ -136,8 +135,7 @@ ${current.build.defines}
</copy>
<csc target="library"
verbose="true"
warnaserror="false"
verbose="true" warnaserror="false"
output="${compile.bin.dir}/${project::get-name()}.dll"
debug="${current.build.debug}"
optimize="${current.build.optimize}"
@@ -230,10 +228,12 @@ ${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}" />
<exec program="${tool.dir}\nunit\net-2.0\nunit-console-x86.exe" workingdir="${test.bin.dir}" verbose="false">
<exec program="${tool.dir}\nunit\${nant.settings.currentframework}\${nunit.console.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}" />