Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Commit b328c64

Browse files
committed
upgrade build to .Net 4.5
1 parent fdf3726 commit b328c64

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

ccnet.build

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<property name="build.configuration" overwrite="false" value="Build" />
88
<property name="build.target" overwrite="false" value="Build" />
99
<property name="build.project" overwrite="false" value="ccnet.sln" />
10-
<property name="build.target.framework" overwrite="false" value="4.0" />
10+
<property name="build.target.framework" overwrite="false" value="4.5" />
1111
<property name="CCNetLabel" overwrite="false" value="0.0.0.0" />
1212
<property name="codemetrics.output.type" overwrite="false" value="XmlFile" />
1313

@@ -28,7 +28,7 @@
2828
<property name="gendarme.executable" readonly="true" value="${path::combine( path::combine(tools.dir, 'Gendarme'), 'gendarme.exe')}" />
2929
<property name="ndepend.executable" readonly="true" value="${path::combine( path::combine(tools.dir, 'NDepend'), 'NDepend.Console.exe')}" />
3030
<property name="fxcop.executable" readonly="true" value="${path::combine( path::combine(tools.dir, 'FxCop'), 'FxCopCmd.exe')}" />
31-
<property name="nunit.executable" readonly="true" value="${path::combine( path::combine(tools.dir, 'NUnit'), 'nunit-console.exe')}" />
31+
<property name="nunit.executable" readonly="true" value="${path::combine( path::combine(tools.dir, 'NUnit'), 'nunit-console-x86.exe')}" />
3232
<property name="nsis.executable" readonly="true" value="${path::combine( path::combine(tools.dir, 'NSIS'), 'makensis.exe')}" />
3333

3434
<!-- common assembly info properties -->
@@ -195,16 +195,27 @@
195195
<copy file="${path::combine( path::combine(src.dir, 'UnitTests'), 'test.config')}" tofile="${path::combine( path::combine(build.dir, 'UnitTests'), 'ThoughtWorks.CruiseControl.UnitTests.dll.config')}" verbose="${nant.verbosity}" />
196196
</if>
197197

198+
<!--
198199
<nunitTest executable="${nunit.executable}" workingDirectory="${path::combine(build.dir, 'UnitTests')}" outputFile="${path::combine(build.metrics.dir, 'nunit-result.xml')}" commandLineParameterFlag="-" showLabels="true" verbose="${nant.verbosity}">
199200
<assemblies>
200201
<include name="${path::combine( path::combine(build.dir, 'UnitTests'), 'ThoughtWorks.CruiseControl.UnitTests.dll')}" />
201202
</assemblies>
202203
203-
<!-- Hack for current xbuild issues on Mono 2.5 -->
204+
204205
<environment>
205206
<variable name="MONO_PATH" value="${path::get-full-path('lib')}" if="${framework::get-family(nant.settings.currentframework) == 'mono'}" />
206207
</environment>
207208
</nunitTest>
209+
-->
210+
<exec program="${nunit.executable}" >
211+
<arg value="${path::combine( path::combine(build.dir, 'UnitTests'), 'ThoughtWorks.CruiseControl.UnitTests.dll')}" />
212+
<arg value="/result=${path::combine(build.metrics.dir, 'nunit-result.xml')}" />
213+
<arg value="/exclude=Integration" />
214+
<arg value="/framework:v4.0" />
215+
</exec>
216+
217+
218+
208219
</target>
209220

210221
<!-- Code analyze metric targets -->

0 commit comments

Comments
 (0)