-rework build scripts to pull all dependencies from current.bin.dir after being copied from lib source folders

-add build scripts for Spring.Template.Velocity.Castle projects

CopyLibToBinHelpers.include

@@ -0,0 +1,70 @@
+<project name="CopyLibToBinHelpers">
+
+	<target name="copycommonlogginglibtobin">
+		<echo message="${common.logging.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${common.logging.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>
+		
+		<echo message="${common.logging.core.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${common.logging.core.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>
+	</target>
+	
+	<target name="copynh3libtobin">
+			<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>
+	</target>
+
+	<target name="copynh4libtobin">
+			<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>
+	</target>
+	
+	<target name="copyquartz2libtobin">
+		<echo message="${quartz2.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${quartz2.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>		
+	</target>
+	
+	<target name="copynvelocitylibtobin">
+		<echo message="${nvelocity.lib.dir}" />
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${nvelocity.lib.dir}">
+				<include name="**/NVelocity.dll" />
+			</fileset>
+		</copy>		
+	
+	</target>
+
+</project>

Spring.build

@@ -504,7 +504,7 @@ Commandline Examples:
 		<property name="common.logging.lib.dir" value="${spring.basedir}/packages/Common.Logging.3.0.0/lib/net40"/>
 		<property name="common.logging.core.lib.dir" value="${spring.basedir}/packages/Common.Logging.Core.3.0.0/lib/net40"/>
 	</if>
-		
+	
 	<!-- we use same libs for both 4.0 and 4.5 builds -->
 	<if test="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}">
 		<property name="lib.dir" value="${spring.basedir}/lib/net/4.0"/>
@@ -535,6 +535,7 @@ Commandline Examples:
 	<nant buildfile="src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build" target="build" if="${build-quartz}"/>
     <nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq}"/>
     <nant buildfile="src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build" target="build" if="${build-velocity}"/>
+    <nant buildfile="src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.build" target="build" if="${build-velocity}"/>
     <!--"Spring.ConversationWA.NH*.dll" should be at last to prevent the other assemblies are compiled with reference to this-->
     <nant buildfile="src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.build" target="build" if="${build-conversation}"/>
     
@@ -564,7 +565,8 @@ Commandline Examples:
     <nant buildfile="test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build" target="test" if="${build-nms}"/>
 	<nant buildfile="test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build" target="test" if="${build-quartz}"/>
     <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq}"/>
-    <nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="test" if="${build-velocity}"/>
+    <!-- <nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="test" if="${build-velocity}"/> -->
+    <nant buildfile="test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.build" target="test" if="${build-velocity}"/>
     <!--"Spring.ConversationWA.NH*.Tests.dll" should be at last to prevent the other tests are compiled with reference to this-->
 	
 	<!-- conversation tests disabled for now because with .NET 4.5 installed NUnitAsp does not seem to work anymore -->
@@ -2036,4 +2038,5 @@ Commandline Examples:
 	</foreach>
 </target>
 
+
 </project>

src/Spring/Spring.Aop/Spring.Aop.build

@@ -6,8 +6,15 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
+
+
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 		<!-- build Spring.Aop -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -38,8 +45,8 @@
 				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
                 <include name="System.Xml.dll"/>
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-		        <include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+		        <include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/antlr.runtime.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 			</references>

src/Spring/Spring.Core/Spring.Core.build

@@ -6,7 +6,13 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ 
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+ 
     <target name="build" depends="compileGrammar">
+	
+		<call target="copycommonlogginglibtobin" />
+	
         <echo message="Compiling '${current.bin.dir}/${project::get-name()}.dll' with args ${compiler.args}" />
         <csc target="library"
              define="${current.build.defines.csc}"
@@ -58,8 +64,8 @@
                 <include name="System.Configuration.dll"/>
                 <include name="System.Xml.dll"/>
                 <include name="Microsoft.VisualBasic.dll"/>
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
             </references>
         </csc>
     </target>

src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.build

@@ -6,8 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ 
+	 <include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+ 
 	<target name="build">
 
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynh3libtobin" />
+
 		<!-- build Spring.Data.NHibernate3 -->
 		<csc target="library" define="${current.build.defines.csc}"
 			 warnaserror="true"
@@ -29,11 +35,7 @@
 				<include name="../GenCommonAssemblyInfo.cs" />
 			</sources>
 			<references>
-				
-					<include name="${nh3.lib.dir}/NHibernate.dll"/>
-					<include name="${iesi3.lib.dir}/Iesi.Collections.dll"/>
-				
-			<include name="mscorlib.dll"/>
+				<include name="mscorlib.dll"/>
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
@@ -43,11 +45,13 @@
 				<include name="System.Web.dll" />
 				<include name="System.Xml.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Aop.dll"/>
 				<include name="${current.bin.dir}/Spring.Data.dll"/>
+				<include name="${current.bin.dir}/NHibernate.dll"/>
+				<include name="${current.bin.dir}/Iesi.Collections.dll"/>
 			</references>
 		</csc>
 	</target>

src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.build

@@ -6,9 +6,16 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ 
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+ 
 	<target name="build">
 
 		<!-- build Spring.Data.NHibernate4 -->
+		
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynh4libtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc},NH_4_0"
 			 warnaserror="true"
 			 optimize="${build.optimize}"
