From 67966c1566def6249fdad021a92d95b84562f787 Mon Sep 17 00:00:00 2001
From: sbohlen <sbohlen@gmail.com>
Date: Thu, 9 Dec 2010 00:24:11 +0000
Subject: [PATCH] misc changes to build infrastructure to support adding .net
 3.5 and 4.0

---
 Spring.build                                  |  69 ++++---
 common-project.include                        |  10 +-
 doc/reference/src/index.xml                   |   1 -
 .../Quartz/SpringObjectJobFactory.cs          | 172 +++++++++---------
 .../Spring.Scheduling.Quartz.2010.csproj      |   8 +-
 .../Spring.Services/Spring.Services.build     |   8 +-
 .../Context/Support/MvcApplicationContext.cs  |  31 ++++
 .../Context/Support/MvcContextHandler.cs      |   4 +-
 .../Spring.Web.Mvc/Properties/AssemblyInfo.cs |  36 ----
 .../Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj |  18 +-
 .../Spring.Web.Mvc/Spring.Web.Mvc.build       |  58 +++---
 .../Spring.Web.Mvc/SpringControllerFactory.cs |   7 +
 .../Spring.Web.Mvc/SpringMvcApplication.cs    |  17 +-
 test/Spring/CommonAssemblyInfo.cs             |  14 +-
 ...Spring.Scheduling.Quartz.Tests.2010.csproj |   5 +-
 .../Spring.Services.Tests.build               |  10 +-
 .../Properties/AssemblyInfo.cs                |  36 ----
 .../Spring.Web.Mvc.Tests.2010.csproj          |  29 ++-
 .../Spring.Web.Mvc.Tests.build                |  79 ++++++--
 .../SpringControllerFactoryTests.cs           |   6 +-
 .../Spring.Web.Tests.2010.csproj              |  12 +-
 21 files changed, 362 insertions(+), 268 deletions(-)
 delete mode 100644 src/Spring/Spring.Web.Mvc/Properties/AssemblyInfo.cs
 delete mode 100644 test/Spring/Spring.Web.Mvc.Tests/Properties/AssemblyInfo.cs

diff --git a/Spring.build b/Spring.build
index d7b25ba0..583170fb 100644
--- a/Spring.build
+++ b/Spring.build
@@ -99,6 +99,8 @@ Commandline Examples:
 
 -->
 
+  <property name="copy-verbose" value="true" />
+
   <!-- global project settings -->
   <property name="project.name" value="Spring.NET"/>
   <property name="project.name.full" value="Spring.NET Framework"/>
@@ -131,7 +133,7 @@ Commandline Examples:
        that we are not allowed to redistribute -->
   <if test="${directory::exists(spring.nonredistdir)}">
     <echo message="Copying non-redistributables into source tree"/>
-    <copy todir="${spring.basedir}">
+    <copy todir="${spring.basedir}" verbose="${copy-verbose}">
       <fileset basedir="${spring.nonredistdir}">
         <include name="**/*.*"/>
       </fileset>
@@ -591,6 +593,7 @@ Commandline Examples:
 	<nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="test" if="${build-quartz}"/>
 	<nant buildfile="src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build" target="build"/>
 	<nant buildfile="test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build" target="test"/>
+	<nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build"/>
   </target>
 
   <target name="compile-net-4.0" description="Builds .NET Framework 4.0 version"
@@ -639,14 +642,14 @@ Commandline Examples:
     <echo message="Current bin dir = ${current.bin.dir}"/>
     <echo message="Current lib dir = ${lib.dir}"/>
     <!-- copy framework-neutral libraries -->
-    <copy todir="${current.bin.dir}">
+    <copy todir="${current.bin.dir}" verbose="${copy-verbose}">
       <fileset basedir="lib">
         <include name="*.dll"/>
         <include name="*.xml"/>
       </fileset>
     </copy>
     <!-- copy framework-specific libraries -->
-    <copy todir="${current.bin.dir}">
+    <copy todir="${current.bin.dir}" verbose="${copy-verbose}">
       <fileset basedir="${lib.dir}">
         <include name="*.dll"/>
         <include name="*.xml"/>
@@ -661,10 +664,13 @@ Commandline Examples:
     <echo message="Current lib dir = ${lib.dir}"/>
 	<mkdir dir="${lib.dir}" failonerror="false" />
 	
-    <copy todir="${lib.dir}" verbose="true">
+    <copy todir="${lib.dir}" verbose="${copy-verbose}">
       <fileset basedir="${lib20.dir}">
         <include name="*.dll"/>
 		<exclude if="${net-4.0}" name="**/System.Web.Extensions.dll"/>
+		<exclude if="${net-3.5}" name="**/System.Web.Extensions.dll"/>
+		<exclude if="${net-3.5}" name="**/Quartz.dll"/>
+		<exclude if="${net-4.0}" name="**/Quartz.dll"/>
         <include name="*.xml"/>
       </fileset>
     </copy>
@@ -1010,14 +1016,15 @@ Commandline Examples:
   <target name="build-all-function" description="Build what is in cvs taking into account approrpiate clr versions and root target name">
 
     <!-- net-1.0 dropped since 1.3.0 -->
-    <call target="${nant.target.root.name}-1.1" />
-
+<!--
+	<call target="${nant.target.root.name}-1.1" />
+-->
     <call target="${nant.target.root.name}-2.0" />
 
     <call target="${nant.target.root.name}-3.0" />
 
     <call target="${nant.target.root.name}-3.5" />
-	
+
 	<call target="${nant.target.root.name}-4.0" />
 
     <!-- ignore Mono 2.0 -->
@@ -1112,7 +1119,7 @@ Commandline Examples:
   <target name="package-tools">
     <!-- copy third-party tools -->
     <mkdir dir="${current.package.dir}/build-support/tools"/>
-    <copy todir="${current.package.dir}/build-support/tools">
+    <copy todir="${current.package.dir}/build-support/tools" verbose="${copy-verbose}">
       <fileset basedir="build-support/tools">
         <include name="antlr-2.7.6/**/*"/>
         <include name="nunit/**/*"/>
@@ -1177,11 +1184,12 @@ Commandline Examples:
 
   <target name="package-release-files" depends="set-package-configuration">
     <echo message="Current package directory = ${current.package.dir}"/>
-    <copy todir="${current.package.dir}">
+    <copy todir="${current.package.dir}" verbose="${copy-verbose}">
       <fileset>
         <include name="${solution.file.2003}"/>
         <include name="${solution.file.2005}"/>
         <include name="${solution.file.2008}"/>
+		<include name="${solution.file.2010}"/>
         <include name="readme.txt"/>
         <include name="changelog.txt"/>
         <include name="license.txt"/>
@@ -1206,7 +1214,7 @@ Commandline Examples:
 
     <!-- copy user reference documentation -->
     <mkdir dir="${current.package.dir}/doc/reference"/>
-    <copy todir="${current.package.dir}/doc/reference">
+    <copy todir="${current.package.dir}/doc/reference" verbose="${copy-verbose}">
       <fileset basedir="doc/reference/target">
         <include name="html/**/*"/>
         <include name="pdf/**/*"/>
@@ -1218,7 +1226,7 @@ Commandline Examples:
     <mkdir dir="${current.package.dir}/lib/Net"/>
 
     <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
-      <copy todir="${current.package.dir}/lib/Net">
+      <copy todir="${current.package.dir}/lib/Net" verbose="${copy-verbose}">
         <fileset basedir="lib/Net">
           <include name="**/DotNetMock*.dll"/>
           <include name="**/log4net.dll"/>
@@ -1246,7 +1254,7 @@ Commandline Examples:
 
     <mkdir dir="${current.package.dir}/lib/NHibernate12"/>
     <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
-      <copy todir="${current.package.dir}/lib/NHibernate12">
+      <copy todir="${current.package.dir}/lib/NHibernate12" verbose="${copy-verbose}">
         <fileset basedir="lib/NHibernate12">
           <include name="**/*.dll"/>
           <include name="**/*.xml"/>
@@ -1258,7 +1266,7 @@ Commandline Examples:
 
     <mkdir dir="${current.package.dir}/lib/NHibernate20"/>
     <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
-      <copy todir="${current.package.dir}/lib/NHibernate20">
+      <copy todir="${current.package.dir}/lib/NHibernate20" verbose="${copy-verbose}">
         <fileset basedir="lib/NHibernate20">
           <include name="**/*.dll"/>
           <include name="**/*.xml"/>
@@ -1270,7 +1278,7 @@ Commandline Examples:
 
     <mkdir dir="${current.package.dir}/lib/NHibernate21"/>
     <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
-      <copy todir="${current.package.dir}/lib/NHibernate21">
+      <copy todir="${current.package.dir}/lib/NHibernate21" verbose="${copy-verbose}">
         <fileset basedir="lib/NHibernate21">
           <include name="**/*.dll"/>
           <include name="**/*.xml"/>
@@ -1282,7 +1290,7 @@ Commandline Examples:
 	
 	<mkdir dir="${current.package.dir}/lib/NHibernate30"/>
     <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
-      <copy todir="${current.package.dir}/lib/NHibernate30">
+      <copy todir="${current.package.dir}/lib/NHibernate30" verbose="${copy-verbose}">
         <fileset basedir="lib/NHibernate30">
           <include name="**/*.dll"/>
           <include name="**/*.xml"/>
@@ -1293,7 +1301,7 @@ Commandline Examples:
     </if>
 
     <if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
-      <copy todir="${current.package.dir}/lib">
+      <copy todir="${current.package.dir}/lib" verbose="${copy-verbose}">
         <fileset basedir="lib">
           <include name="**/*.dll"/>
           <include name="**/*.xml"/>
@@ -1303,7 +1311,7 @@ Commandline Examples:
 
     <!-- copy additional scripts -->
     <mkdir dir="${current.package.dir}/build-support"/>
-    <copy todir="${current.package.dir}/build-support">
+    <copy todir="${current.package.dir}/build-support" verbose="${copy-verbose}">
       <fileset basedir="build-support">
         <include name="solutions.build.nant"/>
       </fileset>
@@ -1311,7 +1319,7 @@ Commandline Examples:
 
     <!-- copy third-party icons -->
     <mkdir dir="${current.package.dir}/build-support/icons"/>
-    <copy todir="${current.package.dir}/build-support/icons">
+    <copy todir="${current.package.dir}/build-support/icons" verbose="${copy-verbose}">
       <fileset basedir="build-support/icons">
         <include name="*.ico"/>
         <include name="*.pal"/>
@@ -1320,7 +1328,7 @@ Commandline Examples:
 
     <!-- copy additional convenience solution files -->
     <mkdir dir="${current.package.dir}/build-support/solutions"/>
-    <copy todir="${current.package.dir}/build-support/solutions">
+    <copy todir="${current.package.dir}/build-support/solutions" verbose="${copy-verbose}">
       <fileset basedir="build-support/solutions">
         <include name="*.sln"/>
       </fileset>
@@ -1385,12 +1393,12 @@ Commandline Examples:
     <echo message="copying source code for release..."/>
 
     <!-- copy source code -->
-    <copy todir="${current.package.dir}" verbose="false">
+    <copy todir="${current.package.dir}" verbose="${copy-verbose}">
       <fileset refid="src.to.copy"/>
     </copy>
 
     <!-- copy examples -->
-    <copy todir="${current.package.dir}/examples">
+    <copy todir="${current.package.dir}/examples" verbose="${copy-verbose}">
         <fileset basedir="examples">
           <include name="**/*.refresh"/>
           <include name="**/*.refresh"/>
@@ -1398,7 +1406,7 @@ Commandline Examples:
     </copy>
 
     <!-- copy templates -->
-    <copy todir="${current.package.dir}/dev-support">
+    <copy todir="${current.package.dir}/dev-support" verbose="${copy-verbose}">
         <fileset basedir="dev-support">
           <include name="resharper/**"/>
           <include name="vs.net-2008/**"/>
@@ -1412,7 +1420,7 @@ Commandline Examples:
     <!-- copy built assemblies -->
     <mkdir dir="${current.package.dir}/bin/net"/>
     <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
-      <copy todir="${current.package.dir}/bin/net">
+      <copy todir="${current.package.dir}/bin/net" verbose="${copy-verbose}">
         <fileset basedir="./build/net">
 
           <include name="*/*/Common.Logging.dll"/>
@@ -1448,6 +1456,10 @@ Commandline Examples:
           <include name="*/*/Spring.Web.dll"/>
           <include name="*/*/Spring.Web.xml"/>
           <include name="*/*/Spring.Web.pdb"/>
+		  
+		  <include name="*/*/Spring.Web.Mvc.dll"/>
+          <include name="*/*/Spring.Web.Mvc.xml"/>
+          <include name="*/*/Spring.Web.Mvc.pdb"/>
 
           <include name="*/*/Spring.Web.Extensions.dll"/>
           <include name="*/*/Spring.Web.Extensions.xml"/>
@@ -1493,7 +1505,7 @@ Commandline Examples:
 
       <if test="${net-3.0.installed}">
         <mkdir dir="${current.package.dir}/bin/net/3.0"/>
-        <copy todir="${current.package.dir}/bin/net/3.0">
+        <copy todir="${current.package.dir}/bin/net/3.0" verbose="${copy-verbose}">
           <fileset basedir="./build/net/3.0">
             <include name="*/Spring.Services.dll"/>
             <include name="*/Spring.Services.xml"/>
@@ -1504,7 +1516,7 @@ Commandline Examples:
    </if>
 
     <if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
-      <copy todir="${current.package.dir}/bin/net">
+      <copy todir="${current.package.dir}/bin/net" verbose="${copy-verbose}">
         <fileset basedir="./build/net">
           <include name="**/Spring.Services.*.exe"/>
           <include name="**/Spring.*.dll"/>
@@ -1573,7 +1585,7 @@ Commandline Examples:
 
     <!-- Copy generated htmlhelp 2.x files, install scripts, -->
     <!-- and install utility for .NET 1.1 assemblies         -->
-    <copy todir="${current.package.dir}/doc/sdk/1.1/vsnet2003">
+    <copy todir="${current.package.dir}/doc/sdk/1.1/vsnet2003" verbose="${copy-verbose}">
       <fileset basedir="${sdk.src.dir}/doc/sdk/Spring-1.3/net-1.1/htmlhelp1and2">
         <include name="COL_*.*"/>
       </fileset>
@@ -1589,7 +1601,7 @@ Commandline Examples:
 
     <!-- Copy generated htmlhelp 2.x files, install scripts, -->
     <!-- and install utility for .NET 2.0 assemblies         -->
-    <copy todir="${current.package.dir}/doc/sdk/2.0/vsnet2005">
+    <copy todir="${current.package.dir}/doc/sdk/2.0/vsnet2005" verbose="${copy-verbose}">
       <fileset basedir="${sdk.src.dir}/doc/sdk/Spring-1.3/net-2.0/htmlhelp1and2">
         <include name="COL_*.*"/>
       </fileset>
@@ -1695,10 +1707,12 @@ Commandline Examples:
     <property name="solution.file.2003" value="Spring.Net.2003.sln"/>
     <property name="solution.file.2005" value="Spring.Net.2005.sln"/>
     <property name="solution.file.2008" value="Spring.Net.2008.sln"/>
+	<property name="solution.file.2010" value="Spring.Net.2010.sln"/>
     <fileset id="src.to.copy">
       <include name="src/Spring/Spring.Core/**"/>
       <include name="src/Spring/Spring.Aop/**"/>
       <include name="src/Spring/Spring.Web/**"/>
+	  <include name="src/Spring/Spring.Web.Mvc/**"/>
       <include name="src/Spring/Spring.Web.Extensions/**"/>
       <include name="src/Spring/Spring.Services/**"/>
       <include name="src/Spring/Spring.Data/**"/>
@@ -1719,6 +1733,7 @@ Commandline Examples:
       <include name="test/Spring/Spring.Core.Tests/**"/>
       <include name="test/Spring/Spring.Aop.Tests/**"/>
       <include name="test/Spring/Spring.Web.Tests/**"/>
+	  <include name="test/Spring/Spring.Web.Mvc.Tests/**"/>
       <include name="test/Spring/Spring.Services.Tests/**"/>
       <include name="test/Spring/Spring.Data.Tests/**"/>
       <include name="test/Spring/Spring.Data.Integration.Tests/**"/>
diff --git a/common-project.include b/common-project.include
index 38b1a12c..c2ae6f75 100644
--- a/common-project.include
+++ b/common-project.include
@@ -106,28 +106,28 @@ ${current.build.defines}
 
         <property name="compile.lib.dir.tmp" value="${lib.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}" dynamic="true" />
         <echo message="copying libs from ${compile.lib.dir.tmp}" />
-        <copy todir="${compile.bin.dir}">
+        <copy todir="${compile.bin.dir}" verbose="${copy-verbose}">
             <fileset>
                 <include name="${compile.lib.dir.tmp}/*.dll" />
             </fileset>
         </copy>
         <property name="compile.lib.dir.tmp" value="${lib.dir}/${framework::get-family(framework::get-target-framework())}" dynamic="true" />
         <echo message="copying libs from ${compile.lib.dir.tmp}" />
-        <copy todir="${compile.bin.dir}">
+        <copy todir="${compile.bin.dir}" verbose="${copy-verbose}">
             <fileset>
                 <include name="${compile.lib.dir.tmp}/*.dll" />
             </fileset>
         </copy>
         <property name="compile.lib.dir.tmp" value="${lib.dir}" dynamic="true" />
         <echo message="copying libs from ${compile.lib.dir.tmp}" />
