Menu
▾
▴
[nant-commits] [PATCH 08/10] Reverting superficial changes to the *.build files to keep pull request clean. As requested by @skolima.
|
From: <nan...@na...> - 2015-02-03 01:30:18
|
From: Ryan Boggs <rm...@gm...>
---
NAnt.build | 47 ++++++++++----------
src/NAnt.DotNet/NAnt.DotNet.build | 11 ++---
.../NDoc.Documenter.NAnt.build | 7 +--
tests/NAnt.Compression/NAnt.Compression.build | 11 ++---
tests/NAnt.Console/NAnt.Console.build | 9 ++--
tests/NAnt.Core/NAnt.Core.build | 9 ++--
tests/NAnt.DotNet/NAnt.DotNet.build | 11 ++---
tests/NAnt.MSNet/NAnt.MSNet.build | 9 ++--
tests/NAnt.SourceControl/NAnt.SourceControl.build | 9 ++--
tests/NAnt.VSNet/NAnt.VSNet.build | 11 ++---
tests/NAnt.VisualCpp/NAnt.VisualCpp.build | 11 ++---
tests/NAnt.Win32/NAnt.Win32.build | 11 ++---
12 files changed, 72 insertions(+), 84 deletions(-)
diff --git a/NAnt.build b/NAnt.build
index 68cc47d..599137f 100644
--- a/NAnt.build
+++ b/NAnt.build
@@ -88,7 +88,6 @@
<target name="init" description="Initializes build properties">
<call target="${project.config}" />
<call target="set-framework-configuration" />
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}"/>
</target>
<target name="create-common-assemblyinfo" if="${create.assemblyinfo}">
<!-- ensure src/CommonAssemblyInfo.cs is writable if it already exists -->
@@ -129,16 +128,16 @@
<target name="build.common" depends="init, create-common-assemblyinfo">
<echo message="Build Directory is ${build.dir}" />
<!-- ensure bin directory exists -->
- <mkdir dir="${build.dir.bin}" />
+ <mkdir dir="${build.dir}/bin" />
<!-- ensure lib directory exists -->
- <mkdir dir="${build.dir.bin}/lib" />
+ <mkdir dir="${build.dir}/bin/lib" />
<!-- copy third party executables -->
- <copy todir="${build.dir.bin}">
+ <copy todir="${build.dir}/bin">
<fileset basedir="bin">
<include name="scvs.exe" />
</fileset>
</copy>
- <copy todir="${build.dir.bin}">
+ <copy todir="${build.dir}/bin">
<fileset basedir="lib/common/neutral">
<!-- copy log4net assembly, workaround for Mono bug #57602 -->
<include name="log4net.dll" />
@@ -147,7 +146,7 @@
</fileset>
</copy>
<!-- copy third party assemblies -->
- <copy todir="${build.dir.bin}/lib">
+ <copy todir="${build.dir}/bin/lib">
<fileset basedir="lib">
<include name="**/*" />
<exclude name="common/neutral/log4net.dll" />
@@ -207,7 +206,7 @@
<!-- test the newly built NAnt -->
<target name="test" depends="build" description="Tests current configuration">
<echo message="Running unit tests with just built version of NAnt." />
- <exec program="${build.dir.bin}/${nant.console.name}.exe" managed="true">
+ <exec program="${build.dir}/bin/${nant.console.name}.exe" managed="true">
<arg value="-buildfile:NAnt.build" />
<arg value="-D:project.version=${project.version}" />
<arg value="-D:project.release.type=${project.release.type}" />
@@ -217,7 +216,7 @@
</exec>
</target>
<target name="test-core" depends="build">
- <exec program="${build.dir.bin}/${nant.console.name}.exe" managed="true">
+ <exec program="${build.dir}/bin/${nant.console.name}.exe" managed="true">
<arg value="-buildfile:NAnt.build" />
<arg value="-D:project.version=${project.version}" />
<arg value="-D:project.release.type=${project.release.type}" />
@@ -227,7 +226,7 @@
</exec>
</target>
<target name="test-dotnet" depends="build">
- <exec program="${build.dir.bin}/${nant.console.name}.exe" managed="true">
+ <exec program="${build.dir}/bin/${nant.console.name}.exe" managed="true">
<arg value="-buildfile:NAnt.build" />
<arg value="-D:project.version=${project.version}" />
<arg value="-D:project.release.type=${project.release.type}" />
@@ -237,7 +236,7 @@
</exec>
</target>
<target name="test-sourcecontrol" depends="build">
- <exec program="${build.dir.bin}/${nant.console.name}.exe" managed="true">
+ <exec program="${build.dir}/bin/${nant.console.name}.exe" managed="true">
<arg value="-buildfile:NAnt.build" />
<arg value="-D:project.version=${project.version}" />
<arg value="-D:project.release.type=${project.release.type}" />
@@ -247,7 +246,7 @@
</exec>
</target>
<target name="test-visualcpp" depends="build">
- <exec program="${build.dir.bin}/${nant.console.name}.exe" managed="true">
+ <exec program="${build.dir}/bin/${nant.console.name}.exe" managed="true">
<arg value="-buildfile:NAnt.build" />
<arg value="-D:project.version=${project.version}" />
<arg value="-D:project.release.type=${project.release.type}" />
@@ -257,7 +256,7 @@
</exec>
</target>
<target name="test-compression" depends="build">
- <exec program="${build.dir.bin}/${nant.console.name}.exe" managed="true">
+ <exec program="${build.dir}/bin/${nant.console.name}.exe" managed="true">
<arg value="-buildfile:NAnt.build" />
<arg value="-D:project.version=${project.version}" />
<arg value="-D:project.release.type=${project.release.type}" />
@@ -338,8 +337,8 @@
<!-- generate user documentation -->
<target name="userdoc" depends="build" description="Builds user documentation">
- <echo message="Creating task and type documentation from ${build.dir.bin}" />
- <exec program="${build.dir.bin}/${nant.console.name}.exe" managed="true">
+ <echo message="Creating task and type documentation from ${build.dir}/bin" />
+ <exec program="${build.dir}/bin/${nant.console.name}.exe" managed="true">
<arg value="-indent:1" />
<arg value="-buildfile:NAnt.build" />
<arg value="-D:project.version=${project.version}" />
@@ -355,7 +354,7 @@
<targetfiles>
<include name="${build.dir}/doc/help/*.html" />
</targetfiles>
- <sourcefiles basedir="${build.dir.bin}">
+ <sourcefiles basedir="${build.dir}/bin">
<!-- make sure the tasks/types are not new -->
<include name="NAnt.Core.dll" />
<include name="*Tasks.dll" />
@@ -366,7 +365,7 @@
</uptodate>
<if test="${not(help.uptodate)}">
<ndoc>
- <assemblies basedir="${build.dir.bin}">
+ <assemblies basedir="${build.dir}/bin">
<include name="NAnt.Core.dll" />
<include name="*Tasks.dll" />
<include name="NAnt.NUnit.dll" />
@@ -407,8 +406,8 @@
<echo message="User documentation: file://${build.dir}/doc/index.html" />
</target>
<target name="sdkdoc" depends="build" description="Builds SDK documentation">
- <echo message="Creating SDK Documentation for ${build.dir.bin}/${nant.console.name}.exe" />
- <exec program="${build.dir.bin}/${nant.console.name}.exe" managed="true">
+ <echo message="Creating SDK Documentation for ${build.dir}/bin/${nant.console.name}.exe" />
+ <exec program="${build.dir}/bin/${nant.console.name}.exe" managed="true">
<arg value="-indent:1" />
<arg value="-buildfile:NAnt.build" />
<arg value="-D:project.version=${project.version}" />
@@ -424,7 +423,7 @@
<targetfiles>
<include name="${build.dir}/doc/sdk/*.chm" />
</targetfiles>
- <sourcefiles basedir="${build.dir.bin}">
+ <sourcefiles basedir="${build.dir}/bin">
<include name="NAnt.Core.dll" />
<include name="*Tasks.dll" />
<include name="NAnt.NUnit.dll" />
@@ -434,7 +433,7 @@
</uptodate>
<if test="${not(sdk.uptodate)}">
<ndoc>
- <assemblies basedir="${build.dir.bin}">
+ <assemblies basedir="${build.dir}/bin">
<include name="NAnt.Core.dll" />
<include name="NAnt.*Tasks.dll" />
<include name="NAnt.NUnit.dll" />
@@ -500,7 +499,7 @@
</target>
<target name="schema" depends="build">
- <exec program="${build.dir.bin}/${nant.console.name}.exe" managed="true">
+ <exec program="${build.dir}/bin/${nant.console.name}.exe" managed="true">
<arg value="-buildfile:NAnt.build" />
<arg value="-D:project.version=${project.version}" />
<arg value="-D:project.release.type=${project.release.type}" />
@@ -557,10 +556,10 @@
<target name="package-common" depends="test, userdoc, sdkdoc, schema">
<!-- move config file -->
- <move file="${build.dir.bin}/NAnt.exe.config" tofile="${build.dir.bin}/${nant.console.name}.exe.config" />
+ <move file="${build.dir}/bin/NAnt.exe.config" tofile="${build.dir}/bin/${nant.console.name}.exe.config" />
<!-- remove non-release files -->
<delete>
- <fileset basedir="${build.dir.bin}">
+ <fileset basedir="${build.dir}/bin">
<include name="NAnt.Console.*" />
<!-- remove test assemblies -->
<include name="*.Tests.*" />
@@ -757,7 +756,7 @@
</fileset>
</delete>
<copy todir="bin" overwrite="true">
- <fileset basedir="${build.dir.bin}/">
+ <fileset basedir="${build.dir}/bin/">
<include name="NAnt*" />
<exclude name="*Test*" />
<exclude name="${nant.console.name}.xml" />
diff --git a/src/NAnt.DotNet/NAnt.DotNet.build b/src/NAnt.DotNet/NAnt.DotNet.build
index 5d03069..7c6bea9 100644
--- a/src/NAnt.DotNet/NAnt.DotNet.build
+++ b/src/NAnt.DotNet/NAnt.DotNet.build
@@ -8,9 +8,8 @@
* current.build.defines - framework-specific build defines
-->
<target name="build">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
<!-- build main assembly -->
- <csc target="library" define="${current.build.defines}" warnaserror="${build.warnaserror}" debug="${build.debug}" output="${build.dir.bin}/${project::get-name()}Tasks.dll" doc="${build.dir.bin}/${project::get-name()}Tasks.xml">
+ <csc target="library" define="${current.build.defines}" warnaserror="${build.warnaserror}" debug="${build.debug}" output="${build.dir}/bin/${project::get-name()}Tasks.dll" doc="${build.dir}/bin/${project::get-name()}Tasks.xml">
<nowarn>
<!-- do not report deprecation warnings -->
<warning number="0612" />
@@ -21,10 +20,10 @@
<!-- common assembly-level attributes -->
<include name="../CommonAssemblyInfo.cs" />
</sources>
- <references basedir="${build.dir.bin}">
- <include name="NAnt.Core.dll" />
- <include name="${nant::scan-probing-paths(build.dir.bin,'NDoc.ExtendedUI.dll')}" />
- <include name="${nant::scan-probing-paths(build.dir.bin,'NDoc.Core.dll')}" />
+ <references>
+ <include name="${build.dir}/bin/NAnt.Core.dll" />
+ <include name="${nant::scan-probing-paths(build.dir + '/bin','NDoc.ExtendedUI.dll')}" />
+ <include name="${nant::scan-probing-paths(build.dir + '/bin','NDoc.Core.dll')}" />
</references>
<resources prefix="NAnt.DotNet" dynamicprefix="true">
<include name="Resources/**/*" />
diff --git a/src/NDoc.Documenter.NAnt/NDoc.Documenter.NAnt.build b/src/NDoc.Documenter.NAnt/NDoc.Documenter.NAnt.build
index b15f6d9..2de6374 100644
--- a/src/NDoc.Documenter.NAnt/NDoc.Documenter.NAnt.build
+++ b/src/NDoc.Documenter.NAnt/NDoc.Documenter.NAnt.build
@@ -8,7 +8,6 @@
* current.build.defines - framework-specific build defines
-->
<target name="build">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
<!-- build main assembly -->
<csc target="library" define="${current.build.defines}" warnaserror="${build.warnaserror}" debug="${build.debug}" output="${build.dir}/bin/${project::get-name()}.dll" doc="${build.dir}/bin/${project::get-name()}.xml">
<nowarn>
@@ -23,10 +22,10 @@
<include name="*.cs" />
<include name="../CommonAssemblyInfo.cs" />
</sources>
- <references basedir="${build.dir.bin}" failonempty="true">
+ <references basedir="${build.dir}/bin" failonempty="true">
<include name="NAnt.Core.dll" />
- <include name="${nant::scan-probing-paths(build.dir.bin,'NDoc.ExtendedUI.dll')}" />
- <include name="${nant::scan-probing-paths(build.dir.bin,'NDoc.Core.dll')}" />
+ <include name="${nant::scan-probing-paths('NDoc.ExtendedUI.dll')}" />
+ <include name="${nant::scan-probing-paths('NDoc.Core.dll')}" />
<include name="System.Web.dll" />
</references>
<resources basedir="Resources" prefix="Documenter.xslt.">
diff --git a/tests/NAnt.Compression/NAnt.Compression.build b/tests/NAnt.Compression/NAnt.Compression.build
index e0dae2c..ec104e8 100644
--- a/tests/NAnt.Compression/NAnt.Compression.build
+++ b/tests/NAnt.Compression/NAnt.Compression.build
@@ -6,8 +6,7 @@
* build.debug - (true|false) debug build?
* current.build.defines - framework-specific build defines
-->
- <target name="build">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
+ <target name="build">
<!-- build test assembly -->
<csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/${project::get-name()}.Tests.dll">
<nowarn>
@@ -19,10 +18,10 @@
<!-- common assembly-level attributes -->
<include name="../../src/CommonAssemblyInfo.cs" />
</sources>
- <references basedir="${build.dir.bin}">
- <include name="NAnt.Core.dll" />
- <include name="NAnt.Core.Tests.dll" />
- <include name="${nant::scan-probing-paths(build.dir.bin, 'nunit.framework.dll')}" />
+ <references>
+ <include name="${build.dir}/bin/NAnt.Core.dll" />
+ <include name="${build.dir}/bin/NAnt.Core.Tests.dll" />
+ <include name="${nant::scan-probing-paths('nunit.framework.dll')}" />
</references>
</csc>
</target>
diff --git a/tests/NAnt.Console/NAnt.Console.build b/tests/NAnt.Console/NAnt.Console.build
index ad0c943..4e2e27b 100644
--- a/tests/NAnt.Console/NAnt.Console.build
+++ b/tests/NAnt.Console/NAnt.Console.build
@@ -8,7 +8,6 @@
* nant.console.name - assembly name for NAnt Console
-->
<target name="build">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
<!-- build test assembly -->
<csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/${nant.console.name}.Tests.dll">
<nowarn>
@@ -20,10 +19,10 @@
<!-- common assembly-level attributes -->
<include name="../../src/CommonAssemblyInfo.cs" />
</sources>
- <references basedir="${build.dir.bin}">
- <include name="NAnt.Core.dll" />
- <include name="NAnt.Core.Tests.dll" />
- <include name="${nant::scan-probing-paths(build.dir.bin, 'nunit.framework.dll')}" />
+ <references>
+ <include name="${build.dir}/bin/NAnt.Core.dll" />
+ <include name="${build.dir}/bin/NAnt.Core.Tests.dll" />
+ <include name="${nant::scan-probing-paths('nunit.framework.dll')}" />
</references>
</csc>
</target>
diff --git a/tests/NAnt.Core/NAnt.Core.build b/tests/NAnt.Core/NAnt.Core.build
index 6c9805d..b93116c 100644
--- a/tests/NAnt.Core/NAnt.Core.build
+++ b/tests/NAnt.Core/NAnt.Core.build
@@ -7,7 +7,6 @@
* current.build.defines - framework-specific build defines
-->
<target name="build">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
<!-- build test assembly -->
<csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/${project::get-name()}.Tests.dll">
<nowarn>
@@ -21,10 +20,10 @@
<!-- common assembly-level attributes -->
<include name="../../src/CommonAssemblyInfo.cs" />
</sources>
- <references basedir="${build.dir.bin}">
- <include name="NAnt.Core.dll" />
- <include name="${nant::scan-probing-paths(build.dir.bin, 'nunit.framework.dll')}" />
- <include name="${nant::scan-probing-paths(build.dir.bin, 'netDumbster.dll')}" />
+ <references>
+ <include name="${build.dir}/bin/NAnt.Core.dll" />
+ <include name="${nant::scan-probing-paths('nunit.framework.dll')}" />
+ <include name="${nant::scan-probing-paths('netDumbster.dll')}" />
</references>
<resources failonempty="true" basedir="Resources" dynamicprefix="true" prefix="XML:">
<include name="**/*.xml"/>
diff --git a/tests/NAnt.DotNet/NAnt.DotNet.build b/tests/NAnt.DotNet/NAnt.DotNet.build
index aa09b3f..5389240 100644
--- a/tests/NAnt.DotNet/NAnt.DotNet.build
+++ b/tests/NAnt.DotNet/NAnt.DotNet.build
@@ -7,7 +7,6 @@
* current.build.defines - framework-specific build defines
-->
<target name="build">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
<!-- build test assembly -->
<property name="vjc.location" value="${path::combine(framework::get-sdk-directory(framework::get-target-framework()), 'vjc.exe')}" />
<property name="jsc.location" value="${path::combine(framework::get-sdk-directory(framework::get-target-framework()), 'jsc.exe')}" />
@@ -26,11 +25,11 @@
<exclude name="Tasks/VjcTaskTest.cs" unless="${file::exists(vjc.location)}" />
<exclude name="Tasks/JscTaskTest.cs" unless="${file::exists(jsc.location)}" />
</sources>
- <references basedir="${build.dir.bin}">
- <include name="NAnt.Core.dll"/>
- <include name="NAnt.Core.Tests.dll"/>
- <include name="${project::get-name()}Tasks.dll"/>
- <include name="${nant::scan-probing-paths(build.dir.bin, 'nunit.framework.dll')}" />
+ <references>
+ <include name="${build.dir}/bin/NAnt.Core.dll"/>
+ <include name="${build.dir}/bin/NAnt.Core.Tests.dll"/>
+ <include name="${build.dir}/bin/${project::get-name()}Tasks.dll"/>
+ <include name="${nant::scan-probing-paths('nunit.framework.dll')}" />
</references>
</csc>
</target>
diff --git a/tests/NAnt.MSNet/NAnt.MSNet.build b/tests/NAnt.MSNet/NAnt.MSNet.build
index 2ae3420..9baf7ac 100644
--- a/tests/NAnt.MSNet/NAnt.MSNet.build
+++ b/tests/NAnt.MSNet/NAnt.MSNet.build
@@ -7,7 +7,6 @@
* current.build.defines - framework-specific build defines
-->
<target name="build" if="${framework::get-family(framework::get-target-framework()) == 'net'}">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
<!-- build test assembly -->
<csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/${project::get-name()}.Tests.dll">
<nowarn>
@@ -19,10 +18,10 @@
<!-- common assembly-level attributes -->
<include name="../../src/CommonAssemblyInfo.cs" />
</sources>
- <references basedir="${build.dir.bin}">
- <include name="NAnt.Core.dll" />
- <include name="NAnt.Core.Tests.dll" />
- <include name="${nant::scan-probing-paths(build.dir.bin, 'nunit.framework.dll')}" />
+ <references>
+ <include name="${build.dir}/bin/NAnt.Core.dll" />
+ <include name="${build.dir}/bin/NAnt.Core.Tests.dll" />
+ <include name="${nant::scan-probing-paths('nunit.framework.dll')}" />
</references>
</csc>
</target>
diff --git a/tests/NAnt.SourceControl/NAnt.SourceControl.build b/tests/NAnt.SourceControl/NAnt.SourceControl.build
index cf66209..cc8d2e9 100644
--- a/tests/NAnt.SourceControl/NAnt.SourceControl.build
+++ b/tests/NAnt.SourceControl/NAnt.SourceControl.build
@@ -7,7 +7,6 @@
* current.build.defines - framework-specific build defines
-->
<target name="build">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
<!-- build test assembly -->
<csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/${project::get-name()}.Tests.dll">
<nowarn>
@@ -19,10 +18,10 @@
<!-- common assembly-level attributes -->
<include name="../../src/CommonAssemblyInfo.cs" />
</sources>
- <references basedir="${build.dir.bin}">
- <include name="NAnt.Core.dll" />
- <include name="NAnt.Core.Tests.dll" />
- <include name="${nant::scan-probing-paths(build.dir.bin, 'nunit.framework.dll')}" />
+ <references>
+ <include name="${build.dir}/bin/NAnt.Core.dll" />
+ <include name="${build.dir}/bin/NAnt.Core.Tests.dll" />
+ <include name="${nant::scan-probing-paths('nunit.framework.dll')}" />
</references>
</csc>
</target>
diff --git a/tests/NAnt.VSNet/NAnt.VSNet.build b/tests/NAnt.VSNet/NAnt.VSNet.build
index bc02166..7a84c7c 100644
--- a/tests/NAnt.VSNet/NAnt.VSNet.build
+++ b/tests/NAnt.VSNet/NAnt.VSNet.build
@@ -7,7 +7,6 @@
* current.build.defines - framework-specific build defines
-->
<target name="build">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
<!-- build test assembly -->
<csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/${project::get-name()}.Tests.dll">
<nowarn>
@@ -19,11 +18,11 @@
<!-- common assembly-level attributes -->
<include name="../../src/CommonAssemblyInfo.cs" />
</sources>
- <references basedir="${build.dir.bin}">
- <include name="NAnt.Core.dll" />
- <include name="NAnt.Core.Tests.dll" />
- <include name="NAnt.VisualCpp.Tests.dll" />
- <include name="${nant::scan-probing-paths(build.dir.bin, 'nunit.framework.dll')}" />
+ <references>
+ <include name="${build.dir}/bin/NAnt.Core.dll" />
+ <include name="${build.dir}/bin/NAnt.Core.Tests.dll" />
+ <include name="${build.dir}/bin/NAnt.VisualCpp.Tests.dll" />
+ <include name="${nant::scan-probing-paths('nunit.framework.dll')}" />
</references>
</csc>
</target>
diff --git a/tests/NAnt.VisualCpp/NAnt.VisualCpp.build b/tests/NAnt.VisualCpp/NAnt.VisualCpp.build
index baedd0f..8d78a8d 100644
--- a/tests/NAnt.VisualCpp/NAnt.VisualCpp.build
+++ b/tests/NAnt.VisualCpp/NAnt.VisualCpp.build
@@ -7,7 +7,6 @@
* current.build.defines - framework-specific build defines
-->
<target name="build">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
<!-- build test assembly -->
<csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/${project::get-name()}.Tests.dll">
<nowarn>
@@ -19,11 +18,11 @@
<!-- common assembly-level attributes -->
<include name="../../src/CommonAssemblyInfo.cs" />
</sources>
- <references basedir="${build.dir.bin}">
- <include name="NAnt.Core.dll" />
- <include name="NAnt.Core.Tests.dll" />
- <include name="NAnt.VisualCppTasks.dll" />
- <include name="${nant::scan-probing-paths(build.dir.bin, 'nunit.framework.dll')}" />
+ <references>
+ <include name="${build.dir}/bin/NAnt.Core.dll" />
+ <include name="${build.dir}/bin/NAnt.Core.Tests.dll" />
+ <include name="${build.dir}/bin/NAnt.VisualCppTasks.dll" />
+ <include name="${nant::scan-probing-paths('nunit.framework.dll')}" />
</references>
</csc>
</target>
diff --git a/tests/NAnt.Win32/NAnt.Win32.build b/tests/NAnt.Win32/NAnt.Win32.build
index a4965cd..48099a7 100644
--- a/tests/NAnt.Win32/NAnt.Win32.build
+++ b/tests/NAnt.Win32/NAnt.Win32.build
@@ -6,8 +6,7 @@
* build.debug - (true|false) debug build?
* current.build.defines - framework-specific build defines
-->
- <target name="build">
- <property name="build.dir.bin" value="${path::combine(build.dir, 'bin')}" unless="${property::exists('build.dir.bin')}"/>
+ <target name="build">
<!-- build test assembly -->
<csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/${project::get-name()}.Tests.dll">
<nowarn>
@@ -19,10 +18,10 @@
<!-- common assembly-level attributes -->
<include name="../../src/CommonAssemblyInfo.cs" />
</sources>
- <references basedir="${build.dir.bin}">
- <include name="NAnt.Core.dll" />
- <include name="NAnt.Core.Tests.dll" />
- <include name="${nant::scan-probing-paths(build.dir.bin, 'nunit.framework.dll')}" />
+ <references>
+ <include name="${build.dir}/bin/NAnt.Core.dll" />
+ <include name="${build.dir}/bin/NAnt.Core.Tests.dll" />
+ <include name="${nant::scan-probing-paths('nunit.framework.dll')}" />
</references>
</csc>
</target>
--
1.7.7
|