@@ -39,14 +46,14 @@
 				<include name="System.Web.dll" />
 				<include name="System.Xml.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Aop.dll"/>
 				<include name="${current.bin.dir}/Spring.Data.dll"/>
 				
-					<include name="${nh4.lib.dir}/NHibernate.dll"/>
-					<include name="${iesi4.lib.dir}/Iesi.Collections.dll"/>
+				<include name="${current.bin.dir}/NHibernate.dll"/>
+				<include name="${current.bin.dir}/Iesi.Collections.dll"/>
 				
 			</references>
 		</csc>

src/Spring/Spring.Data/Spring.Data.build

@@ -6,8 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ 
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 		<!-- build Spring.Data -->
+
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
              warnaserror="true"
 		     optimize="${build.optimize}"
@@ -50,8 +56,8 @@
 				<include name="System.EnterpriseServices.dll" />
 				<include name="System.Transactions.dll" />
 				<include name="System.Xml.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
 			</references>

src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build

@@ -6,8 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ 
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+ 
     <target name="build">
-        <csc target="library" define="${current.build.defines.csc}"
+
+		<call target="copycommonlogginglibtobin" />
+
+		<csc target="library" define="${current.build.defines.csc}"
             warnaserror="false"
             optimize="${build.optimize}"
             debug="${current.build.debug}"
@@ -38,8 +44,8 @@
 			<include name="System.Configuration.dll"/>
 			<include name="System.Data.dll" />
 			<include name="System.Xml.dll" />
-			<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-			<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+			<include name="${current.bin.dir}/Common.Logging.dll"/>
+			<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 			<include name="${current.bin.dir}/Spring.Core.dll" />
 			<include name="${current.bin.dir}/Spring.Aop.dll" />
 			<include name="${current.bin.dir}/Spring.Data.dll" />

src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build

@@ -6,7 +6,12 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+ 
     <target name="build">
+	
+		<call target="copycommonlogginglibtobin" />
+	
         <csc target="library" define="${current.build.defines.csc}"
             warnaserror="true"
             optimize="${build.optimize}"
@@ -38,12 +43,12 @@
 			<include name="System.Configuration.dll"/>
 			<include name="System.Data.dll" />
 			<include name="System.Xml.dll" />
-			<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-			<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+			<include name="${current.bin.dir}/Common.Logging.dll"/>
+			<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 			<include name="${current.bin.dir}/Spring.Core.dll" />
 			<include name="${current.bin.dir}/Spring.Aop.dll" />
 			<include name="${current.bin.dir}/Spring.Data.dll" />
-			<include name="${spring.basedir}/lib/Net/2.0/Apache.NMS.dll" />
+			<include name="${current.bin.dir}/Apache.NMS.dll" />
 	    </references>
         </csc>
     </target>

src/Spring/Spring.Messaging/Spring.Messaging.build

@@ -6,7 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ 
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
+ 
     <target name="build">
+	
+		<call target="copycommonlogginglibtobin" />
+		
         <csc target="library" define="${current.build.defines.csc}"
             warnaserror="true"
             optimize="${build.optimize}"
@@ -34,8 +41,8 @@
 				<include name="System.Messaging.dll"/>
 				<include name="System.Transactions.dll"/>
 				<include name="System.Xml.dll"/>
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 	        </references>

src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build

@@ -6,14 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ 
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+	
     <target name="build">
 	
-		<echo message="${quartz2.lib.dir}" />
-		<copy todir="${current.bin.dir}" overwrite="true">
-			<fileset basedir="${quartz2.lib.dir}">
-				<include name="**/*.dll" />
-			</fileset>
-		</copy>		
+	
+		<call target="copycommonlogginglibtobin" />
+		<call target="copyquartz2libtobin" />
 		
         <csc target="library" define="${current.build.defines.csc},QUARTZ_2_0"
             warnaserror="true"
@@ -43,10 +43,10 @@
 			<include name="System.Data.dll" />
 			<include name="${current.bin.dir}/Spring.Core.dll" />
 			<include name="${current.bin.dir}/Spring.Data.dll" />
-			<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-			<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
-			<include name="${quartz2.lib.dir}/Quartz.dll" />
-			<include name="${quartz2.lib.dir}/C5.dll" />
+			<include name="${current.bin.dir}/Common.Logging.dll"/>
+			<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
+			<include name="${current.bin.dir}/Quartz.dll" />
+			<include name="${current.bin.dir}/C5.dll" />
 	    </references>
         </csc>
     </target>

src/Spring/Spring.Services/Spring.Services.build

@@ -6,9 +6,16 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
+
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
+
   <target name="build">
 
 	<!-- build Spring.Services -->
+
+	<call target="copycommonlogginglibtobin" />
+	
     <csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 			 optimize="${build.optimize}"
@@ -50,8 +57,8 @@
 		<include name="System.Web.dll" />
 		<include name="System.Web.Services.dll" />
 		<include name="System.Xml.dll"/>
-		<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-		<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
         <include name="${current.bin.dir}/Spring.Core.dll" />
         <include name="${current.bin.dir}/Spring.Aop.dll" />
         <include name="${current.bin.dir}/Spring.Web.dll" />

src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.build

@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<project name="Spring.Template.Velocity.Castle" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+ 
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
+	<property name="nvelocity.lib.dir" value="${spring.basedir}/packages/Castle.NVelocity.1.1.1/lib/net35" overwrite="true"/>
+
+	<if test="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}">
+		<property name="nvelocity.lib.dir" value="${spring.basedir}/packages/Castle.NVelocity.1.1.1/lib/net40" overwrite="true"/>
+	</if>
+	
+    <target name="build">
+
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynvelocitylibtobin" />
+		
+		<csc target="library" define="${current.build.defines.csc}"
+            warnaserror="true"
+            optimize="${build.optimize}"
+            debug="${current.build.debug}"
+            output="${current.bin.dir}/${project::get-name()}.dll"
+            doc="${current.bin.dir}/${project::get-name()}.xml"
+           	nostdlib="true"
+			noconfig="true"
+            >
+            <arg line="${compiler.args}"/>
+            <nowarn>
+				<warning number="${nowarn.numbers}" />
+                <warning number="1591" />
+            </nowarn>
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+                <include name="../Spring.Template.Velocity/**/*.cs" />
+                <exclude name="../Spring.Template.Velocity/**/SpringResourceLoader.cs" />
+                <exclude name="../Spring.Template.Velocity/**/TemplateNamespaceParser.cs" />
+                <exclude name="../Spring.Template.Velocity/**/AssemblyInfo.cs" />
+                <include name="../GenCommonAssemblyInfo.cs" />
+            </sources>
+            <resources basedir="." prefix="Spring.Template.Velocity.Config">
+	            <include name="../Spring.Template.Velocity/Template/Velocity/Config/spring-nvelocity-1.3.xsd" />
+      	    </resources>
+	    <references>
+			<include name="mscorlib.dll"/>
+			<include name="Microsoft.CSharp.dll"/>
+			<include name="System.dll"/>
+			<include name="System.Core.dll"/>
+			<include name="System.Configuration.dll"/>
+			<include name="System.Xml.dll" />
+			<include name="${current.bin.dir}/Common.Logging.dll"/>
+			<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
+			<include name="${current.bin.dir}/Spring.Core.dll" />
+            <include name="${current.bin.dir}/NVelocity.dll" />
+	    </references>
+        </csc>
+    </target>
+
+</project>

src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build

@@ -6,7 +6,16 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ 
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
+	<property name="nvelocity.lib.dir" value="${spring.basedir}/lib/net/2.0" overwrite="true"/>
+
     <target name="build">
+	
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynvelocitylibtobin" />
+		
         <csc target="library" define="${current.build.defines.csc}"
             warnaserror="true"
             optimize="${build.optimize}"
@@ -35,10 +44,10 @@
 			<include name="System.Core.dll"/>
 			<include name="System.Configuration.dll"/>
 			<include name="System.Xml.dll" />
-			<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-			<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+			<include name="${current.bin.dir}/Common.Logging.dll"/>
+			<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 			<include name="${current.bin.dir}/Spring.Core.dll" />
-			<include name="${spring.basedir}/lib/Net/2.0/NVelocity.dll" />
+			<include name="${current.bin.dir}/NVelocity.dll" />
 	    </references>
         </csc>
     </target>

src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build

@@ -6,8 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ 
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
     <target name="build">
-        <csc target="library" define="${current.build.defines.csc}"
+
+		<call target="copycommonlogginglibtobin" />
+		
+		<csc target="library" define="${current.build.defines.csc}"
             warnaserror="true"
             optimize="${build.optimize}"
             debug="${current.build.debug}"
@@ -34,8 +40,8 @@
 				<include name="System.Core.dll"/>
 				<include name="System.Configuration.dll"/>
 				<include name="System.Data.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${vs-net.mstest.bin.dir.current}\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" asis="true"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />

src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build

@@ -6,8 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
     <target name="build">
-        <csc target="library" define="${current.build.defines.csc}"
+
+		<call target="copycommonlogginglibtobin" />
+		
+		<csc target="library" define="${current.build.defines.csc}"
             warnaserror="true"
             optimize="${build.optimize}"
             debug="${current.build.debug}"
@@ -34,9 +40,9 @@
 				<include name="System.Core.dll"/>
 				<include name="System.Configuration.dll"/>
 				<include name="System.Data.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
-			    <include name="${nunit.lib.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
+			    <include name="${current.bin.dir}/nunit.framework.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 			</references>

src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.build

@@ -6,9 +6,15 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 
 		<!-- build Spring.Data.NHibernate -->
+
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynh3libtobin" />
+
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
                 optimize="${build.optimize}"
@@ -37,14 +43,14 @@
 				<include name="System.Data.dll" />
 				<include name="System.Web.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Data.NHibernate3.dll" />
 				
-					<include name="${nh3.lib.dir}/NHibernate.dll"/>
-					<include name="${iesi3.lib.dir}/Iesi.Collections.dll"/>
+				<include name="${current.bin.dir}/NHibernate.dll"/>
+				<include name="${current.bin.dir}/Iesi.Collections.dll"/>
 				
 				</references>
 		</csc>

src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build

@@ -6,8 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
+
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
-		<!-- build Spring.Web.Extensions -->
+	<!-- build Spring.Web.Extensions -->
+
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}" 
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -37,8 +43,8 @@
  				<include name="System.Web.dll" />
  				<include name="System.Web.Extensions.dll" />
  				<include name="System.Web.Services.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Web.dll" />
 			</references>

src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build

@@ -6,8 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
+
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 		<!-- build Spring.Web.Mvc -->
+
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}" 
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -42,8 +48,8 @@
 				<include name="System.Web.Routing.dll"/>
  				<include name="System.Web.Services.dll" />
 
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/antlr.runtime.dll" />
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />

src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build

@@ -6,8 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
+
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 		<!-- build Spring.Web.Mvc -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}" 
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -44,8 +50,8 @@
 				<include name="System.Web.Routing.dll"/>
  				<include name="System.Web.Services.dll" />
 
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/antlr.runtime.dll" />
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />

src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build

@@ -6,8 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
+
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 		<!-- build Spring.Web.Mvc -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}" 
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -45,8 +51,8 @@
 				<include name="System.Web.Routing.dll"/>
  				<include name="System.Web.Services.dll" />
 
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/antlr.runtime.dll" />
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />

src/Spring/Spring.Web/Spring.Web.build

@@ -6,9 +6,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
-		<!-- build Spring.Web -->
-		<csc target="library" define="${current.build.defines.csc}" 
+	<!-- build Spring.Web -->
+		
+		<call target="copycommonlogginglibtobin" />
+
+	<csc target="library" define="${current.build.defines.csc}" 
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}" 
@@ -39,8 +44,8 @@
  				<include name="System.Web.dll" />
  				<include name="System.Web.Services.dll" />
 				<include if="${net-4.0.installed and net-4.0}" name="System.Web.ApplicationServices.dll" />        
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/antlr.runtime.dll" />
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />

test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build

@@ -9,8 +9,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
+
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 		<!-- build Spring.Aop -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -46,13 +52,13 @@
 				<include name="System.Data.dll" />
 				<include name="System.Web.dll" />
 				<include name="System.Xml.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
 				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
 			</references>
 		</csc>
 

test/Spring/Spring.Core.Tests/Spring.Core.Tests.build

@@ -9,13 +9,15 @@
             * build.debug               - (true|false) debug build?
             * current.build.defines.csc - framework-specific build defines
     -->
+<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
 
 	<target name="build">
 		<!--
 	        <copy file="../../../src/Spring/Spring.Core/Pool/Support/ISync.cs" todir="../../../CloverBuild/Pool/Support" verbose="true"/>
 		-->
 		
-		<copy file="${iesi3.lib.dir}/Iesi.Collections.dll" todir="${current.bin.dir}" />
+		<call target="copycommonlogginglibtobin" />
+		<!-- <copy file="${iesi3.lib.dir}/Iesi.Collections.dll" todir="${current.bin.dir}" /> -->
 
 		<csc target="library" define="${current.build.defines.csc}"
 			warnaserror="true"
@@ -68,16 +70,16 @@
 				<include name="System.Transactions.dll" />
 				<include name="System.Windows.Forms.dll" />
                 <include name="System.Xml.dll"/>
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Services.dll" />
 				<include name="${current.bin.dir}/Spring.Messaging.NMS.dll" />
 				<include name="${current.bin.dir}/Spring.Template.Velocity.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
 			</references>
 		</csc>
 

test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build

@@ -9,8 +9,13 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
   <target name="build">
     <!-- build Spring.Data.Integration.Tests -->
+	
+	<call target="copycommonlogginglibtobin" />
+	
     <csc target="library" define="${current.build.defines.csc}"
          warnaserror="true"
          optimize="${build.optimize}"
@@ -43,14 +48,14 @@
         <include name="System.Logging.dll" />
         <include name="System.Data.OracleClient.dll" />
         <include name="System.Xml.dll" />
-		<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-		<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 		<include name="${current.bin.dir}/Spring.Core.dll" />
 		<include name="${current.bin.dir}/Spring.Aop.dll" />
 		<include name="${current.bin.dir}/Spring.Data.dll" />
 		<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
 		<include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-		<include name="${nunit.lib.dir}/nunit.framework.dll"/>
+		<include name="${current.bin.dir}/nunit.framework.dll"/>
       </references>
     </csc>
   </target>

test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.build

@@ -6,9 +6,13 @@
 	  * current.build.debug       - (true|false) debug build?
 	  * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 
 		<!-- build Spring.Data.NHibernate3.Integration.Tests -->
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynh3libtobin" />
 
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
@@ -27,28 +31,24 @@
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
 			<references>
-				
-					<include name="${nh3.lib.dir}/NHibernate.dll"/>
-					<include name="${iesi3.lib.dir}/Iesi.Collections.dll"/>
-				
 				<include name="mscorlib.dll"/>
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/log4net.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/log4net.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Data.NHibernate3.dll" />
 				
-					<include name="${nh3.lib.dir}/NHibernate.dll"/>
-					<include name="${iesi3.lib.dir}/Iesi.Collections.dll"/>
+				<include name="${current.bin.dir}/NHibernate.dll"/>
+				<include name="${current.bin.dir}/Iesi.Collections.dll"/>
 				
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />

test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.build

@@ -9,7 +9,12 @@
             * build.debug               - (true|false) debug build?
             * current.build.defines.csc - framework-specific build defines
     -->
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
+	
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynh3libtobin" />
 		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
@@ -28,29 +33,25 @@
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
 			<references>
