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

upgrade to NUnit 3.5

Browse Source 
* upgrade nuget.exe and use single installation in build-support directory
* migrate to preferred automatic visual studio package restore mode
* fix various issues with NHibernate build configuration
* fix building of MVC projects when MVC libs not present
This commit is contained in:
Marko Lahma
2016-10-24 20:36:48 +03:00
parent ad64f00abe
commit b3d1d85426
933 changed files with 2048 additions and 5612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common-project.include
View File

@@ -217,7 +217,6 @@ ${tool.dir} : dir for tools
<exec program="${mstest.exe.current}" workingdir="${test.bin.dir}" verbose="false">
<arg value="/testcontainer:${test.bin.dir}/${test.assemblyname}.dll"/>
<arg value="/resultsfile:${test.assemblyname}.dll-MsTestResults.trx"/>
<arg value="/nologo" />
</exec>
</target>
@@ -245,10 +244,8 @@ ${tool.dir} : dir for tools
<!-- 2.6.2 and 2.6.3 seem to be broken at least w.r.t. remoting and security levels -->
<exec program="${nunit.console.exe}" workingdir="${test.bin.dir}" verbose="true">
<arg line="${test.assemblyfile}" />
<arg value="/xml:${test.assemblyname}.dll-TestResults.xml" />
<arg value="/framework:${nunit.framework.version}" />
<arg value="/nologo" />
<arg value="/noshadow" />
<arg value="--result=&quot;${test.assemblyname}.dll-TestResults.xml;format=nunit2&quot;" />
<arg value="--framework=${nunit.framework.version}" />
</exec>
</target>
@@ -289,10 +286,8 @@ ${tool.dir} : dir for tools
<arg value="//q" />
<arg path="${nunit.console.exe}" />
<arg line="${test.assemblyfile}" />
<arg value="/xml:${test.assemblyname}.dll-TestResults.xml" />
<arg value="/noshadow" />
<arg value="/nologo" />
<arg value="/framework:${nunit.framework.version}" />
<arg value="//result=&quot;${test.assemblyname}.dll-TestResults.xml;format=nunit2&quot;" />
<arg value="//framework=${nunit.framework.version}" />
</exec>
<!--
@@ -327,7 +322,7 @@ ${tool.dir} : dir for tools
<exec program="${tool.dir}/opencover/OpenCover.Console.exe" workingdir="${test.bin.dir}" verbose="true">
<arg value="-register:user" />
<arg value="-target:${nunit.console.exe}" />
<arg value="-targetargs:${test.assemblyfile} /xml:${test.assemblyname}.dll-TestResults.xml /noshadow /nologo /framework:${nunit.framework.version}" />
<arg value="-targetargs:${test.assemblyfile} --result=${test.assemblyname}.dll-TestResults.xml;format=nunit2 --framework=${nunit.framework.version}" />
<arg value="-filter:&quot;+[Spring*]* -[*Test*]* -[*nunit*]*&quot;" />
<arg value="-output:${test.bin.dir}/${test.assemblyname}.dll-TestCoverage.xml" />
</exec>
@@ -340,6 +335,6 @@ ${tool.dir} : dir for tools
<readregistry property="net35.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\InstallPath" hive="LocalMachine" failonerror="true"/>
<property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>
<property name="nunit.console.exe" value="${spring.basedir}/packages/NUnit.Runners.2.6.1/tools/nunit-console-x86.exe" />
<property name="nunit.console.exe" value="${spring.basedir}/packages/NUnit.ConsoleRunner.3.5.0/tools/nunit3-console.exe" />
</project>