From e102d73382bacf1844c2df6a30e8bf2914ad3e65 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Mon, 13 Apr 2015 10:53:14 -0400
Subject: [PATCH] switch build scripts to avoid include=*.dll approach and
 switch to explicit identification of references (necessary to avoid invalid
 image format errors when building for CLR 2.0 and encountering CLR 4.0
 assemblies in the directory when using include=*.dll approach)

---
 Spring.build                                  | 11 ++++-
 src/Spring/Spring.Aop/Spring.Aop.build        |  4 +-
 src/Spring/Spring.Core/Spring.Core.build      |  4 +-
 .../Spring.Data.NHibernate3.build             | 29 +++++--------
 .../Spring.Data.NHibernate4.build             | 26 ++++--------
 src/Spring/Spring.Data/Spring.Data.build      |  4 +-
 .../Spring.Messaging.Ems.build                |  9 ++--
 .../Spring.Messaging.Nms.build                |  9 ++--
 .../Spring.Messaging/Spring.Messaging.build   |  7 ++--
 .../Spring.Scheduling.Quartz2.build           |  9 ++--
 .../Spring.Services/Spring.Services.build     |  4 +-
 .../Spring.Template.Velocity.build            |  7 ++--
 .../Spring.Testing.Microsoft.build            |  6 ++-
 .../Spring.Testing.NUnit.build                |  8 ++--
 .../Spring.Web.Conversation.NHibernate3.build | 29 +++++--------
 .../Spring.Web.Extensions.build               |  2 +
 .../Spring.Web.Mvc3/Spring.Web.Mvc3.build     |  4 +-
 .../Spring.Web.Mvc4/Spring.Web.Mvc4.build     |  4 +-
 .../Spring.Web.Mvc5/Spring.Web.Mvc5.build     |  4 +-
 src/Spring/Spring.Web/Spring.Web.build        |  4 +-
 .../Spring.Aop.Tests/Spring.Aop.Tests.build   | 10 +++--
 .../Spring.Core.Tests/Spring.Core.Tests.build | 18 +++++---
 .../Spring.Data.Integration.Tests.build       | 10 ++++-
 ...ng.Data.NHibernate.Integration.Tests.build |  4 +-
 ...g.Data.NHibernate3.Integration.Tests.build | 38 ++++++++---------
 .../Spring.Data.NHibernate3.Tests.build       | 40 ++++++++----------
 ...g.Data.NHibernate4.Integration.Tests.build | 39 ++++++++----------
 ...NestedTxSuspension.Integration.Tests.build | 41 ++++++++-----------
 .../Spring.Data.NHibernate4.Tests.build       | 38 ++++++-----------
 .../Spring.Data.Tests/Spring.Data.Tests.build | 12 ++++--
 ...ring.Messaging.Ems.Integration.Tests.build | 23 +++++++++--
 ...ring.Messaging.Nms.Integration.Tests.build | 12 +++++-
 .../Spring.Messaging.Nms.Tests.build          | 20 ++++++---
 .../Spring.Messaging.Tests.build              | 12 ++++--
 ...Scheduling.Quartz2.Integration.Tests.build | 11 ++++-
 .../Spring.Scheduling.Quartz2.Tests.build     | 13 ++++--
 .../Spring.Services.Tests.build               | 12 ++++--
 .../Spring.Template.Velocity.Tests.build      |  9 +++-
 .../Spring.Testing.Microsoft.Tests.build      | 10 +++--
 .../Spring.Testing.NUnit.Tests.build          | 12 ++++--
 ...g.Web.Conversation.NHibernate3.Tests.build | 34 ++++++---------
 .../Spring.Web.Mvc3.Tests.build               | 34 ++++++++++-----
 .../Spring.Web.Mvc4.Tests.build               | 37 ++++++++++++-----
 .../Spring.Web.Mvc5.Tests.build               | 34 ++++++++++-----
 .../Spring.Web.Tests/Spring.Web.Tests.build   | 12 ++++--
 45 files changed, 405 insertions(+), 314 deletions(-)