-				
-					<include name="${nh3.lib.dir}/NHibernate.dll"/>
-					<include name="${iesi3.lib.dir}/Iesi.Collections.dll"/>
-				
 				<include name="mscorlib.dll"/>
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Data.NHibernate3.dll" />
 				<include name="${current.bin.dir}/Spring.Data.Tests.dll" />
 				
-					<include name="${nh3.lib.dir}/NHibernate.dll"/>
-					<include name="${iesi3.lib.dir}/Iesi.Collections.dll"/>
+				<include name="${current.bin.dir}/NHibernate.dll"/>
+				<include name="${current.bin.dir}/Iesi.Collections.dll"/>
 				
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />

test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build

@@ -6,9 +6,16 @@
 	  * current.build.debug       - (true|false) debug build?
 	  * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ 
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 
 		<!-- build Spring.Data.NHibernate4.Integration.Tests -->
+		
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynh4libtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
 		        optimize="${build.optimize}"
@@ -26,28 +33,24 @@
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
 			<references>
-				
-					<include name="${nh4.lib.dir}/NHibernate.dll"/>
-					<include name="${iesi4.lib.dir}/Iesi.Collections.dll"/>
-				
 				<include name="mscorlib.dll"/>
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/log4net.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/log4net.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Data.NHibernate4.dll" />
 				
-					<include name="${nh4.lib.dir}/NHibernate.dll"/>
-					<include name="${iesi4.lib.dir}/Iesi.Collections.dll"/>
+				<include name="${current.bin.dir}/NHibernate.dll"/>
+				<include name="${current.bin.dir}/Iesi.Collections.dll"/>
 				
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />

test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build

@@ -8,11 +8,12 @@
  -->
  
  <include buildfile="${spring.basedir}/common-project.include" />
- 
+ <include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 
-	<copy file="${nh4.lib.dir}/NHibernate.dll" todir="${current.bin.dir}" />
-	<copy file="${iesi4.lib.dir}/Iesi.Collections.dll" todir="${current.bin.dir}" />
+	<call target="copycommonlogginglibtobin" />
+	<call target="copynh4libtobin" />
 	
 	
 		<!-- build Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests -->
@@ -42,16 +43,16 @@
 				<include name="System.Transactions.dll" />
 				<include name="System.Xml.dll" />
 				<include name="System.Xml.Linq.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Data.NHibernate4.dll" />
 				<include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-				<include name="${nh4.lib.dir}/NHibernate.dll"/>
-				<include name="${iesi4.lib.dir}/Iesi.Collections.dll"/>
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/NHibernate.dll"/>
+				<include name="${current.bin.dir}/Iesi.Collections.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
 			</references>
 			<resources prefix="Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />

test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build

@@ -9,7 +9,13 @@
             * build.debug               - (true|false) debug build?
             * current.build.defines.csc - framework-specific build defines
     -->
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
+	
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynh4libtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -33,19 +39,19 @@
 				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Data.Tests.dll" />
 				<include name="${current.bin.dir}/Spring.Data.NHibernate4.dll" />
 				
-					<include name="${nh4.lib.dir}/NHibernate.dll"/>
-					<include name="${iesi4.lib.dir}/Iesi.Collections.dll"/>
+				<include name="${current.bin.dir}/NHibernate.dll"/>
+				<include name="${current.bin.dir}/Iesi.Collections.dll"/>
 				
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />

test/Spring/Spring.Data.Tests/Spring.Data.Tests.build

@@ -9,8 +9,13 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 		<!-- build Spring.Data.Tests -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -41,15 +46,15 @@
 				<include name="System.Drawing.dll" />
 				<include name="System.EnterpriseServices.dll" />
 				<include name="System.Transactions.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
 				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${spring.basedir}/packages/odp.net.managed.121.1.1/lib/net40/Oracle.ManagedDataAccess.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
 			</references>
 		</csc>
 

test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build

@@ -9,9 +9,14 @@
     * current.build.debug       - (true|false) debug build?
     * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+ <include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
   <target name="build">
 
     <!-- build Spring.Messaging.Ems.Integration.Tests -->
+	
+	<call target="copycommonlogginglibtobin" />
+	
     <csc target="library" define="${current.build.defines.csc}"
         warnaserror="true"
         optimize="${build.optimize}"
@@ -34,17 +39,17 @@
 		<include name="System.Data.dll" />
 		<include name="System.Xml.dll" />
 		-->
-		<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-		<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
         <include name="${current.bin.dir}/Spring.Core.dll" />
         <include name="${current.bin.dir}/Spring.Aop.dll" />
         <include name="${current.bin.dir}/Spring.Data.dll" />
         <include name="${current.bin.dir}/Spring.Core.Tests.dll" />
         <include name="${current.bin.dir}/Spring.Messaging.EMS.dll" />
         <include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-        <include name="${spring.basedir}/lib/Net/2.0/TIBCO.EMS.dll" />
-        <include name="${spring.basedir}/lib/Net/2.0/TIBCO.EMS.ADMIN.dll" />
-		<include name="${nunit.lib.dir}/nunit.framework.dll"/>
+        <include name="${current.bin.dir}/TIBCO.EMS.dll" />
+        <include name="${current.bin.dir}/TIBCO.EMS.ADMIN.dll" />
+		<include name="${current.bin.dir}/nunit.framework.dll"/>
 	  </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
         <include name="**/*.xml" />

