|
7 | 7 | <property name="build.configuration" overwrite="false" value="Build" />
|
8 | 8 | <property name="build.target" overwrite="false" value="Build" />
|
9 | 9 | <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" /> |
11 | 11 | <property name="CCNetLabel" overwrite="false" value="0.0.0.0" />
|
12 | 12 | <property name="codemetrics.output.type" overwrite="false" value="XmlFile" />
|
13 | 13 |
|
|
28 | 28 | <property name="gendarme.executable" readonly="true" value="${path::combine( path::combine(tools.dir, 'Gendarme'), 'gendarme.exe')}" />
|
29 | 29 | <property name="ndepend.executable" readonly="true" value="${path::combine( path::combine(tools.dir, 'NDepend'), 'NDepend.Console.exe')}" />
|
30 | 30 | <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')}" /> |
32 | 32 | <property name="nsis.executable" readonly="true" value="${path::combine( path::combine(tools.dir, 'NSIS'), 'makensis.exe')}" />
|
33 | 33 |
|
34 | 34 | <!-- common assembly info properties -->
|
|
195 | 195 | <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}" />
|
196 | 196 | </if>
|
197 | 197 |
|
| 198 | +<!-- |
198 | 199 | <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}">
|
199 | 200 | <assemblies>
|
200 | 201 | <include name="${path::combine( path::combine(build.dir, 'UnitTests'), 'ThoughtWorks.CruiseControl.UnitTests.dll')}" />
|
201 | 202 | </assemblies>
|
202 | 203 |
|
203 |
| - <!-- Hack for current xbuild issues on Mono 2.5 --> |
| 204 | + |
204 | 205 | <environment>
|
205 | 206 | <variable name="MONO_PATH" value="${path::get-full-path('lib')}" if="${framework::get-family(nant.settings.currentframework) == 'mono'}" />
|
206 | 207 | </environment>
|
207 | 208 | </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 | + |
208 | 219 | </target>
|
209 | 220 |
|
210 | 221 | <!-- Code analyze metric targets -->
|
|
0 commit comments