diff --git a/Spring.build b/Spring.build
index 384194ab..3bab7014 100644
--- a/Spring.build
+++ b/Spring.build
@@ -495,7 +495,16 @@ Commandline Examples:
     <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"/>
-
+	
+	
+	<property name="common.logging.lib.dir" value="${spring.basedir}/packages/Common.Logging.3.0.0/lib/net35"/>
+	<property name="common.logging.core.lib.dir" value="${spring.basedir}/packages/Common.Logging.Core.3.0.0/lib/net35"/>
+	
+	<if test="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}">
+		<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"/>
diff --git a/src/Spring/Spring.Aop/Spring.Aop.build b/src/Spring/Spring.Aop/Spring.Aop.build
index 0ffc4777..742cb5f3 100644
--- a/src/Spring/Spring.Aop/Spring.Aop.build
+++ b/src/Spring/Spring.Aop/Spring.Aop.build
@@ -38,8 +38,8 @@
 				<include name="System.Core.dll"/>
 				<include name="System.Data.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="${common.logging.lib.dir}/Common.Logging.dll"/>
+		        <include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/antlr.runtime.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 			</references>
diff --git a/src/Spring/Spring.Core/Spring.Core.build b/src/Spring/Spring.Core/Spring.Core.build
index d2fa928d..aca7e6d5 100644
--- a/src/Spring/Spring.Core/Spring.Core.build
+++ b/src/Spring/Spring.Core/Spring.Core.build
@@ -58,8 +58,8 @@
                 <include name="System.Configuration.dll"/>
                 <include name="System.Xml.dll"/>
                 <include name="Microsoft.VisualBasic.dll"/>
-		        <include name="${current.bin.dir}/Common.Logging.dll"/>
-		        <include name="${current.bin.dir}/Common.Logging.Core.dll"/>
+				<include name="${common.logging.lib.dir}/Common.Logging.dll"/>
+				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
             </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.build b/src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.build
index 5b70b163..c0d9b373 100644
--- a/src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.build
+++ b/src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.build
@@ -8,19 +8,6 @@
  -->
 	<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>		
-
 		<!-- build Spring.Data.NHibernate3 -->
 		<csc target="library" define="${current.build.defines.csc}"
 			 warnaserror="true"
@@ -42,7 +29,11 @@
 				<include name="../GenCommonAssemblyInfo.cs" />
 			</sources>
 			<references>
-				<include name="mscorlib.dll"/>
+				
+					<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"/>
@@ -52,11 +43,11 @@
 				<include name="System.Web.dll" />
 				<include name="System.Xml.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${current.bin.dir}/*NHibernate.dll" />
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*.*.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/Spring.Core.dll"/>
+				<include name="${current.bin.dir}/Spring.Aop.dll"/>
+				<include name="${current.bin.dir}/Spring.Data.dll"/>
 			</references>
 		</csc>
 	</target>
diff --git a/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.build b/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.build
index 80bf6c2b..0aa2f9c4 100644
--- a/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.build
+++ b/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.build
@@ -8,19 +8,6 @@
  -->
 	<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>		
-
 		<!-- build Spring.Data.NHibernate4 -->
 		<csc target="library" define="${current.build.defines.csc},NH_4_0"
 			 warnaserror="true"
@@ -52,10 +39,15 @@
 				<include name="System.Web.dll" />
 				<include name="System.Xml.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*.dll" />
-				<exclude name="${current.bin.dir}/*NHibernate3*.*.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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"/>
+				
 			</references>
 		</csc>
 	</target>
diff --git a/src/Spring/Spring.Data/Spring.Data.build b/src/Spring/Spring.Data/Spring.Data.build
index 4577750a..64e14653 100644
--- a/src/Spring/Spring.Data/Spring.Data.build
+++ b/src/Spring/Spring.Data/Spring.Data.build
@@ -50,8 +50,8 @@
 				<include name="System.EnterpriseServices.dll" />
 				<include name="System.Transactions.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="${common.logging.lib.dir}/Common.Logging.dll"/>
+				<include name="${common.logging.core.lib.dir}/Common.Logging.Core.dll"/>
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
 			</references>
diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build
index 9ff58f1a..f4c6e698 100644
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build
+++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build
@@ -38,9 +38,12 @@
 			<include name="System.Configuration.dll"/>
 			<include name="System.Data.dll" />
 			<include name="System.Xml.dll" />
-			<include name="${current.bin.dir}/*.dll" />
-			<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-			<exclude name="${current.bin.dir}/CloverRuntime.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}/Spring.Core.dll" />
+			<include name="${current.bin.dir}/Spring.Aop.dll" />
+			<include name="${current.bin.dir}/Spring.Data.dll" />
+			<include name="${current.bin.dir}/TIBCO.EMS.dll" />
 	    </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
index 7c200e10..f44a1acc 100644
--- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
@@ -38,9 +38,12 @@
 			<include name="System.Configuration.dll"/>
 			<include name="System.Data.dll" />
 			<include name="System.Xml.dll" />
-			<include name="${current.bin.dir}/*.dll" />
-			<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-			<exclude name="${current.bin.dir}/CloverRuntime.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}/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" />
 	    </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Messaging/Spring.Messaging.build b/src/Spring/Spring.Messaging/Spring.Messaging.build
index ba450a92..2f0dceea 100644
--- a/src/Spring/Spring.Messaging/Spring.Messaging.build
+++ b/src/Spring/Spring.Messaging/Spring.Messaging.build
@@ -34,9 +34,10 @@
 				<include name="System.Messaging.dll"/>
 				<include name="System.Transactions.dll"/>
 				<include name="System.Xml.dll"/>
-		        <include name="${current.bin.dir}/*.dll" />
-		        <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/Spring.Core.dll" />
+				<include name="${current.bin.dir}/Spring.Data.dll" />
 	        </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build b/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build
index d299ebf6..6aa18286 100644
--- a/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build
+++ b/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build
@@ -43,11 +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="${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" />
-			<exclude name="${current.bin.dir}/${project::get-name()}.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" />
 	    </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Services/Spring.Services.build b/src/Spring/Spring.Services/Spring.Services.build
index 106896fc..5f8b15d3 100644
--- a/src/Spring/Spring.Services/Spring.Services.build
+++ b/src/Spring/Spring.Services/Spring.Services.build
@@ -50,8 +50,8 @@
 		<include name="System.Web.dll" />
 		<include name="System.Web.Services.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="${common.logging.lib.dir}/Common.Logging.dll"/>
+		<include name="${common.logging.core.lib.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" />
diff --git a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build
index 7f96efa3..e9ed51c9 100644
--- a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build
+++ b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build
@@ -35,9 +35,10 @@
 			<include name="System.Core.dll"/>
 			<include name="System.Configuration.dll"/>
 			<include name="System.Xml.dll" />
-			<include name="${current.bin.dir}/*.dll" />
-			<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-			<exclude name="${current.bin.dir}/CloverRuntime.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}/Spring.Core.dll" />
+			<include name="${spring.basedir}/lib/Net/2.0/NVelocity.dll" />
 	    </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
index 9776164e..ac7d9988 100644
--- a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
+++ b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
@@ -34,9 +34,11 @@
 				<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="${vs-net.mstest.bin.dir.current}\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" asis="true"/>
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<include name="${current.bin.dir}/Spring.Core.dll" />
+				<include name="${current.bin.dir}/Spring.Data.dll" />
 		    </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
index 7a00593e..06654504 100644
--- a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
@@ -34,13 +34,11 @@
 				<include name="System.Core.dll"/>
 				<include name="System.Configuration.dll"/>
 				<include name="System.Data.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="${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}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Data.dll" />
-			    <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.build b/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.build
index 6a9517ab..6fed6a8a 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.build
+++ b/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.build
@@ -8,20 +8,6 @@
  -->
 	<target name="build">
 
-        <!-- copy nh libs -->
-        <echo message="NH Libs: ${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>				
-
 		<!-- build Spring.Data.NHibernate -->
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
@@ -51,11 +37,16 @@
 				<include name="System.Data.dll" />
 				<include name="System.Web.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Conversation.NHibernate*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate4.dll" />
-			</references>
+				<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}/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"/>
+				
+				</references>
 		</csc>
 	</target>
 </project>
diff --git a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
index 39f1ca6a..8434293a 100644
--- a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
+++ b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
@@ -37,6 +37,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}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Web.dll" />
 			</references>
diff --git a/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build b/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build
index 2b8ef1af..1c64c436 100644
--- a/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build
+++ b/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build
@@ -42,8 +42,8 @@
 				<include name="System.Web.Routing.dll"/>
  				<include name="System.Web.Services.dll" />
 
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-		        <include name="${current.bin.dir}/Common.Logging.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}/antlr.runtime.dll" />
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
diff --git a/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build b/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build
index 731b9837..50bcf426 100644
--- a/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build
+++ b/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build
@@ -44,8 +44,8 @@
 				<include name="System.Web.Routing.dll"/>
  				<include name="System.Web.Services.dll" />
 
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-		        <include name="${current.bin.dir}/Common.Logging.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}/antlr.runtime.dll" />
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
diff --git a/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build b/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build
index b80f6f70..b7419a7b 100644
--- a/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build
+++ b/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build
@@ -45,8 +45,8 @@
 				<include name="System.Web.Routing.dll"/>
  				<include name="System.Web.Services.dll" />
 
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-		        <include name="${current.bin.dir}/Common.Logging.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}/antlr.runtime.dll" />
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
diff --git a/src/Spring/Spring.Web/Spring.Web.build b/src/Spring/Spring.Web/Spring.Web.build
index 577aa64c..e7d1da2a 100644
--- a/src/Spring/Spring.Web/Spring.Web.build
+++ b/src/Spring/Spring.Web/Spring.Web.build
@@ -39,8 +39,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="${current.bin.dir}/Common.Logging.dll"/>
-		        <include name="${current.bin.dir}/Common.Logging.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}/antlr.runtime.dll" />
 				<include name="${current.bin.dir}/Spring.Core.dll" />
 				<include name="${current.bin.dir}/Spring.Aop.dll" />
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
index 02877f7b..a557cf93 100644
--- a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
@@ -46,9 +46,13 @@
 				<include name="System.Data.dll" />
 				<include name="System.Web.dll" />
 				<include name="System.Xml.dll" />
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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"/>
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
index 28c99504..857d3499 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
@@ -14,7 +14,8 @@
 		<!--
 	        <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}" />
 
 		<csc target="library" define="${current.build.defines.csc}"
 			warnaserror="true"
@@ -64,12 +65,19 @@
 				<include name="System.Web.Services.dll" />
 				<include name="System.Web.dll" />
 				<include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+				<include name="System.Transactions.dll" />
 				<include name="System.Windows.Forms.dll" />
                 <include name="System.Xml.dll"/>
-				<include name="${current.bin.dir}/Rhino.Mocks.dll" />
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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"/>
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
index 2a7718de..dbe37c14 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
@@ -43,8 +43,14 @@
         <include name="System.Logging.dll" />
         <include name="System.Data.OracleClient.dll" />
         <include name="System.Xml.dll" />
-        <include name="${current.bin.dir}/*.dll" />
-        <exclude name="${current.bin.dir}/${project::get-name()}.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}/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"/>
       </references>
     </csc>
   </target>
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build
index 1b4f02ad..31294fff 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build
@@ -23,9 +23,9 @@
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
 			<references basedir="${current.bin.dir}">
-				<lib>
+				
 					<include name="${nh12.lib.dir}"/>
-				</lib>
+				
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
 				<include name="log4net.dll" />
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 a5b7d920..e566debf 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
@@ -10,19 +10,6 @@
 
 		<!-- 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}"
@@ -40,21 +27,28 @@
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
 			<references>
-				<lib>
-					<include name="${nh3.lib.dir}"/>
-					<include name="${iesi3.lib.dir}"/>
-				</lib>
+				
+					<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="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate3*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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="${nunit.lib.dir}/nunit.framework.dll"/>
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
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 cf777fe7..4b4c993b 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
@@ -11,19 +11,6 @@
     -->
 	<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}"
@@ -41,22 +28,29 @@
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
 			<references>
-				<lib>
-					<include name="${nh3.lib.dir}"/>
-					<include name="${iesi3.lib.dir}"/>
-				</lib>
+				
+					<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="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate1*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate31*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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="${nunit.lib.dir}/nunit.framework.dll"/>
+				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
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 71b31e8e..2cc6e6d3 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,20 +9,6 @@
 	<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}"
@@ -40,21 +26,28 @@
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
 			<references>
-				<lib>
-					<include name="${nh4.lib.dir}"/>
-					<include name="${iesi4.lib.dir}"/>
-				</lib>
+				
+					<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="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate32*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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="${nunit.lib.dir}/nunit.framework.dll"/>
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
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 1da2d223..a46810fe 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
@@ -11,22 +11,11 @@
  
 	<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}" />
+	
+	
 		<!-- 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}"
@@ -44,21 +33,25 @@
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
 			<references>
-				<lib>
-					<include name="${nh4.lib.dir}"/>
-					<include name="${iesi4.lib.dir}"/>
-				</lib>
 				<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="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate3*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
+				<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}/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"/>
 			</references>
 			<resources prefix="Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
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 562011b1..47442f8b 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,21 +10,6 @@
             * 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}"
@@ -42,22 +27,25 @@
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
 			<references>
-				<lib>
-					<include name="${nh4.lib.dir}"/>
-					<include name="${iesi4.lib.dir}"/>
-				</lib>
 				<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="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate1*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate31*.dll" />
-				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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="${nunit.lib.dir}/nunit.framework.dll"/>
+				<include name="${spring.basedir}/lib/Net/2.0/Rhino.Mocks.dll"/>
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
index 22265b5a..e62a21d6 100644
--- a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
+++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
@@ -41,9 +41,15 @@
 				<include name="System.Drawing.dll" />
 				<include name="System.EnterpriseServices.dll" />
 				<include name="System.Transactions.dll" />
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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"/>
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build
index 492a9180..27c43de3 100644
--- a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build
+++ b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build
@@ -26,10 +26,25 @@
         <include name="**/*.cs" />
         <exclude name="AssemblyInfo.cs" />
       </sources>
-      <references basedir="${current.bin.dir}">
-        <include name="*.dll" />
-        <include name="Spring.Messaging.Ems.dll" />
-		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+      <references>
+		<!--
+		<include name="mscorlib.dll"/>
+		<include name="System.dll"/>
+		<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}/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"/>
 	  </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
         <include name="**/*.xml" />
diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build
index 0fa0d1a5..bd8ed0a9 100644
--- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build
+++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build
@@ -36,8 +36,16 @@
 		<include name="System.Core.dll"/>
         <include name="System.Data.dll" />
         <include name="System.EnterpriseServices.dll" />
-        <include name="${current.bin.dir}/*.dll" />
-		<exclude name="${current.bin.dir}/${project::get-name()}.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}/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"/>
       </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
         <include name="**/*.xml" />
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
index 5f35fe8f..69ef0651 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
@@ -30,15 +30,25 @@
 		        <resources prefix="Spring" dynamicprefix="true" failonempty="false">
 			        <include name="**/*.xml" />
 			</resources>
