From 49349ef94a2cd734ab0ebecb0474e904bb0fee09 Mon Sep 17 00:00:00 2001
From: sbohlen <sbohlen@gmail.com>
Date: Mon, 1 Nov 2010 19:20:16 +0000
Subject: [PATCH] prevent assembly copy from 2.0 to current output dir under
 .net 4.0 build

---
 src/Spring/Spring.Services/Spring.Services.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Spring/Spring.Services/Spring.Services.build b/src/Spring/Spring.Services/Spring.Services.build
index ad806d5d..00def53d 100644
--- a/src/Spring/Spring.Services/Spring.Services.build
+++ b/src/Spring/Spring.Services/Spring.Services.build
@@ -7,7 +7,7 @@
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
   <target name="build">
-    <if test="${net-3.0.installed and net-3.0}">
+    <if test="${net-3.0.installed and net-3.0 and not net-4.0}">
       <property name="bin.dir.to.use" value="${current.bin.dir}\..\..\2.0\${current.build.config}"/>
       <echo message="-----------------"/>
       <echo message="Copying Spring NET 2.0 output to 3.0 bin directory except for Spring.Services, which will be compiled."/>
@@ -26,7 +26,7 @@
       </copy>
     </if>
     
-    <if test="${net-3.0.installed and net-3.0}">
+    <if test="${net-3.0.installed and net-3.0 and not net-4.0}">
       <copy todir="${current.bin.dir}" overwrite="true" failonerror="true">
 	<fileset basedir="${bin.dir.to.use}">
 	  <include name="*.dll"/>