From 4316ead14a9da39f27308a702dac512c73dc7e48 Mon Sep 17 00:00:00 2001
From: eeichinger <eeichinger@gmail.com>
Date: Sun, 2 Aug 2009 09:49:03 +0000
Subject: [PATCH] automated mstest detection in build script

---
 Spring.build                                         | 12 ++++++------
 .../Spring.Testing.Microsoft.build                   |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Spring.build b/Spring.build
index 45452020..0f3ac35f 100644
--- a/Spring.build
+++ b/Spring.build
@@ -30,7 +30,7 @@ Additional Remarks:
 if you want to build Spring.Messaging.Ems (Tibco EMS support), you need to copy tibco.ems.dll and tibco.ems.admin.dll into '/lib/net/2.0'
 
 *) Building Spring.Testing.Microsoft
-if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll to '/lib/net/2.0'
+if you want to build Spring.Testing.Microsoft (MSTest Support), you need to have VS Test support installed
 -->
 
   <!-- global project settings -->
@@ -39,10 +39,10 @@ if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy
   <property name="spring.basedir" value="${project::get-base-directory()}"/>
   <property name="tool.dir" value="${project::get-base-directory()}/build-support/tools"/>
 
-
-  <!-- default location of mstest executable -->
+  <!-- default location of mstest executable and reference assemblies -->
   <!-- See target set-user-overrides for how to change this to your machine values -->
-  <property name="vs-net.mstest.bin.dir" value="K:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE"/>
+  <!-- property name="vs-net.mstest.bin.dir" value="C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE"/ -->
+  <readregistry property="vs-net.mstest.bin.dir" key="SOFTWARE\Microsoft\VisualStudio\9.0\InstallDir" hive="LocalMachine" failonerror="false"/>
 
   <!-- debug or release -->
   <property name="project.build.config" value="debug"/>
@@ -1449,7 +1449,7 @@ if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy
     <property name="build-services" value="true" />
     <property name="build-testing-nunit" value="true" />
     <property name="build-testing-microsoft" value="false" />
-    <property name="build-testing-microsoft" value="${file::exists('lib/net/2.0/Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll')}" />
+    <property name="build-testing-microsoft" value="${property::exists('vs-net.mstest.bin.dir')}" />
     <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')}" />
@@ -1484,7 +1484,7 @@ if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy
     <property name="build-data" value="true"/>
     <property name="build-services" value="true"/>
     <property name="build-testing-nunit" value="true"/>
-    <property name="build-testing-microsoft" value="${file::exists('lib/net/2.0/Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll')}" />
+    <property name="build-testing-microsoft" value="${property::exists('vs-net.mstest.bin.dir')}" />
     <property name="build-web" value="true"/>
     <property name="build-examples" value="true"/>
     <property name="build-nms" value="true" />
diff --git a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
index ce707c3d..55179c5a 100644
--- a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
+++ b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
@@ -28,7 +28,6 @@
 				<include name="${vs-net.mstest.bin.dir}\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
 			        <include name="*.dll" />
 			        <exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
 		        </references>
         </csc>
     </target>