-			<references>
+			  <references>
 				<include name="mscorlib.dll"/>
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
-			</references>
+				<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}/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"/>
+			  </references>
 		</csc>
 
                 <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build
index ad8f05cf..eb21bc54 100644
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build
+++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build
@@ -37,9 +37,15 @@
 				<include name="System.Core.dll"/>
 				<include name="System.Messaging.dll"/>
 				<include name="System.Transactions.dll"/>
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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"/>
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.build b/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.build
index 4f828b79..32ee0752 100644
--- a/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.build
+++ b/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.build
@@ -32,8 +32,15 @@
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.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}/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"/>
 			</references>
 		</csc>
 		<copy todir="${current.bin.dir}">
diff --git a/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build b/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build
index bb1225c7..0ca99753 100644
--- a/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build
+++ b/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build
@@ -39,9 +39,16 @@
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/System.Net.Http*.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}/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"/>
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
index d1ea5ac3..d3fb38c1 100644
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
@@ -47,9 +47,15 @@
 		<include name="System.Web.dll"/>
 		<include name="System.Web.Services.dll"/>
 		<include name="System.Xml.dll"/>
-        <include name="${current.bin.dir}/*.dll" />
-        <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-        <exclude name="${current.bin.dir}/CloverRuntime.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}/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"/>
       </references>
     </csc>
     <copy todir="${current.bin.dir}" verbose="${copy-verbose}" >
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
index 210f83ac..9934d3f1 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
+++ b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
@@ -33,8 +33,13 @@
 				<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="${common.logging.lib.dir}/Common.Logging.dll"/>
+				<include name="${common.logging.core.lib.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"/>
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
index da9a58c2..5271b7db 100644
--- a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
+++ b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
@@ -36,9 +36,13 @@
 				<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="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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.Microsoft.dll" />
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
index d636ac16..0012d1da 100644
--- a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
@@ -36,9 +36,15 @@
 				<include name="System.dll"/>
 				<include name="System.Core.dll"/>
 				<include name="System.Data.dll"/>
-				<include name="${current.bin.dir}/*.dll" />
-				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-				<exclude name="${current.bin.dir}/CloverRuntime.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}/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"/>
 			</references>
 		</csc>
 
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 5c5e45d3..8f82404e 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
@@ -11,19 +11,6 @@
     -->
   <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}"
@@ -42,9 +29,6 @@
         <exclude name="bin/**/*" />
       </sources>
       <references>
-        <lib>
-          <include name="${nh3.lib.dir}"/>
-        </lib>
 		<include name="mscorlib.dll"/>
 		<include name="Microsoft.CSharp.dll"/>
 		<include name="System.dll"/>
@@ -53,11 +37,19 @@
         <include name="System.Data.dll" />
         <include name="System.EnterpriseServices.dll" />
         <include name="System.Web.dll" />
