NH-3900 - Update NAnt build configuration to use NUnit 3 console runner.

Author: ngbrown

build-common/common-project.xml

@@ -118,22 +118,14 @@
 		description="Run NUnit tests">
 		<call target="common.find-nunit" unless="${property::exists('nunit.found')}" />
 		<property name="common.run-tests.failonerror" value="${not property::exists(test.file + '.IgnoreFail')}"/>
+		<property name="common.run-tests.x86" value="--x86" unless="${property::exists('nunit-x64')}" />
+		<property name="common.run-tests.x86" value="" if="${property::exists('nunit-x64')}" />
+		<property name="common.run-tests.teamcity" value="--teamcity" if="${property::exists('config.teamcity')}" />
+		<property name="common.run-tests.teamcity" value="" unless="${property::exists('common.run-tests.teamcity')}" />
 		<exec program="${nunit-console}" failonerror="${common.run-tests.failonerror}">
-			<arg line="${bin.dir}/${test.file}.dll /xml:${testresults.dir}/${test.file}.dll-results.xml /framework:${framework::get-target-framework()}" />
+			<arg line="${bin.dir}/${test.file}.dll --result=${testresults.dir}/${test.file}.dll-results.xml;format=nunit2 --framework=${framework::get-target-framework()} ${common.run-tests.teamcity} ${common.run-tests.x86}" />
 		</exec>
 
-		<!--<nunit2>
-			<formatter 
-				type="Xml" 
-				usefile="true" 
-				extension=".xml" 
-				outputdir="${bin.dir}"
-			/>
-			<test
-				assemblyname="${bin.dir}/${test.file}.dll"
-				appconfig="${bin.dir}/${test.file}.dll.config" />
-		</nunit2>-->
-
 	</target>
 
 	<target name="common.run-database-tests"

build-common/common.xml

@@ -261,7 +261,7 @@
 	</target>
 
 	<target name="common.find-nunit">
-		<property name="nunit-console" value="${tools.dir}/NUnit/nunit-console-x86.exe" />
+		<property name="nunit-console" value="${tools.dir}/NUnit.ConsoleRunner.3.6.0/tools/nunit3-console.exe" />
 	</target>
 	<target name="common.find-ndoc">
 		<property name="ndoc-console" value="${tools.dir}/ndoc/NDocConsole.exe" />

teamcity.build

@@ -12,17 +12,7 @@
 
 	<property name="build.number" value="${CCNetLabel}" if="${property::exists('CCNetLabel')}" />
 
-	<target name="clean-configure-test" depends="cleanall init copy-nunitaddin copy-teamcity-configuration binaries test verify-test-results binaries-zip" />
-
-	<target name="copy-nunitaddin" depends="init">
-		<if test="${property::exists('teamcity.dotnet.nunitaddin')}">
-			<copy todir="${tools.dir}/NUnit/addins">
-				<fileset>
-					<include name="${teamcity.dotnet.nunitaddin}-2.6.1.*" />
-				</fileset>
-			</copy>
-		</if>
-	</target>
+	<target name="clean-configure-test" depends="cleanall init copy-teamcity-configuration binaries test verify-test-results binaries-zip" />
 
 	<target name="copy-teamcity-configuration">
 		<copy file="build-common/teamcity-hibernate.cfg.xml" tofile="${bin.dir}/hibernate.cfg.xml" />
@@ -81,6 +71,7 @@
 	</target>
 
 	<target name="setup-teamcity-sqlServerCe64">
+		<property name="nunit-x64" value="true" />
 		<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlServerCeDriver" />
 		<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSqlCe40Dialect" />
 		<property name="nhibernate.connection.connection_string" value="Data Source=NHibernate.sdf" />
@@ -109,8 +100,7 @@
 	</target>
 
 	<target name="setup-teamcity-firebird64">
-		<property name="nunit-console" value="${tools.dir}/NUnit/nunit-console.exe" />
-		<property name="nunit.found" value="true" />
+		<property name="nunit-x64" value="true" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.FirebirdClientDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.FirebirdDialect" />
 		<property name="nhibernate.connection.connection_string"	value="Database=NHibernate.fdb;ServerType=1;UserID=SYSDBA" />
@@ -136,6 +126,7 @@
 	</target>
 
 	<target name="setup-teamcity-sqlite64">
+		<property name="nunit-x64" value="true" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.SQLite20Driver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.SQLiteDialect" />
 		<property name="nhibernate.connection.connection_string"	value="Data Source=NHibernate.db" />
@@ -179,6 +170,7 @@
 	</target>
 
 	<target name="setup-teamcity-oracle64">
+		<property name="nunit-x64" value="true" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.OracleDataClientDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.Oracle10gDialect" />
 		<property name="nhibernate.connection.connection_string"	value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
@@ -210,6 +202,7 @@
 	</target>
 
 	<target name="setup-teamcity-oracle-managed64">
+		<property name="nunit-x64" value="true" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.OracleManagedDataClientDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.Oracle10gDialect" />
 		<property name="nhibernate.connection.connection_string"	value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />