From a24cb2de8e5f0a240242c9c18e7839ebd48bd29a Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Sat, 11 Apr 2015 15:46:19 -0400
Subject: [PATCH] GH-107 - fixing errant build script oversight resulting in
 linking to improper version of NHibernate.dll in misc cases

---
 Spring.build                                  |  6 +++---
 .../Spring.Data.NHibernate4.build             |  2 +-
 ...g.Data.NHibernate3.Integration.Tests.build | 14 ++++++++++++++
 .../Spring.Data.NHibernate3.Tests.build       | 14 ++++++++++++++
 ...g.Data.NHibernate4.Integration.Tests.build | 14 ++++++++++++++
 ...NestedTxSuspension.Integration.Tests.build | 15 +++++++++++++++
 .../Spring.Data.NHibernate4.Tests.build       | 19 +++++++++++++++++--
 ...g.Web.Conversation.NHibernate3.Tests.build | 19 +++++++++++++------
 8 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/Spring.build b/Spring.build
index 87a5ae31..384194ab 100644
--- a/Spring.build
+++ b/Spring.build
@@ -103,7 +103,7 @@ Commandline Examples:
   global DIAGNOSTICS setting, applied to EVERY instance of <copy> task via verbose="${copy-verbose}" attribute
   so as to be toggled in ONE place and affect ALL copy operations; leave FALSE except for debugging/troubleshooting the build
 -->
-  <property name="copy-verbose" value="false" />
+  <property name="copy-verbose" value="true" />
 
   <!-- global project settings -->
   <property name="project.name" value="Spring.NET"/>
@@ -491,7 +491,7 @@ Commandline Examples:
     <property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
     <property name="nh3.lib.dir" value="${spring.basedir}/packages/NHibernate.3.3.3.4001/lib/Net35"/>
     <property name="iesi3.lib.dir" value="${spring.basedir}/packages/Iesi.Collections.3.3.3.4001/lib/Net35"/>
-    <property name="nh4.lib.dir" value="${spring.basedir}/packages/NHibernate.4.0.2.4000/lib/Net40"/>
+    <property name="nh4.lib.dir" value="${spring.basedir}/packages/NHibernate.4.0.3.4000/lib/Net40"/>
     <property name="iesi4.lib.dir" value="${spring.basedir}/packages/Iesi.Collections.4.0.1.4000/lib/Net40"/>
     <property name="quartz2.lib.dir" value="${spring.basedir}/packages/Quartz.2.3.1/lib/net35"/>
 	<property name="nunit.lib.dir" value="${spring.basedir}/packages/NUnit.2.6.3/lib"/>
@@ -539,7 +539,7 @@ Commandline Examples:
     <nant buildfile="test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.build" target="test" if="${build-data}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.build" target="test" if="${build-data}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build" target="test" if="${build-data}"/>
-    <nant buildfile="test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build" target="test" if="${build-data}"/>
+    <nant buildfile="test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' )}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' )}"/>
 	
     <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
diff --git a/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.build b/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.build
index e3a46f79..80bf6c2b 100644
--- a/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.build
+++ b/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.build
@@ -9,7 +9,7 @@
 	<target name="build">
 
 		<echo message="${nh4.lib.dir}" />
-		<copy todir="${current.bin.dir}" overwrite="true">
+		<copy todir="${current.bin.dir}" overwrite="true" >
 			<fileset basedir="${nh4.lib.dir}">
 				<include name="**/*.dll" />
 			</fileset>
diff --git a/test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.build
index 7cf5ae41..a5b7d920 100644
--- a/test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.build
@@ -9,6 +9,20 @@
 	<target name="build">
 
 		<!-- build Spring.Data.NHibernate3.Integration.Tests -->
+
+		<echo message="${nh3.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${nh3.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+		<echo message="${iesi3.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${iesi3.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
 		        optimize="${build.optimize}"
diff --git a/test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.build b/test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.build
index ad4ac804..cf777fe7 100644
--- a/test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.build
@@ -10,6 +10,20 @@
             * current.build.defines.csc - framework-specific build defines
     -->
 	<target name="build">
+		
+		<echo message="${nh3.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${nh3.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+		<echo message="${iesi3.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${iesi3.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
diff --git a/test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build
index 472dcfa5..71b31e8e 100644
--- a/test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build
@@ -9,6 +9,20 @@
 	<target name="build">
 
 		<!-- build Spring.Data.NHibernate4.Integration.Tests -->
+		
+		<echo message="${nh4.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true" >
+			<fileset basedir="${nh4.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+		<echo message="${iesi4.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${iesi4.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+		
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
 		        optimize="${build.optimize}"
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build
index 5f18d163..1da2d223 100644
--- a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build
@@ -12,6 +12,21 @@
 	<target name="build">
 
 		<!-- build Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests -->
+		
+		<echo message="${nh4.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true" >
+			<fileset basedir="${nh4.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+		<echo message="${iesi4.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${iesi4.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+		
+		
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
 		        optimize="${build.optimize}"
diff --git a/test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build b/test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build
index 9639f064..562011b1 100644
--- a/test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build
@@ -10,6 +10,21 @@
             * current.build.defines.csc - framework-specific build defines
     -->
 	<target name="build">
+		
+		<echo message="${nh4.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true" >
+			<fileset basedir="${nh4.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+		<echo message="${iesi4.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${iesi4.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+		
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -28,8 +43,8 @@
 			</sources>
 			<references>
 				<lib>
-					<include name="${nh3.lib.dir}"/>
-					<include name="${iesi3.lib.dir}"/>
+					<include name="${nh4.lib.dir}"/>
+					<include name="${iesi4.lib.dir}"/>
 				</lib>
 				<include name="mscorlib.dll"/>
 				<include name="Microsoft.CSharp.dll"/>
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build b/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build
index afdcdd8f..5c5e45d3 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build
+++ b/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build
@@ -10,12 +10,19 @@
             * current.build.defines.csc - framework-specific build defines
     -->
   <target name="build">
-    <!-- copy nh libs. It's necessary here to avoid wrong reference to NHibernate 3.3-->
-    <copy todir="${current.bin.dir}" overwrite="true">
-      <fileset basedir="${nh3.lib.dir}">
-        <include name="**/*.dll" />
-      </fileset>
-    </copy>
+
+		<echo message="${nh3.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true" >
+			<fileset basedir="${nh3.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+		<echo message="${iesi3.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${iesi3.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
     
     <csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"