-		<include name="${current.bin.dir}/*.dll" />
-        <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-        <exclude name="${current.bin.dir}/*NHibernate4*.dll" />
-        <exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
-        <exclude name="${current.bin.dir}/CloverRuntime.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}/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="${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"/>
       </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
         <include name="**/*.xml" />
diff --git a/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build b/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build
index fa875151..6b12bad2 100644
--- a/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build
+++ b/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build
@@ -11,11 +11,13 @@
     -->
     <target name="build">
 
+		<!--
 		<copy todir="${current.bin.dir}" flatten="true" overwrite="true">
             <fileset basedir="${spring.basedir}/packages/">
                 <include name="Microsoft.AspNet.Mvc.3.0.*/**/*.dll" />
             </fileset>
-		</copy>				
+		</copy>
+		-->
 
 		<!-- build Spring.Web.Mvc -->
         <csc target="library" define="${current.build.defines.csc}" 
@@ -44,6 +46,9 @@
                 <exclude name="obj/**/*" />
             </resources>
             <references>
+				<lib>
+					<include name="${spring.basedir}/packages/Microsoft.AspNet.Mvc.3.0.20105.1/lib/net40" />
+				</lib>
 				<include name="mscorlib.dll"/>
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
@@ -51,21 +56,28 @@
 				<include name="System.Configuration.dll" />
 				<include name="System.Drawing.dll" />
 				<include name="System.Xml.dll" />
+				<include name="System.Xml.Linq.dll" />
 				<include name="System.Web.dll" />
+				<include name="System.Web.Abstractions.dll" />
+				<include name="System.Web.Helpers.dll" />
+				<include name="System.Web.Mvc.dll" />
+				<include name="System.Web.Razor.dll" />
+				<include name="System.Web.Routing.dll" />
+				<include name="System.Web.WebPages.dll" />
+				<include name="System.Web.WebPages.Deployment.dll" />
+				<include name="System.Web.WebPages.Razor.dll" />
 				<include name="System.Web.Services.dll" />
 				<include name="System.Data.dll" />
 				
-				<include name="System.Web.Abstractions.dll"/>
-				<include name="System.Web.Routing.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}/*.dll" />
-                <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-            
-                <include name="${lib.dir}/nunit.core.interfaces.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc4.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc4.Tests.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc5.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc5.Tests.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="${lib.dir}/nunit.core.interfaces.dll" />
+
             </references>
         </csc>
         <copy todir="${current.bin.dir}">
diff --git a/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build b/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build
index 12f3e880..7e7d4eec 100644
--- a/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build
+++ b/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build
@@ -11,11 +11,13 @@
     -->
     <target name="build">
 
+		<!--
 		<copy todir="${current.bin.dir}" flatten="true" overwrite="true">
             <fileset basedir="${spring.basedir}/packages/">
                 <include name="Microsoft.AspNet.*.4.0.*/**/*.dll" />
             </fileset>
 		</copy>
+		-->
 
 		<!-- build Spring.Web.Mvc -->
         <csc target="library" define="${current.build.defines.csc}" 
@@ -47,6 +49,12 @@
                 <exclude name="../Spring.Web.Mvc3.Tests/bin/**/*" />
             </resources>
             <references>
+				<lib>
+					<include name="${spring.basedir}/packages/Microsoft.AspNet.Mvc.4.0.30506.0/lib/net40" />
+					<include name="${spring.basedir}/packages/Microsoft.AspNet.WebApi.Client.4.0.30506.0/lib/net40" />
+					<include name="${spring.basedir}/packages/Microsoft.AspNet.WebApi.Core.4.0.30506.0/lib/net40" />
+					<include name="${spring.basedir}/packages/Microsoft.AspNet.WebApi.WebHost.4.0.30506.0/lib/net40" />
+				</lib>
 				<include name="mscorlib.dll"/>
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
@@ -54,22 +62,29 @@
 				<include name="System.Configuration.dll" />
 				<include name="System.Drawing.dll" />
 				<include name="System.Xml.dll" />
+				<include name="System.Xml.Linq.dll" />
 				<include name="System.Web.dll" />
+				<include name="System.Web.Abstractions.dll" />
+				<include name="System.Web.Helpers.dll" />
+				<include name="System.Web.Http.dll" />
+				<include name="System.Web.Http.WebHost.dll" />
+				<include name="System.Web.Mvc.dll" />
+				<include name="System.Web.Razor.dll" />
+				<include name="System.Web.Routing.dll" />
+				<include name="System.Web.WebPages.dll" />
+				<include name="System.Web.WebPages.Deployment.dll" />
+				<include name="System.Web.WebPages.Razor.dll" />
 				<include name="System.Web.Services.dll" />
 				<include name="System.Data.dll" />
 				
-				<include name="System.Web.Abstractions.dll"/>
-				<include name="System.Web.Routing.dll"/>
-				
-                <include name="${current.bin.dir}/*.dll" />
-                <exclude name="${current.bin.dir}/${project::get-name()}.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}/Spring.Core.dll" />
+                <include name="${current.bin.dir}/Spring.Web.Mvc4.dll" />
+
+				<include name="${nunit.lib.dir}/nunit.framework.dll"/>            
                 <include name="${lib.dir}/nunit.core.interfaces.dll" />
-				<exclude name="${current.bin.dir}/System.Web.Extensions.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc3.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc3.Tests.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc5.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc5.Tests.dll" />
             </references>
         </csc>
         <copy todir="${current.bin.dir}">
diff --git a/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build b/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build
index 4a271c46..a8037e30 100644
--- a/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build
+++ b/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build
@@ -11,11 +11,13 @@
     -->
     <target name="build">
 
+		<!--
 		<copy todir="${current.bin.dir}" flatten="true" overwrite="true">
             <fileset basedir="${spring.basedir}/packages/">
                 <include name="Microsoft.AspNet.*.5.0.0/**/*.dll" />
             </fileset>
-		</copy>		
+		</copy>
+		-->
 
 		<!-- build Spring.Web.Mvc -->
         <csc target="library" define="${current.build.defines.csc}" 
@@ -48,6 +50,12 @@
                 <exclude name="../Spring.Web.Mvc3.Tests/bin/**/*" />
             </resources>
             <references>
+				<lib>
+					<include name="${spring.basedir}/packages/Microsoft.AspNet.Mvc.5.0.0/lib/net45" />
+					<include name="${spring.basedir}/packages/Microsoft.AspNet.WebApi.Client.5.0.0/lib/net45" />
+					<include name="${spring.basedir}/packages/Microsoft.AspNet.WebApi.Core.5.0.0/lib/net45" />
+					<include name="${spring.basedir}/packages/Microsoft.AspNet.WebApi.WebHost.5.0.0/lib/net45" />
+				</lib>
 				<include name="mscorlib.dll"/>
 				<include name="Microsoft.CSharp.dll"/>
 				<include name="System.dll"/>
@@ -56,24 +64,30 @@
 				<include name="System.Data.dll" />
 				<include name="System.Drawing.dll" />
 				<include name="System.Xml.dll" />
+				<include name="System.Xml.Linq.dll" />
 				
 				<include name="System.Web.dll" />
 				<include name="System.Web.Abstractions.dll"/>
+				<include name="System.Web.Helpers.dll"/>
+				<include name="System.Web.Mvc.dll"/>
+				<include name="System.Web.Razor.dll"/>
+				<include name="System.Web.Routing.dll"/>
+				<include name="System.Web.WebPages.dll"/>
+				<include name="System.Web.WebPages.Deployment.dll"/>
+				<include name="System.Web.WebPages.Razor.dll"/>
 				<include name="System.Web.ApplicationServices.dll" />        
 				<include name="System.Web.Routing.dll"/>
 				<include name="System.Web.Services.dll" />
 				
-                <include name="${current.bin.dir}/*.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}/Spring.Core.dll" />
                 <include name="${current.bin.dir}/Spring.Web.Mvc5.dll" />
-                <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-            
+
+ 				<include name="${nunit.lib.dir}/nunit.framework.dll"/>           
                 <include name="${lib.dir}/nunit.core.interfaces.dll" />
-				<exclude name="${current.bin.dir}/System.Web.Extensions.dll" />
-				<exclude name="${current.bin.dir}/System.Net.Http.Formatting.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc3.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc3.Tests.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc4.dll" />
-				<exclude name="${current.bin.dir}/Spring.Web.Mvc4.Tests.dll" />
+
             </references>
         </csc>
         <copy todir="${current.bin.dir}">
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
index 4c10ab86..18a7523c 100644
--- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
@@ -47,10 +47,16 @@
 				<include name="System.Web.dll" />
 				<include name="System.Web.Services.dll" />
 				<include name="System.Data.dll" />
-                <include name="${current.bin.dir}/*.dll" />
-                <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
-                <exclude name="${current.bin.dir}/CloverRuntime.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}/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="${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" />
             </references>
         </csc>
         <copy todir="${current.bin.dir}">