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)

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>
 

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>
 

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>

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" />

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" />

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" />

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" />

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" />

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" />

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>
 

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" />

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" />

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"

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>
 

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}">

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>
 

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}" >

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" />

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>
 

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>
 

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" />

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}">

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}">

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}">

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}">