From 37787ef76e11ae5440f35e862127c7c63c831a51 Mon Sep 17 00:00:00 2001
From: eeichinger <eeichinger@gmail.com>
Date: Sun, 2 Aug 2009 13:31:06 +0000
Subject: [PATCH] removed workaround - mstest is not installed on build box

---
 Spring.build | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Spring.build b/Spring.build
index bd3d5fd3..caa0c6f0 100644
--- a/Spring.build
+++ b/Spring.build
@@ -58,7 +58,7 @@ Examples:
       the line below is for the ccnet build box - see target set-user-overrides for how to change this to your machine values if necessary
       - or better check the registry key as shown above
    -->
-  <property name="vs-net.mstest.bin.dir" value="K:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE" if="${not property::exists('vs-net.mstest.bin.dir')}" />
+  <!-- property name="vs-net.mstest.bin.dir" value="K:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE" if="${not property::exists('vs-net.mstest.bin.dir')}" / -->
 
   <!-- debug or release -->
   <property name="project.build.config" value="debug"/>
@@ -431,13 +431,13 @@ Examples:
     <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services and not net-3.5}"/>
     <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${build-testing-nunit and not net-3.0}"/>
-    <nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${build-testing-microsoft  and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${build-testing-microsoft and not net-3.0}"/>
     <!--
     <nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
     -->
     <nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="build" if="${build-quartz and not net-3.0}"/>
-    <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-testing-microsoft and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="test" if="${build-velocity and not net-3.0}"/>
 
     <!-- build examples -->
@@ -458,6 +458,7 @@ Examples:
     <property name="build-msmq" value="false" overwrite="true" />
     <property name="build-msmq-tests" value="false" overwrite="true" />
     <property name="build-velocity" value="false" overwrite="true" />
+    <property name="build-testing-microsoft" value="false" overwrite="true" />
     <call target="compile-test" />
   </target>
 
@@ -470,6 +471,7 @@ Examples:
     <property name="build-msmq" value="false" overwrite="true" />
     <property name="build-msmq-tests" value="false" overwrite="true" />
     <property name="build-velocity" value="false" overwrite="true" />
+    <property name="build-testing-microsoft" value="false" overwrite="true" />
     <call target="compile-test" />
   </target>