test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build

@@ -9,9 +9,14 @@
     * current.build.debug       - (true|false) debug build?
     * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
   <target name="build">
 
     <!-- build Spring.Messaging.Nms.Integration.Tests -->
+	
+	<call target="copycommonlogginglibtobin" />
+	
     <csc target="library" define="${current.build.defines.csc}"
         warnaserror="true"
         optimize="${build.optimize}"
@@ -36,16 +41,16 @@
 		<include name="System.Core.dll"/>
         <include name="System.Data.dll" />
         <include name="System.EnterpriseServices.dll" />
-		<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-		<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
         <include name="${current.bin.dir}/Spring.Core.dll" />
         <include name="${current.bin.dir}/Spring.Core.Tests.dll" />
         <include name="${current.bin.dir}/Spring.Messaging.dll" />
         <include name="${current.bin.dir}/Spring.Messaging.Nms.dll" />
         <include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-        <include name="${spring.basedir}/lib/Net/2.0/Apache.NMS.dll" />
-        <include name="${spring.basedir}/lib/Net/2.0/Apache.NMS.ActiveMQ.dll" />
-		<include name="${nunit.lib.dir}/nunit.framework.dll"/>
+        <include name="${current.bin.dir}/Apache.NMS.dll" />
+        <include name="${current.bin.dir}/Apache.NMS.ActiveMQ.dll" />
+		<include name="${current.bin.dir}/nunit.framework.dll"/>
       </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
         <include name="**/*.xml" />

test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build

@@ -9,8 +9,14 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
+
 	<target name="build">
 		<!-- build Spring.Data.Tests -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -37,17 +43,17 @@
 				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Messaging.Nms.dll" />
 				<include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-				<include name="${spring.basedir}/lib/Net/2.0/Apache.NMS.dll" />
-				<include name="${spring.basedir}/lib/Net/2.0/Apache.NMS.ActiveMQ.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/Apache.NMS.dll" />
+				<include name="${current.bin.dir}/Apache.NMS.ActiveMQ.dll" />
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
 			  </references>
 		</csc>
 

test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build

@@ -9,8 +9,13 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 		<!-- build Spring.Data.Tests -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -37,15 +42,15 @@
 				<include name="System.Core.dll"/>
 				<include name="System.Messaging.dll"/>
 				<include name="System.Transactions.dll"/>
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Messaging.dll" />
 				<include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
 			</references>
 		</csc>
 

test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.build

@@ -9,8 +9,13 @@
             * build.debug               - (true|false) debug build?
             * current.build.defines.csc - framework-specific build defines
     -->
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 
+		<call target="copycommonlogginglibtobin" />
+		<call target="copyquartz2libtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -32,15 +37,15 @@
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Scheduling.Quartz2.dll" />
-				<include name="${quartz2.lib.dir}/Quartz.dll" />
-				<include name="${quartz2.lib.dir}/C5.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/Quartz.dll" />
+				<include name="${current.bin.dir}/C5.dll" />
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
 			</references>
 		</csc>
 		<copy todir="${current.bin.dir}">

test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build

@@ -9,14 +9,12 @@
             * build.debug               - (true|false) debug build?
             * current.build.defines.csc - framework-specific build defines
     -->
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 
-		<echo message="${quartz2.lib.dir}" />
-		<copy todir="${current.bin.dir}" overwrite="true">
-			<fileset basedir="${quartz2.lib.dir}">
-				<include name="**/*.dll" />
-			</fileset>
-		</copy>		
+		<call target="copycommonlogginglibtobin" />
+		<call target="copyquartz2libtobin" />
 
 		<csc target="library" define="${current.build.defines.csc},QUARTZ_2_0"
 		     warnaserror="true"
@@ -39,16 +37,16 @@
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Scheduling.Quartz2.dll" />
-				<include name="${quartz2.lib.dir}/Quartz.dll" />
-				<include name="${quartz2.lib.dir}/C5.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/Quartz.dll" />
+				<include name="${current.bin.dir}/C5.dll" />
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
 			</references>
 		</csc>
 

test/Spring/Spring.Services.Tests/Spring.Services.Tests.build

@@ -9,9 +9,13 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
+<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
   <target name="build">
 
     <!-- build Spring.Services.Tests -->
+	<call target="copycommonlogginglibtobin" />
+	
     <csc target="library" define="${current.build.defines.csc}"
          warnaserror="true"
          optimize="${build.optimize}"
@@ -47,15 +51,15 @@
 		<include name="System.Web.dll"/>
 		<include name="System.Web.Services.dll"/>
 		<include name="System.Xml.dll"/>
-		<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-		<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
         <include name="${current.bin.dir}/Spring.Core.dll" />
         <include name="${current.bin.dir}/Spring.Core.Tests.dll" />
         <include name="${current.bin.dir}/Spring.Aop.dll" />
         <include name="${current.bin.dir}/Spring.Aop.Tests.dll" />
         <include name="${current.bin.dir}/Spring.Services.dll" />
-		<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-		<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+		<include name="${current.bin.dir}/nunit.framework.dll"/>
+		<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
       </references>
     </csc>
     <copy todir="${current.bin.dir}" verbose="${copy-verbose}" >

test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.2010.csproj

@@ -95,8 +95,10 @@
       <Link>Template\Velocity\SimpleTemplate.vm</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