-        <copy todir="${compile.bin.dir}">
+        <copy todir="${compile.bin.dir}" verbose="${copy-verbose}">
             <fileset>
                 <include name="${compile.lib.dir.tmp}/*.dll" />
             </fileset>
         </copy>
         <property name="compile.lib.dir.tmp" value="${current.bin.dir}" dynamic="true" />
         <echo message="copying libs from ${compile.lib.dir.tmp}" />
-        <copy todir="${compile.bin.dir}">
+        <copy todir="${compile.bin.dir}" verbose="${copy-verbose}">
             <fileset>
                 <!-- exclude name="${current.lib.dir}/*.Tests.dll" / -->
                 <include name="${compile.lib.dir.tmp}/*.dll" />
@@ -166,7 +166,7 @@ ${current.build.defines}
               tofile="${current.bin.dir}/${project::get-name()}.dll.config" failonerror="false"/>
 
         <!-- copy 'TestData' directory -->
-        <copy todir="${current.bin.dir}/TestData" failonerror="false">
+        <copy todir="${current.bin.dir}/TestData" failonerror="false" verbose="${copy-verbose}">
           <fileset basedir="${project::get-base-directory()}/TestData">
             <include name="**/*.*"/>
           </fileset>
diff --git a/doc/reference/src/index.xml b/doc/reference/src/index.xml
index 4ea294db..e4f4c255 100644
--- a/doc/reference/src/index.xml
+++ b/doc/reference/src/index.xml
@@ -112,7 +112,6 @@
         <firstname>Erez</firstname>
         <surname>Mazor</surname>
       </author>
