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

introduce build param (skipmstestrun) to support building but not -running- the MSTEST sequence (necessary for bypass of the currently-crashing QTAgent32.exe process until this issue is properly sorted out)

Browse Source
This commit is contained in:
sbohlen
2014-03-03 06:57:19 -05:00
parent df35992839
commit 167a104fe2
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Spring.build
View File

@@ -23,7 +23,7 @@ Build properties that may be set:
signs all assemblies. Requires the key file $/Spring.Net.snk to be in place
"mstest.exe":
value: string, fully-qualiifed location of mstest.exe, for example, C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\mstest.exe
value: string, fully-qualified location of mstest.exe, for example, C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\mstest.exe
"vs-net.mstest.bin.dir":
value: string: location of mstest.exe, for example C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE
@@ -323,16 +323,6 @@ Commandline Examples:
commandline="restore Spring.NET.2010.sln"
workingdir="."
failonerror="true" />
<exec
program=".nuget\nuget.exe"
commandline="restore ${spring.basedir}\src\Spring\Spring.Web.Mvc5\packages.config -SolutionDirectory ${spring.basedir}"
workingdir="."
failonerror="true" />
<exec
program=".nuget\nuget.exe"
commandline="restore ${spring.basedir}\test\Spring\Spring.Web.Mvc5.Tests\packages.config -SolutionDirectory ${spring.basedir}"
workingdir="."
failonerror="true" />
<exec
program=".nuget\nuget.exe"
commandline="restore ${spring.basedir}\examples\Spring\Spring.CodeConfig.Migration\Spring.CodeConfig.Migration.2010.sln"
@@ -373,7 +363,12 @@ Commandline Examples:
commandline="restore ${spring.basedir}\examples\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2010.sln"
workingdir="."
failonerror="true" />
<exec
<exec
program=".nuget\nuget.exe"
commandline="restore ${spring.basedir}\examples\Spring\Spring.WebQuickStart\Spring.WebQuickStart.2010.sln"
workingdir="."
failonerror="true" />
<exec
program=".nuget\nuget.exe"
commandline="restore ${spring.basedir}\examples\Spring\SpringAir\SpringAir.2010.sln"
workingdir="."
@@ -533,7 +528,7 @@ Commandline Examples:
<nant buildfile="test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}"/>
<nant buildfile="test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.5'}"/>
<nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${build-testing-nunit}"/>
<nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${build-testing-microsoft}"/>
<nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${run-testing-microsoft and build-testing-microsoft}"/>
<nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems}"/>
<nant buildfile="test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build" target="test" if="${build-ems}"/>
<nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms}"/>
@@ -1756,6 +1751,7 @@ Commandline Examples:
<property name="build-testing-nunit" value="true" />
<property name="build-testing-microsoft" value="false" />
<property name="build-testing-microsoft" value="${property::exists('mstest.exe')}" />
<property name="run-testing-microsoft" value="${not property::exists('skipmstestrun')}" />
<property name="build-web" value="true" />
<property name="build-nms" value="true" />
<property name="build-ems" value="${file::exists('lib/net/2.0/tibco.ems.dll')}" />
@@ -1796,6 +1792,7 @@ Commandline Examples:
<property name="build-testing-nunit" value="true"/>
<property name="build-testing-microsoft" value="false" />
<property name="build-testing-microsoft" value="${property::exists('mstest.exe')}" />
<property name="run-testing-microsoft" value="${not property::exists('skipmstestrun')}" />
<property name="build-web" value="true"/>
<property name="build-examples" value="true"/>
<property name="build-nms" value="true" />

2
build-release-all.cmd
View File

@@ -7,7 +7,7 @@ cd ..
@echo ...
@echo Running full Build Script, capturing output to buildlog.txt file...
@echo Start Time: %time%
build-support\tools\nant\bin\nant clean package -f:spring.build -D:project.build.sign=true -D:build-ems=true -D:test.integration.ems=false -D:test.integration.data=true -D:mstest.exe="c:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\mstest.exe" -D:package.version=2.0.0 -D:nuget.version.suffix=RC1 -D:vs-net.mstest.bin.dir="c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE" > buildlog.txt
build-support\tools\nant\bin\nant clean package -f:spring.build -D:project.build.sign=true -D:build-ems=true -D:test.integration.ems=false -D:test.integration.data=true -D:mstest.exe="c:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\mstest.exe" -D:package.version=2.0.0 -D:nuget.version.suffix=RC1 -D:vs-net.mstest.bin.dir="c:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE" -D:skipmstestrun=true > buildlog.txt
@echo .
@echo ..
@echo ...