-    <None Include="App.config" />
     <None Include="packages.config" />
+    <None Include="Spring.Template.Velocity.Castle.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Template\Velocity\config.properties">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.build

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="Spring.Template.Velocity.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<project name="Spring.Template.Velocity.Castle.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
 
     <include buildfile="${spring.basedir}/common-project.include" />
 
@@ -9,8 +9,19 @@
             * build.debug               - (true|false) debug build?
             * current.build.defines.csc - framework-specific build defines
     -->
-	<target name="build">
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+	
+	<property name="nvelocity.lib.dir" value="${spring.basedir}/packages/Castle.NVelocity.1.1.1/lib/net35" overwrite="true"/>
 
+	<if test="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}">
+		<property name="nvelocity.lib.dir" value="${spring.basedir}/packages/Castle.NVelocity.1.1.1/lib/net40" overwrite="true"/>
+	</if>
+
+	<target name="build">
+	
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynvelocitylibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -25,6 +36,7 @@
 			</nowarn>
 			<sources failonempty="true">
 				<include name="**/*.cs" />
+				<include name="../Spring.Template.Velocity.Tests/**/*.cs" />
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
 			<references>
@@ -33,25 +45,42 @@
 				<include name="System.dll"/>
 				<include name="System.Configuration.dll"/>
 				<include name="System.Core.dll"/>
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Spring.Core.dll" />
+				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
+				<include name="${current.bin.dir}/Spring.Template.Velocity.Castle.dll" />
+				<include name="${current.bin.dir}/NVelocity.dll" />
+
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
 			</references>
-			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
+			<resources prefix="Spring.Template.Velocity" failonempty="true">
 				<include name="**/*.xml" />
-				<include name="**/*.xsd" />
-			  <include name="**/*.test" />
-			  <include name="**/*.vm" />
+				<include name="../Spring.Template.Velocity.Tests/**/*.xsd" />
+			  <include name="../Spring.Template.Velocity.Tests/**/*.test" />
+			  <include name="../Spring.Template.Velocity.Tests/**/*.vm" />
 			  <include name="**/*.properties" />
-				<include name="**/*.config" />
+				<include name="../Spring.Template.Velocity.Tests/**/*.config" />
 			</resources>
 		</csc>
-		<copy todir="${current.bin.dir}" failonerror="true">
+		<copy todir="${current.bin.dir}" verbose="true" failonerror="true">
+			<fileset basedir="${spring.basedir}/test/Spring/Spring.Template.Velocity.Tests">
+				<include name="**/*.xml" />
+				<include name="**/*.xsd" />
+				<include name="**/*.test" />
+				<include name="**/*.vm" />
+				<include name="**/*.properties" />
+				<include name="**/*.config" />
+			</fileset>
+		</copy>
+		
+		<copy todir="${current.bin.dir}" verbose="true" failonerror="true">
 			<fileset basedir="${project::get-base-directory()}">
 				<include name="**/*.xml" />
 				<include name="**/*.xsd" />
-			        <include name="**/*.test" />
-			        <include name="**/*.vm" />
-			        <include name="**/*.properties" />
+				<include name="**/*.test" />
+				<include name="**/*.vm" />
+				<include name="**/*.properties" />
 				<include name="**/*.config" />
 			</fileset>
 		</copy>

test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build

@@ -9,8 +9,16 @@
             * build.debug               - (true|false) debug build?
             * current.build.defines.csc - framework-specific build defines
     -->
+
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
+	<property name="nvelocity.lib.dir" value="${spring.basedir}/lib/net/2.0" overwrite="true"/>
+	
 	<target name="build">
 
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynvelocitylibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -33,13 +41,13 @@
 				<include name="System.dll"/>
 				<include name="System.Configuration.dll"/>
 				<include name="System.Core.dll"/>
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
 				<include name="${current.bin.dir}/Spring.Template.Velocity.dll" />
-				<include name="${spring.basedir}/lib/Net/2.0/NVelocity.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/NVelocity.dll" />
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />

test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build

@@ -9,8 +9,13 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 		<!-- build Spring.Data.Tests -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -36,8 +41,8 @@
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
 				<include name="${vs-net.mstest.bin.dir.current}\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />

test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build

@@ -9,8 +9,13 @@
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
  -->
+<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
 	<target name="build">
 		<!-- build Spring.Data.Tests -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -36,15 +41,15 @@
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
 				<include name="System.Data.dll"/>
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
 				<include name="${current.bin.dir}/Spring.Data.Tests.dll" />
 				<include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
 			</references>
 		</csc>
 

test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build

@@ -9,8 +9,13 @@
             * build.debug               - (true|false) debug build?
             * current.build.defines.csc - framework-specific build defines
     -->
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
   <target name="build">
 
+	<call target="copycommonlogginglibtobin" />
+	<call target="copynh3libtobin" />
+  
     <csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -37,19 +42,19 @@
         <include name="System.Data.dll" />
         <include name="System.EnterpriseServices.dll" />
         <include name="System.Web.dll" />
-		<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-		<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.dll"/>
+		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 		<include name="${current.bin.dir}/Spring.Core.dll" />
 		<include name="${current.bin.dir}/Spring.Aop.dll" />
 		<include name="${current.bin.dir}/Spring.Data.dll" />
 		<include name="${current.bin.dir}/Spring.Data.NHibernate3.dll" />
 		<include name="${current.bin.dir}/Spring.Web.dll" />
 		<include name="${current.bin.dir}/Spring.Web.Conversation.NHibernate3.dll" />