-      <author>
       <author>
         <firstname>Stephen</firstname>
         <surname>Bohlen</surname>
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs
index 1b513b4f..58d73f98 100644
--- a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs
@@ -19,102 +19,102 @@ using Spring.Objects;
 
 namespace Spring.Scheduling.Quartz
 {
-	/// <summary> 
-	/// Subclass of AdaptableJobFactory that also supports Spring-style
-	/// dependency injection on object properties. This is essentially the direct
-	/// equivalent of Spring's QuartzJobObject in the shape of a
-	/// Quartz JobFactory.
-	/// </summary>
-	/// <remarks>
-	/// Applies scheduler context, job data map and trigger data map entries
-	/// as object property values. If no matching object property is found, the entry
-	/// is by default simply ignored. This is analogous to QuartzJobObject's behavior.
-	/// </remarks>
-	/// <author>Juergen Hoeller</author>
-	/// <seealso cref="SchedulerFactoryObject.JobFactory" />
-	/// <seealso cref="QuartzJobObject" />
-	public class SpringObjectJobFactory : AdaptableJobFactory, ISchedulerContextAware
-	{
+    /// <summary> 
+    /// Subclass of AdaptableJobFactory that also supports Spring-style
+    /// dependency injection on object properties. This is essentially the direct
+    /// equivalent of Spring's QuartzJobObject in the shape of a
+    /// Quartz JobFactory.
+    /// </summary>
+    /// <remarks>
+    /// Applies scheduler context, job data map and trigger data map entries
+    /// as object property values. If no matching object property is found, the entry
+    /// is by default simply ignored. This is analogous to QuartzJobObject's behavior.
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <seealso cref="SchedulerFactoryObject.JobFactory" />
+    /// <seealso cref="QuartzJobObject" />
+    public class SpringObjectJobFactory : AdaptableJobFactory, ISchedulerContextAware
+    {
         private string[] ignoredUnknownProperties;
         private SchedulerContext schedulerContext;
 
-		/// <summary> 
-		/// Specify the unknown properties (not found in the object) that should be ignored.
-		/// </summary>
-		/// <remarks>
-		/// Default is <code>null</code>, indicating that all unknown properties
-		/// should be ignored. Specify an empty array to throw an exception in case
-		/// of any unknown properties, or a list of property names that should be
-		/// ignored if there is no corresponding property found on the particular
-		/// job class (all other unknown properties will still trigger an exception).
-		/// </remarks>
-		public virtual string[] IgnoredUnknownProperties
-		{
-			set { ignoredUnknownProperties = value; }
-		}
+        /// <summary> 
+        /// Specify the unknown properties (not found in the object) that should be ignored.
+        /// </summary>
+        /// <remarks>
+        /// Default is <code>null</code>, indicating that all unknown properties
+        /// should be ignored. Specify an empty array to throw an exception in case
+        /// of any unknown properties, or a list of property names that should be
+        /// ignored if there is no corresponding property found on the particular
+        /// job class (all other unknown properties will still trigger an exception).
+        /// </remarks>
+        public virtual string[] IgnoredUnknownProperties
+        {
+            set { ignoredUnknownProperties = value; }
+        }
 
         /// <summary>
         /// Set the SchedulerContext of the current Quartz Scheduler.
         /// </summary>
         /// <value></value>
         /// <seealso cref="IScheduler.Context"/>
-		public virtual SchedulerContext SchedulerContext
-		{
-			set { schedulerContext = value; }
-		}
+        public virtual SchedulerContext SchedulerContext
+        {
+            set { schedulerContext = value; }
+        }
 
 
-		/// <summary> 
-		/// Create the job instance, populating it with property values taken
-		/// from the scheduler context, job data map and trigger data map.
-		/// </summary>
-		protected override object CreateJobInstance(TriggerFiredBundle bundle)
-		{
-			ObjectWrapper ow = new ObjectWrapper(bundle.JobDetail.JobType);
-			if (IsEligibleForPropertyPopulation(ow.WrappedInstance))
-			{
-				MutablePropertyValues pvs = new MutablePropertyValues();
-				if (schedulerContext != null)
-				{
-					pvs.AddAll(schedulerContext);
-				}
-				pvs.AddAll(bundle.JobDetail.JobDataMap);
-				pvs.AddAll(bundle.Trigger.JobDataMap);
-				if (ignoredUnknownProperties != null)
-				{
-					for (int i = 0; i < ignoredUnknownProperties.Length; i++)
-					{
-						string propName = ignoredUnknownProperties[i];
-						if (pvs.Contains(propName))
-						{
-							pvs.Remove(propName);
-						}
-					}
-					ow.SetPropertyValues(pvs);
-				}
-				else
-				{
-					ow.SetPropertyValues(pvs, true);
-				}
-			}
-			return ow.WrappedInstance;
-		}
+        /// <summary> 
+        /// Create the job instance, populating it with property values taken
+        /// from the scheduler context, job data map and trigger data map.
+        /// </summary>
+        protected override object CreateJobInstance(TriggerFiredBundle bundle)
+        {
+            ObjectWrapper ow = new ObjectWrapper(bundle.JobDetail.JobType);
+            if (IsEligibleForPropertyPopulation(ow.WrappedInstance))
+            {
+                MutablePropertyValues pvs = new MutablePropertyValues();
+                if (schedulerContext != null)
+                {
+                    pvs.AddAll(schedulerContext);
+                }
+                pvs.AddAll(bundle.JobDetail.JobDataMap);
+                pvs.AddAll(bundle.Trigger.JobDataMap);
+                if (ignoredUnknownProperties != null)
+                {
+                    for (int i = 0; i < ignoredUnknownProperties.Length; i++)
+                    {
+                        string propName = ignoredUnknownProperties[i];
+                        if (pvs.Contains(propName))
+                        {
+                            pvs.Remove(propName);
+                        }
+                    }
+                    ow.SetPropertyValues(pvs);
+                }
+                else
+                {
+                    ow.SetPropertyValues(pvs, true);
+                }
+            }
+            return ow.WrappedInstance;
+        }
 
-		/// <summary> 
-		/// Return whether the given job object is eligible for having
-		/// its object properties populated.
-		/// <p>
-		/// The default implementation ignores QuartzJobObject instances,
-		/// which will inject object properties themselves.
-		/// </p>
-		/// </summary>
-		/// <param name="jobObject">
-		/// The job object to introspect.
-		/// </param>
-		/// <seealso cref="QuartzJobObject" />
-		protected virtual bool IsEligibleForPropertyPopulation(object jobObject)
-		{
-			return (!(jobObject is QuartzJobObject));
-		}
-	}
+        /// <summary> 
+        /// Return whether the given job object is eligible for having
+        /// its object properties populated.
+        /// <p>
+        /// The default implementation ignores QuartzJobObject instances,
+        /// which will inject object properties themselves.
+        /// </p>
+        /// </summary>
+        /// <param name="jobObject">
+        /// The job object to introspect.
+        /// </param>
+        /// <seealso cref="QuartzJobObject" />
+        protected virtual bool IsEligibleForPropertyPopulation(object jobObject)
+        {
+            return (!(jobObject is QuartzJobObject));
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj
index 595bddb2..e04a2d97 100644
--- a/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj
+++ b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj
@@ -10,11 +10,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Scheduling.Quartz</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,9 +41,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Quartz, Version=0.6.0.21049, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\Quartz.dll</HintPath>
+    <Reference Include="Quartz">
+      <HintPath>..\..\..\lib\Net\3.5\Quartz.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/src/Spring/Spring.Services/Spring.Services.build b/src/Spring/Spring.Services/Spring.Services.build
index 00def53d..ccf1ef18 100644
--- a/src/Spring/Spring.Services/Spring.Services.build
+++ b/src/Spring/Spring.Services/Spring.Services.build
@@ -14,11 +14,13 @@
       <echo message="Copying from ${bin.dir.to.use}"/>
       <echo message="          to ${current.bin.dir}"/>
       <echo message="-----------------"/>
-      <copy todir="${current.bin.dir}" overwrite="true" failonerror="true">
+      <copy todir="${current.bin.dir}" overwrite="true" failonerror="true" verbose="${copy-verbose}">
 	<fileset basedir="${bin.dir.to.use}">
 	  <include name="*.dll"/>
 	  <include name="*.pdb"/>
 	  <include name="*.xml"/>
+	  <exclude name="System.Web.Extensions.dll" if="${net-3.5}"/>
+	  <exclude name="System.Web.Extensions.dll" if="${net-4.0}"/>
 	  <exclude name="Spring.Services.dll"/>
 	  <exclude name="Spring.Services.pdb"/>
 	  <exclude name="Spring.Services.xml"/>
@@ -27,11 +29,13 @@
     </if>
     
     <if test="${net-3.0.installed and net-3.0 and not net-4.0}">
-      <copy todir="${current.bin.dir}" overwrite="true" failonerror="true">
+      <copy todir="${current.bin.dir}" overwrite="true" failonerror="true" verbose="${copy-verbose}">
 	<fileset basedir="${bin.dir.to.use}">
 	  <include name="*.dll"/>
 	  <include name="*.pdb"/>
 	  <include name="*.xml"/>
+	  <exclude name="System.Web.Extensions.dll" if="${net-3.5}"/>
+	  <exclude name="System.Web.Extensions.dll" if="${net-4.0}"/>	  
 	  <exclude name="Spring.Services.dll"/>
 	  <exclude name="Spring.Services.pdb"/>
 	  <exclude name="Spring.Services.xml"/>
diff --git a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
index aae11532..d2756fc0 100644
--- a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
+++ b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
@@ -82,11 +82,42 @@ namespace Spring.Context.Support
         {
         }
 
+        /// <summary>
+        /// An array of resource locations, referring to the XML object
+        /// definition files that this context is to be built with.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// 	<p>
+        /// Examples of the format of the various strings that would be
+        /// returned by accessing this property can be found in the overview
+        /// documentation of with the <see cref="XmlApplicationContext"/>
+        /// class.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// An array of resource locations, or <see langword="null"/> if none.
+        /// </returns>
         protected override string[] ConfigurationLocations
         {
             get { return _configurationLocations; }
         }
 
+        /// <summary>
+        /// An array of resources that this context is to be built with.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// 	<p>
+        /// Examples of the format of the various strings that would be
+        /// returned by accessing this property can be found in the overview
+        /// documentation of with the <see cref="XmlApplicationContext"/>
+        /// class.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// An array of <see cref="Spring.Core.IO.IResource"/>s, or <see langword="null"/> if none.
+        /// </returns>
         protected override IResource[] ConfigurationResources
         {
             get { return _configurationResources; }
diff --git a/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs b/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs
index 9cc2c353..24146ebd 100644
--- a/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs
+++ b/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs
@@ -11,12 +11,12 @@ namespace Spring.Context.Support
     /// </summary>
     public class MvcContextHandler : ContextHandler
     {
+
         /// <summary>
         /// The <see cref="System.Type"/> of <see cref="Spring.Context.IApplicationContext"/>
         /// created if no <c>type</c> attribute is specified on a <c>context</c> element.
         /// </summary>
-        /// <value></value>
-        /// <seealso cref="GetContextType"/>
+        /// <value></value>        
         protected override Type DefaultApplicationContextType
         {
             get { return typeof(MvcApplicationContext); }
diff --git a/src/Spring/Spring.Web.Mvc/Properties/AssemblyInfo.cs b/src/Spring/Spring.Web.Mvc/Properties/AssemblyInfo.cs
deleted file mode 100644
index 89ac954d..00000000
--- a/src/Spring/Spring.Web.Mvc/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Spring.Web.Mvc")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Spring.Web.Mvc")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("4e7f33fc-585f-44cb-b8b9-500223e9b760")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj
index 18a108b9..35d65ad9 100644
--- a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj
+++ b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj
@@ -10,17 +10,20 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring.Web.Mvc</RootNamespace>
     <AssemblyName>Spring.Web.Mvc</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\net\3.5\debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Mvc\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_3_5;NET_4_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <DocumentationFile>Spring.Web.Mvc.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +36,7 @@
   <ItemGroup>
     <Reference Include="Common.Logging">
       <HintPath>..\..\..\lib\Net\3.5\Common.Logging.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -46,10 +50,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Context\Support\MvcApplicationContext.cs" />
     <Compile Include="Context\Support\MvcApplicationContextArgs.cs" />
     <Compile Include="Context\Support\MvcContextHandler.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SpringControllerFactory.cs" />
     <Compile Include="SpringMvcApplication.cs" />
   </ItemGroup>
@@ -57,8 +63,12 @@
     <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
       <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
       <Name>Spring.Core.2010</Name>
+      <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
index b37e2e48..ee991791 100644
--- a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
+++ b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
@@ -1,35 +1,47 @@
 <?xml version="1.0" ?>
 <project name="Spring.Web.Mvc" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-<include buildfile="${spring.basedir}/common-project.include" />
-
 <!--
     Required properties:
       * current.bin.dir           - (path) root level to build to
       * current.build.debug       - (true|false) debug build?
       * current.build.defines.csc - framework-specific build defines for C# compiler
 -->
-
 	<target name="build">
 		<!-- build Spring.Web.Mvc -->
-		<property name="solutionconfiguration" value="Debug" if="${current.build.config=='debug'}"/>
-		<property name="solutionconfiguration" value="Release" unless="${current.build.config=='debug'}" />
-		
-		<call target="RebuildSolution" />
+		<csc target="library" define="${current.build.defines.csc}" 
+		     warnaserror="true"
+		     optimize="${build.optimize}"
+		     debug="${current.build.debug}" 
+		     output="${current.bin.dir}/${project::get-name()}.dll" 
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+		     >
+			<arg line="${compiler.args}"/>	
+			<nowarn>
+				<warning number="${nowarn.numbers},0108,0114,0612,0109" />
+				<warning number="${nowarn.numbers},1591" if="${nant.settings.currentframework=='mono-2.0'}"/>
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../GenCommonAssemblyInfo.cs" />
+			</sources>
+			<resources basedir="Resources">
+				<include name="**/*" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+			        <include name="Common.Logging.dll"/>
+				<include name="antlr.runtime.dll" />
+				<include name="Spring.Core.dll" />
+				<include name="Spring.Aop.dll" />
+				<include name="System.Configuration.dll" />
+ 				<include name="System.Web.dll" />
+				<include name="C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
+				<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
+				<include name="System.Web.Routing.dll" if="${nant.settings.currentframework=='net-4.0'}" />
+				<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-3.5'}" />
+				<include name="System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-4.0'}" />
+ 				<include name="System.Web.Services.dll" />
+				<include if="${net-4.0.installed and net-4.0}" name="System.Web.ApplicationServices.dll" />        
+			</references>
+		</csc>
 	</target>
-	
-	<property name="solutionfile" value="${project::get-base-directory()}\${project::get-name()}.2010.csproj" />
-	<target name="RebuildSolution" description="rebuilds a given solution file">
-		<echo message="Rebuilding Solution ${solutionfile}" />
-		<exec program="${msbuild.exe}">
-
-		  <arg value="/property:OutDir=${current.bin.dir}/"/>
-
-		  <arg value="${solutionfile}"/>
-		  <arg line="/nologo" />
-		  <arg line="/verbosity:minimal" />
-		  <arg line="/property:Configuration=${solutionconfiguration}"/>
-		</exec>
-  </target>
-	
 </project>
diff --git a/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs b/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs
index 77d8f017..5fdd5000 100644
--- a/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs
+++ b/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs
@@ -17,6 +17,10 @@ namespace Spring.Web.Mvc
     {
         private static IApplicationContext _context;
 
+        /// <summary>
+        /// Gets the application context.
+        /// </summary>
+        /// <value>The application context.</value>
         public static IApplicationContext ApplicationContext
         {
             get
@@ -37,6 +41,9 @@ namespace Spring.Web.Mvc
             }
         }
 
+
+
+
         /// <summary>
         /// Creates the specified controller by using the specified request context.
         /// </summary>
diff --git a/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs b/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs
index 2eee8da2..15ec4b62 100644
--- a/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs
+++ b/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs
@@ -12,8 +12,16 @@ using Spring.Context.Support;
 
 namespace Spring.Web.Mvc
 {
+    /// <summary>
+    /// Spring.NET-specific HttpApplication for ASP.NET MVC integration.
+    /// </summary>
     public abstract class SpringMvcApplication : HttpApplication
     {
+        /// <summary>
+        /// Handles the Start event of the Application control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
         protected virtual void Application_Start(object sender, EventArgs e)
         {
             RegisterAreas();
@@ -21,18 +29,21 @@ namespace Spring.Web.Mvc
         }
 
         /// <summary>
-        /// Configures the <see cref="ApplicationContext"/> instance.
+        /// Configures the <see cref="Spring.Context.IApplicationContext"/> instance.
         /// </summary>
         /// <remarks>
         /// You must override this method in a derived class to control the manner in which the
-        /// <see cref="ApplicationContext"/> is configured.
+        /// <see cref="Spring.Context.IApplicationContext"/> is configured.
         /// </remarks>        
         protected virtual void ConfigureApplicationContext()
         {
-            
+
         }
 
 
+        /// <summary>
+        /// Executes custom initialization code after all event handler modules have been added.
+        /// </summary>
         public override void Init()
         {
             base.Init();
diff --git a/test/Spring/CommonAssemblyInfo.cs b/test/Spring/CommonAssemblyInfo.cs
index edeb7b1f..c24d192e 100644
--- a/test/Spring/CommonAssemblyInfo.cs
+++ b/test/Spring/CommonAssemblyInfo.cs
@@ -24,7 +24,19 @@ using System.Runtime.CompilerServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.3.0.0")]
+#if NET_4_0
+[assembly: AssemblyVersion("1.3.1.40001")]
+#elif NET_3_5
+[assembly: AssemblyVersion("1.3.1.35001")]
+#elif NET_3_0
+[assembly: AssemblyVersion("1.3.1.30001")]
+#elif NET_2_0
+[assembly: AssemblyVersion("1.3.1.20001")]
+#elif NET_1_1
+[assembly: AssemblyVersion("1.3.1.11001")]
+#elif NET_1_0
+[assembly: AssemblyVersion("1.3.1.10001")]
+#endif
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj
index 09d9d0eb..c3110ffa 100644
--- a/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj
@@ -42,9 +42,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Quartz, Version=0.7.0.15571, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\Quartz.dll</HintPath>
+    <Reference Include="Quartz">
+      <HintPath>..\..\..\lib\Net\3.5\Quartz.dll</HintPath>
     </Reference>
     <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
index e967c398..4c4eff1e 100644
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
@@ -12,7 +12,7 @@
   <target name="build">
     <if test="${net-3.0.installed and net-3.0}">
       <property name="bin.dir.to.use" value="${current.bin.dir}\..\..\2.0\${project.build.config}"/>
-      <copy todir="${current.bin.dir}">
+      <copy todir="${current.bin.dir}" verbose="${copy-verbose}">
         <fileset basedir="${bin.dir.to.use}">
           <include name="*.dll"/>
           <include name="*.pdb"/>
@@ -22,7 +22,9 @@
           <include name="System.Web.Services.Description.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
           <include name="System.ServiceModel.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
           <include name="System.Xml.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-          <exclude name="Spring.Services.dll"/>
+          <exclude name="System.Web.Extensions.dll" if="${net-3.5}"/>
+			<exclude name="System.Web.Extensions.dll" if="${net-4.0}"/>	
+		  <exclude name="Spring.Services.dll"/>
           <exclude name="Spring.Services.pdb"/>
           <exclude name="Spring.Services.xml"/>
         </fileset>
@@ -57,14 +59,14 @@
 		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
       </references>
     </csc>
-    <copy todir="${current.bin.dir}">
+    <copy todir="${current.bin.dir}" verbose="${copy-verbose}" >
       <fileset basedir="${project::get-base-directory()}/Data">
         <include name="**/*.xml" />
         <include name="**/*.wsdl" />
         <include name="**/*.xsd" />
       </fileset>
     </copy>
-    <copy todir="${current.bin.dir}">
+    <copy todir="${current.bin.dir}" verbose="${copy-verbose}">
       <fileset basedir="${project::get-base-directory()}">
         <include name="**/*.config" />
         <include name="**/*.xml" />
diff --git a/test/Spring/Spring.Web.Mvc.Tests/Properties/AssemblyInfo.cs b/test/Spring/Spring.Web.Mvc.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index f03211a9..00000000
--- a/test/Spring/Spring.Web.Mvc.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Spring.Web.Mvc.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Spring.Web.Mvc.Tests")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("3f96ac7b-cd25-4d07-8b1c-ee2eb77cf5eb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj
index f8f0e19d..d4946bb0 100644
--- a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj
@@ -10,17 +10,19 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring.Web.Mvc.Tests</RootNamespace>
     <AssemblyName>Spring.Web.Mvc.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Mvc.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_3_5;NET_4_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +35,7 @@
   <ItemGroup>
     <Reference Include="nunit.framework">
       <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -45,18 +48,21 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="ControllerFactoryTestExtension.cs" />
     <Compile Include="Controllers\NamedContextController.cs" />
     <Compile Include="Controllers\SecondContainerRegisteredController.cs" />
     <Compile Include="Controllers\NotInContainerController.cs" />
     <Compile Include="Controllers\FirstContainerRegisteredController.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SpringControllerFactoryTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
       <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
       <Name>Spring.Core.2010</Name>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Mvc\Spring.Web.Mvc.2010.csproj">
       <Project>{5166CE3A-14BE-478A-88DA-729A39DE1E29}</Project>
@@ -64,13 +70,22 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="objects.xml" />
+    <EmbeddedResource Include="objects.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="namedContextObjects.xml" />
+    <EmbeddedResource Include="namedContextObjects.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="objectsMatchByType.xml" />
+    <EmbeddedResource Include="objectsMatchByType.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
index c1a8481d..45e392b3 100644
--- a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
+++ b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
@@ -11,27 +11,70 @@
     -->
     <target name="build">
         <!-- build Spring.Web.Mvc -->
-        
-		<property name="solutionconfiguration" value="Debug" if="${current.build.config=='debug'}"/>
-		<property name="solutionconfiguration" value="Release" unless="${current.build.config=='debug'}" />
-		
-		<call target="RebuildSolution" />
-	</target>
+        <csc target="library" define="${current.build.defines.csc}" 
+	     warnaserror="true" 
+             optimize="${build.optimize}"
+	     debug="${current.build.debug}"
+             output="${current.bin.dir}/${project::get-name()}.dll" 
+	     doc="${current.bin.dir}/${project::get-name()}.xml">
+            <nowarn>
+                <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
+                <warning number="${nowarn.numbers.test},1587" if="${nant.settings.currentframework=='mono-2.0'}"/>
+            </nowarn>
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+                <include name="../CommonAssemblyInfo.cs" />
+            </sources>
+            <resources prefix="Spring" dynamicprefix="true" failonempty="true">
+                <include name="**/*.resx" />
+                <include name="**/*.xsd" />
+                <include name="**/*.txt" />
+                <include name="**/*.xml" />
+                <exclude name="Data/**/*" />
+                <exclude name="obj/**/*" />
+            </resources>
+            <references basedir="${current.bin.dir}">
+                <include name="*.dll" />
+		<include name="System.Configuration.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="System.Drawing.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="System.Xml.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="System.Web.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="System.Web.Services.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="System.Data.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
+		<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
+		<include name="System.Web.Routing.dll" if="${nant.settings.currentframework=='net-4.0'}" />
+		<include name="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-3.5'}" />
+		<include name="System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-4.0'}" />
+                <exclude name="${project::get-name()}.dll" />
+                <exclude name="CloverRuntime.dll" />
+                <include name="${lib.dir}/nunit.core.interfaces.dll" />
+				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+            </references>
+        </csc>
+        <copy todir="${current.bin.dir}">
+            <fileset basedir="${project::get-base-directory()}/Data">
+                <include name="**/*.*" />
+            </fileset>
+		</copy>
+		<copy todir="${current.bin.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+                <include name="**/*.xml" />
+            </fileset>
+		</copy>
+    </target>
 
     <target name="test" depends="build">
         <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
         <call target="common.run-tests" />
     </target>
-
-	<property name="solutionfile" value="${project::get-base-directory()}\${project::get-name()}.2010.csproj" />
-	<target name="RebuildSolution" description="rebuilds a given solution file">
-		<echo message="Rebuilding Solution ${solutionfile}" />
-		<exec program="${msbuild.exe}">
-		  <arg value="/property:OutDir=${current.bin.dir}/"/>
-		  <arg value="${solutionfile}"/>
-		  <arg line="/nologo" />
-		  <arg line="/verbosity:minimal" />
-		  <arg line="/property:Configuration=${solutionconfiguration}"/>
-		</exec>
-	</target>
+<!--
+    <target name="test" depends="build">
+        <nunit2outproc>
+            <formatter type="Plain" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" />
+            <test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+        </nunit2outproc>
+    </target>
+-->
 </project>
diff --git a/test/Spring/Spring.Web.Mvc.Tests/SpringControllerFactoryTests.cs b/test/Spring/Spring.Web.Mvc.Tests/SpringControllerFactoryTests.cs
index ed13307a..7add004b 100644
--- a/test/Spring/Spring.Web.Mvc.Tests/SpringControllerFactoryTests.cs
+++ b/test/Spring/Spring.Web.Mvc.Tests/SpringControllerFactoryTests.cs
@@ -28,8 +28,8 @@ namespace Spring.Web.Mvc.Tests
         public void _TestSetup()
         {
             ContextRegistry.Clear();
-            _context = new MvcApplicationContext("assembly://Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests/objects.xml");
-            _mvcNamedContext = new MvcApplicationContext("named", false, "assembly://Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests/namedContextObjects.xml");
+            _context = new MvcApplicationContext("file://objects.xml");
+            _mvcNamedContext = new MvcApplicationContext("named", false, "file://namedContextObjects.xml");
 
             ContextRegistry.RegisterContext(_context);
             ContextRegistry.RegisterContext(_mvcNamedContext);
@@ -68,7 +68,7 @@ namespace Spring.Web.Mvc.Tests
         [Test]
         public void CanRevertToTypeMatchIfIdMatchUnsuccessful()
         {
-            MvcApplicationContext context = new MvcApplicationContext("assembly://Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests/objectsMatchByType.xml");
+            MvcApplicationContext context = new MvcApplicationContext("file://objectsMatchByType.xml");
 
             ContextRegistry.Clear();
             ContextRegistry.RegisterContext(context);
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj
index 3b043738..bbdd070b 100644
--- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj
@@ -169,13 +169,19 @@
     <Content Include="Data\Spring\Web\Support\LocalResourceManagerTests\WithoutResources.aspx" />
     <Content Include="Data\Spring\Web\Support\LocalResourceManagerTests\WithResources.aspx" />
     <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\ReadOnlySession.aspx" />
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResult.aspx" />
+    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResult.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\MaintainsSession1.aspx" />
     <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\MaintainsSession2.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\DisablesSession.aspx" />
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResultSave.aspx" />
+    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\DisablesSession.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
+    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResultSave.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <EmbeddedResource Include="Data\Spring\Web\Support\LocalResourceManagerTests\App_LocalResources\WithResources.aspx.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>