From ebee9d3242028fbad540a0ba0f61f56ca994a8c5 Mon Sep 17 00:00:00 2001
From: markpollack <mark.pollack@springsource.com>
Date: Tue, 15 Dec 2009 04:22:08 +0000
Subject: [PATCH] .NET 3.0 build references Spring libs from .NET 2.0 build.
 Only build Spring.Services and run tests for .NET 3.0 build.

---
 Spring.build                                     | 10 ++++++++--
 src/Spring/Spring.Services/Spring.Services.build |  8 +++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Spring.build b/Spring.build
index f98aceb3..08f7ffb3 100644
--- a/Spring.build
+++ b/Spring.build
@@ -911,13 +911,15 @@ Commandline Examples:
 
     <!-- net-1.0 dropped since 1.3.0 -->
     <call target="${nant.target.root.name}-1.1" />
+
     <call target="${nant.target.root.name}-2.0" />
+
     <call target="${nant.target.root.name}-3.0" />
 
-    <!-- ignore .NET 3.5 for now -->
+    <!-- ignore .NET 3.5, nothing in code base dependent on 3.5 libs -->
     <!-- call target="${nant.target.root.name}-3.5" / -->
 
-    <!-- ignore Mono 2.0 for now -->
+    <!-- ignore Mono 2.0 -->
     <!-- <call target="${nant.target.root.name}-mono-2.0" /> -->
 
     <!-- build all Spring.NET solutions and example applications -->
@@ -1113,6 +1115,7 @@ Commandline Examples:
           <include name="**/Common.Logging.dll"/>
           <include name="**/antlr.runtime.dll"/>
           <include name="**/nunit.*.dll"/>
+          <include name="**/nunit.*.xml"/>
           <include name="**/NUnitAsp.dll"/>
           <include name="**/NUnitAspEx.dll"/>
           <include name="**/Rhino.Mocks.dll"/>
@@ -1136,6 +1139,7 @@ Commandline Examples:
       <copy todir="${current.package.dir}/lib/NHibernate12">
         <fileset basedir="lib/NHibernate12">
           <include name="**/*.dll"/>
+          <include name="**/*.xml"/>
           <include name="**/*.license.txt"/>
 	  <exclude name="mono/**"/>
         </fileset>
@@ -1147,6 +1151,7 @@ Commandline Examples:
       <copy todir="${current.package.dir}/lib/NHibernate20">
         <fileset basedir="lib/NHibernate20">
           <include name="**/*.dll"/>
+          <include name="**/*.xml"/>
           <include name="**/*.license.txt"/>
 	  <exclude name="mono/**"/>
         </fileset>
@@ -1158,6 +1163,7 @@ Commandline Examples:
       <copy todir="${current.package.dir}/lib/NHibernate21">
         <fileset basedir="lib/NHibernate21">
           <include name="**/*.dll"/>
+          <include name="**/*.xml"/>
           <include name="**/*.license.txt"/>
 	  <exclude name="mono/**"/>
         </fileset>
diff --git a/src/Spring/Spring.Services/Spring.Services.build b/src/Spring/Spring.Services/Spring.Services.build
index 8ad21782..192f6f4b 100644
--- a/src/Spring/Spring.Services/Spring.Services.build
+++ b/src/Spring/Spring.Services/Spring.Services.build
@@ -8,11 +8,13 @@
 -->
   <target name="build">
     <if test="${net-3.0.installed and net-3.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."/>
+      <echo message="Copying from ${bin.dir.to.use}"/>
+      <echo message="          to ${current.bin.dir}"/>
       <echo message="-----------------"/>
-      <property name="bin.dir.to.use" value="${current.bin.dir}\..\..\2.0\${project.build.config}"/>
-      <copy todir="${current.bin.dir}">
+      <copy todir="${current.bin.dir}" overwrite="true" failonerror="true">
 	<fileset basedir="${bin.dir.to.use}">
 	  <include name="*.dll"/>
 	  <include name="*.pdb"/>
@@ -25,7 +27,7 @@
     </if>
     
     <if test="${net-3.0.installed and net-3.0}">
-      <copy todir="${current.bin.dir}">
+      <copy todir="${current.bin.dir}" overwrite="true" failonerror="true">
 	<fileset basedir="${bin.dir.to.use}">
 	  <include name="*.dll"/>
 	  <include name="*.pdb"/>