-		<include name="${spring.basedir}/lib/Net/2.0/NUnitAspEx.dll" />
+		<include name="${current.bin.dir}/NUnitAspEx.dll" />
 		<include name="${spring.basedir}/test/Spring/${project::get-name()}/lib/Net/2.0/System.Data.SQLite.dll" />
-		<include name="${nh3.lib.dir}/NHibernate.dll"/>
-		<include name="${iesi3.lib.dir}/Iesi.Collections.dll"/>
-		<include name="${nunit.lib.dir}/nunit.framework.dll"/>
+		<include name="${current.bin.dir}/NHibernate.dll"/>
+		<include name="${current.bin.dir}/Iesi.Collections.dll"/>
+		<include name="${current.bin.dir}/nunit.framework.dll"/>
       </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
         <include name="**/*.xml" />

test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build

@@ -9,6 +9,8 @@
             * current.build.defines.csc - framework-specific build defines
             * lib.dir                   - framework-specific assembly references
     -->
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
     <target name="build">
 
 		<!--
@@ -20,6 +22,9 @@
 		-->
 
 		<!-- build Spring.Web.Mvc -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
         <csc target="library" define="${current.build.defines.csc}" 
 			 warnaserror="true" 
              optimize="${build.optimize}"
@@ -69,13 +74,13 @@
 				<include name="System.Web.Services.dll" />
 				<include name="System.Data.dll" />
 				
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Web.Mvc3.dll" />
  
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
 				<include name="${lib.dir}/nunit.core.interfaces.dll" />
 
             </references>

test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build

@@ -9,6 +9,8 @@
             * current.build.defines.csc - framework-specific build defines
             * lib.dir                   - framework-specific assembly references
     -->
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
     <target name="build">
 
 		<!--
@@ -20,6 +22,9 @@
 		-->
 
 		<!-- build Spring.Web.Mvc -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
         <csc target="library" define="${current.build.defines.csc}" 
 			 warnaserror="true" 
              optimize="${build.optimize}"
@@ -77,13 +82,13 @@
 				<include name="System.Web.Services.dll" />
 				<include name="System.Data.dll" />
 				
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 
                 <include name="${current.bin.dir}/Spring.Core.dll" />
                 <include name="${current.bin.dir}/Spring.Web.Mvc4.dll" />
 
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>            
+				<include name="${current.bin.dir}/nunit.framework.dll"/>            
                 <include name="${lib.dir}/nunit.core.interfaces.dll" />
             </references>
         </csc>

test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build

@@ -9,6 +9,9 @@
             * current.build.defines.csc - framework-specific build defines
             * lib.dir                   - framework-specific assembly references
     -->
+	
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
     <target name="build">
 
 		<copy todir="${current.bin.dir}" flatten="true" overwrite="true">
@@ -19,6 +22,9 @@
 
 		
 		<!-- build Spring.Web.Mvc -->
+		
+		<call target="copycommonlogginglibtobin" />
+		
         <csc target="library" define="${current.build.defines.csc}" 
 			 warnaserror="true" 
              optimize="${build.optimize}"
@@ -66,14 +72,14 @@
 				<include name="${spring.basedir}/packages/Microsoft.AspNet.WebApi.WebHost.5.0.0/lib/net45/System.Web.Http.WebHost.dll" />
 				
 
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				
                 <include name="${current.bin.dir}/Spring.Core.dll" />
                 <include name="${current.bin.dir}/Spring.Aop.dll" />
                 <include name="${current.bin.dir}/Spring.Web.Mvc5.dll" />
 
- 				<include name="${nunit.lib.dir}/nunit.framework.dll"/>           
+ 				<include name="${current.bin.dir}/nunit.framework.dll"/>           
                 <include name="${lib.dir}/nunit.core.interfaces.dll" />
 
             </references>

test/Spring/Spring.Web.Tests/Spring.Web.Tests.build

@@ -9,8 +9,15 @@
             * current.build.defines.csc - framework-specific build defines
             * lib.dir                   - framework-specific assembly references
     -->
+	
+	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
+
     <target name="build">
         <!-- build Spring.Web -->
+		
+		<call target="copycommonlogginglibtobin" />
+		<call target="copynh3libtobin" />
+		
         <csc target="library" define="${current.build.defines.csc}" 
 			 warnaserror="true" 
              optimize="${build.optimize}"
@@ -47,16 +54,16 @@
 				<include name="System.Web.dll" />
 				<include name="System.Web.Services.dll" />
 				<include name="System.Data.dll" />
-				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
-				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
 				<include name="${current.bin.dir}/Spring.Web.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
+				<include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
                 <include name="${lib.dir}/nunit.core.interfaces.dll" />
-                <include name="${spring.basedir}/lib/Net/2.0/NUnitAsp.dll" />
-                <include name="${spring.basedir}/lib/Net/2.0/NUnitAspEx.dll" />
+                <include name="${current.bin.dir}/NUnitAsp.dll" />
+                <include name="${current.bin.dir}/NUnitAspEx.dll" />
             </references>
         </csc>
         <copy todir="${current.bin.dir}">