diff --git a/Spring.build b/Spring.build
index 86d5b91a..6914d812 100644
--- a/Spring.build
+++ b/Spring.build
@@ -8,7 +8,7 @@ Main build targets:
   builds debug builds for all projects for all available target platforms
 
 "compile-build-<framework id>":
-  builds all projects for a specific platform, e.g. compile-build-2.0 for net-2.0
+  builds all projects for a specific platform, e.g. compile-build-3.5 for net-3.5
 
 "doc":
   builds the reference and sdk documentation
@@ -92,7 +92,7 @@ Commandline Examples:
   nant clean package -f:spring.build -D:project.build.sign=true -D:package.version=1.3.0
 
 *) to build a specific target platform
-  nant compile-build-2.0
+  nant compile-build-3.5
 
 *) to build just debug builds for all available platforms and execute tests
   nant test
@@ -217,14 +217,6 @@ Commandline Examples:
 
   <!-- Displays configuration info, usefull for working out why Spring.NET doesn't build -->
   <target name="display-setup" depends="check-htmlhelp-compiler">
-    <!-- .NET Framework 2.0 -->
-    <if test="${framework::exists('net-2.0')}">
-      <property name="nant.settings.currentframework" value="net-2.0"/>
-      <call target="display-target-framework"/>
-    </if>
-    <if test="${not framework::exists('net-2.0')}">
-      <echo message=".NET Framework 2.0 runtime is not available."/>
-    </if>
     <!-- Mono 2.0 -->
     <if test="${framework::exists('mono-2.0')}">
       <property name="nant.settings.currentframework" value="mono-2.0"/>
@@ -245,7 +237,6 @@ Commandline Examples:
     <echo message="htmlhelp.compiler: ${htmlhelp.compiler}"/>
   </target>
 
-
   <target name="display-target-framework">
     <echo message=""/>
     <echo message="----------------------------------------------------------"/>
@@ -300,8 +291,6 @@ Commandline Examples:
   <target name="compile-build" description="Compile current build configurations for all runtime configurations">
     <echo message="Compiling all framework versions for the ${current.build.config} build configuration."/>
 
-    <call target="compile-build-2.0"/>
-    <call target="compile-build-3.0"/>
     <call target="compile-build-3.5"/>
     <call target="compile-build-4.0"/>
   
@@ -310,42 +299,6 @@ Commandline Examples:
   </target>
 -->
 
-  <target name="compile-build-2.0" description="Builds for .NET 2.0 if available">
-    <if test="${framework::exists('net-2.0')}">
-      <call target="compile-net-2.0"/>
-    </if>
-
-    <if test="${not framework::exists('net-2.0')}">
-      <if test="${property::exists('project.build.package') and project.build.package}">
-        .NET 2.0 Build Skipped for Package
-        <fail message="The .NET Framework 2.0 is not available."/>
-        <echo message="The .NET Framework 2.0 is not available. Build skipped during package."/>
-      </if>
-      <if test="${not(property::exists('project.build.package') and project.build.package)}">
-        <echo message="The .NET Framework 2.0 is not available. Build skipped."/>
-      </if>
-    </if>
-  </target>
-
-  <target name="compile-build-3.0" description="Builds for .NET 3.0 if available">
-
-    <if test="${net-3.0.installed}">
-      <call target="compile-net-3.0"/>
-    </if>
-
-    <if test="${not net-3.0.installed}">
-      <if test="${property::exists('project.build.package') and project.build.package}">
-        .NET 3.0 Build Skipped for Package
-        <fail message="The .NET Framework 3.0 is not available."/>
-        <echo message="The .NET Framework 3.0 is not available. Build skipped during package."/>
-      </if>
-      <if test="${not(property::exists('project.build.package') and project.build.package)}">
-        <echo message="The .NET Framework 3.0 is not available. Build skipped."/>
-      </if>
-    </if>
-  </target>
-
-
   <target name="compile-build-3.5" description="Builds for .NET 3.5 if available">
 
     <if test="${net-3.5.installed}">
@@ -424,9 +377,9 @@ Commandline Examples:
   <target name="compile-test"> <!-- used as configurable template by all compile-{net|mono|netcf}-x.x targets -->
     <property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
     <property name="nh.lib.dir" value="${spring.basedir}/lib/NHibernate10/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-    <property name="nh12.lib.dir" value="${spring.basedir}/lib/NHibernate12/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-    <property name="nh20.lib.dir" value="${spring.basedir}/lib/NHibernate20/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-    <property name="nh21.lib.dir" value="${spring.basedir}/lib/NHibernate21/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+    <property name="nh12.lib.dir" value="${spring.basedir}/lib/NHibernate12/${framework::get-family(framework::get-target-framework())}/2.0"/>
+    <property name="nh20.lib.dir" value="${spring.basedir}/lib/NHibernate20/${framework::get-family(framework::get-target-framework())}/2.0"/>
+    <property name="nh21.lib.dir" value="${spring.basedir}/lib/NHibernate21/${framework::get-family(framework::get-target-framework())}/2.0"/>
     <property name="nh30.lib.dir" value="${spring.basedir}/lib/NHibernate30/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
     <property name="nh31.lib.dir" value="${spring.basedir}/lib/NHibernate31/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
     <property name="nh32.lib.dir" value="${spring.basedir}/lib/NHibernate32/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
@@ -438,20 +391,20 @@ Commandline Examples:
     <nant buildfile="src/Spring/Spring.Core/Spring.Core.build" target="build" />
     <nant buildfile="src/Spring/Spring.Aop/Spring.Aop.build" target="build" if="${build-aop}"/>
     <nant buildfile="src/Spring/Spring.Web/Spring.Web.build" target="build" if="${build-web}"/>
-    <nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build" if="${build-web and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
-	  <nant buildfile="src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build" target="build" if="${nant.settings.currentframework == 'net-4.0'}"/>
-	  <nant buildfile="src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build" target="build" if="${nant.settings.currentframework == 'net-4.0'}"/>
+    <nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build" if="${build-web and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
+    <nant buildfile="src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build" target="build" if="${nant.settings.currentframework == 'net-4.0'}"/>
+    <nant buildfile="src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build" target="build" if="${nant.settings.currentframework == 'net-4.0'}"/>
     <nant buildfile="src/Spring/Spring.Data/Spring.Data.build" target="build" if="${build-data}"/>
-    <nant buildfile="src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0')}"/>
-    <nant buildfile="src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
-    <nant buildfile="src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
+    <nant buildfile="src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build" target="build" if="${build-data and (nant.settings.currentframework == 'mono-2.0')}"/>
+    <nant buildfile="src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
+    <nant buildfile="src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
     <nant buildfile="src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
     <nant buildfile="src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
     <nant buildfile="src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
     <nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services}"/>
     <nant buildfile="src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build" target="build" if="${build-testing-nunit}"/>
     <nant buildfile="src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build" target="build" if="${build-testing-microsoft}"/>
-    <nant buildfile="src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build" target="build" if="${build-ems  and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-4.0' )}"/>
+    <nant buildfile="src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build" target="build" if="${build-ems  and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' )}"/>
     <nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-nms}"/>
     <nant buildfile="src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.build" target="build" if="${build-quartz}"/>
     <nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq}"/>
@@ -464,13 +417,13 @@ Commandline Examples:
     <nant buildfile="test/Spring/Spring.Data.Tests/Spring.Data.Tests.build" target="test" if="${build-data}"/>
     <nant buildfile="test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build" target="test" if="${build-data}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build" target="test"
-                 if="${build-data and nant.settings.currentframework == 'net-2.0'}"/>
+                 if="${build-data and nant.settings.currentframework == 'net-3.5'}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build" target="test"
-                 if="${build-data and nant.settings.currentframework == 'net-2.0'}"/>
+                 if="${build-data and nant.settings.currentframework == 'net-3.5'}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build" target="test"
-                 if="${build-data and nant.settings.currentframework == 'net-2.0'}"/>
+                 if="${build-data and nant.settings.currentframework == 'net-3.5'}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build" target="test"
-                 if="${build-data and nant.settings.currentframework == 'net-2.0'}"/>
+                 if="${build-data and nant.settings.currentframework == 'net-3.5'}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.build" target="test"
                  if="${build-data and nant.settings.currentframework == 'net-3.5'}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.build" target="test"
@@ -501,8 +454,8 @@ Commandline Examples:
 	<nant buildfile="test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build" target="test" if="${nant.settings.currentframework == 'net-4.0'}"/>
     <nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${build-testing-nunit}"/>
     <nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${build-testing-microsoft}"/>
-    <nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-4.0' ) and not net-3.0}"/>
-    <nant buildfile="test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-4.0') and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' ) and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0') and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms}"/>
     <nant buildfile="test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build" target="test" if="${build-nms}"/>
     <nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="build" if="${build-quartz}"/>
@@ -523,80 +476,31 @@ Commandline Examples:
 
   </target>
 
-  <target name="compile-net-2.0" description="Builds .NET Framework 2.0 version"
-          depends="set-net-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
-	
-	<property name="test.withcoverage" value="true" overwrite="true"/>
-	
+  <target name="compile-net-3.5" description="Builds .NET Framework 3.5 version"
+        depends="set-net-3.5-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
+		
+	<property name="test.withcoverage" value="true" overwrite="true"/>		  
+
 	<if test="${property::exists('mstest.exe')}">
 		<property name="mstest.exe.current" value="${string::replace(property::get-value('mstest.exe'), 'Microsoft Visual Studio 10.0', 'Microsoft Visual Studio 9.0')}" />
 	</if>
 	<if test="${property::exists('mstest.exe')}">
 		<property name="vs-net.mstest.bin.dir.current" value="${string::replace(property::get-value('vs-net.mstest.bin.dir'), 'Microsoft Visual Studio 10.0', 'Microsoft Visual Studio 9.0')}" />
 	</if>
+
 	<call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
-    <call target="compile-test" />
-  </target>
-
-  <target name="compile-net-3.0" description="Builds .NET Framework 3.0 version"
-          depends="set-net-3.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
-
-	<property name="test.withcoverage" value="true" overwrite="true"/>		  
-
- <call target="copykeys" if="${project.build.sign}"/>
-    <call target="common.generate-assemblyinfo"/>
-    <property name="build-ems" value="false" overwrite="true" />
-    <property name="build-nms" value="false" overwrite="true" />
-    <property name="build-quartz" value="false" overwrite="true" />
-    <property name="build-msmq" value="false" overwrite="true" />
-    <property name="build-msmq-tests" value="false" overwrite="true" />
-    <property name="build-velocity" value="false" overwrite="true" />
-
-    <!-- Do not call compile-test target - only build Spring.Services and tests which uses WCF in .NET 3.0 -->
-    <property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-    <call target="copylibtobin"/>
-    <nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services and not net-3.5}"/>
-    <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services and not net-3.5}"/>
-
-  </target>
-
-  <target name="compile-net-3.5" description="Builds .NET Framework 3.5 version"
-        depends="set-net-3.5-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
-		
-	<property name="test.withcoverage" value="true" overwrite="true"/>		  
-		
-	<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-	<property name="nh30.lib.dir" value="${spring.basedir}/lib/NHibernate30/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-	<property name="nh31.lib.dir" value="${spring.basedir}/lib/NHibernate31/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-	<property name="nh32.lib.dir" value="${spring.basedir}/lib/NHibernate32/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-    <property name="quartz.lib.dir" value="${spring.basedir}/lib/Quartz10/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-    <property name="quartz20.lib.dir" value="${spring.basedir}/lib/Quartz20/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-	<call target="copykeys" if="${project.build.sign}"/>
-	<call target="copylibs" />
-	<call target="common.generate-assemblyinfo"/>
-    <property name="build-ems" value="false" overwrite="true" />
-    <property name="build-nms" value="false" overwrite="true" />
-    <property name="build-quartz" value="true" overwrite="true" />
-    <property name="build-msmq" value="false" overwrite="true" />
-    <property name="build-msmq-tests" value="false" overwrite="true" />
-    <property name="build-velocity" value="false" overwrite="true" />
-	<property name="build-data" value="true" overwrite="true" />
 	
-	<!-- Do not call compile-test target - only build the following projects and related tests in .NET 3.5 -->
-    <property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-    <call target="copylibtobin"/>
-    <nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services}"/>
-    <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
-	<nant buildfile="src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.build" target="build" if="${build-quartz}"/>
-	<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"/>
-	<nant buildfile="src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.build" target="build" if="${build-data}" />
-	<nant buildfile="src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.build" target="build" if="${build-data}" />
-	<nant buildfile="src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.build" target="build" if="${build-data}" />
-  </target>
+    <property name="build-ems" value="false" overwrite="true" />
+    <property name="build-nms" value="true" overwrite="true" />
+    <property name="build-quartz" value="true" overwrite="true" />
+    <property name="build-msmq" value="true" overwrite="true" />
+    <property name="build-msmq-tests" value="true" overwrite="true" />
+    <property name="build-velocity" value="true" overwrite="true" />
+	
+    <call target="compile-test" />
+
+	</target>
 
   <target name="compile-net-4.0" description="Builds .NET Framework 4.0 version"
         depends="set-net-4.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
@@ -609,16 +513,17 @@ Commandline Examples:
 	<if test="${property::exists('mstest.exe')}">
 		<property name="vs-net.mstest.bin.dir.current" value="${string::replace(property::get-value('vs-net.mstest.bin.dir'), 'Microsoft Visual Studio 9.0', 'Microsoft Visual Studio 10.0')}" />
 	</if>
-	<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-    <call target="copykeys" if="${project.build.sign}"/>
-	<call target="copylibs" />
+	
+	<call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
+
     <property name="build-ems" value="false" overwrite="true" />
     <property name="build-nms" value="true" overwrite="true" />
     <property name="build-quartz" value="true" overwrite="true" />
     <property name="build-msmq" value="true" overwrite="true" />
     <property name="build-msmq-tests" value="true" overwrite="true" />
     <property name="build-velocity" value="true" overwrite="true" />
+	
     <call target="compile-test" />
   </target>
   
@@ -680,15 +585,11 @@ Commandline Examples:
         <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>
   </target>
-
-  
-  
+ 
   <!-- Top level targets -->
   <!-- target for developers to do just debug build and test everything in CVS -->
   <target name="test">
@@ -697,60 +598,6 @@ Commandline Examples:
     <call target="build-all-function"/>
   </target>
 
-  <target name="build-1.1">
-    <call target="set-build-namespaces-release"/>
-    <echo message="------------------------"/>
-    <echo message="Building .NET 1.1 DEBUG "/>
-    <echo message="------------------------"/>
-    <call target="set-debug-build-configuration"/>
-    <call target="compile-build-1.1"/>
-
-    <if test="${property::exists('project.build.package') and project.build.package}">
-      <echo message="------------------------"/>
-      <echo message="Building .NET 1.1 DEBUG "/>
-      <echo message="------------------------"/>
-      <call target="set-release-build-configuration"/>
-      <call target="compile-build-1.1"/>
-    </if>
-  </target>
-
-  <target name="build-2.0">
-    <call target="set-build-namespaces-release"/>
-    <echo message="------------------------"/>
-    <echo message="Building .NET 2.0 DEBUG "/>
-    <echo message="------------------------"/>
-    <call target="set-debug-build-configuration"/>
-    <call target="compile-build-2.0"/>
-
-
-    <if test="${property::exists('project.build.package') and project.build.package}">
-    <echo message="--------------------------"/>
-    <echo message="Building .NET 2.0 RELEASE "/>
-    <echo message="--------------------------"/>
-      <call target="set-release-build-configuration"/>
-      <call target="compile-build-2.0"/>
-    </if>
-  </target>
-
-
-  <target name="build-3.0">
-    <call target="set-build-namespaces-release"/>
-    <echo message="------------------------"/>
-    <echo message="Building .NET 3.0 DEBUG "/>
-    <echo message="------------------------"/>
-    <call target="set-debug-build-configuration"/>
-    <call target="compile-build-3.0"/>
-
-
-    <if test="${property::exists('project.build.package') and project.build.package}">
-    <echo message="--------------------------"/>
-    <echo message="Building .NET 3.0 RELEASE "/>
-    <echo message="--------------------------"/>
-      <call target="set-release-build-configuration"/>
-      <call target="compile-build-3.0"/>
-    </if>
-  </target>
-
   <target name="build-3.5">
     <call target="set-build-namespaces-release"/>
     <echo message="------------------------"/>
@@ -1047,10 +894,6 @@ Commandline Examples:
 
   <target name="build-all-function" description="Build what is in cvs taking into account approrpiate clr versions and root target name">
 
-    <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" />
@@ -1064,37 +907,6 @@ Commandline Examples:
 
   </target>
 
-  <target name="daily-build-1.1">
-    <call target="set-build-namespaces-all"/>
-    <call target="set-package-configuration"/>
-
-    <call target="set-debug-build-configuration"/>
-    <call target="compile-build-1.1"/>
-    <call target="set-release-build-configuration"/>
-    <call target="compile-build-1.1"/>
-
-  </target>
-
-  <target name="daily-build-2.0">
-    <call target="set-build-namespaces-all"/>
-    <call target="set-package-configuration"/>
-
-    <call target="set-debug-build-configuration"/>
-    <call target="compile-build-2.0"/>
-    <call target="set-release-build-configuration"/>
-    <call target="compile-build-2.0"/>
-
-  </target>
-
-  <target name="daily-build-3.0">
-    <call target="set-build-namespaces-all"/>
-    <call target="set-package-configuration"/>
-    <call target="set-debug-build-configuration"/>
-    <call target="compile-build-3.0"/>
-    <call target="set-release-build-configuration"/>
-    <call target="compile-build-3.0"/>
-  </target>
-
   <target name="daily-build-3.5">
     <call target="set-build-namespaces-all"/>
     <call target="set-package-configuration"/>
@@ -1103,8 +915,7 @@ Commandline Examples:
     <call target="set-release-build-configuration"/>
     <call target="compile-build-3.5"/>
   </target>
-
-  
+ 
   <target name="daily-build-4.0">
     <call target="set-build-namespaces-all"/>
     <call target="set-package-configuration"/>
@@ -1566,23 +1377,8 @@ Commandline Examples:
           <include name="*/*/Spring.Template.Velocity.xml"/>
           <include name="*/*/Spring.Template.Velocity.pdb"/>
 
-          <exclude name="3.0/**"/>
-          <exclude name="3.5/**"/>
-
         </fileset>
       </copy>
-
-<!--      <if test="${net-3.0.installed}"> -->
-        <mkdir dir="${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"/>
-            <include name="*/Spring.Services.pdb"/>
-          </fileset>
-        </copy>
-<!--      </if> -->
-	  
 	  
         <mkdir dir="${current.package.dir}/bin/net/3.5"/>
         <copy todir="${current.package.dir}/bin/net/3.5" verbose="${copy-verbose}">
diff --git a/Spring.include b/Spring.include
index 8102cda9..63410371 100644
--- a/Spring.include
+++ b/Spring.include
@@ -348,43 +348,6 @@
         </if>
         <call target="set-${framework::get-target-framework()}-runtime-configuration"/>
     </target>
-    <target name="set-net-2.0-runtime-configuration"
-            depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
-        <property name="nant.settings.currentframework" value="net-2.0"/>
-        <property name="nant.settings.currentframework.number" value="2.0"/>
-        <property name="nant.settings.currentframework.revisionnumber" value="20"/>
-        <property name="net-2.0" value="true"/>
-        <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
-        <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0" dynamic="true"/>
-        <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0" dynamic="true"/>
-        <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True" dynamic="true"/>
-        <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0" dynamic="true"/>
-        <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0" dynamic="true"/>
-        <property name="current.bin.dir"
-                  value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"/>
-        <property name="current.sdkdoc.dir"
-                  value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
-        <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
-        <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default},1701"/>
-    </target>
-    <target name="set-net-3.0-runtime-configuration"
-            depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
-        <property name="nant.settings.currentframework" value="net-2.0"/>
-        <property name="nant.settings.currentframework.number" value="2.0"/>
-	<!-- revision number used when generating assembly info -->
-        <property name="nant.settings.currentframework.revisionnumber" value="30"/>
-        <property name="net-2.0" value="true"/>
-        <property name="net-3.0" value="true"/>
-        <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
-        <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0,NET_3_0" dynamic="true"/>
-        <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0 /D NET_3_0" dynamic="true"/>
-        <property name="current.bin.dir"
-                  value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/3.0/${current.build.config}"/>
-        <property name="current.sdkdoc.dir"
-                  value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/3.0"/>
-        <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
-        <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default},1701"/>
-    </target>
     <target name="set-net-3.5-runtime-configuration"
             depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
       <property name="nant.settings.currentframework" value="net-3.5"/>
diff --git a/build-support/solutions/Spring.Net.NHibernate.sln b/build-support/solutions/Spring.Net.NHibernate.sln
deleted file mode 100644
index 97f8ad07..00000000
--- a/build-support/solutions/Spring.Net.NHibernate.sln
+++ /dev/null
@@ -1,127 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
-	ProjectSection(SolutionItems) = preProject
-		Spring.build = Spring.build
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2008", "..\..\test\Spring\Spring.Data.Tests\Spring.Data.Tests.2008.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.2008", "..\..\src\Spring\Spring.Data.NHibernate\Spring.Data.NHibernate.2008.csproj", "{130E1609-45A7-4F65-B112-105F2DD3E2CE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.Tests.2008", "..\..\test\Spring\Spring.Data.NHibernate.Tests\Spring.Data.NHibernate.Tests.2008.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.Integration.Tests.2008", "..\..\test\Spring\Spring.Data.NHibernate.Integration.Tests\Spring.Data.NHibernate.Integration.Tests.2008.csproj", "{4A07E150-ED90-407C-8CAD-4760444DDFD9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|.NET.ActiveCfg = Release|Any CPU
-		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|.NET.ActiveCfg = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|.NET.ActiveCfg = Release|Any CPU
-		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		NAntAddinLastFileName = Spring.build
-	EndGlobalSection
-EndGlobal
diff --git a/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/projects/App.AdoQuickStart/App.Service/App.Service.csproj b/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/projects/App.AdoQuickStart/App.Service/App.Service.csproj
index 9e1186a2..79b1adee 100644
--- a/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/projects/App.AdoQuickStart/App.Service/App.Service.csproj
+++ b/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/projects/App.AdoQuickStart/App.Service/App.Service.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>App.Service</RootNamespace>
     <AssemblyName>App.Service</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/solution-items/App.HibernateQuickStart/src/App.Service/App.Service.csproj b/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/solution-items/App.HibernateQuickStart/src/App.Service/App.Service.csproj
index 9e1186a2..79b1adee 100644
--- a/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/solution-items/App.HibernateQuickStart/src/App.Service/App.Service.csproj
+++ b/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/solution-items/App.HibernateQuickStart/src/App.Service/App.Service.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>App.Service</RootNamespace>
     <AssemblyName>App.Service</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/solution-items/App.WebQuickStart/src/App.Service/App.Service.csproj b/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/solution-items/App.WebQuickStart/src/App.Service/App.Service.csproj
index 9e1186a2..79b1adee 100644
--- a/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/solution-items/App.WebQuickStart/src/App.Service/App.Service.csproj
+++ b/dev-support/vs.net-2008/templates/solution/AdoSolution/App.AdoQuickStart/solution-items/App.WebQuickStart/src/App.Service/App.Service.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>App.Service</RootNamespace>
     <AssemblyName>App.Service</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2008.csproj
index 2c595a1c..d207882e 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2008.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -77,15 +78,18 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Aspects\ConsoleLoggingAroundAdvice.cs" />
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2010.csproj
index 8ff705d5..b5285a10 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2010.csproj
@@ -80,11 +80,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2008.csproj
index 45b4d74e..2d7fbe88 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2008.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1B3559A0-5274-4968-A628-77F036984F02}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -15,6 +15,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,13 +37,16 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2010.csproj
index 09b9b7f0..5039ac64 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2010.csproj
@@ -39,11 +39,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2008.csproj
index 8c072a07..b4afc9f3 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2008.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -15,6 +15,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,13 +37,16 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2010.csproj
index f710a294..6f5c8fa3 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2010.csproj
@@ -39,11 +39,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2008.csproj
index 4107def2..40dbc7e9 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2008.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -15,6 +15,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,13 +37,16 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2010.csproj
index de6050e8..feb0ce42 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2010.csproj
@@ -39,11 +39,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2008.csproj
index 069a5ebe..d098fda0 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2008.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -15,6 +15,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,13 +37,16 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Aspects\ConsoleLoggingAdvice.cs">
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2010.csproj
index f8df4b84..62a2c145 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2010.csproj
@@ -39,11 +39,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2008.csproj
index cee99aef..16b3f89b 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2008.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{61086108-3EB7-4ACE-B4B6-B4B60AB76108}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -15,6 +15,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,13 +37,16 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Aspects\ExpressionDynamicPointcutAdvisor.cs" />
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2010.csproj
index d574be67..2045d60e 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2010.csproj
@@ -39,11 +39,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2008.csproj
index 2343cd79..bb79fc95 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2008.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -15,6 +15,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,13 +37,16 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Contact.cs" />
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2010.csproj
index d9f1581d..ff3c08c0 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2010.csproj
@@ -39,11 +39,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2008.csproj
index 022149d6..0699a280 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2008.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0077A8CA-4C09-42B1-B227-91095CE4CCA2}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -15,6 +15,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,13 +37,16 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Commands\AnotherServiceCommand.cs" />
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2010.csproj
index 9b48dd3a..73a2d013 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2010.csproj
@@ -39,11 +39,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.2008.csproj b/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.2008.csproj
index d50c97d8..01bb7b17 100644
--- a/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.2008.csproj
+++ b/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.2008.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring.CachingQuickStart</RootNamespace>
     <AssemblyName>Spring.CachingQuickStart.Web</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -32,15 +32,15 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.3.1.20711, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.3.1.20711, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web, Version=1.3.1.20711, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Web" />
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj
index 2fece33d..cc8d4da6 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj
@@ -78,11 +78,11 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj
index 45e5088f..f4266852 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj
@@ -94,11 +94,11 @@
     </ProjectReference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj
index 323bb22b..c04dd18f 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj
@@ -103,7 +103,7 @@
   <ItemGroup>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj
index b5bb5783..2547826e 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj
@@ -79,11 +79,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj
index 14f2bd7b..7ba4db9b 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj
@@ -44,11 +44,11 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -56,7 +56,7 @@
     </Reference>
     <Reference Include="Spring.Web, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2008.csproj
index 18715246..6b0355de 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2008.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2008.csproj
@@ -51,15 +51,15 @@
     </Reference>
     <Reference Include="Spring.Core">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data.NHibernate21">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate21.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2010.csproj
index 205f8d87..fde267b2 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2010.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -70,15 +70,15 @@
     </Reference>
     <Reference Include="Spring.Core">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data.NHibernate21">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Data.NHibernate21.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj
index 52e62d33..b36b0f94 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj
@@ -46,15 +46,15 @@
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data.NHibernate21, Version=1.1.1.20093, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate21.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2010.csproj
index 7bb02e82..538a5aef 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2010.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2008.csproj
index fb56a8b8..9fe0c303 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2008.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2008.csproj
@@ -39,7 +39,7 @@
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj
index a4b074f1..34b71ac5 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -58,7 +58,7 @@
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj
index 506d9280..817bab01 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj
@@ -34,7 +34,7 @@
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.2008.csproj
index fe51038f..9952c6c8 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.2008.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.2008.csproj
@@ -54,7 +54,7 @@
     </Reference>
     <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
@@ -71,23 +71,23 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data.NHibernate21, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate21.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.2010.csproj
index 6a42495f..cab01622 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.2010.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.2010.csproj
@@ -16,7 +16,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -58,7 +58,7 @@
     </Reference>
     <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Common.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
@@ -75,23 +75,23 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data.NHibernate21, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Data.NHibernate21.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.Debug.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.Debug.csproj
index 38519aaf..010c695b 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.Debug.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.Debug.csproj
@@ -34,7 +34,7 @@
     </Reference>
     <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.csproj
index c262dd4c..77e431d1 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.csproj
@@ -34,7 +34,7 @@
     </Reference>
     <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
@@ -55,23 +55,23 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>	
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data.NHibernate21, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate21.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2008.csproj
index c73b55d3..58024406 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2008.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2008.csproj
@@ -55,23 +55,23 @@
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data.NHibernate21, Version=1.1.2.20153, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate21.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Testing.NUnit, Version=1.1.2.20153, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Testing.NUnit.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Testing.NUnit.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2010.csproj
index 24f96aaf..92ea502f 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2010.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -74,23 +74,23 @@
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data.NHibernate21, Version=1.1.2.20153, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Data.NHibernate21.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Testing.NUnit, Version=1.1.2.20153, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Testing.NUnit.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Testing.NUnit.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
index d866a00d..88309266 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
@@ -50,23 +50,23 @@
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data.NHibernate21, Version=1.1.2.20153, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate21.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Testing.NUnit, Version=1.1.2.20153, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Testing.NUnit.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Testing.NUnit.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2008.csproj b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2008.csproj
index c5160f04..a6d689c8 100644
--- a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2008.csproj
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{92B2A60E-D3B9-4647-8CFE-AC19611869F6}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,17 +38,20 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2010.csproj b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2010.csproj
index 6ae189c1..d2bdc8d5 100644
--- a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2010.csproj
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -56,15 +56,15 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2008.csproj b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2008.csproj
index 9e4e8386..f72df61b 100644
--- a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2008.csproj
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2008.csproj
@@ -29,6 +29,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,13 +59,16 @@
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2010.csproj b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2010.csproj
index b471dce0..294041f3 100644
--- a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2010.csproj
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2010.csproj
@@ -16,7 +16,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -62,11 +62,11 @@
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.2010.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.2010.csproj
index 41b6807a..f2be3d7c 100644
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.2010.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.2010.csproj
@@ -16,7 +16,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Spring.EmsQuickStart.Client/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -57,13 +57,13 @@
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging.Ems">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.Ems.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.Ems.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj
index 5dfde217..7a05d26b 100644
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj
@@ -29,6 +29,7 @@
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,25 +55,28 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging.Ems, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.Ems.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.Ems.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.2010.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.2010.csproj
index 687aea2d..3af5176d 100644
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.2010.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.2010.csproj
@@ -16,7 +16,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Spring.EmsQuickStart.Common/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -53,14 +53,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging.Ems, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.Ems.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.Ems.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.csproj
index 5b386f62..58ed1804 100644
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.csproj
@@ -29,6 +29,7 @@
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,25 +51,28 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging.Ems, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.Ems.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.Ems.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.2010.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.2010.csproj
index 294097ff..4852feee 100644
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.2010.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.2010.csproj
@@ -16,7 +16,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Spring.EmsQuickStart.Server/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -57,13 +57,13 @@
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging.Ems">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.Ems.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.Ems.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.csproj
index 84e1a4d8..c6b58f7c 100644
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.csproj
@@ -29,6 +29,7 @@
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,25 +55,28 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging.Ems, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.Ems.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.Ems.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
diff --git a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2008.csproj b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2008.csproj
index 12e4021d..ad320dfc 100644
--- a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2008.csproj
+++ b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2008.csproj
@@ -27,6 +27,7 @@
     <OldToolsVersion>0.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -86,6 +87,9 @@
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data">
       <Name>System.Data</Name>
     </Reference>
diff --git a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2010.csproj b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2010.csproj
index 09d64cd2..2f536d28 100644
--- a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2010.csproj
+++ b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2010.csproj
@@ -28,7 +28,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2008.csproj b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2008.csproj
index 8b58de5e..4919eed6 100644
--- a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2008.csproj
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{880EA873-E951-465A-AC5B-BA899A2C744E}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -77,11 +78,14 @@
   <ItemGroup>
     <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data">
       <Name>System.Data</Name>
     </Reference>
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2010.csproj b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2010.csproj
index 1c6ca501..1c434037 100644
--- a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2010.csproj
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2010.csproj
@@ -95,7 +95,7 @@
   <ItemGroup>
     <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2008.csproj b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2008.csproj
index 59c5795f..30bc04a9 100644
--- a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2008.csproj
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0D35F19E-308E-4A0B-88B1-7E7C2D665053}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -26,6 +26,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -76,11 +77,14 @@
   <ItemGroup>
     <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2010.csproj b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2010.csproj
index a82f4ab3..3ca6cfbc 100644
--- a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2010.csproj
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2010.csproj
@@ -94,7 +94,7 @@
   <ItemGroup>
     <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2008.csproj b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2008.csproj
index 73990118..0d3922b2 100644
--- a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2008.csproj
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C261D9ED-85C3-4B35-BE48-7156F5B17430}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -26,6 +26,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -76,7 +77,7 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Common.Logging.Log4Net, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -88,11 +89,14 @@
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2010.csproj b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2010.csproj
index 62765e5b..13dc5629 100644
--- a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2010.csproj
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2010.csproj
@@ -94,7 +94,7 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\4.0\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Common.Logging.Log4Net, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -106,7 +106,7 @@
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2008.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2008.csproj
index d423461d..e8e6937c 100644
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2008.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2008.csproj
@@ -29,6 +29,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,21 +56,24 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2010.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2010.csproj
index 71fb6e97..ab062006 100644
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2010.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2010.csproj
@@ -16,7 +16,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -59,19 +59,19 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2008.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2008.csproj
index 49ef90cf..6184d7bf 100644
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2008.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2008.csproj
@@ -29,6 +29,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,25 +51,28 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Messaging" />
     <Reference Include="System.Xml" />
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2010.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2010.csproj
index 90cf4828..9ef3af36 100644
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2010.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2010.csproj
@@ -16,7 +16,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -54,23 +54,23 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2008.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2008.csproj
index a8906554..c3e7a882 100644
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2008.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2008.csproj
@@ -29,6 +29,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,21 +55,24 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Messaging" />
     <Reference Include="System.Xml" />
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2010.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2010.csproj
index c08dc8b1..29d964da 100644
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2010.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2010.csproj
@@ -16,7 +16,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -58,19 +58,19 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.MvcQuickStart/src/Spring.MvcQuickStart/Spring.MvcQuickStart.2010.csproj b/examples/Spring/Spring.MvcQuickStart/src/Spring.MvcQuickStart/Spring.MvcQuickStart.2010.csproj
index 69ca9036..946dc507 100644
--- a/examples/Spring/Spring.MvcQuickStart/src/Spring.MvcQuickStart/Spring.MvcQuickStart.2010.csproj
+++ b/examples/Spring/Spring.MvcQuickStart/src/Spring.MvcQuickStart/Spring.MvcQuickStart.2010.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring.MvcQuickStart</RootNamespace>
     <AssemblyName>Spring.MvcQuickStart</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>false</UseIISExpress>
   </PropertyGroup>
@@ -35,13 +35,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data">
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web">
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web.Mvc">
       <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.Mvc.dll</HintPath>
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2008.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2008.csproj
index fce1bbc5..b4f1a3ba 100644
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2008.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{87D0B725-A652-4A6B-A95F-197F7155769F}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -46,6 +47,9 @@
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2010.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2010.csproj
index ff3d1f11..4aa3e296 100644
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2010.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -65,13 +65,13 @@
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging.Nms">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.Nms.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.Nms.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2008.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2008.csproj
index a3382113..f99ed08d 100644
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2008.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,6 +43,9 @@
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.ActiveMQ.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2010.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2010.csproj
index c23cdba7..b2bfc5c8 100644
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2010.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -61,13 +61,13 @@
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.ActiveMQ.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging.Nms">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.Nms.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.Nms.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2008.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2008.csproj
index 7c6e521c..3a4d1228 100644
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2008.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{85E7B947-8153-45E4-B572-BEDB191F1FB2}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -46,6 +47,9 @@
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2010.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2010.csproj
index efc6f912..625717da 100644
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2010.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -65,13 +65,13 @@
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Messaging.Nms">
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Messaging.Nms.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.Nms.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2008.csproj b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2008.csproj
index d38065f1..f35693f5 100644
--- a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2008.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E641F51F-1B51-4B94-B419-F902EABCE4D4}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -34,6 +35,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
diff --git a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2010.csproj b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2010.csproj
index 5516facc..a826f043 100644
--- a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2010.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
diff --git a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2008.csproj b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2008.csproj
index 14951356..fd74f384 100644
--- a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2008.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -34,6 +35,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
diff --git a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2010.csproj b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2010.csproj
index ecdbe397..d8db20a5 100644
--- a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2010.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
diff --git a/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2008.csproj b/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2008.csproj
index 606a4ec7..4900e547 100644
--- a/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2008.csproj
+++ b/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0C0D8C65-90DE-4914-9940-4C684C54971B}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz.Example\Debug\</OutputPath>
@@ -84,15 +85,18 @@
     </Reference>
     <Reference Include="Spring.Core">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Scheduling.Quartz, Version=1.1.2.20220, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Scheduling.Quartz.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\3.5\debug\Spring.Scheduling.Quartz.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="App.config" />
diff --git a/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2010.csproj b/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2010.csproj
index 0e54b12a..b01253ba 100644
--- a/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2010.csproj
+++ b/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2010.csproj
@@ -28,7 +28,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -103,11 +103,11 @@
     </Reference>
     <Reference Include="Spring.Core">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Scheduling.Quartz, Version=1.1.2.20220, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Scheduling.Quartz.dll</HintPath>
+      <HintPath>..\..\..\..\bin\net\4.0\debug\Spring.Scheduling.Quartz.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2008.csproj b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2008.csproj
index ae5c105c..1b3bcc04 100644
--- a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2008.csproj
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,21 +38,24 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2010.csproj b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2010.csproj
index 3c268c05..31a37745 100644
--- a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2010.csproj
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -56,19 +56,19 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2008.csproj b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2008.csproj
index f41b38fe..c94be0b3 100644
--- a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2008.csproj
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2008.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -14,6 +14,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -35,7 +36,7 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -51,17 +52,20 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2010.csproj b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2010.csproj
index 83a9728d..4233121c 100644
--- a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2010.csproj
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2010.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -54,7 +54,7 @@
   <ItemGroup>
     <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Common.Logging.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -66,15 +66,15 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj
index 89546754..2e712ffa 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj
@@ -35,11 +35,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj
index 402ed7d9..e1e6ef3f 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj
@@ -54,11 +54,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Services, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj
index 965520eb..ce8a38f7 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj
@@ -52,11 +52,11 @@
   <ItemGroup>
     <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Services, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj
index 08bb6a2e..593dc80e 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj
@@ -36,7 +36,7 @@
     </Reference>
     <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Services, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2008.sln b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2008.sln
index c8f18935..498e0be9 100644
--- a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2008.sln
+++ b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2008.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.2005", "src\Spring.WebQuickStart.2005\", "{B4F56253-6425-4065-8A93-EF88F8730E57}"
 	ProjectSection(WebsiteProperties) = preProject
-		TargetFramework = "2.0"
+		TargetFramework = "3.5"
 		ProjectReferences = "{BA4789EB-281A-48EA-8763-28B9F0596A18}|Spring.Web.dll;{710961A3-0DF4-49E4-A26E-F5B9C044AC84}|Spring.Core.dll;"
 		Debug.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.2005"
 		Debug.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.2005\"
@@ -25,7 +25,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.2005",
 EndProject
 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.Providers", "src\Spring.WebQuickStart.Providers\", "{F42A333D-D305-4649-8B5A-6F5862F0F62A}"
 	ProjectSection(WebsiteProperties) = preProject
-		TargetFramework = "2.0"
+		TargetFramework = "3.5"
 		ProjectReferences = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}|Spring.Core.dll;{BA4789EB-281A-48EA-8763-28B9F0596A18}|Spring.Web.dll;"
 		Debug.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.Providers"
 		Debug.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.Providers\"
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Web.Config b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Web.Config
index 7323bbc7..737b5871 100644
--- a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Web.Config
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Web.Config
@@ -8,7 +8,14 @@
 		<sectionGroup name="common">
 			<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" requirePermission="false"/>
 		</sectionGroup>
-	</configSections>
+		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
+					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/></sectionGroup></sectionGroup></sectionGroup></configSections>
 	<!-- to see logging output in the attached debugger -->
 	<common>
 		<logging>
@@ -27,11 +34,16 @@
 		<customErrors mode="Off"/>
 		<compilation debug="true">
 			<assemblies>
-				<add assembly="System.DirectoryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/></assemblies></compilation>
+				<add assembly="System.DirectoryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+				<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+				<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/></assemblies></compilation>
 		<pages>
 			<controls>
 				<add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web"/>
-			</controls>
+				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+				<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></controls>
 		</pages>
 		<!--
     The following needs to be configured in order to enable Spring.NET Web Framework features
@@ -40,20 +52,28 @@
 			<add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
 			<!-- this custom module is only for DI demonstration purposes -->
 			<add name="HtmlCommentAppender" type="HtmlCommentAppenderModule"/>
-		</httpModules>
+			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></httpModules>
 		<httpHandlers>
 			<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
-		</httpHandlers>
+			<remove verb="*" path="*.asmx"/>
+			<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add verb="GET,HEAD" path="ScriptResource.axd" validate="false" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></httpHandlers>
 	</system.web>
 	<system.webServer>
 		<validation validateIntegratedModeConfiguration="false"/>
 		<modules>
-			<add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+			<remove name="ScriptModule"/><add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
 			<add name="HtmlCommentAppender" type="HtmlCommentAppenderModule"/>
-		</modules>
+			<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></modules>
 		<handlers>
-			<add name="SpringPageHandler" verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
-		</handlers>
+			<remove name="WebServiceHandlerFactory-Integrated"/>
+			<remove name="ScriptHandlerFactory"/>
+			<remove name="ScriptHandlerFactoryAppServices"/>
+			<remove name="ScriptResource"/><add name="SpringPageHandler" verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+			<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></handlers>
 	</system.webServer>
 	<!-- demonstrates how to configure IHttpModule instances -->
 	<spring>
@@ -77,4 +97,20 @@
 			</object>
 		</objects>
 	</spring>
-</configuration>
+	<system.codedom>
+			<compilers>
+				<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
+					<providerOption name="CompilerVersion" value="v3.5"/>
+					<providerOption name="WarnAsError" value="false"/></compiler>
+				<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
+					<providerOption name="CompilerVersion" value="v3.5"/>
+					<providerOption name="OptionInfer" value="true"/>
+					<providerOption name="WarnAsError" value="false"/></compiler></compilers></system.codedom>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/></dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/></dependentAssembly></assemblyBinding></runtime></configuration>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.config b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.config
index 1451118c..89c4fbd6 100644
--- a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.config
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.config
@@ -1,84 +1,94 @@
 <?xml version="1.0"?>
 <configuration xmlns="http://schemas.microsoft.com/.NetConfiguration/v2.0">
-    <configSections>
-        <sectionGroup name="common">
-            <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging"/>
-        </sectionGroup>
-        <sectionGroup name="spring">
-            <section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
-            <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
-        </sectionGroup>
-    </configSections>
-    <common>
-        <logging>
-            <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
-                <arg key="level" value="ALL"/>
-            </factoryAdapter>
-        </logging>
-    </common>
-    <spring>
-        <context>
-            <resource uri="~/Config/Web.xml"/>
-            <resource uri="config://spring/objects"/>
-        </context>
-        <objects xmlns="http://www.springframework.net">
-            <object type="~/UserLogin.aspx" />
-        </objects>
-    </spring>
-    <appSettings>
-        <add key="Name" value="SpringNetProvidersTest"/>
-    </appSettings>
-    <connectionStrings>
-        <add name="MyLocalSQLServer"
-             connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|ASPNETDB.MDF;Integrated Security=SSPI;User Instance=True"
-             providerName="System.Data.SqlClient"
-        />
-    </connectionStrings>
-    <system.web>
-        <httpModules>
-            <add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
-        </httpModules>
-        <httpHandlers>
-            <add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
-            <add verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
-        </httpHandlers>
-        <compilation debug="true">
-            <assemblies>
-                <add assembly="System.DirectoryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
-            </assemblies>
-        </compilation>
-        <authentication mode="Forms">
-            <forms name="Login" loginUrl="UserLogin.aspx" timeout="20" protection="All"/>
-        </authentication>
-        <membership defaultProvider="mySqlMembershipProvider">
-            <providers>
-                <clear/>
-                <add connectionStringName="" name="mySqlMembershipProvider" type="Spring.Web.Providers.MembershipProviderAdapter, Spring.Web"/>
-            </providers>
-        </membership>
-        <roleManager enabled="true" defaultProvider="mySqlRoleProvider">
-            <providers>
-                <clear/>
-                <add connectionStringName="" name="mySqlRoleProvider" type="Spring.Web.Providers.RoleProviderAdapter, Spring.Web"/>
-            </providers>
-        </roleManager>
-        <profile defaultProvider="mySqlProfileProvider">
-            <providers>
-                <clear/>
-                <add name="mySqlProfileProvider" type="Spring.Web.Providers.ProfileProviderAdapter, Spring.Web" connectionStringName=""/>
-            </providers>
-            <properties>
-                <add name="Greeting" type="String"/>
-            </properties>
-        </profile>
-        <siteMap defaultProvider="myXmlSiteMapProvider">
-            <providers>
-                <clear/>
-                <add name="myXmlSiteMapProvider" type="Spring.Web.Providers.SiteMapProviderAdapter, Spring.Web" siteMapFile=""/>
-            </providers>
-        </siteMap>
-        <!---->
-        <!--
+	<configSections>
+		<sectionGroup name="common">
+			<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging"/>
+		</sectionGroup>
+		<sectionGroup name="spring">
+			<section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
+			<section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
+		</sectionGroup>
+		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
+					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/></sectionGroup></sectionGroup></sectionGroup></configSections>
+	<common>
+		<logging>
+			<factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
+				<arg key="level" value="ALL"/>
+			</factoryAdapter>
+		</logging>
+	</common>
+	<spring>
+		<context>
+			<resource uri="~/Config/Web.xml"/>
+			<resource uri="config://spring/objects"/>
+		</context>
+		<objects xmlns="http://www.springframework.net">
+			<object type="~/UserLogin.aspx"/>
+		</objects>
+	</spring>
+	<appSettings>
+		<add key="Name" value="SpringNetProvidersTest"/>
+	</appSettings>
+	<connectionStrings>
+		<add name="MyLocalSQLServer" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|ASPNETDB.MDF;Integrated Security=SSPI;User Instance=True" providerName="System.Data.SqlClient"/>
+	</connectionStrings>
+	<system.web>
+		<httpModules>
+			<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></httpModules>
+		<httpHandlers>
+			<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+			<add verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
+			<remove verb="*" path="*.asmx"/>
+			<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add verb="GET,HEAD" path="ScriptResource.axd" validate="false" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></httpHandlers>
+		<compilation debug="true">
+			<assemblies>
+				<add assembly="System.DirectoryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+				<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+				<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/></assemblies>
+		</compilation>
+		<authentication mode="Forms">
+			<forms name="Login" loginUrl="UserLogin.aspx" timeout="20" protection="All"/>
+		</authentication>
+		<membership defaultProvider="mySqlMembershipProvider">
+			<providers>
+				<clear/>
+				<add connectionStringName="" name="mySqlMembershipProvider" type="Spring.Web.Providers.MembershipProviderAdapter, Spring.Web"/>
+			</providers>
+		</membership>
+		<roleManager enabled="true" defaultProvider="mySqlRoleProvider">
+			<providers>
+				<clear/>
+				<add connectionStringName="" name="mySqlRoleProvider" type="Spring.Web.Providers.RoleProviderAdapter, Spring.Web"/>
+			</providers>
+		</roleManager>
+		<profile defaultProvider="mySqlProfileProvider">
+			<providers>
+				<clear/>
+				<add name="mySqlProfileProvider" type="Spring.Web.Providers.ProfileProviderAdapter, Spring.Web" connectionStringName=""/>
+			</providers>
+			<properties>
+				<add name="Greeting" type="String"/>
+			</properties>
+		</profile>
+		<siteMap defaultProvider="myXmlSiteMapProvider">
+			<providers>
+				<clear/>
+				<add name="myXmlSiteMapProvider" type="Spring.Web.Providers.SiteMapProviderAdapter, Spring.Web" siteMapFile=""/>
+			</providers>
+		</siteMap>
+		<!---->
+		<!--
     <healthMonitoring enabled="true">
       <providers>
         <add name="AspNetTextFileWebEventProvider" type="TextFileWebEventProvider" logFileName="~/App_Data/MyTest.txt"/>
@@ -89,16 +99,38 @@
       </rules>
     </healthMonitoring>
 -->
-    </system.web>
-    <system.webServer>
-        <validation validateIntegratedModeConfiguration="false"/>
-
-        <modules>
-            <add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
-        </modules>
-
-        <handlers>
-            <add name="SpringPageHandler" verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
-        </handlers>
-    </system.webServer>    
-</configuration>
+		<pages>
+			<controls>
+				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+				<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></controls></pages></system.web>
+	<system.webServer>
+		<validation validateIntegratedModeConfiguration="false"/>
+		<modules>
+			<remove name="ScriptModule"/><add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+			<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></modules>
+		<handlers>
+			<remove name="WebServiceHandlerFactory-Integrated"/>
+			<remove name="ScriptHandlerFactory"/>
+			<remove name="ScriptHandlerFactoryAppServices"/>
+			<remove name="ScriptResource"/><add name="SpringPageHandler" verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+			<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></handlers>
+	</system.webServer>
+	<system.codedom>
+			<compilers>
+				<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
+					<providerOption name="CompilerVersion" value="v3.5"/>
+					<providerOption name="WarnAsError" value="false"/></compiler>
+				<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
+					<providerOption name="CompilerVersion" value="v3.5"/>
+					<providerOption name="OptionInfer" value="true"/>
+					<providerOption name="WarnAsError" value="false"/></compiler></compilers></system.codedom>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/></dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/></dependentAssembly></assemblyBinding></runtime></configuration>
diff --git a/examples/Spring/SpringAir/SpringAir.2008.sln b/examples/Spring/SpringAir/SpringAir.2008.sln
index 16936fe7..17acabb4 100644
--- a/examples/Spring/SpringAir/SpringAir.2008.sln
+++ b/examples/Spring/SpringAir/SpringAir.2008.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "SpringAir.Web.2005", "src\SpringAir.Web.2005\", "{839602F5-8077-497D-9CCB-C9F02741CA55}"
 	ProjectSection(WebsiteProperties) = preProject
-		TargetFramework = "2.0"
+		TargetFramework = "3.5"
 		ProjectReferences = "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}|SpringAir.Core.dll;{78B285FE-27F3-44F4-84B1-7A589AB48EF3}|SpringAir.Data.Ado.dll;{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}|SpringAir.Web.2008.References.dll;"
 		Debug.AspNetCompiler.VirtualPath = "/SpringAir.Web.2005"
 		Debug.AspNetCompiler.PhysicalPath = "src\SpringAir.Web.2005\"
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2008.csproj b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2008.csproj
index 25472770..87acc9f5 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2008.csproj
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -77,11 +78,14 @@
   <ItemGroup>
     <Reference Include="Spring.Core, Version=1.1.1.20001, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2010.csproj b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2010.csproj
index 07a9b447..edf1b444 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2010.csproj
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2010.csproj
@@ -95,7 +95,7 @@
   <ItemGroup>
     <Reference Include="Spring.Core, Version=1.1.1.20001, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2008.csproj b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2008.csproj
index 680bb41b..0aa5cbcc 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2008.csproj
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{78B285FE-27F3-44F4-84B1-7A589AB48EF3}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -77,15 +78,18 @@
   <ItemGroup>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data">
       <Name>System.Data</Name>
     </Reference>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2010.csproj b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2010.csproj
index 0f40b058..c96d2b5c 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2010.csproj
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2010.csproj
@@ -95,11 +95,11 @@
   <ItemGroup>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2005.References.csproj b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2005.References.csproj
index c18b76a2..cb592932 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2005.References.csproj
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2005.References.csproj
@@ -33,19 +33,19 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2008.References.csproj b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2008.References.csproj
index befa7328..690bee89 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2008.References.csproj
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2008.References.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -13,6 +13,7 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,21 +39,24 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Transactions" />
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2010.References.csproj b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2010.References.csproj
index 9aa1a7e4..4c930aa6 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2010.References.csproj
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2010.References.csproj
@@ -56,19 +56,19 @@
     </Reference>
     <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web.config b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web.config
index 0c29602e..1d48939a 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web.config
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web.config
@@ -11,7 +11,14 @@
 			<section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
 		</sectionGroup>
 		<section name="databaseSettings" type="System.Configuration.NameValueSectionHandler"/>
-	</configSections>
+		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
+					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/></sectionGroup></sectionGroup></sectionGroup></configSections>
 	<common>
 		<logging>
 			<!-- 
@@ -32,7 +39,7 @@
 			<resource uri="~/Config/Aspects.xml"/>
 			<resource uri="~/Config/Web.xml"/>
 			<resource uri="~/Config/Services.xml"/>
-      <resource uri="~/Config/Validation.xml"/>
+			<resource uri="~/Config/Validation.xml"/>
 			<!-- TEST CONFIGURATION -->
 			<resource uri="~/Config/Test/Services.xml"/>
 			<resource uri="~/Config/Test/Dao.xml"/>
@@ -47,22 +54,29 @@
 		<pages>
 			<controls>
 				<add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web"/>
-			</controls>
+				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+				<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></controls>
 		</pages>
 		<httpModules>
 			<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
-		</httpModules>
+			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></httpModules>
 		<httpHandlers>
 			<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
-			<add verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/>
+			<add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
 			<add verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
-		</httpHandlers>
+			<remove verb="*" path="*.asmx"/>
+			<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add verb="GET,HEAD" path="ScriptResource.axd" validate="false" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></httpHandlers>
 		<trace enabled="true" requestLimit="20" pageOutput="true" traceMode="SortByTime" localOnly="true" writeToDiagnosticsTrace="true"/>
 		<compilation debug="true">
 			<assemblies>
 				<add assembly="System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
 				<add assembly="System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-				<add assembly="System.DirectoryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/></assemblies>
+				<add assembly="System.DirectoryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+				<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+				<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/></assemblies>
 		</compilation>
 	</system.web>
 	<databaseSettings>
@@ -71,4 +85,33 @@
 		<add key="db.password" value="springqa"/>
 		<add key="db.schema" value="SpringAir"/>
 	</databaseSettings>
-</configuration>
+	<system.codedom>
+			<compilers>
+				<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
+					<providerOption name="CompilerVersion" value="v3.5"/>
+					<providerOption name="WarnAsError" value="false"/></compiler>
+				<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
+					<providerOption name="CompilerVersion" value="v3.5"/>
+					<providerOption name="OptionInfer" value="true"/>
+					<providerOption name="WarnAsError" value="false"/></compiler></compilers></system.codedom>
+	<system.webServer>
+			<validation validateIntegratedModeConfiguration="false"/>
+		<modules>
+			<remove name="ScriptModule"/>
+			<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></modules>
+		<handlers>
+			<remove name="WebServiceHandlerFactory-Integrated"/>
+			<remove name="ScriptHandlerFactory"/>
+			<remove name="ScriptHandlerFactoryAppServices"/>
+			<remove name="ScriptResource"/>
+			<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></handlers></system.webServer>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/></dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/></dependentAssembly></assemblyBinding></runtime></configuration>
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2008.csproj b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2008.csproj
index 6805330e..ae7c5001 100644
--- a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2008.csproj
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -86,6 +87,9 @@
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2008.csproj b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2008.csproj
index bbb54ded..3122dff8 100644
--- a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2008.csproj
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2008.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B0A6F98E-5363-4575-BB6B-A84E91895468}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,6 +27,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -85,15 +86,18 @@
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data">
       <Name>System.Data</Name>
     </Reference>
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2010.csproj b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2010.csproj
index b6d89f4a..51961a53 100644
--- a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2010.csproj
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2010.csproj
@@ -103,11 +103,11 @@
     </Reference>
     <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Data.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/src/Spring/CommonAssemblyInfo.cs b/src/Spring/CommonAssemblyInfo.cs
index 3687af72..6c69634f 100644
--- a/src/Spring/CommonAssemblyInfo.cs
+++ b/src/Spring/CommonAssemblyInfo.cs
@@ -34,10 +34,6 @@ using System.Reflection;
 [assembly: AssemblyVersion("1.3.2.40001")]
 #elif NET_3_5
 [assembly: AssemblyVersion("1.3.2.35001")]
-#elif NET_3_0
-[assembly: AssemblyVersion("1.3.2.30001")]
-#elif NET_2_0
-[assembly: AssemblyVersion("1.3.2.20001")]
 #endif
 
 
@@ -80,7 +76,4 @@ using System.Reflection;
 //
 #if STRONG
 [assembly: AssemblyDelaySign(false)]
-#if !NET_2_0
-[assembly: AssemblyKeyFile("Spring.Net.snk")]
-#endif
 #endif
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs
index 36830792..e155f63d 100644
--- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs
@@ -27,7 +27,6 @@ using System.Reflection.Emit;
 using System.Runtime.Serialization;
 
 using Spring.Proxy;
-using Spring.Util;
 
 #endregion
 
@@ -81,7 +80,6 @@ namespace Spring.Aop.Framework.DynamicProxy
         /// </summary>
         protected LocalBuilder returnValue;
 
-#if NET_2_0
         /// <summary>
         /// The local variable to store the closed generic method 
         /// when the target method is generic.
@@ -93,7 +91,7 @@ namespace Spring.Aop.Framework.DynamicProxy
         /// when the target method defined on the proxy is generic.
         /// </summary>
         protected LocalBuilder genericOnProxyTargetMethod;
-#endif
+
         /// <summary>
         /// The field to cache the target <see cref="System.Reflection.MethodInfo"/>.
         /// </summary>
@@ -239,9 +237,7 @@ namespace Spring.Aop.Framework.DynamicProxy
             targetMethodCacheField = typeBuilder.DefineField(methodId, typeof(MethodInfo), 
                 FieldAttributes.Private | FieldAttributes.Static | FieldAttributes.InitOnly);
 
-#if NET_2_0
             MakeGenericMethod(il, method, targetMethodCacheField, genericTargetMethod);
-#endif
         }
 
         /// <summary>
@@ -254,7 +250,6 @@ namespace Spring.Aop.Framework.DynamicProxy
         {
         }
 
-#if NET_2_0
         /// <summary>
         /// Create a closed generic method for the current call 
         /// if target method is a generic definition.
@@ -300,7 +295,6 @@ namespace Spring.Aop.Framework.DynamicProxy
                 il.Emit(OpCodes.Stloc, localMethod);
             }
         }
-#endif
 
         /// <summary>
         /// Generates the IL instructions that pushes 
@@ -331,13 +325,11 @@ namespace Spring.Aop.Framework.DynamicProxy
         /// <param name="method">The method to proxy.</param>
         protected virtual void PushTargetMethodInfo(ILGenerator il, MethodInfo method)
         {
-#if NET_2_0
             if (method.IsGenericMethodDefinition)
             {
                 il.Emit(OpCodes.Ldloc, genericTargetMethod);
                 return;
             }
-#endif
             il.Emit(OpCodes.Ldsfld, targetMethodCacheField);
         }
 
@@ -350,13 +342,11 @@ namespace Spring.Aop.Framework.DynamicProxy
         {
             if (onProxyTargetMethodCacheField != null)
             {
-#if NET_2_0
                 if (method.IsGenericMethodDefinition)
                 {
                     il.Emit(OpCodes.Ldloc, genericOnProxyTargetMethod);
                     return;
                 }
-#endif
                 il.Emit(OpCodes.Ldsfld, onProxyTargetMethodCacheField);
             }
             else
@@ -376,13 +366,11 @@ namespace Spring.Aop.Framework.DynamicProxy
             targetType = il.DeclareLocal(typeof(Type));
             arguments = il.DeclareLocal(typeof(Object[]));
             
-#if NET_2_0
             if (method.IsGenericMethodDefinition)
             {
                 genericTargetMethod = il.DeclareLocal(typeof(MethodInfo));
                 genericOnProxyTargetMethod = il.DeclareLocal(typeof(MethodInfo));
             }
-#endif
             if (methodReturnsValue)
             {
                 returnValue = il.DeclareLocal(method.ReturnType);
@@ -392,13 +380,13 @@ namespace Spring.Aop.Framework.DynamicProxy
             interceptors.SetLocalSymInfo("interceptors");
             targetType.SetLocalSymInfo("targetType");
             arguments.SetLocalSymInfo("arguments");
-#if NET_2_0
+
             if (method.IsGenericMethodDefinition)
             {
                 genericTargetMethod.SetLocalSymInfo("genericTargetMethod");
                 genericOnProxyTargetMethod.SetLocalSymInfo("genericOnProxyTargetMethod");
             }
-#endif
+
             if (methodReturnsValue)
             {
                 returnValue.SetLocalSymInfo("returnValue");
@@ -567,11 +555,7 @@ namespace Spring.Aop.Framework.DynamicProxy
                         EmitLoadValueIndirect(il, type);
                     }
 
-#if NET_2_0
                     if (type.IsValueType || type.IsGenericParameter)
-#else
-                    if (type.IsValueType)
-#endif
                     {
                         il.Emit(OpCodes.Box, type);
                     }
@@ -686,18 +670,10 @@ namespace Spring.Aop.Framework.DynamicProxy
         /// <param name="type">The type specified in the instruction.</param>
         protected static void EmitUnboxIfNeeded(ILGenerator il, Type type)
         {
-#if NET_2_0
             if (type.IsValueType || type.IsGenericParameter)
             {
                 il.Emit(OpCodes.Unbox_Any, type);
             }
-#else
-            if (type.IsValueType)
-            {
-                il.Emit(OpCodes.Unbox, type);
-                il.Emit(OpCodes.Ldobj, type);
-            }
-#endif
         }
 
         #endregion
@@ -764,10 +740,8 @@ namespace Spring.Aop.Framework.DynamicProxy
         public static readonly MethodInfo GetTypeFromHandle = 
             typeof(Type).GetMethod("GetTypeFromHandle", new Type[] { typeof(RuntimeTypeHandle) });
 
-#if NET_2_0
         public static readonly MethodInfo MakeGenericMethod =
             typeof(MethodInfo).GetMethod("MakeGenericMethod", new Type[] { typeof(Type[]) });
-#endif
 
         public static readonly MethodInfo DisposeMethod =
             typeof(IDisposable).GetMethod("Dispose", Type.EmptyTypes);
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs
index a48a6a95..8a7ed927 100644
--- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs
@@ -84,9 +84,7 @@ namespace Spring.Aop.Framework.DynamicProxy
                     CallingConventions.Standard,
                     method.ReturnType, ReflectionUtils.GetParameterTypes(method));
 
-#if NET_2_0
                 DefineGenericParameters(baseMethod, method);
-#endif
                 //DefineParameters(baseMethod, method);
 
                 ILGenerator localIL = baseMethod.GetILGenerator();
@@ -106,9 +104,7 @@ namespace Spring.Aop.Framework.DynamicProxy
                 onProxyTargetMethodCacheField = typeBuilder.DefineField(
                     methodId, typeof(MethodInfo), FieldAttributes.Private | FieldAttributes.Static | FieldAttributes.InitOnly);
 
-#if NET_2_0
                 MakeGenericMethod(il, method, onProxyTargetMethodCacheField, genericOnProxyTargetMethod);
-#endif
             }
         }
 
diff --git a/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs
index 39f047e8..fc212dca 100644
--- a/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs
+++ b/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs
@@ -252,7 +252,6 @@ namespace Spring.Aop.Support
             string patt = string.Empty;
             patt = String.Format("{0}.{1}", method.DeclaringType, method.Name);
 
-#if NET_2_0
             if (method.DeclaringType.IsGenericType)
             {
                 patt = String.Format("{0}.{1}", ReflectionUtils.GetTypeFriendlyName(method.DeclaringType), method.Name);
@@ -261,7 +260,7 @@ namespace Spring.Aop.Support
             {
                 patt = String.Format("{0}.{1}", method.DeclaringType, method.Name);
             }
-#endif            
+
             for (int i = 0; i < this.Patterns.Length; ++i)
             {
                 bool matched = Matches(patt, i);
diff --git a/src/Spring/Spring.Aop/Spring.Aop.2008.csproj b/src/Spring/Spring.Aop/Spring.Aop.2008.csproj
index d5f642a4..6c3d3cb5 100644
--- a/src/Spring/Spring.Aop/Spring.Aop.2008.csproj
+++ b/src/Spring/Spring.Aop/Spring.Aop.2008.csproj
@@ -23,7 +23,7 @@
     <StartupObject>
     </StartupObject>
     <SignAssembly>false</SignAssembly>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Spring.Aop/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
diff --git a/src/Spring/Spring.Aop/Spring.Aop.2010.csproj b/src/Spring/Spring.Aop/Spring.Aop.2010.csproj
index 50c74b1f..c0d569c0 100644
--- a/src/Spring/Spring.Aop/Spring.Aop.2010.csproj
+++ b/src/Spring/Spring.Aop/Spring.Aop.2010.csproj
@@ -24,7 +24,7 @@
     <StartupObject>
     </StartupObject>
     <SignAssembly>false</SignAssembly>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Spring.Aop/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
diff --git a/src/Spring/Spring.Core/Collections/Generic/DictionarySet.cs b/src/Spring/Spring.Core/Collections/Generic/DictionarySet.cs
index f426f7cb..78944080 100644
--- a/src/Spring/Spring.Core/Collections/Generic/DictionarySet.cs
+++ b/src/Spring/Spring.Core/Collections/Generic/DictionarySet.cs
@@ -1,8 +1,5 @@
 /* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */
 
-#if NET_2_0
-
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -250,5 +247,3 @@ namespace Spring.Collections.Generic
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/Generic/HashedSet.cs b/src/Spring/Spring.Core/Collections/Generic/HashedSet.cs
index 54d6cbce..ee0cdc74 100644
--- a/src/Spring/Spring.Core/Collections/Generic/HashedSet.cs
+++ b/src/Spring/Spring.Core/Collections/Generic/HashedSet.cs
@@ -1,8 +1,5 @@
 /* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */
 
-#if NET_2_0
-
-
 using System;
 using System.Collections.Generic;
 
@@ -36,5 +33,3 @@ namespace Spring.Collections.Generic
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/Generic/ISet.cs b/src/Spring/Spring.Core/Collections/Generic/ISet.cs
index 2552ffa6..5e276777 100644
--- a/src/Spring/Spring.Core/Collections/Generic/ISet.cs
+++ b/src/Spring/Spring.Core/Collections/Generic/ISet.cs
@@ -18,9 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -160,5 +157,3 @@ namespace Spring.Collections.Generic
         bool RetainAll(ICollection<T> c);
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/Generic/ImmutableSet.cs b/src/Spring/Spring.Core/Collections/Generic/ImmutableSet.cs
index e4f1b3fd..c5c07c46 100644
--- a/src/Spring/Spring.Core/Collections/Generic/ImmutableSet.cs
+++ b/src/Spring/Spring.Core/Collections/Generic/ImmutableSet.cs
@@ -1,7 +1,5 @@
 /* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */
 
-#if NET_2_0
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -309,5 +307,3 @@ namespace Spring.Collections.Generic
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs b/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs
index b0e89f11..854960f3 100644
--- a/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs
+++ b/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs
@@ -18,9 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
-
 using System;
 using System.Collections.Generic;
 
@@ -51,5 +48,3 @@ namespace Spring.Collections.Generic
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/Generic/ReadOnlyDictionary.cs b/src/Spring/Spring.Core/Collections/Generic/ReadOnlyDictionary.cs
index 1999653b..19c42aae 100644
--- a/src/Spring/Spring.Core/Collections/Generic/ReadOnlyDictionary.cs
+++ b/src/Spring/Spring.Core/Collections/Generic/ReadOnlyDictionary.cs
@@ -1,5 +1,3 @@
-#if NET_2_0
-
 #region License
 
 /*
@@ -428,4 +426,3 @@ namespace Spring.Collections.Generic
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/Generic/Set.cs b/src/Spring/Spring.Core/Collections/Generic/Set.cs
index 2e331f55..a8587f16 100644
--- a/src/Spring/Spring.Core/Collections/Generic/Set.cs
+++ b/src/Spring/Spring.Core/Collections/Generic/Set.cs
@@ -1,8 +1,5 @@
 /* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */
 
-#if NET_2_0
-
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -563,6 +560,3 @@ namespace Spring.Collections.Generic
         #endregion ISet implementation
     }
 }
-
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/Generic/SortedSet.cs b/src/Spring/Spring.Core/Collections/Generic/SortedSet.cs
index 48e2624e..1be8c746 100644
--- a/src/Spring/Spring.Core/Collections/Generic/SortedSet.cs
+++ b/src/Spring/Spring.Core/Collections/Generic/SortedSet.cs
@@ -1,8 +1,5 @@
 /* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */
 
-#if NET_2_0
-
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -71,6 +68,3 @@ namespace Spring.Collections.Generic
         }
     }
 }
-
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/Generic/SynchronizedSet.cs b/src/Spring/Spring.Core/Collections/Generic/SynchronizedSet.cs
index 83eed0a4..ffd10d5f 100644
--- a/src/Spring/Spring.Core/Collections/Generic/SynchronizedSet.cs
+++ b/src/Spring/Spring.Core/Collections/Generic/SynchronizedSet.cs
@@ -1,8 +1,5 @@
 /* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */
 
-#if NET_2_0
-
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -264,6 +261,3 @@ namespace Spring.Collections.Generic
         }
     }
 }
-
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IO/AbstractResource.cs b/src/Spring/Spring.Core/Core/IO/AbstractResource.cs
index 5240f3b3..597808e1 100644
--- a/src/Spring/Spring.Core/Core/IO/AbstractResource.cs
+++ b/src/Spring/Spring.Core/Core/IO/AbstractResource.cs
@@ -198,34 +198,6 @@ namespace Spring.Core.IO
             get { return false; }
         }
 
-#if !NET_2_0
-        /// <summary>
-        /// Returns the <see cref="System.Uri"/> handle for this resource.
-        /// </summary>
-        /// <remarks>
-        /// <p>
-        /// This, the default implementation, always throws a
-        /// <see cref="System.IO.FileNotFoundException"/>, assuming that the
-        /// resource cannot be exposed as a <see cref="System.Uri"/>.
-        /// </p>
-        /// </remarks>
-        /// <value>
-        /// The <see cref="System.Uri"/> handle for this resource.
-        /// </value>
-        /// <exception cref="System.IO.FileNotFoundException">
-        /// This, the default implementation, <b>always</b> throws a
-        /// <see cref="System.IO.FileNotFoundException"/>.
-        /// </exception>
-        /// <seealso cref="Spring.Core.IO.IResource.Uri"/>
-        public virtual Uri Uri
-        {
-            get
-            {
-                throw new FileNotFoundException(
-                    Description + " cannot be resolved to a Uri.");
-            }
-        }
-#else
         /// <summary>
         /// Returns the <see cref="System.Uri"/> handle for this resource.
         /// </summary>
@@ -237,7 +209,7 @@ namespace Spring.Core.IO
                 return new Uri(resourceName);
             }
         }
-#endif
+
         /// <summary>
         /// Returns a <see cref="System.IO.FileInfo"/> handle for this resource.
         /// </summary>
diff --git a/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs b/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs
index a210e881..d64d0aed 100644
--- a/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs
+++ b/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs
@@ -95,11 +95,7 @@ namespace Spring.Core.IO
             {
                 throw new UriFormatException(string.Format("Invalid resource name. Name has to be in 'assembly:<assemblyName>/<namespace>/<resourceName>' format:{0}", resourceName));
             }
-#if NET_2_0
             this._assembly = Assembly.Load(info[0]);
-#else
-	        this._assembly = Assembly.LoadWithPartialName(info[0]);
-#endif
             if (this._assembly == null)
             {
                 throw new FileNotFoundException("Unable to load assembly [" + info[0] + "]");
diff --git a/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs b/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs
index 8e89e86c..f4ed3a39 100644
--- a/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs
+++ b/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs
@@ -115,9 +115,7 @@ namespace Spring.Core.IO
                 RegisterResourceHandler("file", typeof(FileSystemResource));
                 RegisterResourceHandler("http", typeof(UrlResource));
                 RegisterResourceHandler("https", typeof(UrlResource));
-#if NET_2_0
                 RegisterResourceHandler("ftp", typeof(UrlResource));
-#endif
                 RegisterResourceHandler("assembly", typeof(AssemblyResource));
 
                 // register custom resource handlers
@@ -245,7 +243,6 @@ namespace Spring.Core.IO
 
             lock (resourceHandlers.SyncRoot)
             {
-#if NET_2_0
                 SecurityCritical.ExecutePrivileged( new SecurityPermission(SecurityPermissionFlag.Infrastructure), delegate
                 {
                     // register generic uri parser for this scheme
@@ -254,13 +251,11 @@ namespace Spring.Core.IO
                         UriParser.Register(new TolerantUriParser(), protocolName, 0);
                     }
                 });
-#endif
                 IDynamicConstructor ctor = GetResourceConstructor(handlerType);
                 resourceHandlers[protocolName] = ctor;
             }
         }
 
-#if NET_2_0
         /// <summary>
         /// Allows to create any arbitrary Url format
         /// </summary>
@@ -274,7 +269,6 @@ namespace Spring.Core.IO
                 : base(DefaultOptions)
             { }
         }
-#endif
 
         private static IDynamicConstructor GetResourceConstructor(Type handlerType)
         {
diff --git a/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs b/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs
index f6e31488..3c458c73 100644
--- a/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs
+++ b/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs
@@ -18,15 +18,11 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
 using System.Reflection;
 
-using Spring.Core;
-
 #endregion
 
 namespace Spring.Core
@@ -136,5 +132,3 @@ namespace Spring.Core
         #endregion
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs
index 8c1f9751..8df93f94 100644
--- a/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs
+++ b/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs
@@ -126,7 +126,6 @@ namespace Spring.Core.TypeConversion
                 {
                     throw new ArgumentException("Empty value set for the assembly name in ResourceManager string.");
                 }
-#if NET_2_0
                 if (assemblyName == APP_GLOBALRESOURCES_ASSEMBLYNAME)
                 {
                     try
@@ -142,9 +141,6 @@ namespace Spring.Core.TypeConversion
                     }
                 }
                 Assembly ass = Assembly.LoadWithPartialName(assemblyName);
-#else
-                Assembly ass = Assembly.LoadWithPartialName(assemblyName);
-#endif
                 if (ass == null)
                 {
                     throw new ArgumentException("Could not find assembly with name = '" + assemblyName + "'.");
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs b/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs
index bac5e3cc..0b850f82 100644
--- a/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs
+++ b/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs
@@ -22,9 +22,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
 using System.Collections.Generic;
-#endif
 
 using System.ComponentModel;
 using Spring.Util;
@@ -93,7 +91,6 @@ namespace Spring.Core.TypeConversion
                         return result;
                     }
                 }
-#if NET_2_0
                 // if required type is some ISet<T>, convert all the elements
                 if (requiredType != null && requiredType.IsGenericType && TypeImplementsGenericInterface(requiredType, typeof(Spring.Collections.Generic.ISet<>)))
                 {
@@ -156,7 +153,6 @@ namespace Spring.Core.TypeConversion
                         return ToTypedCollectionWithTypeConversion(typeof(List<>), componentType, elements, propertyName);
                     }
                 }
-#endif
 
                 // try to convert using type converter
                 try
@@ -223,13 +219,7 @@ namespace Spring.Core.TypeConversion
                     throw new TypeMismatchException(
                         CreatePropertyChangeEventArgs(propertyName, null, newValue), requiredType, ex);
                 }
-#if NET_2_0
-                if (newValue == null
-                    && (requiredType == null
-                        || !Type.GetType("System.Nullable`1").Equals(requiredType.GetGenericTypeDefinition())))
-#else                
-                if (newValue == null)
-#endif
+                if (newValue == null && (requiredType == null || !Type.GetType("System.Nullable`1").Equals(requiredType.GetGenericTypeDefinition())))
                 {
                     throw new TypeMismatchException(
                         CreatePropertyChangeEventArgs(propertyName, null, newValue), requiredType);
@@ -251,7 +241,6 @@ namespace Spring.Core.TypeConversion
             return destination;
         }
 
-#if NET_2_0
         private static object ToTypedCollectionWithTypeConversion(Type targetCollectionType, Type componentType, ICollection elements, string propertyName)
         {
             if (!TypeImplementsGenericInterface(targetCollectionType, typeof(ICollection<>)))
@@ -274,7 +263,6 @@ namespace Spring.Core.TypeConversion
             return typedCollection;
         }
 
-#endif
         private static string BuildIndexedPropertyName(string propertyName, int index)
         {
             return (propertyName != null ?
@@ -314,8 +302,6 @@ namespace Spring.Core.TypeConversion
             return new PropertyChangeEventArgs(fullPropertyName, oldValue, newValue);
         }
 
-
-#if NET_2_0
         /// <summary>
         /// Determines if a Type implements a specific generic interface.
         /// </summary>
@@ -352,6 +338,5 @@ namespace Spring.Core.TypeConversion
         {
             return candidateInterfaceType.IsGenericType && candidateInterfaceType.GetGenericTypeDefinition() == matchingGenericInterface;
         }
-#endif
     }
-}
\ No newline at end of file
+}
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs b/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs
index 182a554d..cacf1d97 100644
--- a/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs
+++ b/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs
@@ -18,11 +18,8 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
-using System.Collections;
 using System.Text.RegularExpressions;
 using Spring.Util;
 
@@ -362,5 +359,3 @@ namespace Spring.Core.TypeResolution
         #endregion
     }
 }
-
-#endif
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs
index 6ddf290f..ff5d92cf 100644
--- a/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs
+++ b/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs
@@ -18,15 +18,9 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
-using System.Collections;
-using System.Reflection;
-
-using Spring.Core;
 using Spring.Util;
 
 #endregion
@@ -101,5 +95,3 @@ namespace Spring.Core.TypeResolution
         }
     }
 }
-
-#endif
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs
index 46155a86..049a8ed5 100644
--- a/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs
+++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs
@@ -316,7 +316,6 @@ namespace Spring.Core.TypeResolution
         /// </summary>
         public const string ObjectArrayAliasVB = "Object()";
 
-#if NET_2_0
         /// <summary>
         /// The alias around the 'int?' type.
         /// </summary>
@@ -426,7 +425,6 @@ namespace Spring.Core.TypeResolution
         /// The alias around the 'bool?[]' array type.
         /// </summary>
         public const string NullableBoolArrayAlias = "bool?[]";
-#endif
 
         #endregion
 
@@ -517,7 +515,6 @@ namespace Spring.Core.TypeResolution
                 types[ObjectArrayAlias] = typeof(object[]);
                 types[ObjectArrayAliasVB] = typeof(object[]);
 
-#if NET_2_0
                 types[NullableInt32Alias] = typeof(int?);
                 types[NullableInt32ArrayAlias] = typeof(int?[]);
 
@@ -550,7 +547,6 @@ namespace Spring.Core.TypeResolution
 
                 types[NullableBoolAlias] = typeof(bool?);
                 types[NullableBoolArrayAlias] = typeof(bool?[]);
-#endif
 
                 // register user-configured type aliases
                 ConfigurationUtils.GetSection(TypeAliasesSectionName);
@@ -592,10 +588,10 @@ namespace Spring.Core.TypeResolution
             AssertUtils.ArgumentHasText(typeName, "typeName");
 
             Type type = TypeResolutionUtils.ResolveType(typeName);
-#if NET_2_0
+
             if (type.IsGenericTypeDefinition)
                 alias += ("`" + type.GetGenericArguments().Length);
-#endif
+
             RegisterType(alias, type);
         }
 
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs
index 07134a7c..7b967cf7 100644
--- a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs
+++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs
@@ -45,13 +45,8 @@ namespace Spring.Core.TypeResolution
     {
         #region Fields
 
-#if NET_2_0
         private static readonly ITypeResolver internalTypeResolver
             = new CachedTypeResolver(new GenericTypeResolver());
-#else
-        private static readonly ITypeResolver internalTypeResolver
-            = new CachedTypeResolver(new TypeResolver());
-#endif
 
         #endregion
 
diff --git a/src/Spring/Spring.Core/Expressions/OpLike.cs b/src/Spring/Spring.Core/Expressions/OpLike.cs
index 7113aadd..f1c94683 100644
--- a/src/Spring/Spring.Core/Expressions/OpLike.cs
+++ b/src/Spring/Spring.Core/Expressions/OpLike.cs
@@ -20,7 +20,7 @@
 
 using System;
 using System.Runtime.Serialization;
-#if NET_2_0  && !MONO_2_0
+#if !MONO_2_0
 using Microsoft.VisualBasic;
 using Microsoft.VisualBasic.CompilerServices;
 #endif
@@ -59,7 +59,7 @@ namespace Spring.Expressions
         /// </returns>
         protected override object Get(object context, EvaluationContext evalContext)
         {
-#if NET_2_0 && !MONO_2_0
+#if !MONO_2_0
             string text = GetLeftValue( context, evalContext ) as string;
             string pattern = GetRightValue( context, evalContext ) as string;
 
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs
index b6cb7647..443b6345 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs
@@ -147,16 +147,14 @@ namespace Spring.Objects.Factory.Config
                 {
                     variables.Add((NameValueCollection) section);
                 }
-#if NET_2_0
-                else if (section is System.Configuration.ClientSettingsSection)
+                else if (section is ClientSettingsSection)
                 {
-                    System.Configuration.ClientSettingsSection clientSettingsSection = (System.Configuration.ClientSettingsSection)section;
+                    ClientSettingsSection clientSettingsSection = (ClientSettingsSection)section;
                     foreach (SettingElement setting in clientSettingsSection.Settings)
                     {
                         variables.Add(setting.Name, setting.Value.ValueXml.InnerText);
                     }
                 }
-#endif
                 else
                 {
                     throw new ArgumentException("Section [" + sectionName +
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs
index 795b0b8d..f7756199 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs
@@ -244,7 +244,6 @@ namespace Spring.Objects.Factory.Config
             }
         }
 
-#if NET_2_0
         /// <summary>
         /// Returns the typed section from the specified resource with the given section name
         /// </summary>
@@ -280,7 +279,7 @@ namespace Spring.Objects.Factory.Config
             }
             return (TResult)result;
         }
-#endif
+
         /// <summary>
         /// Reads the specified configuration section from the given <see cref="XmlDocument"/>
         /// </summary>
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs
index 6d287252..e8b6f20f 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs
@@ -1,4 +1,3 @@
-#if NET_2_0
 #region License
 
 /*
@@ -109,4 +108,3 @@ namespace Spring.Objects.Factory.Config
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs
index a2fb2c18..ae46b4e0 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs
@@ -22,16 +22,13 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
 using System.Collections.Generic;
-#endif
 using System.Collections.Specialized;
 using System.Globalization;
 
 using Spring.Core;
 using Spring.Core.TypeConversion;
 using Spring.Core.TypeResolution;
-using Spring.Objects.Factory.Config;
 using Spring.Util;
 
 #endregion
@@ -122,7 +119,7 @@ namespace Spring.Objects.Factory.Config
             {
                 valueType = TypeResolutionUtils.ResolveType(this.valueTypeName);
             }
-#if NET_2_0
+
             if ((keyType == null) && (valueType == null))
             {
                 dictionary = new HybridDictionary();
@@ -137,9 +134,7 @@ namespace Spring.Objects.Factory.Config
 
                 dictionary = (IDictionary)ObjectUtils.InstantiateType(type);
             }
-#else
-            dictionary = new HybridDictionary();
-#endif
+
             foreach (object key in this.Keys)
 			{
 				string elementName = string.Format(CultureInfo.InvariantCulture, "{0}[{1}]", propertyName, key);
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs
index 0030c833..242e518d 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs
@@ -22,9 +22,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
 using System.Collections.Generic;
-#endif
 using System.Globalization;
 
 using Spring.Core;
@@ -102,7 +100,7 @@ namespace Spring.Objects.Factory.Config
             {
                 elementType = TypeResolutionUtils.ResolveType(this.elementTypeName);
             }
-#if NET_2_0
+
             if (elementType == null)
             {
                 list = new ArrayList();
@@ -117,9 +115,7 @@ namespace Spring.Objects.Factory.Config
                 list = (IList)ObjectUtils.InstantiateType(type);
                 // CLOVER:OFF
             }
-#else
-            list = new ArrayList();
-#endif
+
             for (int i = 0; i < Count; ++i)
             {
                 object element = this[i];
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs
index 1dc5cd1f..d22f75d6 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs
@@ -106,11 +106,7 @@ namespace Spring.Objects.Factory.Config
             Assembly assembly;
             try
             {
-#if NET_2_0
                 assembly = Assembly.Load(AssemblyName);
-#else
-                assembly = Assembly.LoadWithPartialName(AssemblyName);
-#endif
             }
             catch (FileLoadException)
             {
diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs
index f89167ac..0e83ef5d 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs
@@ -18,12 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
 using Common.Logging;
 
 namespace Spring.Objects.Factory.Parsing
@@ -57,6 +51,3 @@ namespace Spring.Objects.Factory.Parsing
 
     }
 }
-
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs
index efcefced..d8d60c7f 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs
@@ -18,11 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
-using System;
-using System.Text;
-
 namespace Spring.Objects.Factory.Parsing
 {
     public interface IProblemReporter
@@ -32,5 +27,3 @@ namespace Spring.Objects.Factory.Parsing
         void Error(Problem problem);
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs
index dd6c0fc3..b14c620a 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs
@@ -18,14 +18,7 @@
 
 #endregion
 
-#if NET_2_0
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
 using Spring.Core.IO;
-using Spring.Util;
 
 namespace Spring.Objects.Factory.Parsing
 {
@@ -74,5 +67,3 @@ namespace Spring.Objects.Factory.Parsing
 
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs
index 6086010b..84fa4cb6 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs
@@ -18,12 +18,7 @@
 
 #endregion
 
-#if NET_2_0
-
-
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.Serialization;
 using Spring.Core.IO;
 
@@ -167,6 +162,3 @@ namespace Spring.Objects.Factory.Parsing
 
     }
 }
-
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs
index 8201811e..e3735825 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs
@@ -19,13 +19,8 @@
 #endregion
 
 
-#if NET_2_0
-
-
 using System;
-using System.Collections.Generic;
 using System.Text;
-using Spring.Core.IO;
 using Spring.Util;
 
 namespace Spring.Objects.Factory.Parsing
@@ -101,5 +96,3 @@ namespace Spring.Objects.Factory.Parsing
 
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs
index ac187561..764c9860 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs
@@ -208,7 +208,6 @@ namespace Spring.Objects.Factory.Support
             ISet returnTypes = new HybridSet();
             foreach (MethodInfo factoryMethod in candidates)
             {
-#if NET_2_0
                 GenericArgumentsHolder genericArgsInfo = new GenericArgumentsHolder(definition.FactoryMethodName);
                 if (factoryMethod.IsStatic == isStatic && factoryMethod.Name.Equals(genericArgsInfo.GenericMethodName)
                     && ReflectionUtils.GetParameterTypes(factoryMethod).Length >= minNrOfArgs
@@ -229,13 +228,6 @@ namespace Spring.Objects.Factory.Support
                         returnTypes.Add(factoryMethod.ReturnType);
                     }
                 }
-#else
-                if (factoryMethod.IsStatic == isStatic && factoryMethod.Name.Equals(definition.FactoryMethodName)
-                    && ReflectionUtils.GetParameterTypes(factoryMethod).Length >= minNrOfArgs)
-                {
-                    returnTypes.Add(factoryMethod.ReturnType);
-                }
-#endif
             }
             if (returnTypes.Count == 1)
             {
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ConstructorResolver.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ConstructorResolver.cs
index f092ecd3..2d7ba754 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Support/ConstructorResolver.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/ConstructorResolver.cs
@@ -305,12 +305,8 @@ namespace Spring.Objects.Factory.Support
                 factoryClass = definition.ObjectType;
             }
 
-#if NET_2_0
             GenericArgumentsHolder genericArgsInfo = new GenericArgumentsHolder(definition.FactoryMethodName);
             MethodInfo[] factoryMethodCandidates = FindMethods(genericArgsInfo.GenericMethodName, expectedArgCount, isStatic, factoryClass);
-#else
-            MethodInfo[] factoryMethodCandidates = FindMethods(definition.FactoryMethodName, expectedArgCount, isStatic, factoryClass);
-#endif
 
             bool autowiring = (definition.AutowireMode == AutoWiringMode.Constructor);
 
@@ -318,7 +314,6 @@ namespace Spring.Objects.Factory.Support
             for (int i = 0; i < factoryMethodCandidates.Length; i++)
             {
                 MethodInfo factoryMethodCandidate = factoryMethodCandidates[i];
-#if NET_2_0
                 if (genericArgsInfo.ContainsGenericArguments)
                 {
                     string[] unresolvedGenericArgs = genericArgsInfo.GetGenericArguments();
@@ -332,7 +327,6 @@ namespace Spring.Objects.Factory.Support
                     }
                     factoryMethodCandidate = factoryMethodCandidate.MakeGenericMethod(paramTypes);
                 }
-#endif
                 if (arguments == null || arguments.Length == 0)
                 {
                     Type[] paramTypes = ReflectionUtils.GetParameterTypes(factoryMethodCandidate.GetParameters());
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs
index 7e953511..69ea7b14 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs
@@ -81,12 +81,7 @@ namespace Spring.Objects.Factory.Xml
 
         private static IDictionary parsers;
         private readonly static IDictionary wellknownNamespaceParserTypeNames;
-
-#if !NET_2_0
-        private static XmlSchemaCollection schemas;
-#else
         private static XmlSchemaSet schemas;
-#endif
 
         #endregion
 
@@ -117,12 +112,8 @@ namespace Spring.Objects.Factory.Xml
         public static void Reset()
         {
             parsers = new HybridDictionary();
-#if !NET_2_0
-            schemas = new XmlSchemaCollection();
-#else
             schemas = new XmlSchemaSet();
             schemas.XmlResolver = new XmlResourceUrlResolver();            
-#endif
 
             RegisterParser(new ObjectsNamespaceParser());
             // register custom config parsers
@@ -203,11 +194,7 @@ namespace Spring.Objects.Factory.Xml
         /// <returns>
         /// A schema collection containing validation schemas for all registered parsers.
         /// </returns>
-#if !NET_2_0
-        public static XmlSchemaCollection GetSchemas()
-#else
         public static XmlSchemaSet GetSchemas()
-#endif
         {
             return schemas;
         }
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs
index b5936a4f..7636a4cc 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs
@@ -65,29 +65,6 @@ namespace Spring.Objects.Factory.Xml
             { }
         }
 
-#if !NET_2_0
-        private class ValidationEventHandlerWrapper
-        {
-            private XmlReader _sender;
-            private XmlObjectDefinitionReader _owner;
-
-            public XmlReader Reader
-            {
-                set { _sender = value; }
-            }
-
-            public ValidationEventHandlerWrapper(XmlObjectDefinitionReader owner)
-            {
-                _owner = owner;
-            }
-
-            public void HandleValidation(object sender, ValidationEventArgs args)
-            {
-                _owner.HandleValidation(_sender,args);
-            }
-        }
-#endif
-
         #endregion
 
         #region Fields
@@ -357,15 +334,7 @@ namespace Spring.Objects.Factory.Xml
             }
             else
             {
-#if !NET_2_0
-                // only because 1.0/1.1 don't pass the sender into the handler callback...
-                ValidationEventHandlerWrapper validationEventHandlerWrapper = new ValidationEventHandlerWrapper(this);
-                reader = XmlUtils.CreateValidatingReader(stream, Resolver, NamespaceParserRegistry.GetSchemas(),
-                                                         new ValidationEventHandler(validationEventHandlerWrapper.HandleValidation));       
-                validationEventHandlerWrapper.Reader = reader;
-#else
                 reader = XmlUtils.CreateValidatingReader(stream, Resolver, NamespaceParserRegistry.GetSchemas(), HandleValidation);
-#endif
             }
 
             #region Instrumentation
@@ -390,11 +359,7 @@ namespace Spring.Objects.Factory.Xml
             {
                 XmlSchemaException ex = args.Exception;
                 XmlReader xmlReader = (XmlReader)sender;
-                if (!NamespaceParserRegistry.GetSchemas().Contains(xmlReader.NamespaceURI)
-#if NET_2_0
- && ex is XmlSchemaValidationException
-#endif
-)
+                if (!NamespaceParserRegistry.GetSchemas().Contains(xmlReader.NamespaceURI) && ex is XmlSchemaValidationException)
                 {
                     // try wellknown parsers
                     bool registered = NamespaceParserRegistry.RegisterWellknownNamespaceParserType(xmlReader.NamespaceURI);
@@ -403,13 +368,6 @@ namespace Spring.Objects.Factory.Xml
                         throw new RetryParseException();
                     }
                 }
-#if !NET_2_0
-                // ignore validation errors for well-known 'xml' namespace. This seems to be a bug in net 1.0 + 1.1
-                if (ex.Message.IndexOf("http://www.w3.org/XML/1998/namespace:") > -1)
-                {
-                    return;
-                }
-#endif
                 throw ex;
             }
             else
diff --git a/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs b/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs
index 939bae54..b257cd45 100644
--- a/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs
+++ b/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs
@@ -27,8 +27,6 @@ using System.Reflection;
 
 using Spring.Core;
 using Spring.Core.TypeResolution;
-using Spring.Objects;
-using Spring.Util;
 
 #endregion
 
@@ -397,22 +395,15 @@ namespace Spring.Objects.Support
         {
             MethodInfo theMethod = null;
             Type targetType = (TargetObject != null) ? TargetObject.GetType() : TargetType;
-#if NET_2_0
             GenericArgumentsHolder genericInfo = new GenericArgumentsHolder(TargetMethod);
-#endif
+
             // if we don't have any named arguments, we can try to get the exact method first...
 			if (NamedArguments.Count == 0)
 			{
                 ComposedCriteria searchCriteria = new ComposedCriteria();
-#if NET_2_0
                 searchCriteria.Add(new MethodNameMatchCriteria(genericInfo.GenericMethodName));
                 searchCriteria.Add(new MethodParametersCountCriteria(ArgumentCount));
-                searchCriteria.Add(new MethodGenericArgumentsCountCriteria(
-                    genericInfo.GetGenericArguments().Length));
-#else
-                searchCriteria.Add(new MethodNameMatchCriteria(TargetMethod));
-                searchCriteria.Add(new MethodParametersCountCriteria(ArgumentCount));
-#endif
+                searchCriteria.Add(new MethodGenericArgumentsCountCriteria(genericInfo.GetGenericArguments().Length));
                 searchCriteria.Add(new MethodArgumentsCriteria(Arguments));
 
                 MemberInfo[] matchingMethods = targetType.FindMembers(
@@ -430,15 +421,10 @@ namespace Spring.Objects.Support
             {
                 // search for a method with a matching signature... 
                 ComposedCriteria searchCriteria = new ComposedCriteria();
-#if NET_2_0
                 searchCriteria.Add(new MethodNameMatchCriteria(genericInfo.GenericMethodName));
                 searchCriteria.Add(new MethodParametersCountCriteria(ArgumentCount));
-                searchCriteria.Add(new MethodGenericArgumentsCountCriteria(
-                    genericInfo.GetGenericArguments().Length));
-#else
-                searchCriteria.Add(new MethodNameMatchCriteria(TargetMethod));
-                searchCriteria.Add(new MethodParametersCountCriteria(ArgumentCount));
-#endif
+                searchCriteria.Add(new MethodGenericArgumentsCountCriteria(genericInfo.GetGenericArguments().Length));
+
                 MemberInfo[] matchingMethods = targetType.FindMembers(
                     MemberTypes.Method,
                     MethodSearchingFlags,
@@ -459,7 +445,7 @@ namespace Spring.Objects.Support
                 }
                 theMethod = matchingMethods[0] as MethodInfo;
             }
-#if NET_2_0
+
             if (genericInfo.ContainsGenericArguments)
             {
                 string[] unresolvedGenericArgs = genericInfo.GetGenericArguments();
@@ -470,7 +456,7 @@ namespace Spring.Objects.Support
                 }
                 theMethod = theMethod.MakeGenericMethod(genericArgs);
             }
-#endif
+
             return theMethod;
         }
 
diff --git a/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs
index 3f509126..50dd6983 100644
--- a/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs
+++ b/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs
@@ -189,9 +189,7 @@ namespace Spring.Proxy
                 method.CallingConvention, method.ReturnType,
                 ReflectionUtils.GetParameterTypes(method.GetParameters()));
 
-#if NET_2_0
             DefineGenericParameters(methodBuilder, method);
-#endif
             //DefineParameters(methodBuilder, method);
 
             return methodBuilder;
@@ -216,7 +214,6 @@ namespace Spring.Proxy
         }
         */
 
-#if NET_2_0
         /// <summary>
         /// Defines generic method parameters based on proxied method metadata.
         /// </summary>
@@ -252,7 +249,6 @@ namespace Spring.Proxy
                 }
             }
         }
-#endif
 
         /// <summary>
         /// Generates the proxy method.
diff --git a/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs
index 13a01aec..3fac325c 100644
--- a/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs
+++ b/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs
@@ -25,10 +25,7 @@ using System.Collections;
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Runtime.Serialization;
-using System.Security.Permissions;
-
 using Common.Logging;
-using Spring.Collections;
 using Spring.Core.TypeResolution;
 using Spring.Util;
 
@@ -234,17 +231,14 @@ namespace Spring.Proxy
 				{
                     typeBuilder.SetCustomAttribute((CustomAttributeBuilder)attr);
 				}
-#if NET_2_0
                 else if (attr is CustomAttributeData)
                 {
                     typeBuilder.SetCustomAttribute(
                         ReflectionUtils.CreateCustomAttribute((CustomAttributeData)attr));
                 }
-#endif
 				else if (attr is Attribute)
 				{
-                    typeBuilder.SetCustomAttribute(
-                        ReflectionUtils.CreateCustomAttribute((Attribute)attr));
+                    typeBuilder.SetCustomAttribute(ReflectionUtils.CreateCustomAttribute((Attribute)attr));
 				}
 			}
 		}
@@ -264,13 +258,11 @@ namespace Spring.Proxy
                 {
                     methodBuilder.SetCustomAttribute((CustomAttributeBuilder)attr);
                 }
-#if NET_2_0
                 else if (attr is CustomAttributeData)
                 {
                     methodBuilder.SetCustomAttribute(
                         ReflectionUtils.CreateCustomAttribute((CustomAttributeData)attr));
                 }
-#endif
                 else if (attr is Attribute)
                 {
                     methodBuilder.SetCustomAttribute(
@@ -278,13 +270,10 @@ namespace Spring.Proxy
                 }
             }
 
-#if NET_2_0
             ApplyMethodReturnTypeAttributes(methodBuilder, targetMethod);
-#endif
             ApplyMethodParameterAttributes(methodBuilder, targetMethod);
         }
 
-#if NET_2_0
         /// <summary>
         /// Applies attributes to the proxied method's return type.
         /// </summary>
@@ -312,7 +301,6 @@ namespace Spring.Proxy
                 }
             }
         }
-#endif
 
         /// <summary>
         /// Applies attributes to proxied method's parameters.
@@ -332,13 +320,11 @@ namespace Spring.Proxy
                     {
                         parameterBuilder.SetCustomAttribute((CustomAttributeBuilder)attr);
                     }
-#if NET_2_0
                     else if (attr is CustomAttributeData)
                     {
                         parameterBuilder.SetCustomAttribute(
                             ReflectionUtils.CreateCustomAttribute((CustomAttributeData)attr));
                     }
-#endif
                     else if (attr is Attribute)
                     {
                         parameterBuilder.SetCustomAttribute(
@@ -415,7 +401,6 @@ namespace Spring.Proxy
             return attributes;
         }
 
-#if NET_2_0
         /// <summary>
         /// Calculates and returns the list of attributes that apply to the
         /// specified method's return type.
@@ -463,7 +448,6 @@ namespace Spring.Proxy
 
             return attributes;
         }
-#endif
 
         /// <summary>
         /// Calculates and returns the list of attributes that apply to the
@@ -483,7 +467,6 @@ namespace Spring.Proxy
                 !method.DeclaringType.IsInterface)
             {
                 // add attributes that apply to the target method's parameter
-#if NET_2_0
                 object[] attrs = paramInfo.GetCustomAttributes(false);
                 try
                 {
@@ -508,9 +491,6 @@ namespace Spring.Proxy
                     // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=296032
                     attributes.AddRange(attrs);
                 }
-#else
-                attributes.AddRange(paramInfo.GetCustomAttributes(false));
-#endif
             }
 
             // TODO: add attributes defined by configuration
@@ -549,12 +529,10 @@ namespace Spring.Proxy
             {
                 return (attrType == attr.GetType());
             }
-#if NET_2_0
             else if (attr is CustomAttributeData)
             {
                 return (attrType == ((CustomAttributeData)attr).Constructor.DeclaringType);
             }
-#endif
             else if (attr is CustomAttributeBuilder)
             {
                 return (attrType == ((ConstructorInfo)CustomAttributeConstructorField.GetValue(attr)).DeclaringType);
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs b/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs
index f537f32f..4c759eff 100644
--- a/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs
@@ -34,8 +34,6 @@ namespace Spring.Reflection.Dynamic
     /// <author>Aleksandar Seovic</author>
     public class BaseDynamicMember
     {
-//#if NET_2_0
-//#else
         /// <summary>
         /// Method attributes constant.
         /// </summary>
@@ -58,12 +56,8 @@ namespace Spring.Reflection.Dynamic
             if (targetType.IsValueType)
             {
                 LocalBuilder target = il.DeclareLocal(targetType);
-//#if NET_2_0 
-//                il.Emit(OpCodes.Unbox_Any, targetType);
-//#else
             	il.Emit(OpCodes.Unbox, targetType);
             	il.Emit(OpCodes.Ldobj, targetType);
-//#endif          
             	il.Emit(OpCodes.Stloc, target);
                 il.Emit(OpCodes.Ldloca, target);
             }
@@ -84,12 +78,8 @@ namespace Spring.Reflection.Dynamic
             il.Emit(OpCodes.Ldarg, argumentPosition);
             if (argumentType.IsValueType)
             {
-//#if NET_2_0 
-//				il.Emit(OpCodes.Unbox_Any, argumentType);
-//#else
 				il.Emit(OpCodes.Unbox, argumentType);
 				il.Emit(OpCodes.Ldobj, argumentType);
-//#endif          
             }
             else
             {
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs
index 264bc6e0..14bf3ab9 100644
--- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs
@@ -20,10 +20,8 @@
 
 #region Imports
 
-using System;
 using System.Collections;
 using System.Reflection;
-using System.Reflection.Emit;
 using Spring.Util;
 
 #endregion
@@ -65,7 +63,6 @@ namespace Spring.Reflection.Dynamic
     {
         private ConstructorInfo constructorInfo;
 
-#if NET_2_0
         #region Generated Function Cache
 
         private static readonly IDictionary constructorCache = new Hashtable();
@@ -115,61 +112,10 @@ namespace Spring.Reflection.Dynamic
         {
             return constructor(arguments);
         }
-#else
-        private IDynamicConstructor dynamicConstructor;
-        private bool isOptimized = false;
-        
-        /// <summary>
-        /// Creates a new instance of the safe constructor wrapper.
-        /// </summary>
-        /// <param name="constructor">Constructor to wrap.</param>
-        public SafeConstructor(ConstructorInfo constructor)
-        {
-            this.constructorInfo = constructor;
-            if (constructor.IsPublic &&
-                ReflectionUtils.IsTypeVisible(constructor.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
-            {
-                this.dynamicConstructor = DynamicConstructor.Create(constructor);
-                this.isOptimized = true;
-            }
-        }
-
-        /// <summary>
-        /// Invokes dynamic constructor.
-        /// </summary>
-        /// <param name="arguments">
-        /// Constructor arguments.
-        /// </param>
-        /// <returns>
-        /// A constructor value.
-        /// </returns>
-        public object Invoke(object[] arguments)
-        {
-            if (isOptimized)
-            {
-                // try dynamic constructor first but fall back to standard reflection 
-                // if arguments are causing InvalidCastExceptions
-                try
-                {
-                    return dynamicConstructor.Invoke(arguments);
-                }
-                catch (InvalidCastException)
-                {
-                    isOptimized = false;
-                    return constructorInfo.Invoke(arguments);
-                }
-            }
-            else
-            {
-                return constructorInfo.Invoke(arguments);
-            }
-        }
-#endif
     }
 
     #endregion
 
-#if NET_2_0
     /// <summary>
     /// Factory class for dynamic constructors.
     /// </summary>
@@ -188,58 +134,4 @@ namespace Spring.Reflection.Dynamic
             return new SafeConstructor(constructorInfo);
         }
     }
-    
-#else
-    /// <summary>
-    /// Factory class for dynamic constructors.
-    /// </summary>
-    /// <author>Aleksandar Seovic</author>
-    public class DynamicConstructor : BaseDynamicMember
-    {
-        private static readonly CreateConstructorCallback s_createCallback = new CreateConstructorCallback(CreateInternal);
-
-        #region Create Constructor
-
-        /// <summary>
-        /// Creates dynamic constructor instance for the specified <see cref="ConstructorInfo"/>.
-        /// </summary>
-        /// <param name="constructor">Constructor info to create dynamic constructor for.</param>
-        /// <returns>Dynamic constructor for the specified <see cref="ConstructorInfo"/>.</returns>
-        public static IDynamicConstructor Create(ConstructorInfo constructor)
-        {
-            AssertUtils.ArgumentNotNull(constructor, "You cannot create a dynamic constructor for a null value.");
-
-            IDynamicConstructor dynamicConstructor = DynamicReflectionManager.GetDynamicConstructor(constructor, s_createCallback);
-            return dynamicConstructor;
-        }
-
-        private static IDynamicConstructor CreateInternal(ConstructorInfo constructor)
-        {
-            IDynamicConstructor dynamicConstructor = null;
-
-            TypeBuilder tb = DynamicReflectionManager.CreateTypeBuilder("Ctor_" + constructor.DeclaringType.Name);
-            tb.AddInterfaceImplementation(typeof(IDynamicConstructor));
-
-            GenerateInvoke(tb, constructor);
-
-            Type dynamicConstructorType = tb.CreateType();
-            ConstructorInfo ctor = dynamicConstructorType.GetConstructor(Type.EmptyTypes);
-            dynamicConstructor = (IDynamicConstructor) ctor.Invoke(ObjectUtils.EmptyObjects);
-            
-            return dynamicConstructor;
-        }
-
-        private static void GenerateInvoke(TypeBuilder tb, ConstructorInfo constructor)
-        {
-            MethodBuilder invokeMethod = 
-                tb.DefineMethod("Invoke", METHOD_ATTRIBUTES, typeof(object), new Type[] {typeof(object[])});
-            invokeMethod.DefineParameter(1, ParameterAttributes.None, "args");
-
-            ILGenerator il = invokeMethod.GetILGenerator();
-
-            DynamicReflectionManager.EmitInvokeConstructor(il, constructor, true);
-        }
-        #endregion
-    }
-#endif
 }
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs
index 8bb22aa1..2ad5de97 100644
--- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs
@@ -20,10 +20,8 @@
 
 #region Imports
 
-using System;
 using System.Collections;
 using System.Reflection;
-using System.Reflection.Emit;
 using Spring.Util;
 
 #endregion
@@ -75,7 +73,7 @@ namespace Spring.Reflection.Dynamic
     public class SafeField : IDynamicField
     {
         private readonly FieldInfo fieldInfo;
-#if NET_2_0
+
         #region Cache
 
         private static readonly IDictionary fieldCache = new Hashtable();
@@ -159,123 +157,6 @@ namespace Spring.Reflection.Dynamic
             setter(target, value);
         }
 
-#else
-        /// <summary>
-        /// Returns a <see cref="IDynamicField"/> implementation
-        /// by determining the fastest possible dynamic access strategy 
-        /// </summary>
-        /// <param name="field">the field to be wrapped</param>
-        /// <returns>an <see cref="IDynamicField"/> instance for accessing the 
-        /// field represented by the given <see cref="FieldInfo"/></returns>
-        public static IDynamicField CreateFrom(FieldInfo field)
-        {
-            AssertUtils.ArgumentNotNull(field, "You cannot create a dynamic field for a null value.");
-
-            IDynamicField dynamicField;
-
-            if (field.IsPublic &&
-               ReflectionUtils.IsTypeVisible(field.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
-            {
-                dynamicField = DynamicField.Create(field);
-            }
-            else
-            {
-                dynamicField = new SafeField(field);
-            }
-
-            return dynamicField;
-        }
-
-        private readonly IDynamicField dynamicField;
-        private readonly bool isOptimizedGet = false;
-        private bool isOptimizedSet = false;
-        private readonly bool canSet;
-
-        /// <summary>
-        /// Creates a new instance of the safe field wrapper.
-        /// </summary>
-        /// <param name="field">Field to wrap.</param>
-        public SafeField(FieldInfo field)
-        {
-            AssertUtils.ArgumentNotNull(field, "You cannot create a dynamic field for a null value.");
-
-            this.fieldInfo = field;
-            this.canSet = (!fieldInfo.IsLiteral
-                && !fieldInfo.IsInitOnly
-                && !(fieldInfo.DeclaringType.IsValueType && !fieldInfo.IsStatic));
-
-            if (fieldInfo.IsPublic &&
-                ReflectionUtils.IsTypeVisible(fieldInfo.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
-            {
-                dynamicField = DynamicField.Create(fieldInfo);
-                isOptimizedGet = isOptimizedSet = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of the dynamic field for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to get field value from.
-        /// </param>
-        /// <returns>
-        /// A field value.
-        /// </returns>
-        public object GetValue(object target)
-        {
-            if (isOptimizedGet)
-            {
-                return dynamicField.GetValue(target);
-            }
-            else
-            {
-                return fieldInfo.GetValue(target);
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of the dynamic field for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to set field value on.
-        /// </param>
-        /// <param name="value">
-        /// A new field value.
-        /// </param>
-        public void SetValue(object target, object value)
-        {
-            if (isOptimizedSet)
-            {
-                try
-                {
-                    dynamicField.SetValue(target, value);
-                    return;
-                }
-                catch (InvalidCastException)
-                {
-                    isOptimizedSet = false;
-                }
-            }
-
-            if (!canSet)
-            {
-                throw new InvalidOperationException("Cannot set value of a read-only field or a constant.");
-            }
-
-            try
-            {
-                fieldInfo.SetValue(target, value);
-            }
-            catch(ArgumentException)
-            {
-                if (value != null && !fieldInfo.GetType().IsAssignableFrom(value.GetType()))
-                {
-                    throw new InvalidCastException();
-                }
-                throw;
-            }
-        }
-#endif
         internal FieldInfo FieldInfo
         {
             get { return fieldInfo; }
@@ -284,7 +165,6 @@ namespace Spring.Reflection.Dynamic
 
     #endregion
 
-#if NET_2_0
     /// <summary>
     /// Factory class for dynamic fields.
     /// </summary>
@@ -304,187 +184,4 @@ namespace Spring.Reflection.Dynamic
             return dynamicField;
         }
     }
-#else
-    /// <summary>
-    /// Factory class for dynamic fields.
-    /// </summary>
-    /// <author>Aleksandar Seovic</author>
-    public class DynamicField : BaseDynamicMember
-    {
-        private static readonly CreateFieldCallback s_createCallback = new CreateFieldCallback(CreateInternal);
-
-        #region Create Method
-
-        /// <summary>
-        /// Creates dynamic field instance for the specified <see cref="FieldInfo"/>.
-        /// </summary>
-        /// <param name="field">Field info to create dynamic field for.</param>
-        /// <returns>Dynamic field for the specified <see cref="FieldInfo"/>.</returns>
-        public static IDynamicField Create(FieldInfo field)
-        {
-            AssertUtils.ArgumentNotNull(field, "You cannot create a dynamic field for a null value.");
-
-            IDynamicField dynamicField = DynamicReflectionManager.GetDynamicField(field, s_createCallback);
-            return dynamicField;
-        }
-
-        private static IDynamicField CreateInternal(FieldInfo field)
-        {
-            IDynamicField dynamicField = null;
-
-            TypeBuilder tb = DynamicReflectionManager.CreateTypeBuilder("Field_" + field.Name);
-            tb.AddInterfaceImplementation(typeof(IDynamicField));
-
-            GenerateGetValue(tb, field);
-            GenerateSetValue(tb, field);
-
-            Type dynamicFieldType = tb.CreateType();
-            ConstructorInfo ctor = dynamicFieldType.GetConstructor(Type.EmptyTypes);
-            dynamicField = (IDynamicField)ctor.Invoke(ObjectUtils.EmptyObjects);
-
-            return dynamicField;
-        }
-
-        private static void GenerateGetValue(TypeBuilder tb, FieldInfo field)
-        {
-            MethodBuilder getValueMethod =
-                tb.DefineMethod("GetValue", METHOD_ATTRIBUTES, typeof(object), new Type[] { typeof(object) });
-            getValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
-
-            ILGenerator il = getValueMethod.GetILGenerator();
-            if (field.IsLiteral)
-            {
-                EmitConstant(il, field.GetValue(field.FieldType));
-            }
-            else if (field.IsStatic)
-            {
-                il.Emit(OpCodes.Ldsfld, field);
-            }
-            else
-            {
-                SetupTargetInstance(il, field.DeclaringType);
-                il.Emit(OpCodes.Ldfld, field);
-            }
-            ProcessReturnValue(il, field.FieldType);
-            il.Emit(OpCodes.Ret);
-        }
-
-        private static void EmitConstant(ILGenerator il, object value)
-        {
-            if (value is String)
-            {
-                il.Emit(OpCodes.Ldstr, (string)value);
-                return;
-            }
-
-            if (value is bool)
-            {
-                if ((bool)value)
-                {
-                    il.Emit(OpCodes.Ldc_I4_1);
-                }
-                else
-                {
-                    il.Emit(OpCodes.Ldc_I4_0);
-                }
-                return;
-            }
-
-            if (value is Char)
-            {
-                il.Emit(OpCodes.Ldc_I4, (Char)value);
-                il.Emit(OpCodes.Conv_I2);
-                return;
-            }
-
-            if (value is byte)
-            {
-                il.Emit(OpCodes.Ldc_I4, (byte)value);
-                il.Emit(OpCodes.Conv_I1);
-            }
-            else if (value is Int16)
-            {
-                il.Emit(OpCodes.Ldc_I4, (Int16)value);
-                il.Emit(OpCodes.Conv_I2);
-            }
-            else if (value is Int32)
-            {
-                il.Emit(OpCodes.Ldc_I4, (Int32)value);
-            }
-            else if (value is Int64)
-            {
-                il.Emit(OpCodes.Ldc_I8, (Int64)value);
-            }
-            else if (value is UInt16)
-            {
-                il.Emit(OpCodes.Ldc_I4, (UInt16)value);
-                il.Emit(OpCodes.Conv_U2);
-            }
-            else if (value is UInt32)
-            {
-                il.Emit(OpCodes.Ldc_I4, (UInt32)value);
-                il.Emit(OpCodes.Conv_U4);
-            }
-            else if (value is UInt64)
-            {
-                il.Emit(OpCodes.Ldc_I8, (UInt64)value);
-                il.Emit(OpCodes.Conv_U8);
-            }
-            else if (value is Single)
-            {
-                il.Emit(OpCodes.Ldc_R4, (Single)value);
-            }
-            else if (value is Double)
-            {
-                il.Emit(OpCodes.Ldc_R8, (Double)value);
-            }
-        }
-
-        private static void GenerateSetValue(TypeBuilder tb, FieldInfo field)
-        {
-            MethodBuilder setValueMethod =
-                tb.DefineMethod("SetValue", METHOD_ATTRIBUTES, typeof(void),
-                                new Type[] { typeof(object), typeof(object) });
-            setValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
-            setValueMethod.DefineParameter(2, ParameterAttributes.None, "value");
-
-            ILGenerator il = setValueMethod.GetILGenerator();
-            if (!(field.IsInitOnly || field.IsLiteral))
-            {
-                bool isValueType = field.DeclaringType.IsValueType;
-                if (isValueType && !field.IsStatic)
-                {
-                    ThrowInvalidOperationException(il, "Cannot set field value on a value type due to boxing.");
-                }
-                else
-                {
-                    bool isStatic = field.IsStatic;
-
-                    if (!isStatic)
-                    {
-                        SetupTargetInstance(il, field.DeclaringType);
-                    }
-
-                    SetupArgument(il, field.FieldType, 2);
-                    if (!isStatic)
-                    {
-                        il.Emit(OpCodes.Stfld, field);
-                    }
-                    else
-                    {
-                        il.Emit(OpCodes.Stsfld, field);
-                    }
-                    il.Emit(OpCodes.Ret);
-                }
-            }
-            else
-            {
-                ThrowInvalidOperationException(il, "Cannot set value of a read-only field or a constant.");
-            }
-        }
-
-        #endregion
-    }
-#endif // NET_2_0
 }
-
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs
index a680e763..763cb6df 100644
--- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs
@@ -127,7 +127,6 @@ namespace Spring.Reflection.Dynamic
 
     #region Safe wrapper
 
-#if NET_2_0
     /// <summary>
     /// Safe wrapper for the dynamic indexer.
     /// </summary>
@@ -266,232 +265,8 @@ namespace Spring.Reflection.Dynamic
         }
     }
 
-#else
-
-    /// <summary>
-    /// Safe wrapper for the dynamic indexer.
-    /// </summary>
-    /// <remarks>
-    /// <see cref="SafeIndexer"/> will attempt to use dynamic
-    /// indexer if possible, but it will fall back to standard
-    /// reflection if necessary.
-    /// </remarks>    
-    public class SafeIndexer : IDynamicIndexer
-    {
-        private PropertyInfo indexerProperty;
-
-        /// <summary>
-        /// Internal PropertyInfo accessor.
-        /// </summary>
-        internal PropertyInfo IndexerProperty
-        {
-            get { return indexerProperty; }
-        }
-
-        private IDynamicIndexer dynamicIndexer;
-        private bool isOptimizedGet = false;
-        private bool isOptimizedSet = false;
-
-        /// <summary>
-        /// Creates a new instance of the safe indexer wrapper.
-        /// </summary>
-        /// <param name="indexer">Indexer to wrap.</param>
-        public SafeIndexer(PropertyInfo indexer)
-        {
-            this.indexerProperty = indexer;
-
-            if (indexer.CanRead 
-                && indexer.GetGetMethod() != null 
-                && ReflectionUtils.IsTypeVisible(indexer.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
-            {
-                dynamicIndexer = DynamicIndexer.Create(indexer);
-                isOptimizedGet = true;
-            }
-            if (indexer.CanWrite 
-                && indexer.GetSetMethod() != null
-                && ReflectionUtils.IsTypeVisible(indexer.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
-            {
-                if (dynamicIndexer == null)
-                {
-                    dynamicIndexer = DynamicIndexer.Create(indexer);
-                }
-                isOptimizedSet = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of the dynamic indexer for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to get indexer value from.
-        /// </param>
-        /// <param name="index">
-        /// Indexer arguments.
-        /// </param>
-        /// <returns>
-        /// A indexer value.
-        /// </returns>
-        public object GetValue(object target, int index)
-        {
-            if (isOptimizedGet)
-            {
-                return dynamicIndexer.GetValue(target, index);
-            }
-            else
-            {
-                return indexerProperty.GetValue(target, new object[] { index });
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of the dynamic indexer for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to get the indexer value from.
-        /// </param>
-        /// <param name="index">
-        /// Indexer argument.
-        /// </param>
-        /// <returns>
-        /// A indexer value.
-        /// </returns>
-        public object GetValue(object target, object index)
-        {
-            if (isOptimizedGet)
-            {
-                return dynamicIndexer.GetValue(target, index);
-            }
-            else
-            {
-                return indexerProperty.GetValue(target, new object[] { index });
-            }
-        }
-        
-        /// <summary>
-        /// Gets the value of the dynamic indexer for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to get indexer value from.
-        /// </param>
-        /// <param name="index">
-        /// Indexer arguments.
-        /// </param>
-        /// <returns>
-        /// A indexer value.
-        /// </returns>
-        public object GetValue(object target, object[] index)
-        {
-            if (isOptimizedGet)
-            {
-                return dynamicIndexer.GetValue(target, index);
-            }
-            else
-            {
-                return indexerProperty.GetValue(target, index);
-            }
-        }
-
-        /// <summary>
-        /// Sets the value of the dynamic indexer for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to set indexer value on.
-        /// </param>
-        /// <param name="index">
-        /// Indexer arguments.
-        /// </param>
-        /// <param name="value">
-        /// A new indexer value.
-        /// </param>
-        public void SetValue(object target, int index, object value)
-        {
-            if (isOptimizedSet)
-            {
-                try
-                {
-                    dynamicIndexer.SetValue(target, index, value);
-                }
-                catch (InvalidCastException)
-                {
-                    isOptimizedSet = false;
-                    indexerProperty.SetValue(target, value, new object[] { index });
-                }
-            }
-            else
-            {
-                indexerProperty.SetValue(target, value, new object[] { index });
-            }
-        }
-
-        /// <summary>
-        /// Sets the value of the dynamic indexer for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to set indexer value on.
-        /// </param>
-        /// <param name="index">
-        /// Indexer arguments.
-        /// </param>
-        /// <param name="value">
-        /// A new indexer value.
-        /// </param>
-        public void SetValue(object target, object index, object value)
-        {
-            if (isOptimizedSet)
-            {
-                try
-                {
-                    dynamicIndexer.SetValue(target, index, value);
-                }
-                catch (InvalidCastException)
-                {
-                    isOptimizedSet = false;
-                    indexerProperty.SetValue(target, value, new object[] { index });
-                }
-            }
-            else
-            {
-                indexerProperty.SetValue(target, value, new object[] { index });
-            }
-        }
-
-        /// <summary>
-        /// Sets the value of the dynamic indexer for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to set indexer value on.
-        /// </param>
-        /// <param name="index">
-        /// Indexer arguments.
-        /// </param>
-        /// <param name="value">
-        /// A new indexer value.
-        /// </param>
-        public void SetValue(object target, object[] index, object value)
-        {
-            if (isOptimizedSet)
-            {
-                try
-                {
-                    dynamicIndexer.SetValue(target, index, value);
-                }
-                catch (InvalidCastException)
-                {
-                    isOptimizedSet = false;
-                    indexerProperty.SetValue(target, value, index);
-                }
-            }
-            else
-            {
-                indexerProperty.SetValue(target, value, index);
-            }
-        }
-    }
-#endif
-
     #endregion
 
-#if NET_2_0
     /// <summary>
     /// Factory class for dynamic indexers.
     /// </summary>
@@ -517,172 +292,5 @@ namespace Spring.Reflection.Dynamic
             return dynamicIndexer;
         }
     }
-#else
-    /// <summary>
-    /// Factory class for dynamic indexers.
-    /// </summary>
-    /// <author>Aleksandar Seovic</author>
-    public class DynamicIndexer : BaseDynamicMember
-    {
-        private static readonly CreateIndexerCallback s_createCallback = new CreateIndexerCallback(CreateInternal);
 
-    #region Create Method
-
-        /// <summary>
-        /// Creates dynamic indexer instance for the specified <see cref="PropertyInfo"/>.
-        /// </summary>
-        /// <param name="indexer">Indexer info to create dynamic indexer for.</param>
-        /// <returns>Dynamic indexer for the specified <see cref="PropertyInfo"/>.</returns>
-        public static IDynamicIndexer Create(PropertyInfo indexer)
-        {
-            AssertUtils.ArgumentNotNull(indexer, "You cannot create a dynamic indexer for a null value.");
-
-            IDynamicIndexer dynamicIndexer = DynamicReflectionManager.GetDynamicIndexer(indexer, s_createCallback);
-            return dynamicIndexer;
-        }
-
-        private static IDynamicIndexer CreateInternal(PropertyInfo indexer)
-        {
-            IDynamicIndexer dynamicIndexer = null;
-
-            TypeBuilder tb = DynamicReflectionManager.CreateTypeBuilder("Indexer_" + indexer.DeclaringType.Name);
-            tb.AddInterfaceImplementation(typeof(IDynamicIndexer));
-
-            GenerateGetValue(tb, indexer, typeof(int));
-            GenerateGetValue(tb, indexer, typeof(object));
-            GenerateGetValue(tb, indexer, typeof(object[]));
-            GenerateSetValue(tb, indexer, typeof(int));
-            GenerateSetValue(tb, indexer, typeof(object));
-            GenerateSetValue(tb, indexer, typeof(object[]));
-
-            Type dynamicIndexerType = tb.CreateType();
-            ConstructorInfo ctor = dynamicIndexerType.GetConstructor(Type.EmptyTypes);
-            dynamicIndexer = (IDynamicIndexer) ctor.Invoke(ObjectUtils.EmptyObjects);
-            
-            return dynamicIndexer;
-        }
-
-        private static void GenerateGetValue(TypeBuilder tb, PropertyInfo indexer, Type indexType)
-        {
-            MethodBuilder getValueMethod =
-                tb.DefineMethod("GetValue", METHOD_ATTRIBUTES, typeof(object), new Type[] { typeof(object), indexType });
-            getValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
-            getValueMethod.DefineParameter(2, ParameterAttributes.None, "index");
-            
-            ILGenerator il = getValueMethod.GetILGenerator();
-            if (indexer.CanRead)
-            {
-                MethodInfo getMethod = indexer.GetGetMethod();
-                bool isValueType = indexer.DeclaringType.IsValueType;
-                bool isStatic = getMethod.IsStatic;
-                
-                if (!isStatic)
-                {
-                    SetupTargetInstance(il, indexer.DeclaringType);
-                }
-
-                if (indexType != typeof(object) && indexType != typeof(object[]))
-                {
-                    il.Emit(OpCodes.Ldarg_2);
-                }
-                else if (indexType == typeof(object))
-                {
-                    Type argumentType = ReflectionUtils.GetParameterTypes(getMethod)[0];
-                    SetupIndexerArgument(il, argumentType, 0, false);
-                }
-                else
-                {
-                    Type[] argTypes = ReflectionUtils.GetParameterTypes(getMethod);
-                    for (int i = 0; i < argTypes.Length; i++)
-                    {
-                        SetupIndexerArgument(il, argTypes[i], i, true);
-                    }
-                }
-                InvokeMethod(il, isStatic, isValueType, getMethod);
-                ProcessReturnValue(il, indexer.PropertyType);
-                il.Emit(OpCodes.Ret);
-            }
-            else
-            {
-                ThrowInvalidOperationException(il, "Cannot get value of a non-readable indexer");
-            }
-        }
-
-        private static void GenerateSetValue(TypeBuilder tb, PropertyInfo indexer, Type indexType)
-        {
-            MethodBuilder setValueMethod =
-                tb.DefineMethod("SetValue", METHOD_ATTRIBUTES, typeof(void),
-                                new Type[] { typeof(object), indexType, typeof(object) });
-            setValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
-            setValueMethod.DefineParameter(2, ParameterAttributes.None, "value");
-
-            ILGenerator il = setValueMethod.GetILGenerator();
-            if (indexer.CanWrite)
-            {
-                bool isValueType = indexer.DeclaringType.IsValueType;
-                if (isValueType)
-                {
-                    ThrowInvalidOperationException(il, "Cannot set indexer value on a value type due to boxing.");
-                }
-                else
-                {
-                    MethodInfo setMethod = indexer.GetSetMethod();
-                    bool isStatic = setMethod.IsStatic;
-
-                    if (!isStatic)
-                    {
-                        SetupTargetInstance(il, indexer.DeclaringType);
-                    }
-
-                    if (indexType != typeof(object) && indexType != typeof(object[]))
-                    {
-                        il.Emit(OpCodes.Ldarg_2);
-                    }
-                    else if (indexType == typeof(object))
-                    {
-                        Type argumentType = ReflectionUtils.GetParameterTypes(setMethod)[0];
-                        SetupIndexerArgument(il, argumentType, 0, false);
-                    }
-                    else
-                    {
-                        Type[] argTypes = ReflectionUtils.GetParameterTypes(setMethod);
-                        for (int i = 0; i < argTypes.Length - 1; i++)
-                        {
-                            SetupIndexerArgument(il, argTypes[i], i, true);
-                        }
-                    }
-                    SetupArgument(il, indexer.PropertyType, 3);
-                    InvokeMethod(il, isStatic, isValueType, setMethod);
-                    il.Emit(OpCodes.Ret);
-                }
-            }
-            else
-            {
-                ThrowInvalidOperationException(il, "Cannot set value of a read-only indexer");
-            }
-        }
-
-        private static void SetupIndexerArgument(ILGenerator il, Type argumentType, int argumentPosition, bool isObjectArray)
-        {
-            il.Emit(OpCodes.Ldarg_2);
-            if (isObjectArray)
-            {
-                il.Emit(OpCodes.Ldc_I4, argumentPosition);
-                il.Emit(OpCodes.Ldelem_Ref);
-            }
-            if (argumentType.IsValueType)
-            {
-				il.Emit(OpCodes.Unbox, argumentType);
-				il.Emit(OpCodes.Ldobj, argumentType);
-            }
-            else
-            {
-                il.Emit(OpCodes.Castclass, argumentType);
-            }
-        }
-        
-    #endregion
-    }
-#endif
-
-} // namespace
\ No newline at end of file
+} // namespace
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs
index 1e2e43e1..33e85267 100644
--- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs
@@ -20,10 +20,7 @@
 
 using System;
 using System.Collections;
-using System.Collections.Specialized;
 using System.Reflection;
-using System.Reflection.Emit;
-using Spring.Collections;
 using Spring.Util;
 
 namespace Spring.Reflection.Dynamic
@@ -74,7 +71,6 @@ namespace Spring.Reflection.Dynamic
             get { return methodInfo.DeclaringType; }
         }
 
-#if NET_2_0
         #region Generated Function Cache
 
         private class SafeMethodState
@@ -155,74 +151,10 @@ namespace Spring.Reflection.Dynamic
 
             return this.state.method(target, arguments);
         }
-#else
-        private IDynamicMethod dynamicMethod;
-        private bool isOptimized = false;
-
-        /// <summary>
-        /// Creates a new instance of the safe method wrapper.
-        /// </summary>
-        /// <param name="method">Method to wrap.</param>
-        public SafeMethod(MethodInfo method)
-        {
-            this.methodInfo = method;
-            if (method.IsPublic && 
-                ReflectionUtils.IsTypeVisible(method.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
-            {
-                this.dynamicMethod = DynamicMethod.Create(method);
-                this.isOptimized = true;
-            }
-        }
-
-        /// <summary>
-        /// Invokes dynamic method.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to invoke method on.
-        /// </param>
-        /// <param name="arguments">
-        /// Method arguments.
-        /// </param>
-        /// <returns>
-        /// A method return value.
-        /// </returns>
-        public object Invoke(object target, object[] arguments)
-        {
-            if (isOptimized)
-            {
-                // try dynamic method first but fall back to standard reflection 
-                // if arguments are causing InvalidCastExceptions
-                try
-                {
-                    return dynamicMethod.Invoke(target, arguments);
-                }
-                catch (InvalidCastException e)
-                {
-                    // Only attempt if DynamicReflection code itself threw the exception.
-                    if (!ExceptionFromDynamicReflection(e))
-                    {
-                        throw;
-                    }
-                    isOptimized = false;
-                    return methodInfo.Invoke(target, arguments);
-                }
-            }
-            else
-            {
-                return methodInfo.Invoke(target, arguments);
-            }
-        }
-
-        private bool ExceptionFromDynamicReflection(InvalidCastException e)
-        {
-            return e.TargetSite.DeclaringType.FullName.IndexOf(DynamicReflectionManager.ASSEMBLY_NAME) >= 0;
-        }
-#endif
     }
 
     #endregion
 
-#if NET_2_0
     /// <summary>
     /// Factory class for dynamic methods.
     /// </summary>
@@ -242,86 +174,4 @@ namespace Spring.Reflection.Dynamic
             return dynamicMethod;
         }
     }
-#else
-    /// <summary>
-    /// Factory class for dynamic methods.
-    /// </summary>
-    /// <author>Aleksandar Seovic</author>
-    public class DynamicMethod : BaseDynamicMember
-    {
-        private class DynamicMethodImpl : IDynamicMethod
-        {
-            private readonly object[] nullArguments;
-            private readonly MethodInfo methodInfo;
-            private readonly IDynamicMethod method;
-
-            public DynamicMethodImpl(MethodInfo methodInfo, IDynamicMethod generatedMethod)
-            {
-                this.nullArguments = new object[methodInfo.GetParameters().Length];
-                this.methodInfo = methodInfo;
-                this.method = generatedMethod;
-            }
-
-            public object Invoke(object target, params object[] arguments)
-            {
-                // special case - when calling Invoke(null,null) it is undecidible if the second null is an argument or the argument array
-                if (arguments==null && nullArguments.Length==1) arguments=nullArguments;
-                int arglen = (arguments==null?0:arguments.Length);
-                AssertUtils.IsTrue(
-                    nullArguments.Length == arglen
-                    , string.Format("Invalid number of arguments passed into method {0} - expected {1}, but was {2}", methodInfo.Name, nullArguments.Length, arglen)
-                );
-
-                return this.method.Invoke(target, arguments);                
-            }
-        }
-
-        private static readonly CreateMethodCallback s_createMethodCallback = new CreateMethodCallback(CreateInternal);
-
-    #region Create Method
-
-        /// <summary>
-        /// Creates dynamic method instance for the specified <see cref="MethodInfo"/>.
-        /// </summary>
-        /// <param name="method">Method info to create dynamic method for.</param>
-        /// <returns>Dynamic method for the specified <see cref="MethodInfo"/>.</returns>
-        public static IDynamicMethod Create(MethodInfo method)
-        {
-            AssertUtils.ArgumentNotNull(method, "You cannot create a dynamic method for a null value.");
-
-            IDynamicMethod dynamicMethod = DynamicReflectionManager.GetDynamicMethod(method, s_createMethodCallback);
-            return new DynamicMethodImpl(method, dynamicMethod);
-        }
-
-        private static IDynamicMethod CreateInternal(MethodInfo method)
-        {
-            IDynamicMethod dynamicMethod = null;
-
-            TypeBuilder tb = DynamicReflectionManager.CreateTypeBuilder("Method_" + method.Name);
-            tb.AddInterfaceImplementation(typeof(IDynamicMethod));
-
-            GenerateInvoke(tb, method);
-
-            Type dynamicMethodType = tb.CreateType();
-            ConstructorInfo ctor = dynamicMethodType.GetConstructor(Type.EmptyTypes);
-            dynamicMethod = (IDynamicMethod) ctor.Invoke(ObjectUtils.EmptyObjects);
-
-            return dynamicMethod;
-        }
-
-        private static void GenerateInvoke(TypeBuilder tb, MethodInfo method)
-        {
-            MethodBuilder invokeMethod = 
-                tb.DefineMethod("Invoke", METHOD_ATTRIBUTES, typeof(object), new Type[] {typeof(object), typeof(object[])});
-            invokeMethod.DefineParameter(1, ParameterAttributes.None, "target");
-            invokeMethod.DefineParameter(2, ParameterAttributes.None, "args");
-
-            ILGenerator il = invokeMethod.GetILGenerator();
-            DynamicReflectionManager.EmitInvokeMethod(il, method, true);
-        }
-
-        #endregion
-    }
-
-#endif
 }
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs
index 97134591..563f686f 100644
--- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs
@@ -20,11 +20,8 @@
 
 #region Imports
 
-using System;
 using System.Collections;
 using System.Reflection;
-using System.Reflection.Emit;
-
 using Common.Logging;
 using Spring.Util;
 
@@ -104,8 +101,6 @@ namespace Spring.Reflection.Dynamic
 
         private readonly PropertyInfo propertyInfo;
 
-#if NET_2_0
-
         #region Cache
 
         private static readonly IDictionary propertyCache = new Hashtable();
@@ -219,169 +214,6 @@ namespace Spring.Reflection.Dynamic
             setter(target, value, index);
         }
 
-#else
-        private readonly IDynamicProperty dynamicProperty;
-        private readonly bool isOptimizedGet = false;
-        private bool isOptimizedSet = false;
-        private readonly bool canSet;
-
-        /// <summary>
-        /// Creates a new instance of the safe property wrapper.
-        /// </summary>
-        /// <param name="property">Property to wrap.</param>
-        public SafeProperty(PropertyInfo property)
-        {
-            this.propertyInfo = property;
-
-            if (property.CanRead
-                && property.GetGetMethod() != null
-                && ReflectionUtils.IsTypeVisible(property.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
-            {
-                dynamicProperty = DynamicProperty.Create(property);
-                isOptimizedGet = true;
-            }
-
-            canSet = property.CanWrite && !(propertyInfo.DeclaringType.IsValueType && !propertyInfo.GetSetMethod(true).IsStatic);
-            if (property.GetSetMethod() != null
-                && ReflectionUtils.IsTypeVisible(property.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
-            {
-                if (dynamicProperty == null)
-                {
-                    dynamicProperty = DynamicProperty.Create(property);
-                }
-                isOptimizedSet = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of the dynamic property for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to get property value from.
-        /// </param>
-        /// <returns>
-        /// A property value.
-        /// </returns>
-        public object GetValue(object target)
-        {
-            if (isOptimizedGet)
-            {
-                return dynamicProperty.GetValue(target);
-            }
-            else
-            {
-                return propertyInfo.GetValue(target, null);
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of the dynamic property for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to set property value on.
-        /// </param>
-        /// <param name="value">
-        /// A new property value.
-        /// </param>
-        public void SetValue(object target, object value)
-        {
-            try
-            {
-                if (isOptimizedSet)
-                {
-                    try
-                    {
-                        dynamicProperty.SetValue(target, value);
-                    }
-                    catch (InvalidCastException ex)
-                    {
-                        Log.Debug("Failed optimized set", ex);
-                        isOptimizedSet = false;
-                        propertyInfo.SetValue(target, value, null);
-                    }
-                }
-                else
-                {
-                    if (!canSet)
-                    {
-                        throw (propertyInfo.DeclaringType.IsValueType)
-                            ? new InvalidOperationException("Cannot set property value on a value type due to boxing.")
-                            : new InvalidOperationException("Cannot set value of a read-only property.");
-                    }
-
-                    propertyInfo.SetValue(target, value, null);
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.Error(
-                    string.Format("Failed setting value '{0}' on property '{2}.{1}' on instance of type '{3}'",
-                                  (value != null ? value.GetType().FullName : "<null>"), 
-                                  propertyInfo.Name, 
-                                  propertyInfo.DeclaringType.FullName,
-                                  (target != null ? target.GetType().FullName : "<null>")), ex);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of the dynamic indexer for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to get indexer value from.
-        /// </param>
-        /// <param name="index">
-        /// Indexer arguments.
-        /// </param>
-        /// <returns>
-        /// A indexer value.
-        /// </returns>
-        public object GetValue(object target, object[] index)
-        {
-            if (isOptimizedGet)
-            {
-                try
-                {
-                    return dynamicProperty.GetValue(target, index);
-                }
-                catch (InvalidCastException)
-                {
-                    isOptimizedSet = false;
-                }
-            }
-            return propertyInfo.GetValue(target, index);
-        }
-
-        /// <summary>
-        /// Sets the value of the dynamic indexer for the specified target object.
-        /// </summary>
-        /// <param name="target">
-        /// Target object to set indexer value on.
-        /// </param>
-        /// <param name="index">
-        /// Indexer arguments.
-        /// </param>
-        /// <param name="value">
-        /// A new indexer value.
-        /// </param>
-        public void SetValue(object target, object value, object[] index)
-        {
-            if (isOptimizedSet)
-            {
-                try
-                {
-                    dynamicProperty.SetValue(target, value, index);
-                    return;
-                }
-                catch (InvalidCastException ex)
-                {
-                    Log.Debug("Failed optimized set", ex);
-                    isOptimizedSet = false;
-                }
-            }
-            propertyInfo.SetValue(target, value, index);
-        }
-#endif
         /// <summary>
         /// Internal PropertyInfo accessor.
         /// </summary>
@@ -393,7 +225,6 @@ namespace Spring.Reflection.Dynamic
 
     #endregion
 
-#if NET_2_0
     /// <summary>
     /// Factory class for dynamic properties.
     /// </summary>
@@ -429,234 +260,4 @@ namespace Spring.Reflection.Dynamic
             return dynamicProperty;
         }
     }
-#else
-    /// <summary>
-    /// Factory class for dynamic properties.
-    /// </summary>
-    /// <author>Aleksandar Seovic</author>
-    public class DynamicProperty : BaseDynamicMember
-    {
-        private readonly static CreatePropertyCallback s_createPropertyCallback = new CreatePropertyCallback(CreateInternal);
-
-        #region Create Method
-
-        /// <summary>
-        /// Creates safe dynamic property instance for the specified <see cref="PropertyInfo"/>.
-        /// </summary>
-        /// <remarks>
-        /// <p>This factory method will create a dynamic property with a "safe" wrapper.</p>
-        /// <p>Safe wrapper will attempt to use generated dynamic property if possible,
-        /// but it will fall back to standard reflection if necessary.</p>
-        /// </remarks>
-        /// <param name="property">Property info to create dynamic property for.</param>
-        /// <returns>Safe dynamic property for the specified <see cref="PropertyInfo"/>.</returns>
-        /// <seealso cref="SafeProperty"/>
-        public static IDynamicProperty CreateSafe(PropertyInfo property)
-        {
-            return new SafeProperty(property);
-        }
-
-        /// <summary>
-        /// Creates dynamic property instance for the specified <see cref="PropertyInfo"/>.
-        /// </summary>
-        /// <param name="property">Property info to create dynamic property for.</param>
-        /// <returns>Dynamic property for the specified <see cref="PropertyInfo"/>.</returns>
-        public static IDynamicProperty Create(PropertyInfo property)
-        {
-            AssertUtils.ArgumentNotNull(property, "You cannot create a dynamic property for a null value.");
-
-            IDynamicProperty dynamicProperty = DynamicReflectionManager.GetDynamicProperty(property, s_createPropertyCallback);
-            return dynamicProperty;
-        }
-
-        private static IDynamicProperty CreateInternal(PropertyInfo property)
-        {
-            IDynamicProperty dynamicProperty = null;
-
-            TypeBuilder tb = DynamicReflectionManager.CreateTypeBuilder("Property_" + property.Name);
-            tb.AddInterfaceImplementation(typeof(IDynamicProperty));
-
-            GenerateGetValue(tb, property);
-            GenerateGetIndexedValue(tb, property);
-            GenerateSetValue(tb, property);
-            GenerateSetIndexedValue(tb, property);
-
-            Type dynamicPropertyType = tb.CreateType();
-            ConstructorInfo ctor = dynamicPropertyType.GetConstructor(Type.EmptyTypes);
-            dynamicProperty = (IDynamicProperty)ctor.Invoke(ObjectUtils.EmptyObjects);
-
-            return dynamicProperty;
-        }
-
-        private static void GenerateGetValue(TypeBuilder tb, PropertyInfo property)
-        {
-            MethodBuilder getValueMethod =
-                tb.DefineMethod("GetValue", METHOD_ATTRIBUTES, typeof(object), new Type[] { typeof(object) });
-            getValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
-
-            ILGenerator il = getValueMethod.GetILGenerator();
-            if (property.CanRead)
-            {
-                MethodInfo getMethod = property.GetGetMethod(true);
-                bool isValueType = property.DeclaringType.IsValueType;
-                bool isStatic = getMethod.IsStatic;
-
-                if (!isStatic)
-                {
-                    SetupTargetInstance(il, property.DeclaringType);
-                }
-
-                InvokeMethod(il, isStatic, isValueType, getMethod);
-                ProcessReturnValue(il, property.PropertyType);
-                il.Emit(OpCodes.Ret);
-            }
-            else
-            {
-                ThrowInvalidOperationException(il, "Cannot get value of a non-readable property");
-            }
-        }
-
-        private static void GenerateGetIndexedValue(TypeBuilder tb, PropertyInfo indexer)
-        {
-            MethodBuilder getValueMethod =
-                tb.DefineMethod("GetValue", METHOD_ATTRIBUTES, typeof(object), new Type[] { typeof(object), typeof(object[]) });
-            getValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
-            getValueMethod.DefineParameter(2, ParameterAttributes.None, "index");
-            
-            ILGenerator il = getValueMethod.GetILGenerator();
-            if (indexer.CanRead)
-            {
-                MethodInfo getMethod = indexer.GetGetMethod();
-                bool isValueType = indexer.DeclaringType.IsValueType;
-                bool isStatic = getMethod.IsStatic;
-                
-                if (!isStatic)
-                {
-                    SetupTargetInstance(il, indexer.DeclaringType);
-                }
-
-                Type[] argTypes = ReflectionUtils.GetParameterTypes(getMethod);
-                for (int i = 0; i < argTypes.Length; i++)
-                {
-                    SetupIndexerArgument(il, 2, argTypes[i], i, true);
-                }
-
-                InvokeMethod(il, isStatic, isValueType, getMethod);
-                ProcessReturnValue(il, indexer.PropertyType);
-                il.Emit(OpCodes.Ret);
-            }
-            else
-            {
-                ThrowInvalidOperationException(il, "Cannot get value of a non-readable indexer");
-            }
-        }
-
-        private static void GenerateSetValue(TypeBuilder tb, PropertyInfo property)
-        {
-            MethodBuilder setValueMethod =
-                tb.DefineMethod("SetValue", METHOD_ATTRIBUTES, typeof(void),
-                                new Type[] { typeof(object), typeof(object) });
-            setValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
-            setValueMethod.DefineParameter(2, ParameterAttributes.None, "value");
-
-            ILGenerator il = setValueMethod.GetILGenerator();
-            if (property.CanWrite)
-            {
-                bool isValueType = property.DeclaringType.IsValueType;
-                // we can't set nonstatic properties on value types (due to boxing)
-                bool canSet = !(isValueType && !property.GetSetMethod(true).IsStatic);
-                if (!canSet)
-                {
-                    ThrowInvalidOperationException(il, "Cannot set property value on a value type due to boxing.");
-                }
-                else
-                {
-                    MethodInfo setMethod = property.GetSetMethod(true);
-                    bool isStatic = setMethod.IsStatic;
-
-                    if (!isStatic)
-                    {
-                        SetupTargetInstance(il, property.DeclaringType);
-                    }
-
-                    SetupArgument(il, property.PropertyType, 2);
-                    InvokeMethod(il, isStatic, property.DeclaringType.IsValueType, setMethod);
-                    il.Emit(OpCodes.Ret);
-                }
-            }
-            else
-            {
-                ThrowInvalidOperationException(il, "Cannot set value of a read-only property");
-            }
-        }
-
-        private static void GenerateSetIndexedValue(TypeBuilder tb, PropertyInfo indexer)
-        {
-            MethodBuilder setValueMethod =
-                tb.DefineMethod("SetValue", METHOD_ATTRIBUTES, typeof(void),
-                new Type[] { typeof(object), typeof(object), typeof(object[]) });
-            setValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
-            setValueMethod.DefineParameter(2, ParameterAttributes.None, "value");
-            setValueMethod.DefineParameter(3, ParameterAttributes.None, "index");
-
-            ILGenerator il = setValueMethod.GetILGenerator();
-            if (indexer.CanWrite)
-            {
-                bool isValueType = indexer.DeclaringType.IsValueType;
-                if (isValueType)
-                {
-                    ThrowInvalidOperationException(il, "Cannot set indexer value on a value type due to boxing.");
-                }
-                else
-                {
-                    MethodInfo setMethod = indexer.GetSetMethod();
-                    bool isStatic = setMethod.IsStatic;
-
-                    if (!isStatic)
-                    {
-                        SetupTargetInstance(il, indexer.DeclaringType);
-                    }
-
-                    Type[] argTypes = ReflectionUtils.GetParameterTypes(setMethod);
-                    for (int i = 0; i < argTypes.Length - 1; i++)
-                    {
-                        SetupIndexerArgument(il, 3, argTypes[i], i, true);
-                    }
-
-                    SetupArgument(il, indexer.PropertyType, 2);
-                    InvokeMethod(il, isStatic, isValueType, setMethod);
-                    il.Emit(OpCodes.Ret);
-                }
-            }
-            else
-            {
-                ThrowInvalidOperationException(il, "Cannot set value of a read-only indexer");
-            }
-        }
-
-        private static OpCode[] LdArgOpCodes = { OpCodes.Ldarg_0, OpCodes.Ldarg_1, OpCodes.Ldarg_2, OpCodes.Ldarg_3 };
-
-        private static void SetupIndexerArgument(ILGenerator il, int indexArgumentPosition, Type argumentType, int argumentPosition, bool isObjectArray)
-        {
-            il.Emit(LdArgOpCodes[indexArgumentPosition]);
-            if (isObjectArray)
-            {
-                il.Emit(OpCodes.Ldc_I4, argumentPosition);
-                il.Emit(OpCodes.Ldelem_Ref);
-            }
-            if (argumentType.IsValueType)
-            {
-                il.Emit(OpCodes.Unbox, argumentType);
-                il.Emit(OpCodes.Ldobj, argumentType);
-            }
-            else
-            {
-                il.Emit(OpCodes.Castclass, argumentType);
-            }
-        }
-
-        #endregion
-    }
-
-#endif
 }
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs
index f3d09c8f..19300dce 100644
--- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs
@@ -30,9 +30,7 @@ using System.Security;
 using System.Security.Permissions;
 using Spring.Util;
 
-#if NET_2_0
 using NetDynamicMethod = System.Reflection.Emit.DynamicMethod;
-#endif
 
 #endregion
 
@@ -281,7 +279,6 @@ namespace Spring.Reflection.Dynamic
 
         #endregion
 
-#if NET_2_0
         /// <summary>
         /// Create a new Get method delegate for the specified field using <see cref="System.Reflection.Emit.DynamicMethod"/>
         /// </summary>
@@ -484,7 +481,6 @@ namespace Spring.Reflection.Dynamic
                                 {
                                     return false;
                                 }
-        #if NET_2_0
                                 if (type.IsGenericType)
                                 {
                                     foreach(Type genericTypeArg in type.GetGenericArguments())
@@ -495,7 +491,6 @@ namespace Spring.Reflection.Dynamic
                                         }
                                     }
                                 }
-        #endif
                                 return true;
                             }
                         default:
@@ -503,7 +498,6 @@ namespace Spring.Reflection.Dynamic
                     }
                 }
         */
-#endif
 
         #region Shared Code Generation
 
@@ -774,12 +768,7 @@ namespace Spring.Reflection.Dynamic
 
         private static void EmitUnbox(ILGenerator il, Type argumentType)
         {
-#if NET_2_0
             il.Emit(OpCodes.Unbox_Any, argumentType);
-#else
-                il.Emit(OpCodes.Unbox, argumentType);
-                il.Emit(OpCodes.Ldobj, argumentType);
-#endif
         }
 
         /// <summary>
@@ -831,12 +820,12 @@ namespace Spring.Reflection.Dynamic
             }
 
             Type valueType = value.GetType();
-#if NET_2_0
+
             if (ReflectionUtils.IsNullableType(targetType))
             {
                 targetType = Nullable.GetUnderlyingType(targetType);
             }
-#endif
+
             // no conversion necessary?
             if (valueType == targetType)
             {
diff --git a/src/Spring/Spring.Core/Spring.Core.2008.csproj b/src/Spring/Spring.Core/Spring.Core.2008.csproj
index d19a4189..dae1a802 100644
--- a/src/Spring/Spring.Core/Spring.Core.2008.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2008.csproj
@@ -20,7 +20,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Spring.Core/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
diff --git a/src/Spring/Spring.Core/Spring.Core.2010.csproj b/src/Spring/Spring.Core/Spring.Core.2010.csproj
index 905cd759..abe09bfa 100644
--- a/src/Spring/Spring.Core/Spring.Core.2010.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2010.csproj
@@ -21,7 +21,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>http://localhost/Spring.Core/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
diff --git a/src/Spring/Spring.Core/Util/ConfigurationUtils.cs b/src/Spring/Spring.Core/Util/ConfigurationUtils.cs
index cc4327a3..3b598507 100644
--- a/src/Spring/Spring.Core/Util/ConfigurationUtils.cs
+++ b/src/Spring/Spring.Core/Util/ConfigurationUtils.cs
@@ -211,8 +211,6 @@ namespace Spring.Util
             return ConfigurationErrorsException.GetFilename(node);
         }
 
-
-#if NET_2_0
         /// <summary>
         /// Sets the current <see cref="System.Configuration.Internal.IInternalConfigSystem"/> to be used by <see cref="ConfigurationManager"/>.
         /// </summary>
@@ -290,7 +288,6 @@ namespace Spring.Util
         //        private static SetConfigurationSystemHandler setConfigurationSystem =
         //            CreateDelegate<SetConfigurationSystemHandler>(typeof(ConfigurationManager).GetMethod("SetConfigurationSystem"
         //                                                         , BindingFlags.Static | BindingFlags.NonPublic));
-#endif
 
     }
 }
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs b/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs
index 256190f4..b07cc1ee 100644
--- a/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs
+++ b/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
@@ -156,4 +154,3 @@ namespace Spring.Util.Generic
 	    #endregion
 	}
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/IChainableConfigSystem.cs b/src/Spring/Spring.Core/Util/IChainableConfigSystem.cs
index 73b01c88..ccf67ffb 100644
--- a/src/Spring/Spring.Core/Util/IChainableConfigSystem.cs
+++ b/src/Spring/Spring.Core/Util/IChainableConfigSystem.cs
@@ -18,11 +18,10 @@
 
 #endregion
 
+using System.Configuration.Internal;
+
 namespace Spring.Util
 {
-#if NET_2_0
-    using System.Configuration.Internal;
-
     /// <summary>
     /// Implement this interface to create your own, delegating <see cref="IInternalConfigSystem"/>
     /// and set them using <see cref="ConfigurationUtils.SetConfigurationSystem"/>
@@ -35,5 +34,4 @@ namespace Spring.Util
         /// <param name="innerConfigSystem"></param>
         void SetInnerConfigurationSystem(IInternalConfigSystem innerConfigSystem);
     }
-#endif
-}
\ No newline at end of file
+}
diff --git a/src/Spring/Spring.Core/Util/ITextPosition.cs b/src/Spring/Spring.Core/Util/ITextPosition.cs
index 806736d0..36b9ac5e 100644
--- a/src/Spring/Spring.Core/Util/ITextPosition.cs
+++ b/src/Spring/Spring.Core/Util/ITextPosition.cs
@@ -1,8 +1,25 @@
-using System;
+#region License
+
+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#endregion
 
 namespace Spring.Util
 {
-#if NET_2_0
     /// <summary>
     /// Holds text position information for e.g. error reporting purposes.
     /// </summary>
@@ -23,26 +40,4 @@ namespace Spring.Util
         /// </summary>
         int LinePosition { get; }
     }
-#else
-    /// <summary>
-    /// Holds text position information for e.g. error reporting purposes.
-    /// </summary>
-    /// <seealso cref="ConfigXmlElement" />
-    /// <seealso cref="ConfigXmlAttribute" />
-    public interface ITextPosition
-    {
-        /// <summary>
-        /// Gets a string specifying the file/resource name related to the configuration details.
-        /// </summary>
-        string Filename { get; }
-        /// <summary>
-        /// Gets an integer specifying the line number related to the configuration details.
-        /// </summary>
-        int LineNumber { get; }
-        /// <summary>
-        /// Gets an integer specifying the line position related to the configuration details.
-        /// </summary>
-        int LinePosition { get; }
-    }
-#endif
 }
diff --git a/src/Spring/Spring.Core/Util/NumberUtils.cs b/src/Spring/Spring.Core/Util/NumberUtils.cs
index 1e280134..50508b05 100644
--- a/src/Spring/Spring.Core/Util/NumberUtils.cs
+++ b/src/Spring/Spring.Core/Util/NumberUtils.cs
@@ -283,10 +283,8 @@ namespace Spring.Util
                 return (bool)m | (bool)n;
             else if (n is Int32)
                 return (Int32)m | (Int32)n;
-#if NET_2_0
             else if (n is Int16)
                 return (Int16)m | (Int16)n;
-#endif
             else if (n is Int64)
                 return (Int64)m | (Int64)n;
             else if (n is UInt16)
@@ -297,7 +295,6 @@ namespace Spring.Util
                 return (UInt64)m | (UInt64)n;
             else if (n is Byte)
                 return (Byte)m | (Byte)n;
-#if NET_2_0
             else if (n is SByte)
             {
                 if (SystemUtils.MonoRuntime)
@@ -309,7 +306,6 @@ namespace Spring.Util
                 }
                 return (SByte) ((SByte) m | (SByte) n);
             }
-#endif
             throw new ArgumentException(string.Format("'{0}' and/or '{1}' are not one of the supported integral types.", m, n));
         }
 
diff --git a/src/Spring/Spring.Core/Util/ObjectUtils.cs b/src/Spring/Spring.Core/Util/ObjectUtils.cs
index 36929e88..3492872b 100644
--- a/src/Spring/Spring.Core/Util/ObjectUtils.cs
+++ b/src/Spring/Spring.Core/Util/ObjectUtils.cs
@@ -186,14 +186,12 @@ namespace Spring.Util
                     string.Format(
                         CultureInfo.InvariantCulture, "Cannot instantiate an abstract class [{0}].", type));
             }
-#if NET_2_0
             if (type.ContainsGenericParameters)
             {
                 throw new FatalReflectionException(
                     string.Format(
                         CultureInfo.InvariantCulture, "Cannot instantiate an open generic type [{0}].", type));
             }
-#endif
         }
 
         /// <summary>
@@ -238,14 +236,12 @@ namespace Spring.Util
                     string.Format(
                         CultureInfo.InvariantCulture, "Cannot instantiate an abstract class [{0}].", constructor.DeclaringType));
             }
-#if NET_2_0
             if (constructor.DeclaringType.ContainsGenericParameters)
             {
                 throw new FatalReflectionException(
                     string.Format(
                         CultureInfo.InvariantCulture, "Cannot instantiate an open generic type [{0}].", constructor.DeclaringType));
             }
-#endif
             try
             {
                 // replaced with SafeConstructor() to avoid nasty "TargetInvocationException"s in NET >= 2.0
diff --git a/src/Spring/Spring.Core/Util/ReflectionUtils.cs b/src/Spring/Spring.Core/Util/ReflectionUtils.cs
index 7b7d1cdc..604dc8f1 100644
--- a/src/Spring/Spring.Core/Util/ReflectionUtils.cs
+++ b/src/Spring/Spring.Core/Util/ReflectionUtils.cs
@@ -22,10 +22,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
-using System.Collections.ObjectModel;
 using System.Collections.Generic;
-#endif
 using System.Globalization;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -33,7 +30,6 @@ using System.Security;
 using System.Security.Permissions;
 using System.Text;
 using System.Runtime.CompilerServices;
-using System.Diagnostics;
 
 #endregion
 
@@ -70,11 +66,7 @@ namespace Spring.Util
         /// </summary>
         public static bool IsNullableType(Type type)
         {
-#if NET_2_0
             return (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>));
-#else
-            return false;
-#endif
         }
 
         /// <summary>
@@ -276,7 +268,6 @@ namespace Spring.Util
             return types;
         }
 
-#if NET_2_0
         /// <summary>
         /// Returns an array of <see langword="string"/>s that represent 
         /// the names of the generic type parameter.
@@ -385,7 +376,6 @@ namespace Spring.Util
             }
             return methodInfo;
         }
-#endif
 
         /// <summary>
         /// From a given list of methods, selects the method having an exact match on the given <paramref name="argValues"/>' types.
@@ -448,24 +438,13 @@ namespace Spring.Util
                             Type paramType = parameters[i].ParameterType;
                             object paramValue = paramValues[i];
 
-
-#if !NET_2_0
-                            if ((paramValue == null && paramType.IsValueType)
-                                || (paramValue != null && !paramType.IsAssignableFrom(paramValue.GetType())))
-                            {
-                                isMatch = false;
-                                break;
-                            }
-#endif
-
-#if NET_2_0
                             if ((paramValue == null && paramType.IsValueType && !IsNullableType(paramType))
                                 || (paramValue != null && !paramType.IsAssignableFrom(paramValue.GetType())))
                             {
                                 isMatch = false;
                                 break;
                             }
-#endif
+
                             if (paramValue == null || paramType != paramValue.GetType())
                             {
                                 isExactMatch = false;
@@ -839,10 +818,7 @@ namespace Spring.Util
             //TODO: investigate whether there is another equivalent manner of providing this functionality under MONO
             return type.ToString();
 #endif
-#if NET_2_0
             return (new Microsoft.CSharp.CSharpCodeProvider()).GetTypeOutput(new System.CodeDom.CodeTypeReference(type));
-#endif
-            return type.ToString();
         }
 
 
@@ -1093,7 +1069,6 @@ namespace Spring.Util
             return CreateCustomAttribute(type, ctorArgs, null);
         }
 
-#if NET_2_0
         /// <summary>
         /// Creates a <see cref="System.Reflection.Emit.CustomAttributeBuilder"/>.
         /// </summary>
@@ -1242,8 +1217,6 @@ namespace Spring.Util
             return arguments;
         }
 
-#endif
-
         /// <summary>
         /// Calculates and returns the list of attributes that apply to the
         /// specified type or method.
@@ -1258,7 +1231,6 @@ namespace Spring.Util
             ArrayList attributes = new ArrayList();
 
             // add attributes that apply to the target type or method
-#if NET_2_0
             object[] attrs = member.GetCustomAttributes(false);
             try
             {
@@ -1314,9 +1286,6 @@ namespace Spring.Util
                 // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=161522
                 attributes.AddRange(attrs);
             }
-#else
-            attributes.AddRange(member.GetCustomAttributes(false));
-#endif
             return attributes;
         }
 
@@ -1393,13 +1362,8 @@ namespace Spring.Util
         }
 
 
-#if NET_2_0
         private static readonly MethodInfo Exception_InternalPreserveStackTrace =
             typeof(Exception).GetMethod("InternalPreserveStackTrace", BindingFlags.Instance | BindingFlags.NonPublic);
-#else
-        private static readonly FieldInfo Exception_RemoteStackTraceString = 
-            typeof(Exception).GetField("_remoteStackTraceString", BindingFlags.Instance | BindingFlags.NonPublic);
-#endif
 
         /// <summary>
         /// Unwraps the supplied <see cref="System.Reflection.TargetInvocationException"/> 
@@ -1411,15 +1375,11 @@ namespace Spring.Util
         /// <returns>The unwrapped exception.</returns>
         public static Exception UnwrapTargetInvocationException(TargetInvocationException ex)
         {
-#if NET_2_0
             if (SystemUtils.MonoRuntime)
             {
                 return ex.InnerException;
             }
             Exception_InternalPreserveStackTrace.Invoke(ex.InnerException, new Object[] { });
-#else
-            Exception_RemoteStackTraceString.SetValue(ex.InnerException, ex.InnerException.StackTrace + Environment.NewLine);
-#endif
             return ex.InnerException;
         }
 
@@ -1436,8 +1396,6 @@ namespace Spring.Util
             return IsTypeVisible(type, null);
         }
 
-#if NET_2_0
-
         /// <summary>
         /// Determines whether the specified type is nullable.
         /// </summary>
@@ -1449,7 +1407,6 @@ namespace Spring.Util
         {
             return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
         }
-#endif
 
         /// <summary>
         /// Is the supplied <paramref name="type"/> can be accessed 
@@ -1463,7 +1420,6 @@ namespace Spring.Util
         /// </returns>
         public static bool IsTypeVisible(Type type, string friendlyAssemblyName)
         {
-#if NET_2_0
             if (type.IsVisible)
             {
                 return true;
@@ -1485,12 +1441,6 @@ namespace Spring.Util
                     }
                 }
             }
-#else
-            if (type.IsPublic || (type.IsNestedPublic && type.DeclaringType.IsPublic))
-            {
-                return true;
-            }
-#endif
             return false;
         }
 
@@ -1638,10 +1588,6 @@ namespace Spring.Util
             }
         }
 
-
-
-
-#if NET_2_0
         private static void MemberwiseCopyInternal(object fromObject, object toObject, Type smallerType)
         {
             MemberwiseCopyHandler impl = GetImpl(smallerType);
@@ -1694,17 +1640,6 @@ namespace Spring.Util
             }
             return handler;
         }
-#else
-        private static void MemberwiseCopyInternal(object fromObject, object toObject, Type smallerType)
-        {
-            FieldInfo[] fields = GetFields(smallerType);
-            for (int i = 0; i < fields.Length; i++)
-            {
-                FieldInfo field = fields[i];
-                field.SetValue(toObject, field.GetValue(fromObject));
-            }
-        }
-#endif
 
         #region Field Cache Management for "MemberwiseCopy"
 
diff --git a/src/Spring/Spring.Core/Util/UniqueKey.cs b/src/Spring/Spring.Core/Util/UniqueKey.cs
index 0e6f58c0..243d3c8c 100644
--- a/src/Spring/Spring.Core/Util/UniqueKey.cs
+++ b/src/Spring/Spring.Core/Util/UniqueKey.cs
@@ -49,10 +49,7 @@ namespace Spring.Util
 	/// </example>
     [Serializable]
     [TypeConverter(typeof(UniqueKeyConverter))]
-    public sealed class UniqueKey 
-#if NET_2_0
-        : IEquatable<UniqueKey>
-#endif
+    public sealed class UniqueKey : IEquatable<UniqueKey>
     {
         private readonly string _generatedKey;
 
diff --git a/src/Spring/Spring.Core/Util/XmlUtils.cs b/src/Spring/Spring.Core/Util/XmlUtils.cs
index f532ff9b..88904c15 100644
--- a/src/Spring/Spring.Core/Util/XmlUtils.cs
+++ b/src/Spring/Spring.Core/Util/XmlUtils.cs
@@ -20,8 +20,6 @@
 
 #region Imports
 
-using System;
-using System.Configuration;
 using System.Xml;
 using System.IO;
 using System.Xml.Schema;
@@ -36,46 +34,6 @@ namespace Spring.Util
     /// <author>Aleksandar Seovic</author>
     public class XmlUtils
     {
-#if !NET_2_0
-        /// <summary>
-        /// Gets an appropriate <see cref="System.Xml.XmlReader"/> implementation
-        /// for the supplied <see cref="System.IO.Stream"/>.
-        /// </summary>
-        /// <param name="stream">The XML <see cref="System.IO.Stream"/> that is going to be read.</param>
-        /// <param name="schemas">XML schemas that should be used for validation.</param>
-        /// <param name="eventHandler">Validation event handler.</param>
-        /// <returns>
-        /// A validating <see cref="System.Xml.XmlReader"/> implementation.
-        /// </returns>
-        public static XmlReader CreateValidatingReader(Stream stream, XmlSchemaCollection schemas, ValidationEventHandler eventHandler)
-        {
-            return CreateValidatingReader(stream, new XmlUrlResolver(), schemas, eventHandler);
-        }
-
-		/// <summary>
-		/// Gets an appropriate <see cref="System.Xml.XmlReader"/> implementation
-		/// for the supplied <see cref="System.IO.Stream"/>.
-		/// </summary>
-		/// <param name="stream">The XML <see cref="System.IO.Stream"/> that is going to be read.</param>
-		/// <param name="xmlResolver"><see cref="XmlResolver"/> to be used for resolving external references</param>
-		/// <param name="schemas">XML schemas that should be used for validation.</param>
-		/// <param name="eventHandler">Validation event handler.</param>
-		/// <returns>
-		/// A validating <see cref="System.Xml.XmlReader"/> implementation.
-		/// </returns>
-		public static XmlReader CreateValidatingReader(Stream stream, XmlResolver xmlResolver, XmlSchemaCollection schemas, ValidationEventHandler eventHandler)
-		{
-			XmlValidatingReader reader = new XmlValidatingReader(new XmlTextReader(stream));
-			reader.XmlResolver = xmlResolver;
-			reader.Schemas.Add(schemas);
-			reader.ValidationType = ValidationType.Schema;
-			if (eventHandler != null)
-			{
-				reader.ValidationEventHandler += eventHandler;
-			}
-			return reader;
-		}
-#else
         /// <summary>
         /// Gets an appropriate <see cref="System.Xml.XmlReader"/> implementation
         /// for the supplied <see cref="System.IO.Stream"/>.
@@ -123,23 +81,6 @@ namespace Spring.Util
                 return XmlReader.Create(stream, settings);
             }
         }
-#endif
-
-
-#if !NET_2_0
-        /// <summary>
-        /// Gets an <see cref="System.Xml.XmlTextReader"/> implementation 
-        /// for the supplied <see cref="System.IO.Stream"/>.
-        /// </summary>
-        /// <param name="stream">The XML <see cref="System.IO.Stream"/> that is going to be read.</param>
-        /// <returns>
-        /// A non-validating <see cref="System.Xml.XmlReader"/> implementation.
-        /// </returns>
-        public static XmlReader CreateReader(Stream stream)
-        {
-            return new XmlTextReader(stream);
-        }
-#else
 
         /// <summary>
         /// Gets an appropriate <see cref="System.Xml.XmlReader"/> implementation 
@@ -153,6 +94,5 @@ namespace Spring.Util
         {
             return XmlReader.Create(stream);
         }
-#endif
     }
 }
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2008.csproj b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2008.csproj
index 624bfc32..d9983f28 100644
--- a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2008.csproj
+++ b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2008.csproj b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2008.csproj
index c1db179d..190eb9e0 100644
--- a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2008.csproj
+++ b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate12</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2010.csproj b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2010.csproj
index b8b591f6..7bdfac11 100644
--- a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2010.csproj
+++ b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate12</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2008.csproj b/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2008.csproj
index 4d275f63..8cbd9102 100644
--- a/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2008.csproj
+++ b/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate20</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2010.csproj b/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2010.csproj
index c023c414..c4c729d1 100644
--- a/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2010.csproj
+++ b/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate20</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj
index 588bb3e5..93b61d24 100644
--- a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj
+++ b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate21</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2010.csproj b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2010.csproj
index 88c67707..1a173283 100644
--- a/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2010.csproj
+++ b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate21</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2008.csproj b/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2008.csproj
index 9bb7c36e..acc33a87 100644
--- a/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2008.csproj
+++ b/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate30</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2010.csproj b/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2010.csproj
index b6f460f1..80fd656d 100644
--- a/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2010.csproj
+++ b/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate30</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2008.csproj b/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2008.csproj
index 346c2f73..90aac372 100644
--- a/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2008.csproj
+++ b/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate31</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2010.csproj b/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2010.csproj
index 288d52e0..847ac027 100644
--- a/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2010.csproj
+++ b/src/Spring/Spring.Data.NHibernate31/Spring.Data.NHibernate31.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate31</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2008.csproj b/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2008.csproj
index 7b356482..ac2260c1 100644
--- a/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2008.csproj
+++ b/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate32</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2010.csproj b/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2010.csproj
index 8356a0d9..71018868 100644
--- a/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2010.csproj
+++ b/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate32</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs b/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs
index bf6de39f..39262862 100644
--- a/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs
+++ b/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs
@@ -18,12 +18,8 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
 using Spring.Util.Generic;
 
@@ -72,4 +68,3 @@ namespace Spring.Dao.Support.Generic
 	}
 
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Common/DbProvider.cs b/src/Spring/Spring.Data/Data/Common/DbProvider.cs
index 625e1fe8..0b5fad00 100644
--- a/src/Spring/Spring.Data/Data/Common/DbProvider.cs
+++ b/src/Spring/Spring.Data/Data/Common/DbProvider.cs
@@ -216,7 +216,6 @@ namespace Spring.Data.Common
         public bool IsDataAccessException(Exception e)
         {
 
-#if NET_2_0
             if (e is System.Data.Common.DbException)
             {
                 return true;
@@ -225,9 +224,6 @@ namespace Spring.Data.Common
             {
                 return false;
             }
-#else       
-            return IsDataAccessExceptionBCL11(e);
-#endif
         }
 
         /// <summary>
diff --git a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs
index 6109e1de..7b796cb7 100644
--- a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs
+++ b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs
@@ -240,7 +240,6 @@ namespace Spring.Data.Common
         /// </returns>
         public bool IsDataAccessException(Exception e)
         {
-#if NET_2_0
             if (e is System.Data.Common.DbException)
             {
                 return true;
@@ -249,9 +248,6 @@ namespace Spring.Data.Common
             {
                 return false;
             }
-#else
-            return IsDataAccessExceptionBCL11(e);
-#endif
         }
 
         /// <summary>
diff --git a/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs b/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs
index fb27fd07..683c22be 100644
--- a/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs
+++ b/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs
@@ -220,7 +220,6 @@ namespace Spring.Data.Core
                 case System.Data.IsolationLevel.Serializable:
                     serviceConfig.IsolationLevel = TransactionIsolationLevel.Serializable;
                     break;
-#if NET_2_0
                 case System.Data.IsolationLevel.Snapshot:
                     if (log.IsInfoEnabled)
                     {
@@ -228,7 +227,6 @@ namespace Spring.Data.Core
                     }   
                     serviceConfig.IsolationLevel = TransactionIsolationLevel.ReadCommitted;  //err on the side of consistency
                     break;
-#endif
                 case System.Data.IsolationLevel.Unspecified:
                     serviceConfig.IsolationLevel = TransactionIsolationLevel.Any;
                     break;
diff --git a/src/Spring/Spring.Data/Data/Core/TxScopeTransactionManager.cs b/src/Spring/Spring.Data/Data/Core/TxScopeTransactionManager.cs
index 0d8af06d..e93f879f 100644
--- a/src/Spring/Spring.Data/Data/Core/TxScopeTransactionManager.cs
+++ b/src/Spring/Spring.Data/Data/Core/TxScopeTransactionManager.cs
@@ -1,5 +1,3 @@
-#if NET_2_0
-
 #region License
 
 /*
@@ -285,4 +283,3 @@ namespace Spring.Data.Core
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs b/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs
index ff0f13b8..36ec31ab 100644
--- a/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs
+++ b/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
@@ -149,5 +147,3 @@ namespace Spring.Data.Generic
         
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs b/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs
index 6386cd61..e112e7d7 100644
--- a/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs
+++ b/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs
@@ -18,9 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -1703,4 +1700,3 @@ namespace Spring.Data.Generic
 
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs b/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs
index ffa53c96..eaf4db89 100644
--- a/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs
+++ b/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System.Data.Common;
 
 namespace Spring.Data.Generic
@@ -46,4 +44,3 @@ namespace Spring.Data.Generic
     /// <author>Mark Pollack</author>
     public delegate T CommandDelegate<T>(DbCommand command);
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs b/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs
index 4fad55ce..ce4ec752 100644
--- a/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs
+++ b/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System.Data;
 
 namespace Spring.Data.Generic
@@ -36,4 +34,3 @@ namespace Spring.Data.Generic
     public delegate T DataAdapterDelegate<T>(IDbDataAdapter dataAdapter);
    
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs b/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs
index 9a66be7e..ea7ad2fd 100644
--- a/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs
+++ b/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -233,4 +231,3 @@ namespace Spring.Data.Generic
 
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs b/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs
index 5581dcdc..5cdd5803 100644
--- a/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs
+++ b/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System.Data.Common;
 
 namespace Spring.Data.Generic
@@ -57,4 +55,3 @@ namespace Spring.Data.Generic
         T DoInCommand(DbCommand command);
 	}
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs b/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs
index c312b5a4..d37ece79 100644
--- a/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs
+++ b/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System.Data;
 
 namespace Spring.Data.Generic
@@ -58,4 +56,3 @@ namespace Spring.Data.Generic
         T DoInDataAdapter(IDbDataAdapter dataAdapter);
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs b/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs
index 908e70ba..5cc30e2e 100644
--- a/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs
+++ b/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System.Data;
 
 namespace Spring.Data.Generic
@@ -62,5 +60,3 @@ namespace Spring.Data.Generic
         T DoInCommand(IDbCommand command);
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs b/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs
index 3958fd2f..7e1b6efb 100644
--- a/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs
+++ b/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System.Data;
 
 namespace Spring.Data.Generic
@@ -46,4 +44,3 @@ namespace Spring.Data.Generic
     /// <author>Mark Pollack</author>
     public delegate T IDbCommandDelegate<T>(IDbCommand command);
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs
index 4fc11a0e..0f74497e 100644
--- a/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs
+++ b/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System.Data;
 
 namespace Spring.Data.Generic
@@ -59,5 +57,3 @@ namespace Spring.Data.Generic
 
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs b/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs
index b995368e..e8ca3cba 100644
--- a/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs
+++ b/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System.Data;
 
 namespace Spring.Data.Generic
@@ -55,5 +53,3 @@ namespace Spring.Data.Generic
         T MapRow(IDataReader reader, int rowNum);
     }
 }
-
-#endif
diff --git a/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs b/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs
index 2b28ef5b..d2ecd1ee 100644
--- a/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs
+++ b/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs
@@ -18,16 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
-#region Imports
-
-
-
-#endregion
-
-using Spring.Data.Support;
-
 namespace Spring.Data.Generic
 {
 	/// <summary>
@@ -118,5 +108,3 @@ namespace Spring.Data.Generic
 
 	}
 }
-
-#endif
diff --git a/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs b/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs
index b5865b77..6359bc16 100644
--- a/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs
+++ b/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System.Data;
 
 namespace Spring.Data.Generic
@@ -36,5 +34,3 @@ namespace Spring.Data.Generic
     /// <returns>An arbitrary result object or null if none.</returns>
     public delegate T ResultSetExtractorDelegate<T>(IDataReader reader);
 }
-
-#endif
diff --git a/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs b/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs
index ef380ae9..aad77a7d 100644
--- a/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs
+++ b/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System.Data;
 
 namespace Spring.Data.Generic
@@ -34,5 +32,3 @@ namespace Spring.Data.Generic
     /// in the result set.</returns>
     public delegate T RowMapperDelegate<T>(IDataReader dataReader, int rowNum);
 }
-
-#endif
diff --git a/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs
index d3338b31..8113acec 100644
--- a/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs
+++ b/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs
@@ -18,13 +18,10 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System.Collections.Generic;
 using System.Data;
-using Spring.Data.Support;
 using Spring.Util;
 
 #endregion
@@ -146,5 +143,3 @@ namespace Spring.Data.Generic
         #endregion
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs b/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs
index d593c55d..682636a6 100644
--- a/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs
+++ b/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
@@ -188,14 +186,7 @@ namespace Spring.Data.Objects.Generic
 		
             }
         }
-
-
-
-
-  
         
         #endregion
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs
index c7768214..f5ae5208 100644
--- a/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs
+++ b/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System.Collections.Generic;
@@ -147,5 +145,3 @@ namespace Spring.Data.Objects.Generic
 
 	}
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs
index 5290277a..ab2c4685 100644
--- a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs
+++ b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System.Collections;
@@ -71,5 +69,3 @@ namespace Spring.Data.Objects.Generic
         #endregion
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs
index 8fed03a3..043e8aae 100644
--- a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs
+++ b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System.Collections;
@@ -97,5 +95,3 @@ namespace Spring.Data.Objects.Generic
 
 	}
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs b/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs
index a564302d..73c63886 100644
--- a/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs
+++ b/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System.Collections;
@@ -250,5 +248,3 @@ namespace Spring.Data.Objects.Generic
 
 	}
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs b/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs
index 29d340da..9bf94e0a 100644
--- a/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs
+++ b/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs
@@ -1,5 +1,3 @@
-#if NET_2_0
-
 #region License
 
 /*
@@ -105,4 +103,3 @@ namespace Spring.Data.Support
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs b/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs
index 765901f3..5baa2970 100644
--- a/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs
+++ b/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs
@@ -1,5 +1,3 @@
-#if NET_2_0
-
 #region License
 
 /*
@@ -70,4 +68,3 @@ namespace Spring.Data.Support
        }
 
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs b/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs
index 8b7ff6ac..f3b81759 100644
--- a/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs
+++ b/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs
@@ -1,5 +1,3 @@
-#if NET_2_0
-
 #region License
 
 /*
@@ -166,4 +164,3 @@ namespace Spring.Data.Support
 
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Spring.Data.2008.csproj b/src/Spring/Spring.Data/Spring.Data.2008.csproj
index 6d9714c8..89f145d4 100644
--- a/src/Spring/Spring.Data/Spring.Data.2008.csproj
+++ b/src/Spring/Spring.Data/Spring.Data.2008.csproj
@@ -22,7 +22,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data\Debug\</OutputPath>
diff --git a/src/Spring/Spring.Data/Spring.Data.2010.csproj b/src/Spring/Spring.Data/Spring.Data.2010.csproj
index f71384ac..7e9a4f08 100644
--- a/src/Spring/Spring.Data/Spring.Data.2010.csproj
+++ b/src/Spring/Spring.Data/Spring.Data.2010.csproj
@@ -23,7 +23,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs b/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs
index 3b03349b..fb1505ad 100644
--- a/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs
+++ b/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs
@@ -110,12 +110,10 @@ namespace Spring.Transaction
         /// </remarks>
         string Name { get; }
 
-#if NET_2_0
         /// <summary>
         /// Gets the enterprise services interop option.
         /// </summary>
         /// <value>The enterprise services interop option.</value>
         System.Transactions.EnterpriseServicesInteropOption EnterpriseServicesInteropOption { get;}
-#endif
 	}
 }
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/AbstractFallbackTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/AbstractFallbackTransactionAttributeSource.cs
index a1d187f0..a31a922f 100644
--- a/src/Spring/Spring.Data/Transaction/Interceptor/AbstractFallbackTransactionAttributeSource.cs
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/AbstractFallbackTransactionAttributeSource.cs
@@ -244,10 +244,7 @@ namespace Spring.Transaction.Interceptor
                 ComposedCriteria searchCriteria = new ComposedCriteria();
                 searchCriteria.Add(new MethodNameMatchCriteria(method.Name));
                 searchCriteria.Add(new MethodParametersCountCriteria(parameters.Length));
-#if NET_2_0
-                searchCriteria.Add(new MethodGenericArgumentsCountCriteria(
-                    method.GetGenericArguments().Length));
-#endif
+                searchCriteria.Add(new MethodGenericArgumentsCountCriteria(method.GetGenericArguments().Length));
                 searchCriteria.Add(new MethodParametersCriteria(ReflectionUtils.GetParameterTypes(parameters)));
 
                 MemberInfo[] matchingMethods = targetType.FindMembers(
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs
index 749aa9d1..0706e753 100644
--- a/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs
@@ -89,10 +89,8 @@ namespace Spring.Transaction.Interceptor
                     rbta.TransactionIsolationLevel = ta.IsolationLevel;
                     rbta.ReadOnly = ta.ReadOnly;
                     rbta.TransactionTimeout = ta.Timeout;
-
-#if NET_2_0
                     rbta.EnterpriseServicesInteropOption = ta.EnterpriseServicesInteropOption;
-#endif
+
                     Type[] rbf = ta.RollbackFor;
 
                     IList rollBackRules = new ArrayList();
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs b/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs
index 44158c2a..df064af7 100644
--- a/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs
@@ -19,9 +19,7 @@
 #endregion
 
 using System;
-#if NET_2_0
 using System.Transactions;
-#endif
 using IsolationLevel=System.Data.IsolationLevel;
 
 namespace Spring.Transaction.Interceptor
@@ -145,8 +143,6 @@ namespace Spring.Transaction.Interceptor
             get { return joinpointIdentification; }
         }
 
-#if NET_2_0
-
         /// <summary>
         /// Gets the enterprise services interop option.
         /// </summary>
@@ -155,7 +151,6 @@ namespace Spring.Transaction.Interceptor
         {
             get { return targetAttribute.EnterpriseServicesInteropOption;  }
         }
-#endif
 
         /// <summary> 
         /// Return a description of this transaction attribute.
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs
index 6cdc0c9f..82e875ba 100644
--- a/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs
@@ -259,10 +259,7 @@ namespace Spring.Transaction.Interceptor
                     ComposedCriteria searchCriteria = new ComposedCriteria();
                     searchCriteria.Add(new MethodNameMatchCriteria(currentMethod.Name));
                     searchCriteria.Add(new MethodParametersCountCriteria(parameters.Length));
-#if NET_2_0
-                    searchCriteria.Add(new MethodGenericArgumentsCountCriteria(
-                        currentMethod.GetGenericArguments().Length));
-#endif
+                    searchCriteria.Add(new MethodGenericArgumentsCountCriteria(currentMethod.GetGenericArguments().Length));
                     searchCriteria.Add(new MethodParametersCriteria(ReflectionUtils.GetParameterTypes(parameters)));
 
                     MemberInfo[] matchingMethods = targetType.FindMembers(
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs
index 82982a38..9d0c7db6 100644
--- a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs
@@ -60,10 +60,8 @@ namespace Spring.Transaction.Interceptor
         private bool _readOnly = false;
         private Type[] _rollbackTypes = Type.EmptyTypes;
         private Type[] _noRollbackTypes = Type.EmptyTypes;
-#if NET_2_0
 	    private System.Transactions.EnterpriseServicesInteropOption _esInteropOption =
             System.Transactions.EnterpriseServicesInteropOption.Automatic;
-#endif	
 
 		#endregion
 
@@ -179,8 +177,6 @@ namespace Spring.Transaction.Interceptor
 	        set { _noRollbackTypes = value; }
 	    }
 
-       
-#if NET_2_0
         /// <summary>
         /// Gets or sets the enterprise services interop option.
         /// </summary>
@@ -190,7 +186,6 @@ namespace Spring.Transaction.Interceptor
 	        get { return _esInteropOption;}
             set { _esInteropOption = value; }
 	    }
-#endif
 
 	    #endregion
 
diff --git a/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionDefinition.cs b/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionDefinition.cs
index fe28b321..972c4017 100644
--- a/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionDefinition.cs
+++ b/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionDefinition.cs
@@ -72,10 +72,7 @@ namespace Spring.Transaction.Support
 		private int _timeout = DefaultTransactionDefinition.TIMEOUT_DEFAULT;
 	    private bool _readOnly = false;
         private string _name = null;
-#if NET_2_0
 	    private System.Transactions.EnterpriseServicesInteropOption _esInteropOption;
-
-#endif
 		
 		/// <summary>
         /// Creates a new instance of the
@@ -204,7 +201,6 @@ namespace Spring.Transaction.Support
             set { _name = value;}
 	    }
 
-#if NET_2_0
         /// <summary>
         /// Gets the enterprise services interop option.
         /// </summary>
@@ -214,7 +210,6 @@ namespace Spring.Transaction.Support
             get { return _esInteropOption; }
             set { _esInteropOption = value; }
         }
-#endif
 
 	    #endregion
 
diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj
index 550941af..e30ba582 100644
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj
+++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging.Ems</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2010.csproj b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2010.csproj
index 13a02c3f..4aa4f0b2 100644
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2010.csproj
+++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging.Ems</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj
index 4f46c357..0e44b804 100644
--- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging.Nms</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2010.csproj b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2010.csproj
index 425040a6..ebfd9809 100644
--- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2010.csproj
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging.Nms</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Messaging/Spring.Messaging.2008.csproj b/src/Spring/Spring.Messaging/Spring.Messaging.2008.csproj
index de25947f..d0593d1d 100644
--- a/src/Spring/Spring.Messaging/Spring.Messaging.2008.csproj
+++ b/src/Spring/Spring.Messaging/Spring.Messaging.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Messaging/Spring.Messaging.2010.csproj b/src/Spring/Spring.Messaging/Spring.Messaging.2010.csproj
index e5f7bf22..af7eeb12 100644
--- a/src/Spring/Spring.Messaging/Spring.Messaging.2010.csproj
+++ b/src/Spring/Spring.Messaging/Spring.Messaging.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
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 0fe05a39..c947039a 100644
--- a/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj
+++ b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Scheduling.Quartz</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.2010.csproj b/src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.2010.csproj
index ee69946e..79251f25 100644
--- a/src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.2010.csproj
+++ b/src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Scheduling.Quartz20</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs b/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs
index d86e4cc0..961abbca 100644
--- a/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs
+++ b/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs
@@ -20,7 +20,7 @@
 
 namespace Spring.EnterpriseServices
 {
-#if (NET_2_0 && !MONO)
+#if !MONO
     using System;
     using System.Configuration;
     using System.Reflection;
diff --git a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs
index 4c8769ba..30223d70 100644
--- a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs
+++ b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs
@@ -117,7 +117,6 @@ namespace Spring.EnterpriseServices
 
             if (isRunningOutOfProcess)
             {
-#if NET_2_0
                 Trace.WriteLine(string.Format("configuring COM OutProc Server '{0}' using '{1}'", componentAssemblyFile.FullName, configFile.FullName));
                 // read in config file
                 ExeConfigurationSystem comConfig = new ExeConfigurationSystem(assemblyFile.FullName);
@@ -125,9 +124,6 @@ namespace Spring.EnterpriseServices
                 // existing configuration that might already have been loaded
                 ConfigurationUtils.SetConfigurationSystem(comConfig, true);
                 _appContext = ContextRegistry.GetContext();
-#else
-                _appContext = (IApplicationContext) ConfigurationReader.GetSection(new FileSystemResource(configFile.FullName),"spring/context");
-#endif
             }
             else
             {
diff --git a/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs b/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs
index 08127e81..500c08e3 100644
--- a/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs
+++ b/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs
@@ -97,15 +97,7 @@ namespace Spring.Remoting
         public bool EnsureSecurity
         {
             get { return _ensureSecurity; }
-            set
-            {
-#if NET_2_0
-                _ensureSecurity = value;
-#else
-                throw new NotSupportedException(
-                    "The EnsureSecurity property is supported only on .Net Framework 2.0.");
-#endif
-            }
+            set { _ensureSecurity = value; }
         }
         
         #endregion
@@ -129,11 +121,9 @@ namespace Spring.Remoting
                     ? AppDomain.CurrentDomain.SetupInformation.ConfigurationFile 
                     : Filename.File.FullName;
             }
-#if NET_2_0
+
             RemotingConfiguration.Configure(filename, EnsureSecurity);
-#else
-            RemotingConfiguration.Configure(filename);
-#endif
+            
             #region Instrumentation
 
             if (log.IsDebugEnabled)
diff --git a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs
index 44c340c4..0c563107 100644
--- a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs
+++ b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs
@@ -1,4 +1,3 @@
-#if NET_3_0
 #region License
 
 /*
@@ -73,4 +72,3 @@ namespace Spring.ServiceModel.Activation
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs
index 8f4852fa..96e039f6 100644
--- a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs
+++ b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs
@@ -1,4 +1,3 @@
-#if NET_3_0
 #region License
 
 /*
@@ -229,4 +228,3 @@ namespace Spring.ServiceModel.Activation
         #endregion
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs b/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs
index 9907430c..d29a080f 100644
--- a/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs
+++ b/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs
@@ -1,5 +1,4 @@
-#if NET_3_0
-#region License
+#region License
 
 /*
  * Copyright © 2002-2011 the original author or authors.
@@ -118,4 +117,3 @@ namespace Spring.ServiceModel
         #endregion
     }
 }
-#endif
diff --git a/src/Spring/Spring.Services/ServiceModel/Config/ChannelFactoryObjectDefinitionParser.cs b/src/Spring/Spring.Services/ServiceModel/Config/ChannelFactoryObjectDefinitionParser.cs
index 43dec085..c35e0280 100644
--- a/src/Spring/Spring.Services/ServiceModel/Config/ChannelFactoryObjectDefinitionParser.cs
+++ b/src/Spring/Spring.Services/ServiceModel/Config/ChannelFactoryObjectDefinitionParser.cs
@@ -1,4 +1,3 @@
-#if NET_3_0
 #region License
 
 /*
@@ -105,4 +104,3 @@ namespace Spring.ServiceModel.Config
         #endregion
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/ServiceModel/Config/WcfNamespaceParser.cs b/src/Spring/Spring.Services/ServiceModel/Config/WcfNamespaceParser.cs
index a6c1ad1d..b2b98fe3 100644
--- a/src/Spring/Spring.Services/ServiceModel/Config/WcfNamespaceParser.cs
+++ b/src/Spring/Spring.Services/ServiceModel/Config/WcfNamespaceParser.cs
@@ -1,5 +1,4 @@
-#if NET_3_0
-#region License
+#region License
 
 /*
  * Copyright 2002-2010 the original author or authors.
@@ -52,4 +51,3 @@ namespace Spring.ServiceModel.Config
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs b/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs
index ec405a70..b9e83ff5 100644
--- a/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs
+++ b/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs
@@ -1,4 +1,3 @@
-#if NET_3_0
 #region License
 
 /*
@@ -29,8 +28,6 @@ using System.ServiceModel;
 using System.Net.Security;
 using Spring.Objects.Factory.Config;
 using Spring.Util;
-using Spring.Context;
-using Spring.Core.TypeResolution;
 using Spring.Objects;
 using Spring.Objects.Factory;
 using Spring.Objects.Factory.Support;
@@ -528,13 +525,11 @@ namespace Spring.ServiceModel
                     {
                         typeBuilder.SetCustomAttribute((CustomAttributeBuilder)attr);
                     }
-#if NET_2_0
                     else if (attr is CustomAttributeData)
                     {
                         typeBuilder.SetCustomAttribute(
                             ReflectionUtils.CreateCustomAttribute((CustomAttributeData)attr));
                     }
-#endif
                     else if (attr is Attribute)
                     {
                         typeBuilder.SetCustomAttribute(
@@ -595,4 +590,3 @@ namespace Spring.ServiceModel
         #endregion
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs b/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs
index 69b95a27..33f0e44a 100644
--- a/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs
+++ b/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs
@@ -1,5 +1,4 @@
-#if NET_3_0
-#region License
+#region License
 
 /*
  * Copyright © 2002-2011 the original author or authors.
@@ -115,4 +114,3 @@ namespace Spring.ServiceModel
         #endregion
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs b/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs
index 5ab31eae..fbf3561f 100644
--- a/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs
+++ b/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs
@@ -1,4 +1,3 @@
-#if NET_3_0
 #region License
 
 /*
@@ -181,4 +180,3 @@ namespace Spring.ServiceModel.Support
         #endregion
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.2008.csproj b/src/Spring/Spring.Services/Spring.Services.2008.csproj
index 876acd86..82d0be19 100644
--- a/src/Spring/Spring.Services/Spring.Services.2008.csproj
+++ b/src/Spring/Spring.Services/Spring.Services.2008.csproj
@@ -23,7 +23,7 @@
     <StartupObject>
     </StartupObject>
     <SignAssembly>false</SignAssembly>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Services\Debug\</OutputPath>
diff --git a/src/Spring/Spring.Services/Spring.Services.2010.csproj b/src/Spring/Spring.Services/Spring.Services.2010.csproj
index f5bb8fe1..a0e36987 100644
--- a/src/Spring/Spring.Services/Spring.Services.2010.csproj
+++ b/src/Spring/Spring.Services/Spring.Services.2010.csproj
@@ -24,7 +24,7 @@
     <StartupObject>
     </StartupObject>
     <SignAssembly>false</SignAssembly>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -91,11 +91,10 @@
     <Reference Include="System.EnterpriseServices">
       <Name>system.enterpriseservices</Name>
     </Reference>
-    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Activation" />
     <Reference Include="System.ServiceModel.Web" />
-    <Reference Include="System.Web.Services">
-      <Name>system.web.services</Name>
-    </Reference>
+    <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
diff --git a/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs b/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs
index 4f0e8969..2bebfbef 100644
--- a/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs
+++ b/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs
@@ -22,8 +22,6 @@
 
 using System;
 using System.Collections;
-using System.Globalization;
-using System.Xml;
 using System.Xml.Schema;
 using System.Xml.Serialization;
 using System.Net;
@@ -33,15 +31,11 @@ using System.Web.Services;
 using System.Web.Services.Description;
 using System.Web.Services.Protocols;
 using System.Web.Services.Discovery;
-
-using Spring.Core;
 using Spring.Objects.Factory;
 using Spring.Objects.Factory.Config;
 using Spring.Proxy;
 using Spring.Util;
-using Spring.Objects;
 using Spring.Core.IO;
-using Spring.Expressions;
 
 #endregion
 
@@ -400,11 +394,7 @@ namespace Spring.Web.Services
             {
                 if (webProxy == null)
                 {
-#if !NET_2_0
-                    webProxy = GlobalProxySelection.Select;
-#else
                     webProxy = WebRequest.DefaultWebProxy;
-#endif
                 }
                 webProxy.Credentials = ProxyCredential;
             }
@@ -596,7 +586,6 @@ namespace Spring.Web.Services
                 return attrs;
             }
 
-#if NET_2_0
             protected override IList GetMethodReturnTypeAttributes(MethodInfo method)
             {
                 IList attrs = base.GetMethodReturnTypeAttributes(method);
@@ -663,7 +652,7 @@ namespace Spring.Web.Services
 
                 return attrs;
             }
-#endif
+
 /*
             protected override IList GetMethodParameterAttributes(MethodInfo method, ParameterInfo paramInfo)
             {
@@ -824,7 +813,6 @@ namespace Spring.Web.Services
             /// </summary>
             private XmlMembersMapping GetMembersMapping(string messageName, MessagePartCollection messageParts, SoapBodyBinding soapBodyBinding, SoapBindingStyle soapBindingStyle)
             {
-#if NET_2_0
                 if (soapBindingStyle == SoapBindingStyle.Rpc)
                 {
                     SoapSchemaMember[] soapSchemaMembers = new SoapSchemaMember[messageParts.Count];
@@ -841,9 +829,6 @@ namespace Spring.Web.Services
                 {
                     return this.schemaImporter.ImportMembersMapping(messageParts[0].Element);
                 }
-#else
-				return this.schemaImporter.ImportMembersMapping(messageParts[0].Element);
-#endif
             }
 
             private void MoveToMethod(MethodInfo targetMethod)
@@ -855,13 +840,6 @@ namespace Spring.Web.Services
                 string inputMessageName = (!StringUtils.IsNullOrEmpty(operationBinding.Input.Name) && (soapOperationBinding.Style != SoapBindingStyle.Rpc)) ? operationBinding.Input.Name : operation.Name;
                 SoapBodyBinding inputSoapBodyBinding = (SoapBodyBinding)operationBinding.Input.Extensions.Find(typeof(SoapBodyBinding));
 
-#if !NET_2_0
-				if (soapOperationBinding.Style == SoapBindingStyle.Rpc &&
-					inputSoapBodyBinding.Use == SoapBindingUse.Literal)
-				{
-					throw new NotSupportedException("rpc-literal SOAP messages are not supported on .NET Framework 1.1");
-				}
-#endif
                 if (inputSoapBodyBinding.Use != SoapBindingUse.Literal)
                 {
                     throw new NotSupportedException("WebServiceProxyFactory only supports document-literal and rpc-literal SOAP messages to conform to WS-I Basic Profiles.");
@@ -894,14 +872,6 @@ namespace Spring.Web.Services
                 return cabb.Build();
             }
 
-#if !NET_2_0
-            private static readonly PropertyInfo XmlMembersMapping_ElementName =
-                typeof(XmlMembersMapping).GetProperty("ElementName");
-
-            private static readonly PropertyInfo XmlMembersMapping_Namespace = 
-                typeof(XmlMembersMapping).GetProperty("Namespace");
-#endif
-
             /// <summary>
             /// Creates a <see cref="SoapDocumentMethodAttribute"/> or a <see cref="SoapRpcMethodAttribute"/>
             /// that should be applied to proxy method.
@@ -912,14 +882,8 @@ namespace Spring.Web.Services
             {
                 ReflectionUtils.CustomAttributeBuilderBuilder cabb;
 
-#if !NET_2_0
-                // Access XmlMembersMapping.ElementName and .Namespace property using reflection [SPRNET-520]
-                string inputMembersMappingElementName = XmlMembersMapping_ElementName.GetValue(inputMembersMapping, null) as string;
-                string inputMembersMappingNamespace = XmlMembersMapping_Namespace.GetValue(inputMembersMapping, null) as string;
-#else
                 string inputMembersMappingElementName = inputMembersMapping.ElementName;
                 string inputMembersMappingNamespace = inputMembersMapping.Namespace;
-#endif
 
                 if (soapOperationBinding.Style == SoapBindingStyle.Rpc)
                 {
@@ -932,15 +896,7 @@ namespace Spring.Web.Services
                 }
 
                 cabb.AddContructorArgument(soapOperationBinding.SoapAction);
-
-#if NET_2_0
                 cabb.AddPropertyValue("Use", SoapBindingUse.Literal);
-#else
-                if (soapOperationBinding.Style != SoapBindingStyle.Rpc)
-                {
-                    cabb.AddPropertyValue("Use", SoapBindingUse.Literal);
-                }
-#endif
 
                 if (inputMembersMappingElementName.Length > 0 &&
                     inputMembersMappingElementName != operation.Name)
@@ -959,14 +915,9 @@ namespace Spring.Web.Services
                 }
                 else
                 {
-#if !NET_2_0
-                    // Access XmlMembersMapping.ElementName and .Namespace property using reflection [SPRNET-520]
-                    string outputMembersMappingElementName = XmlMembersMapping_ElementName.GetValue(outputMembersMapping, null) as string;
-                    string outputMembersMappingNamespace = XmlMembersMapping_Namespace.GetValue(outputMembersMapping, null) as string;
-#else
                     string outputMembersMappingElementName = outputMembersMapping.ElementName;
                     string outputMembersMappingNamespace = outputMembersMapping.Namespace;
-#endif
+
                     if (outputMembersMappingElementName.Length > 0 &&
                         outputMembersMappingElementName != (operation.Name + "Response"))
                     {
diff --git a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2010.csproj b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2010.csproj
index 0af80fc1..72238d3e 100644
--- a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2010.csproj
+++ b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2010.csproj
@@ -29,7 +29,7 @@
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2008.csproj b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2008.csproj
index 3ebaaa6c..a54bd721 100644
--- a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2008.csproj
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Testing.NUnit</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2010.csproj b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2010.csproj
index 6f070b0f..d525e86b 100644
--- a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2010.csproj
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Testing.NUnit</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2010.csproj b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2010.csproj
index b5833cf4..1b4b856c 100644
--- a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2010.csproj
+++ b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Web.Extensions</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
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 07df65fb..7627c599 100644
--- a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj
+++ b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj
@@ -10,7 +10,7 @@
     <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>
diff --git a/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs b/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs
index c2c2bf5f..b95e059a 100644
--- a/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs
+++ b/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs
@@ -158,7 +158,7 @@ namespace Spring.Context.Support
             // register for ContextRegistry.Cleared event - we need to discard our cache in this case
             ContextRegistry.Cleared += new EventHandler(OnContextRegistryCleared);
 
-#if NET_2_0 && !MONO_2_0
+#if !MONO_2_0
             if (HttpRuntime.AppDomainAppVirtualPath != null) // check if we're within an ASP.NET AppDomain!
             {
                 // ensure HttpRuntime has been fully initialized!
diff --git a/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs b/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs
index ff034cf5..a5089467 100644
--- a/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs
+++ b/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs
@@ -80,11 +80,10 @@ namespace Spring.Context.Support
         // Required for Session End event handling
         private static int CACHEKEYPREFIXLENGTH = 0;
         private static CacheItemRemovedCallback s_originalCallback;
-#if NET_2_0
+
         // required to enable accessing HttpContext.Request during IHttpModule.Init() in integrated mode
         private static readonly FieldInfo fiHideRequestResponse;
         private static readonly SafeField ContextHideRequestResponse;
-#endif
 
         /// <summary>
         /// For webapplications always
@@ -97,7 +96,7 @@ namespace Spring.Context.Support
         static WebSupportModule()
         {
             s_log = LogManager.GetLogger(typeof(WebSupportModule));
-#if NET_2_0
+
             // required to enable accessing HttpContext.Request during IHttpModule.Init() in integrated mode
             ContextHideRequestResponse = null;
             try
@@ -110,7 +109,6 @@ namespace Spring.Context.Support
             {
                 s_log.Warn(string.Format("failed reflecting field HttpContext.HideRequestResponse due to security restrictions {0}", sec));
             }
-#endif
 
             // register additional resource handler
             ResourceHandlerRegistry.RegisterResourceHandler(WebUtils.DEFAULT_RESOURCE_PROTOCOL, typeof(WebResource));
@@ -153,7 +151,6 @@ namespace Spring.Context.Support
             app.PreRequestHandlerExecute += new EventHandler(OnConfigureHandler);
             app.EndRequest += new EventHandler(VirtualEnvironment.RaiseEndRequest);
 
-#if NET_2_0
             // TODO: this is only a workaround to get us up & running in IIS7/integrated mode
             // We must review all code for relative virtual paths - they must be resolved to application-relative paths
             // during parsing of the object definitions
@@ -164,7 +161,6 @@ namespace Spring.Context.Support
                 ContextHideRequestResponse.SetValue(app.Context, false);
             }
             
-#endif
             try
             {
                 // ensure context is instantiated
@@ -179,9 +175,7 @@ namespace Spring.Context.Support
             }
             finally
             {
-#if NET_2_0
                 if (ContextHideRequestResponse!=null) ContextHideRequestResponse.SetValue(app.Context, hideRequestResponse);
-#endif
             }
         }
 
diff --git a/src/Spring/Spring.Web/Spring.Web.2008.csproj b/src/Spring/Spring.Web/Spring.Web.2008.csproj
index fad5c626..3a8f9ace 100644
--- a/src/Spring/Spring.Web/Spring.Web.2008.csproj
+++ b/src/Spring/Spring.Web/Spring.Web.2008.csproj
@@ -22,7 +22,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\..\Spring.Net.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
@@ -242,7 +242,6 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Web\UI\Controls\ContentReplacer.cs" />
-    <Compile Include="Web\UI\Controls\ControlState.cs" />
     <Compile Include="Web\UI\Controls\DataBindingAdapter.cs" />
     <Compile Include="Web\UI\Controls\DataBindingPanel.cs" />
     <Compile Include="Web\UI\Controls\Form.cs" />
@@ -252,7 +251,6 @@
     <Compile Include="Web\UI\Controls\LocalizedImage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Web\UI\Controls\MultiView.cs" />
     <Compile Include="Web\UI\Controls\Panel.cs" />
     <Compile Include="Web\UI\Controls\RadioButtonGroup.cs">
       <SubType>Code</SubType>
@@ -269,8 +267,6 @@
     <Compile Include="Web\UI\Controls\ValidationSummary.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Web\UI\Controls\View.cs" />
-    <Compile Include="Web\UI\Controls\ViewCollection.cs" />
     <Compile Include="Web\UI\DialogAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/src/Spring/Spring.Web/Spring.Web.2010.csproj b/src/Spring/Spring.Web/Spring.Web.2010.csproj
index 4069813d..51d50529 100644
--- a/src/Spring/Spring.Web/Spring.Web.2010.csproj
+++ b/src/Spring/Spring.Web/Spring.Web.2010.csproj
@@ -23,7 +23,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\..\Spring.Net.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
@@ -89,15 +89,9 @@
       <Name>System.Data</Name>
     </Reference>
     <Reference Include="System.DirectoryServices" />
-    <Reference Include="System.EnterpriseServices">
-      <Name>system.enterpriseservices</Name>
-    </Reference>
-    <Reference Include="System.Web">
-      <Name>system.web</Name>
-    </Reference>
-    <Reference Include="System.Web.Services">
-      <Name>system.web.services</Name>
-    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
@@ -247,7 +241,6 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Web\UI\Controls\ContentReplacer.cs" />
-    <Compile Include="Web\UI\Controls\ControlState.cs" />
     <Compile Include="Web\UI\Controls\DataBindingAdapter.cs" />
     <Compile Include="Web\UI\Controls\DataBindingPanel.cs" />
     <Compile Include="Web\UI\Controls\Form.cs" />
@@ -257,7 +250,6 @@
     <Compile Include="Web\UI\Controls\LocalizedImage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Web\UI\Controls\MultiView.cs" />
     <Compile Include="Web\UI\Controls\Panel.cs" />
     <Compile Include="Web\UI\Controls\RadioButtonGroup.cs">
       <SubType>Code</SubType>
@@ -274,8 +266,6 @@
     <Compile Include="Web\UI\Controls\ValidationSummary.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Web\UI\Controls\View.cs" />
-    <Compile Include="Web\UI\Controls\ViewCollection.cs" />
     <Compile Include="Web\UI\DialogAttribute.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/src/Spring/Spring.Web/Util/ISessionState.cs b/src/Spring/Spring.Web/Util/ISessionState.cs
index 6a48e114..de01d46b 100644
--- a/src/Spring/Spring.Web/Util/ISessionState.cs
+++ b/src/Spring/Spring.Web/Util/ISessionState.cs
@@ -38,7 +38,7 @@ namespace Spring.Util
         /// </summary>
         int CodePage { get; set; }
 
-#if NET_2_0 && !MONO    
+#if !MONO    
         /// <summary>
         /// <see cref="System.Web.SessionState.HttpSessionState.CookieMode"/>
         /// </summary>
diff --git a/src/Spring/Spring.Web/Util/VirtualEnvironment.cs b/src/Spring/Spring.Web/Util/VirtualEnvironment.cs
index bfa60f57..f6a3d74c 100644
--- a/src/Spring/Spring.Web/Util/VirtualEnvironment.cs
+++ b/src/Spring/Spring.Web/Util/VirtualEnvironment.cs
@@ -222,7 +222,7 @@ namespace Spring.Util
                     get { return _sessionState.CodePage; }
                     set { _sessionState.CodePage = value; }
                 }
-#if NET_2_0 && !MONO
+#if !MONO
                 public HttpCookieMode CookieMode
                 {
                     get { return _sessionState.CookieMode; }
diff --git a/src/Spring/Spring.Web/Util/WebUtils.cs b/src/Spring/Spring.Web/Util/WebUtils.cs
index 1c63e96c..80baa917 100644
--- a/src/Spring/Spring.Web/Util/WebUtils.cs
+++ b/src/Spring/Spring.Web/Util/WebUtils.cs
@@ -261,13 +261,9 @@ namespace Spring.Util
             // to determine "correct" order of bubbling control->page->masterpage, 
             // the trick below is necessary because technically the hierarchy goes 
             // control->masterpage->page
-            if (control is System.Web.UI.Page)
+            if (control is Page)
             {
-#if !NET_2_0
-                control = ((Spring.Web.UI.Page)control).Master;
-#else
-                control = ((System.Web.UI.Page)control).Master;
-#endif
+                control = ((Page)control).Master;
             }
             else if (IsMaster(control))
             {
@@ -286,11 +282,7 @@ namespace Spring.Util
 
         private static bool IsMaster(Control control)
         {
-#if !NET_2_0
-            return (control is Spring.Web.UI.MasterPage);
-#else
-            return (control is System.Web.UI.MasterPage);
-#endif            
+            return (control is MasterPage);
         }
 
         /// <summary>
diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs
index 311dbb81..1a197c4a 100644
--- a/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs
+++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs
@@ -18,7 +18,7 @@
 
 #endregion
 
-#if NET_2_0 && !MONO
+#if !MONO
 
 #region Imports
 
diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs
index 263be8e0..aec49247 100644
--- a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs
+++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System.Collections.Specialized;
@@ -99,5 +97,3 @@ namespace Spring.Web.Providers
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs
index b896d169..581965ab 100644
--- a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs
+++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs
@@ -18,16 +18,12 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
-using System;
 using System.Collections.Specialized;
 using System.Security.Permissions;
 using System.Web;
 using System.Web.Profile;
-using System.Web.Security;
 
 #endregion
 
@@ -100,5 +96,3 @@ namespace Spring.Web.Providers
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs
index 3f0d1232..23aa8524 100644
--- a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs
+++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs
@@ -18,11 +18,8 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
-using System;
 using System.Collections.Specialized;
 using System.Security.Permissions;
 using System.Web;
@@ -99,5 +96,3 @@ namespace Spring.Web.Providers
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs
index 7ed6d787..c29dbe34 100644
--- a/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs
+++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System.Collections.Specialized;
@@ -98,5 +96,3 @@ namespace Spring.Web.Providers
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs
index 24f387f9..3ba65d8c 100644
--- a/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs
+++ b/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs
@@ -1,4 +1,22 @@
-#if NET_2_0
+#region License
+
+/*
+ * Copyright © 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#endregion
 
 using System.Collections.Specialized;
 using System.Web.Security;
@@ -358,4 +376,3 @@ namespace Spring.Web.Providers
         string PasswordStrengthRegularExpression { get; }
     }
 }
-#endif
diff --git a/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs b/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs
index 93f7421d..d605f0c9 100644
--- a/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs
+++ b/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs
@@ -1,4 +1,22 @@
-#if NET_2_0
+#region License
+
+/*
+ * Copyright © 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#endregion
 
 using System;
 using System.Collections.Specialized;
@@ -198,4 +216,3 @@ namespace Spring.Web.Providers
             int pageIndex, int pageSize, out int totalRecords);
     }
 }
-#endif
diff --git a/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs b/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs
index 8a096aed..7cac3a48 100644
--- a/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs
+++ b/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System.Collections.Specialized;
@@ -185,4 +183,3 @@ namespace Spring.Web.Providers
         string ApplicationName { get; set; }
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs b/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs
index 0c876276..aa55d2af 100644
--- a/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs
+++ b/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System.Collections.Specialized;
@@ -261,5 +259,3 @@ namespace Spring.Web.Providers
         SiteMapNode RootNode { get; }
     }
 }
-
-#endif
diff --git a/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs
index ff073b9d..f5f63213 100644
--- a/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs
+++ b/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
@@ -514,4 +512,3 @@ namespace Spring.Web.Providers
         #endregion
     }        
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs
index 7ed7ec2a..edd10682 100644
--- a/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs
+++ b/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs
@@ -1,4 +1,22 @@
-#if NET_2_0
+#region License
+
+/*
+ * Copyright © 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#endregion
 
 using System;
 using System.Collections.Specialized;
@@ -281,4 +299,3 @@ namespace Spring.Web.Providers
 
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs
index 61cb15ad..90506c18 100644
--- a/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs
+++ b/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
@@ -266,4 +264,3 @@ namespace Spring.Web.Providers
 
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs
index 624f874e..c64d0429 100644
--- a/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs
+++ b/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs
@@ -18,20 +18,16 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
 using System.Collections.Specialized;
-using System.Configuration.Provider;
 using System.Security.Permissions;
 using System.Web;
 using Spring.Context.Support;
 
 #endregion
 
-
 namespace Spring.Web.Providers
 {
     /// <summary>
@@ -365,4 +361,3 @@ namespace Spring.Web.Providers
 
     }
 }
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs b/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs
index c4a867fd..d9bd382f 100644
--- a/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs
+++ b/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs
@@ -21,17 +21,11 @@
 #region Imports
 
 using System;
-using System.Globalization;
 using System.Collections;
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Web.Services;
-
-using Spring.Context;
-using Spring.Context.Support;
-using Spring.Core;
 using Spring.Core.TypeResolution;
-using Spring.Objects;
 using Spring.Objects.Factory;
 using Spring.Util;
 using Spring.Proxy;
@@ -90,9 +84,7 @@ namespace Spring.Web.Services
 
         #region Fields
 
-#if NET_2_0
         private WsiProfiles _wsiProfile = WsiProfiles.BasicProfile1_1;
-#endif
         private readonly string EXPORTER_ID = Guid.NewGuid().ToString();
         private Type _webServiceBaseType = typeof(WebService);
         private string _targetName;
@@ -174,7 +166,6 @@ namespace Spring.Web.Services
 
         #region Properties
 
-#if NET_2_0
         /// <summary>
         /// Gets or Sets the Web Services Interoperability (WSI) specification 
         /// to which the Web Service claims to conform.
@@ -187,7 +178,6 @@ namespace Spring.Web.Services
             get { return _wsiProfile; }
             set { _wsiProfile = value; }
         }
-#endif
 
         /// <summary>
         /// Gets or sets the base type that web service should inherit.
@@ -397,11 +387,7 @@ namespace Spring.Web.Services
         /// </summary>
         protected virtual void GenerateProxy()
         {
-#if NET_2_0
             IProxyTypeBuilder builder = new WebServiceProxyTypeBuilder(this, Description, Name, Namespace, WsiProfile);
-#else
-            IProxyTypeBuilder builder = new WebServiceProxyTypeBuilder(this, Description, Name, Namespace);
-#endif
             builder.Name = WebUtils.GetPageName(objectName);
             builder.BaseType = WebServiceBaseType;
             builder.TargetType = objectFactory.GetType(TargetName);
@@ -431,9 +417,7 @@ namespace Spring.Web.Services
             private static readonly MethodInfo WebServiceExporter_GetTargetInstance = typeof(WebServiceExporter).GetMethod( "GetTarget", new Type[] { typeof( string ) } );
             private WebServiceExporter exporter;
             private CustomAttributeBuilder webServiceAttribute;
-#if NET_2_0
             private CustomAttributeBuilder webServiceBindingAttribute;
-#endif
 
             #endregion
 
@@ -446,7 +430,7 @@ namespace Spring.Web.Services
                 // Creates a WebServiceAttribute from configuration info
                 this.webServiceAttribute = CreateWebServiceAttribute(description, name, ns);
             }
-#if NET_2_0
+
             public WebServiceProxyTypeBuilder(WebServiceExporter exporter, string description, string name, string ns, WsiProfiles wsiProfile)
             {
                 this.exporter = exporter;
@@ -468,7 +452,6 @@ namespace Spring.Web.Services
                 }
                 return cabb.Build();
             }
-#endif
 
             private static CustomAttributeBuilder CreateWebServiceAttribute(string description, string name, string ns)
             {
@@ -526,9 +509,8 @@ namespace Spring.Web.Services
                 IList attrs = base.GetTypeAttributes(type);
 
                 bool containsWebServiceAttribute = false;
-#if NET_2_0
                 bool containsWebServiceBindingAttribute = false;
-#endif
+
                 for (int i = 0; i < attrs.Count; i++)
                 {
                     if (IsAttributeMatchingType(attrs[i], typeof(WebServiceAttribute)))
@@ -537,12 +519,10 @@ namespace Spring.Web.Services
                         containsWebServiceAttribute = true;
                         attrs[i] = webServiceAttribute;
                     } 
-#if NET_2_0
                     else if (IsAttributeMatchingType(attrs[i], typeof(WebServiceBindingAttribute)))
                     {
                         containsWebServiceBindingAttribute = true;
                     }
-#endif
                 }
 
                 // Add missing WebServiceAttribute
@@ -551,13 +531,11 @@ namespace Spring.Web.Services
                     attrs.Add(webServiceAttribute);
                 }
 
-#if NET_2_0
                 // Add missing WebServiceBindingAttribute
                 if (!containsWebServiceBindingAttribute)
                 {
                     attrs.Add(webServiceBindingAttribute);
                 }
-#endif
 
                 return attrs;
             }
diff --git a/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs b/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs
index 87a692e8..f94c221c 100644
--- a/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs
+++ b/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs
@@ -29,15 +29,9 @@ using System.Web.Services;
 
 using Spring.Context;
 using Spring.Context.Support;
-using Spring.Objects.Factory.Config;
 using Spring.Util;
 using Spring.Web.Support;
 
-#if NET_2_0
-using WSConfig = System.Web.Services.Configuration.WebServicesSection;
-using WSProtocol = System.Web.Services.Configuration.WebServiceProtocols;
-#endif
-
 #if MONO_2_0
 using System.Web.Compilation;
 using System.CodeDom.Compiler;
@@ -126,11 +120,7 @@ namespace Spring.Web.Services
 
             if (serviceType == null)
             {
-#if NET_2_0
                 serviceType = WebServiceParser.GetCompiledType(url, context);
-#else
-                serviceType = WebServiceParser.GetCompiledType(path, context);
-#endif
             }
 			
 
diff --git a/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs b/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs
index 6fd4b645..1fc05e2c 100644
--- a/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs
+++ b/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs
@@ -46,111 +46,42 @@ namespace Spring.Web.Support
         private static readonly MethodInfo s_miClear;
         private static readonly SafeField ControlsArrayField;
 
-#if NET_2_0
         private static readonly CreateControlCollectionDelegate BaseCreateControlCollection;
         private static readonly AddedControlDelegate BaseAddedControl;
         private static readonly RemovedControlDelegate BaseRemovedControl;
         private static readonly VoidMethodDelegate BaseClearNamingContainer;
 
-#else
-        private class DynamicMethodWrapper
-        {
-            private IDynamicMethod _method;
-
-            public DynamicMethodWrapper(IDynamicMethod method)
-            {
-                _method = method;
-            }
-
-            public static CreateControlCollectionDelegate CreateControlCollection(MethodInfo methodInfo)
-            {
-                IDynamicMethod method = new SafeMethod(methodInfo);
-                return new CreateControlCollectionDelegate(new DynamicMethodWrapper(method).CreateControlCollectionInternal);
-            }
-
-            public static AddedControlDelegate AddedControl(MethodInfo methodInfo)
-            {
-                IDynamicMethod method = new SafeMethod(methodInfo);
-                return new AddedControlDelegate(new DynamicMethodWrapper(method).AddedControlInternal);
-            }
-
-            public static RemovedControlDelegate RemovedControl(MethodInfo methodInfo)
-            {
-                IDynamicMethod method = new SafeMethod(methodInfo);
-                return new RemovedControlDelegate(new DynamicMethodWrapper(method).RemovedControlInternal);
-            }
-
-            public static VoidMethodDelegate ClearNamingContainer(MethodInfo methodInfo)
-            {
-                IDynamicMethod method = new SafeMethod(methodInfo);
-                return new VoidMethodDelegate(new DynamicMethodWrapper(method).ClearNamingContainerInternal);
-            }
-
-            private ControlCollection CreateControlCollectionInternal(Control target)
-            {
-                return (ControlCollection) _method.Invoke(target, null);
-            }
-
-            private void AddedControlInternal(Control target, Control control, int index)
-            {
-                _method.Invoke(target, new object[] { control, index });
-            }
-
-            private void RemovedControlInternal(Control target, Control control)
-            {
-                _method.Invoke(target, new object[] { control });
-            }
-
-            private void ClearNamingContainerInternal(Control target)
-            {
-                _method.Invoke(target, null);
-            }
-        }
-
-        private static readonly CreateControlCollectionDelegate BaseCreateControlCollection = DynamicMethodWrapper.CreateControlCollection(GetMethod("CreateControlCollection"));
-        private static readonly AddedControlDelegate BaseAddedControl = DynamicMethodWrapper.AddedControl(GetMethod("AddedControl"));
-        private static readonly RemovedControlDelegate BaseRemovedControl = DynamicMethodWrapper.RemovedControl(GetMethod("RemovedControl"));
-        private static readonly VoidMethodDelegate BaseClearNamingContainer = DynamicMethodWrapper.ClearNamingContainer(GetMethod("ClearNamingContainer"));
-#endif
-
         static ControlAccessor()
         {
             SafeField fldControls = null;
             MethodInfo fnClear = null;
-#if NET_2_0
+
             SecurityCritical.ExecutePrivileged(new PermissionSet(PermissionState.Unrestricted), delegate
             {
-#endif
                 fnClear = GetMethod("Clear");
                 fldControls = new SafeField(typeof(ControlCollection).GetField("_controls", BindingFlags.Instance | BindingFlags.NonPublic));
-#if NET_2_0
             });
-#endif
+
             s_miClear = fnClear;
             ControlsArrayField = fldControls;
 
-#if NET_2_0
             CreateControlCollectionDelegate fnBaseCreateControlCollection = null;
             AddedControlDelegate fnBaseAddedControl = null;
             RemovedControlDelegate fnBaseRemovedControl = null;
             VoidMethodDelegate fnBaseClearNamingContainer = null;
-#if NET_2_0
+
             SecurityCritical.ExecutePrivileged(new PermissionSet(PermissionState.Unrestricted), delegate
             {
-#endif
                 fnBaseCreateControlCollection = (CreateControlCollectionDelegate)Delegate.CreateDelegate(typeof(CreateControlCollectionDelegate), GetMethod("CreateControlCollection"));
                 fnBaseAddedControl = (AddedControlDelegate)Delegate.CreateDelegate(typeof(AddedControlDelegate), GetMethod("AddedControl"));
                 fnBaseRemovedControl = (RemovedControlDelegate)Delegate.CreateDelegate(typeof(RemovedControlDelegate), GetMethod("RemovedControl"));
                 fnBaseClearNamingContainer = (VoidMethodDelegate)Delegate.CreateDelegate(typeof(VoidMethodDelegate), GetMethod("ClearNamingContainer"));
-#if NET_2_0
             });
-#endif
+
             BaseCreateControlCollection = fnBaseCreateControlCollection;
             BaseAddedControl = fnBaseAddedControl;
             BaseRemovedControl = fnBaseRemovedControl;
             BaseClearNamingContainer = fnBaseClearNamingContainer;
-#endif
-
         }
 
         private static MethodInfo GetMethod(string name)
@@ -239,7 +170,6 @@ namespace Spring.Web.Support
             controls[index] = control;
         }
 
-#if NET_2_0
         private delegate ControlCollection GetControlsDelegate(Control target);
         private delegate void SetControlsDelegate(Control target, ControlCollection controls);
 
@@ -365,18 +295,5 @@ namespace Spring.Web.Support
             }
             return handler;
         }
-#else
-	    private static readonly IDynamicField fControls = new SafeField(GetField("_controls"));
-
-		private ControlCollection GetChildControlCollection()
-		{
-		    return (ControlCollection)fControls.GetValue(_targetControl);
-		}
-
-		private void SetChildControlCollection(ControlCollection controls)
-		{
-            fControls.SetValue(_targetControl, controls);
-		}
-#endif
     }
 }
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs b/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs
index fc9c8335..41165aed 100644
--- a/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs
+++ b/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs
@@ -40,18 +40,15 @@ namespace Spring.Web.Support
         static ControlCollectionAccessor()
         {
             IDynamicField owner = null;
-#if NET_2_0
+
             SecurityCritical.ExecutePrivileged( new PermissionSet(PermissionState.Unrestricted), delegate 
             {
-#endif
 #if MONO_2_0
                 owner = new SafeField(typeof (ControlCollection).GetField("owner", BindingFlags.Instance | BindingFlags.NonPublic));
 #else
                 owner = new SafeField(typeof (ControlCollection).GetField("_owner", BindingFlags.Instance | BindingFlags.NonPublic));
 #endif
-#if NET_2_0
             });
-#endif
             _owner = owner;
         }
 
diff --git a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs
index 4d4b821e..357d73a6 100644
--- a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs
+++ b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs
@@ -26,13 +26,6 @@ using System.Web.UI;
 using Spring.Context;
 using Spring.Proxy;
 using Spring.Util;
-using Spring.Web.Support;
-
-#if NET_2_0
-using System.Collections.Generic;
-#else
-using Spring.Reflection.Dynamic;
-#endif
 
 #endregion
 
@@ -119,7 +112,6 @@ namespace Spring.Web.Support
         private delegate ControlCollection CreateControlCollectionDelegate(Control owner);
         private static readonly Hashtable s_collectionFactoryCache = new Hashtable();
 
-#if NET_2_0
         private static CreateControlCollectionDelegate GetInterceptedCollectionFactory(Type ownerType, Type collectionType)
         {
             AssertUtils.State( typeof(Control).IsAssignableFrom(ownerType), "ownerType must be of type Control" );
@@ -151,46 +143,6 @@ namespace Spring.Web.Support
             }
             return factoryMethod;
         }
-#else
-        private class CreateControlCollectionWrapper
-        {
-            private IDynamicConstructor _ctor;
-
-            public CreateControlCollectionWrapper(IDynamicConstructor ctor)
-            {
-                _ctor = ctor;
-            }
-
-            public ControlCollection Create(Control owner)
-            {
-                return (ControlCollection) _ctor.Invoke(new object[] {owner});
-            }
-        }
-
-        private static CreateControlCollectionDelegate GetInterceptedCollectionFactory(Type controlType, Type controlCollectionType)
-        {
-            AssertUtils.State( typeof(Control).IsAssignableFrom(controlType), "controlType must be of type Control" );
-            AssertUtils.State( typeof(ControlCollection).IsAssignableFrom(controlCollectionType), "controlCollectionType must be of type ControlCollection" );
-
-            CreateControlCollectionDelegate factoryMethod = (CreateControlCollectionDelegate)s_collectionFactoryCache[controlType];
-            if (factoryMethod == null)
-            {
-                lock (s_collectionFactoryCache)
-                {
-                    factoryMethod = (CreateControlCollectionDelegate)s_collectionFactoryCache[controlType];
-                    if (factoryMethod == null)
-                    {
-                        Type interceptedCollectionType = GetInterceptedCollectionType(controlCollectionType, new InjectDependenciesCallbackHandler(WebDependencyInjectionUtils.InjectDependenciesRecursive));
-
-                        ConstructorInfo ctor = interceptedCollectionType.GetConstructor(new Type[] {typeof (Control)});
-                        IDynamicConstructor dynCtor = new SafeConstructor(ctor);
-                        s_collectionFactoryCache[controlType] = new CreateControlCollectionDelegate(new CreateControlCollectionWrapper(dynCtor).Create);
-                    }
-                }
-            }
-            return factoryMethod;
-        }
-#endif
 
         private static Type GetInterceptedCollectionType(Type controlCollectionType, InjectDependenciesCallbackHandler staticCallback)
         {
diff --git a/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs b/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs
index 54a1e10c..8351dd79 100644
--- a/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs
+++ b/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs
@@ -29,15 +29,11 @@ using System.Security.Permissions;
 using System.Web;
 using System.Web.Compilation;
 using System.Web.UI;
-using Spring.Expressions;
-using Spring.Globalization;
 using Spring.Reflection.Dynamic;
 using Spring.Util;
 
 #endregion
 
-#if NET_2_0
-
 namespace Spring.Web.Support
 {
     /// <summary>
@@ -232,5 +228,3 @@ namespace Spring.Web.Support
         #endregion
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs
index b2e1f93e..e4d18e0f 100644
--- a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs
+++ b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs
@@ -23,10 +23,8 @@ using System.Security;
 using System.Security.Permissions;
 using System.Web.UI;
 using Spring.Context;
-using Spring.Context.Support;
 using Spring.Reflection.Dynamic;
 using Spring.Util;
-using Spring.Web.Support;
 
 #endregion
 
@@ -92,7 +90,6 @@ namespace Spring.Web.Support
     internal class NamingContainerSupportsWebDependencyInjectionOwnerProxy : SupportsWebDependencyInjectionOwnerProxy
         , INamingContainer
     {
-#if NET_2_0
         private static readonly SafeField refOccasionalFields;
 
         static NamingContainerSupportsWebDependencyInjectionOwnerProxy()
@@ -104,14 +101,11 @@ namespace Spring.Web.Support
             });
             refOccasionalFields = fld;
         }
-#endif
 
         public NamingContainerSupportsWebDependencyInjectionOwnerProxy(IApplicationContext defaultApplicationContext, Control targetControl) : base(defaultApplicationContext, targetControl)
         {
-#if NET_2_0
             object targetOccasionalFields = refOccasionalFields.GetValue(targetControl);
             refOccasionalFields.SetValue(this, targetOccasionalFields);
-#endif            
         }
     }
 }
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs b/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs
index 98b6b148..0aa97fb3 100644
--- a/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs
+++ b/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs
@@ -34,14 +34,13 @@ namespace Spring.Web.UI.Controls
 	/// but are unfortunately not accessible from <see cref="BaseValidator"/>
 	/// </summary>
 	/// <author>Erich Eichinger</author>
-	public abstract class AbstractBaseValidator : System.Web.UI.WebControls.BaseValidator
+	public abstract class AbstractBaseValidator : BaseValidator
     {
 		/// <summary>
 		/// Registers a javascript-block to be rendered.
 		/// </summary>
 		protected void RegisterClientScriptBlock(Type type, string key, string script)
 		{
-#if NET_2_0
                 this.Page.ClientScript.RegisterClientScriptBlock(
                     typeof(RequiredCheckBoxValidator)
                     , "RequiredCheckBoxValidatorEvaluateIsChecked"
@@ -57,23 +56,6 @@ function RequiredCheckBoxValidatorEvaluateIsChecked(val)
 </script>
 "
                     );
-#else
-			key = type.FullName + "." + key;
-			this.Page.RegisterClientScriptBlock(
-				key
-				,
-				@"
-<script type=""text/javascript"">
-function RequiredCheckBoxValidatorEvaluateIsChecked(val)
-{
-  var control;
-  control = document.getElementById(val.controltovalidate);
-  return control.checked;
-}
-</script>
-"
-				);
-#endif
 		}
 
 		/// <summary>
@@ -81,11 +63,7 @@ function RequiredCheckBoxValidatorEvaluateIsChecked(val)
 		/// </summary>
     	protected bool IsClientScriptBlockRegistered(Type type, string key)
     	{
-#if NET_2_0
 			return this.Page.ClientScript.IsClientScriptBlockRegistered(type, key);
-#else
-    		return this.Page.IsClientScriptBlockRegistered( type.FullName + "." + key );
-#endif
     	}
 
 		/// <summary>
@@ -93,22 +71,14 @@ function RequiredCheckBoxValidatorEvaluateIsChecked(val)
 		/// </summary>
         protected void AddExpandoAttribute(HtmlTextWriter writer, string controlId, string attributeName, string attributeValue, bool encode)
         {
-#if NET_2_0
-
-            typeof(System.Web.UI.WebControls.BaseValidator).InvokeMember("AddExpandoAttribute"
-                                                                         ,
-                                                                         BindingFlags.InvokeMethod | BindingFlags.NonPublic
-                                                                         | BindingFlags.Instance
-                                                                         , null
-                                                                         , this
-                                                                         , new object[] {writer, controlId, attributeName, attributeValue, encode}
+            typeof(BaseValidator).InvokeMember("AddExpandoAttribute"
+                                                ,
+                                                BindingFlags.InvokeMethod | BindingFlags.NonPublic
+                                                | BindingFlags.Instance
+                                                , null
+                                                , this
+                                                , new object[] {writer, controlId, attributeName, attributeValue, encode}
                 );
-#else
-			if (writer != null)
-			{
-				writer.AddAttribute(attributeName, attributeValue);
-			}
-#endif
         }
 
 		/// <summary>
@@ -118,14 +88,9 @@ function RequiredCheckBoxValidatorEvaluateIsChecked(val)
         {
             get
             {
-#if NET_2_0
-                return
-                    (bool) typeof(System.Web.UI.WebControls.BaseValidator).GetProperty("EnableLegacyRendering",
+                return (bool) typeof(BaseValidator).GetProperty("EnableLegacyRendering",
                                                                                        BindingFlags.Instance
                                                                                        | BindingFlags.NonPublic).GetValue(this, null);
-#else
-				return (this.Page != null);
-#endif
             }
         }
     }
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs b/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs
index 9752f81a..86023de5 100644
--- a/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs
+++ b/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs
@@ -40,36 +40,6 @@ namespace Spring.Web.UI.Controls
         private IValidationErrors _validationErrors;
         private IMessageSource _messageSource;
 
-#if !NET_2_0
-        private bool initialized;
-
-        /// <summary>
-        /// Raises the <see cref="E:System.Web.UI.Control.Init"/> event.
-        /// </summary>
-        protected override void OnInit(System.EventArgs e)
-        {
-            initialized = true;
-            base.OnInit(e);
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is in design mode.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> if this instance is in design mode; otherwise, <c>false</c>.
-        /// </value>
-        protected bool DesignMode
-        {
-            get
-            {
-                if (this.Site != null)
-                {
-                    return this.Site.DesignMode;
-                }
-                return initialized && (this.Context == null);
-            }
-        }
-#endif
         /// <summary>
         /// Set a particular message source to be used for
         /// resolving error messages to display texts.
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Content.cs b/src/Spring/Spring.Web/Web/UI/Controls/Content.cs
index efcccf32..9c979fa1 100644
--- a/src/Spring/Spring.Web/Web/UI/Controls/Content.cs
+++ b/src/Spring/Spring.Web/Web/UI/Controls/Content.cs
@@ -38,25 +38,6 @@ namespace Spring.Web.UI.Controls
     /// within the master page
     /// </remarks>
     /// <author>Aleksandar Seovic</author>
-#if NET_2_0
 	public class Content : System.Web.UI.WebControls.Content
 	{}
-#else
-    [Designer("System.Web.UI.Design.ReadWriteControlDesigner, System.Design")]
-    [PersistChildren(true)]
-    [ParseChildren(false)]
-    public class Content : Control
-    {
-        private String contentPlaceHolderID;
-
-        /// <summary>
-        /// Id of the <see cref="Spring.Web.UI.Controls.ContentPlaceHolder"/> to override.
-        /// </summary>
-        public String ContentPlaceHolderID
-        {
-            get { return contentPlaceHolderID; }
-            set { contentPlaceHolderID = value; }
-        }
-    }
-#endif
 }
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs b/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs
index 460a7a76..969a3f15 100644
--- a/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs
+++ b/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs
@@ -18,9 +18,6 @@
 
 #endregion
 
-using System.ComponentModel;
-using System.Web.UI;
-
 namespace Spring.Web.UI.Controls
 {
     /// <summary>
@@ -33,42 +30,8 @@ namespace Spring.Web.UI.Controls
     /// by defining matching <see cref="Spring.Web.UI.Controls.Content"/> control.
     /// </remarks>
     /// <author>Aleksandar Seovic</author>
-#if NET_2_0
 	public class ContentPlaceHolder : System.Web.UI.WebControls.ContentPlaceHolder
-	{}
-#else
-    [Designer("System.Web.UI.Design.ReadWriteControlDesigner, System.Design")]
-    [PersistChildren(true)]
-    [ParseChildren(false)]
-    public class ContentPlaceHolder : Control
     {
-        private Content content;
-
-        /// <summary>
-        /// Association to content control defined in the child page
-        /// </summary>
-        public Content Content
-        {
-            get { return content; }
-            set { content = value; }
-        }
-
-        /// <summary>
-        /// Renders either its own (default) content or content defined if the associated
-        /// <see cref="Spring.Web.UI.Controls.Content"/> control.
-        /// </summary>
-        /// <param name="writer">HtmlTextWriter that should be used for output</param>
-        protected override void Render(HtmlTextWriter writer)
-        {
-            if (content == null)
-            {
-                base.Render(writer);
-            }
-            else
-            {
-                content.RenderControl(writer);
-            }
-        }
+        
     }
-#endif	
-}
\ No newline at end of file
+}
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs b/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs
index ef17eef5..b6aa6ca2 100644
--- a/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs
+++ b/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs
@@ -118,7 +118,6 @@ namespace Spring.Web.UI.Controls
             // do nothing
         }
 
-#if NET_2_0
         private static readonly PropertyInfo piRareFieldsEnsured =
             typeof(Control).GetProperty("RareFieldsEnsured", BindingFlags.NonPublic | BindingFlags.Instance);
         private static readonly FieldInfo fiRenderMethod = 
@@ -130,16 +129,5 @@ namespace Spring.Web.UI.Controls
             RenderMethod myRenderMethod = (RenderMethod) fiRenderMethod.GetValue(o);
             return myRenderMethod;
         }
-#else
-        private static readonly FieldInfo fiRenderMethod = 
-            typeof(Control).GetField("_renderMethod", BindingFlags.NonPublic | BindingFlags.Instance);
-
-        private RenderMethod GetRenderMethod()
-        {
-            RenderMethod myRenderMethod = (RenderMethod)fiRenderMethod.GetValue(this);
-            return myRenderMethod;
-        }
-#endif
-
     }
 }
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ControlState.cs b/src/Spring/Spring.Web/Web/UI/Controls/ControlState.cs
deleted file mode 100644
index e57c1d8e..00000000
--- a/src/Spring/Spring.Web/Web/UI/Controls/ControlState.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-#region License
-
-/*
- * Copyright 2002-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-#region Imports
-
-using System;
-
-#endregion
-
-namespace Spring.Web.UI.Controls
-{
-#if !NET_2_0
-	/// <summary>
-	/// Enumeration representing a control's current initialization state.
-	/// </summary>
-	/// <author>Erich Eichinger</author>
-	internal enum ControlState
-	{
-		Constructed,
-		ChildrenInitialized,
-		Initialized,
-		ViewStateLoaded,
-		Loaded,
-		PreRendered
-	}
-#endif //!NET_2_0
-}
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs b/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs
index 1ff9275f..a10db65b 100644
--- a/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs
+++ b/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs
@@ -322,12 +322,10 @@ namespace Spring.Web.UI.Controls
             {
                 return "Text";
             }
-#if NET_2_0
             else if (wc is HiddenField)
             {
                 return "Value";
             }
-#endif
             else if (wc is RadioButtonGroup)
             {
                 return "Value";
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Form.cs b/src/Spring/Spring.Web/Web/UI/Controls/Form.cs
index ea4e5458..23117cf4 100644
--- a/src/Spring/Spring.Web/Web/UI/Controls/Form.cs
+++ b/src/Spring/Spring.Web/Web/UI/Controls/Form.cs
@@ -71,11 +71,7 @@ namespace Spring.Web.UI.Controls
         /// <remarks>
         /// The url specified here is only rendered, if <see cref="SuppressAction"/> is true.
         /// </remarks>
-#if !NET_2_0
-        public string Action
-#else
         public new string Action
-#endif
         {
             get { return this.action; }
             set { this.action = value; }
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/MultiView.cs b/src/Spring/Spring.Web/Web/UI/Controls/MultiView.cs
deleted file mode 100644
index c5e0116a..00000000
--- a/src/Spring/Spring.Web/Web/UI/Controls/MultiView.cs
+++ /dev/null
@@ -1,447 +0,0 @@
-#region License
-
-/*
- * Copyright 2002-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-#region Imports
-
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using System.Reflection;
-using System.Security.Permissions;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-#endregion
-
-namespace Spring.Web.UI.Controls
-{
-#if !NET_2_0
-	/// <summary>
-	/// This controls provides MultiView introduced with ASP.NET 2.0 for NET 1.1 Platform
-	/// </summary>
-	/// <author>Erich Eichinger</author>
-	[
-		DefaultEvent("ActiveViewChanged")
-			, ToolboxData("<{0}:MultiView runat=\"server\"></{0}:MultiView>")
-			, ParseChildren(false, null)
-			, AspNetHostingPermission(SecurityAction.LinkDemand, Level=AspNetHostingPermissionLevel.Minimal)
-			, AspNetHostingPermission(SecurityAction.InheritanceDemand, Level=AspNetHostingPermissionLevel.Minimal)]
-	public class MultiView : Control
-	{
-		#region Constants
-
-		/// <summary>
-		/// Represents the command name associated with the next View control to display in a MultiView control. This field is read-only.
-		/// </summary>
-		public static readonly string NextViewCommandName = "NextView";
-		/// <summary>
-		/// Represents the command name associated with the previous View control to display in a MultiView control. This field is read-only.
-		/// </summary>
-		public static readonly string PreviousViewCommandName = "PrevView";
-		/// <summary>
-		/// Represents the command name associated with changing the active View control in a MultiView control, based on a specified View id. This field is read-only.
-		/// </summary>
-		public static readonly string SwitchViewByIDCommandName = "SwitchViewByID";
-		/// <summary>
-		/// Represents the command name associated with changing the active View control in a MultiView control based on a specified View index. This field is read-only.
-		/// </summary>
-		public static readonly string SwitchViewByIndexCommandName = "SwitchViewByIndex";
-
-		#endregion
-
-		#region Fields
-
-		private static readonly FieldInfo s_fiControlState =
-			typeof(Control).GetField("_controlState", BindingFlags.Instance | BindingFlags.NonPublic);
-
-
-		private int _activeViewIndex = -1;
-		private int _cachedActiveViewIndex = -1;
-		private bool _controlStateApplied;
-		private static readonly object _eventActiveViewChanged = new object();
-		private bool _ignoreBubbleEvents;
-
-		#endregion
-
-		#region Construction
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MultiView"/> class.
-		/// </summary>
-		public MultiView()
-		{
-			// intentionally left empty
-		}
-
-		#endregion
-
-		#region Events
-
-		/// <summary>
-		/// Occurs when the active View control of a MultiView control changes between posts to the server.
-		/// </summary>
-		public event EventHandler ActiveViewChanged
-		{
-			add { base.Events.AddHandler(_eventActiveViewChanged, value); }
-			remove { base.Events.RemoveHandler(_eventActiveViewChanged, value); }
-		}
-
-		#endregion
-
-		#region Properties
-
-		/// <summary>
-		/// Gets or sets the index of the active View control within a MultiView control.
-		/// </summary>
-		[DefaultValue(-1)]
-		public virtual int ActiveViewIndex
-		{
-			get
-			{
-				if (_cachedActiveViewIndex > -1)
-				{
-					return _cachedActiveViewIndex;
-				}
-				return _activeViewIndex;
-			}
-			set
-			{
-				if (value < -1)
-				{
-					throw new ArgumentOutOfRangeException("value",
-						string.Format(
-						"MultiView_ActiveViewIndex_less_than_minus_one",
-						new object[] {value}));
-				}
-				if ((Views.Count == 0) && (ControlState < ControlState.ChildrenInitialized))
-				{
-					_cachedActiveViewIndex = value;
-				}
-				else
-				{
-					if (value >= Views.Count)
-					{
-						throw new ArgumentOutOfRangeException("value",
-							string.Format(
-							"MultiView_ActiveViewIndex_equal_or_greater_than_count",
-							new object[] {value, Views.Count}));
-					}
-					int num = (_cachedActiveViewIndex != -1) ? -1 : _activeViewIndex;
-					_activeViewIndex = value;
-					_cachedActiveViewIndex = -1;
-					if (((num != value) && (num != -1)) && (num < Views.Count))
-					{
-						Views[num].Active = false;
-						if (ShouldTriggerViewEvent)
-						{
-							Views[num].OnDeactivate(EventArgs.Empty);
-						}
-					}
-					if (((num != value) && (Views.Count != 0)) && (value != -1))
-					{
-						Views[value].Active = true;
-						if (ShouldTriggerViewEvent)
-						{
-							Views[value].OnActivate(EventArgs.Empty);
-							OnActiveViewChanged(EventArgs.Empty);
-						}
-					}
-				}
-			}
-		}
-
-
-		/// <summary>
-		/// Gets the collection of View controls in the MultiView control.
-		/// </summary>
-		[
-		PersistenceMode(PersistenceMode.InnerDefaultProperty)
-		, Browsable(false)
-		]
-		public virtual ViewCollection Views
-		{
-			get { return (ViewCollection) Controls; }
-		}
-
-		/// <summary>
-		/// Return the current lifecycle state of this control.
-		/// </summary>
-		private ControlState ControlState
-		{
-			get { return (ControlState) s_fiControlState.GetValue(this); }
-		}
-
-		#endregion
-
-		/// <summary>
-		/// Sets the specified View control to the active view within a MultiView control.
-		/// </summary>
-		/// <param name="view">A View control to set as the active view within a MultiView control.</param>
-		public void SetActiveView(View view)
-		{
-			int index = Views.IndexOf(view);
-			if (index < 0)
-			{
-				throw new HttpException(
-					string.Format("MultiView_view_not_found", new object[] {(view == null) ? "null" : view.ID, ID}));
-			}
-			ActiveViewIndex = index;
-		}
-
-		/// <summary>
-		/// Returns the current active View control within a MultiView control. 
-		/// </summary>
-		/// <returns>A View control that represents the active view within a MultiView control.</returns>
-		public View GetActiveView()
-		{
-			int activeViewIndex = ActiveViewIndex;
-			if (activeViewIndex >= Views.Count)
-			{
-				throw new Exception("MultiView_ActiveViewIndex_out_of_range");
-			}
-			if (activeViewIndex < 0)
-			{
-				return null;
-			}
-			View view = Views[activeViewIndex];
-			if (!view.Active)
-			{
-				UpdateActiveView(activeViewIndex);
-			}
-			return view;
-		}
-
-		/// <summary>
-		/// Mark this control to ignore <see cref="OnBubbleEvent"/>
-		/// </summary>
-		internal void IgnoreBubbleEvents()
-		{
-			_ignoreBubbleEvents = true;
-		}
-
-		/// <summary>
-		/// Adds the element to the collection of child controls.
-		/// </summary>
-		protected override void AddParsedSubObject(object obj)
-		{
-			if (obj is View)
-			{
-				Controls.Add((Control) obj);
-			}
-			else if (!(obj is LiteralControl))
-			{
-				throw new HttpException(
-					string.Format("MultiView_cannot_have_children_of_type", new object[] {obj.GetType().Name}));
-			}
-		}
-
-		/// <summary>
-		/// Creates a new <see cref="ViewCollection"/> instance.
-		/// </summary>
-		/// <returns></returns>
-		protected override ControlCollection CreateControlCollection()
-		{
-			return new ViewCollection(this);
-		}
-
-		/// <summary>
-		/// Restores view-state information from a previous page request.
-		/// </summary>
-		protected override void LoadViewState(object savedState)
-		{
-			base.LoadViewState(savedState);
-			ActiveViewIndex = (int) ViewState["_activeViewIndex"];
-			_controlStateApplied = true;
-		}
-
-		/// <summary>
-		/// Saves view-state information to the page response.
-		/// </summary>
-		protected override object SaveViewState()
-		{
-			ViewState["_activeViewIndex"] = ActiveViewIndex;
-			return base.SaveViewState();
-		}
-
-		/// <summary>
-		/// Raises the <see cref="ActiveViewChanged"/> event.
-		/// </summary>
-		protected virtual void OnActiveViewChanged(EventArgs e)
-		{
-			EventHandler handler = (EventHandler) base.Events[_eventActiveViewChanged];
-			if (handler != null)
-			{
-				handler(this, e);
-			}
-		}
-
-		/// <summary>
-		/// Captures know commands.
-		/// </summary>
-		protected override bool OnBubbleEvent(object source, EventArgs e)
-		{
-			if (!_ignoreBubbleEvents && (e is CommandEventArgs))
-			{
-				CommandEventArgs args = (CommandEventArgs) e;
-				string commandName = args.CommandName;
-				if (commandName == NextViewCommandName)
-				{
-					if (ActiveViewIndex < (Views.Count - 1))
-					{
-						ActiveViewIndex++;
-					}
-					else
-					{
-						ActiveViewIndex = -1;
-					}
-					return true;
-				}
-				if (commandName == PreviousViewCommandName)
-				{
-					if (ActiveViewIndex > -1)
-					{
-						ActiveViewIndex--;
-					}
-					return true;
-				}
-				if (commandName == SwitchViewByIDCommandName)
-				{
-					View view = FindControl((string) args.CommandArgument) as View;
-					if ((view == null) || (view.Parent != this))
-					{
-						throw new HttpException(
-							string.Format("MultiView_invalid_view_id",
-							              new object[]
-							              	{ID, (string) args.CommandArgument, SwitchViewByIDCommandName}));
-					}
-					SetActiveView(view);
-					return true;
-				}
-				if (commandName == SwitchViewByIndexCommandName)
-				{
-					int num;
-					try
-					{
-						num = int.Parse((string) args.CommandArgument, CultureInfo.InvariantCulture);
-					}
-					catch (FormatException)
-					{
-						throw new FormatException(
-							string.Format("MultiView_invalid_view_index_format",
-							              new object[] {(string) args.CommandArgument, SwitchViewByIndexCommandName}));
-					}
-					ActiveViewIndex = num;
-					return true;
-				}
-			}
-			return false;
-		}
-
-		/// <summary>
-		/// Initialize this control.
-		/// </summary>
-		/// <param name="e"></param>
-		protected override void OnInit(EventArgs e)
-		{
-			base.OnInit(e);
-			if (_cachedActiveViewIndex > -1)
-			{
-				ActiveViewIndex = _cachedActiveViewIndex;
-				_cachedActiveViewIndex = -1;
-				GetActiveView();
-			}
-		}
-
-		/// <summary>
-		/// Handle removal of a view.
-		/// </summary>
-		/// <param name="ctl"></param>
-		protected override void RemovedControl(Control ctl)
-		{
-			if (((View) ctl).Active && (ActiveViewIndex < Views.Count))
-			{
-				GetActiveView();
-			}
-			base.RemovedControl(ctl);
-		}
-
-		/// <summary>
-		/// Render the currently active view.
-		/// </summary>
-		/// <param name="writer"></param>
-		protected override void Render(HtmlTextWriter writer)
-		{
-			View activeView = GetActiveView();
-			if (activeView != null)
-			{
-				activeView.RenderControl(writer);
-			}
-		}
-
-		/// <summary>
-		/// Switches from the currently active view to the specified view.
-		/// </summary>
-		/// <param name="activeViewIndex"></param>
-		private void UpdateActiveView(int activeViewIndex)
-		{
-			for (int i = 0; i < Views.Count; i++)
-			{
-				View view = Views[i];
-				if (i == activeViewIndex)
-				{
-					view.Active = true;
-					if (ShouldTriggerViewEvent)
-					{
-						view.OnActivate(EventArgs.Empty);
-					}
-				}
-				else if (view.Active)
-				{
-					view.Active = false;
-					if (ShouldTriggerViewEvent)
-					{
-						view.OnDeactivate(EventArgs.Empty);
-					}
-				}
-			}
-		}
-
-		/// <summary>
-		/// Indicates if view events are ready to be raised.
-		/// </summary>
-		private bool ShouldTriggerViewEvent
-		{
-			get
-			{
-				if (_controlStateApplied)
-				{
-					return true;
-				}
-				if (this.Page != null)
-				{
-					return !this.Page.IsPostBack;
-				}
-				return false;
-			}
-		}
-	}
-#endif // !NET_2_0
-}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs
index 88d6f3b6..e946a73f 100644
--- a/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs
+++ b/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs
@@ -36,7 +36,6 @@ namespace Spring.Web.UI.Controls
 	[ToolboxData("<{0}:TabularView runat=\"server\"></{0}:TabularView>")]
 	public class TabularView : View
 	{
-#if NET_2_0
 		private static readonly PropertyInfo s_fiActive =
 			typeof(View).GetProperty("Active", BindingFlags.Instance | BindingFlags.NonPublic);
 
@@ -47,8 +46,8 @@ namespace Spring.Web.UI.Controls
 		{
 			get { return (bool) s_fiActive.GetValue(this, null); }
 		}
-#endif
-		private string m_TabToolTip;
+
+        private string m_TabToolTip;
 
 		/// <summary>
 		/// Get or Set the name of the tab item associated with this view.
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/View.cs b/src/Spring/Spring.Web/Web/UI/Controls/View.cs
deleted file mode 100644
index 3811b673..00000000
--- a/src/Spring/Spring.Web/Web/UI/Controls/View.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-#region License
-
-/*
- * Copyright 2002-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-#region Imports
-
-using System;
-using System.Security.Permissions;
-using System.Web;
-using System.Web.UI;
-
-#endregion
-
-namespace Spring.Web.UI.Controls
-{
-#if !NET_2_0
-	/// <summary>
-	/// Represents a control that acts as a container for a group of controls within a <see cref="MultiView"/> control.
-	/// </summary>
-	[ParseChildren(false, null)
-		, ToolboxData("<{0}:View runat=\"server\"></{0}:View>")
-		, AspNetHostingPermission(SecurityAction.LinkDemand, Level=AspNetHostingPermissionLevel.Minimal)
-		, AspNetHostingPermission(SecurityAction.InheritanceDemand, Level=AspNetHostingPermissionLevel.Minimal)]
-	public class View : Control
-	{
-		private bool _active;
-		private static readonly object _eventActivate = new object();
-		private static readonly object _eventDeactivate = new object();
-
-		/// <summary>
-		/// Occurs when the current View control becomes the active view.
-		/// </summary>
-		public event EventHandler Activate
-		{
-			add { base.Events.AddHandler(_eventActivate, value); }
-			remove { base.Events.RemoveHandler(_eventActivate, value); }
-		}
-
-		/// <summary>
-		/// Occurs when the current active View control becomes inactive.
-		/// </summary>
-		public event EventHandler Deactivate
-		{
-			add { base.Events.AddHandler(_eventDeactivate, value); }
-			remove { base.Events.RemoveHandler(_eventDeactivate, value); }
-		}
-
-		/// <summary>
-		/// Raises the <see cref="Activate"/> event of the View control.
-		/// </summary>
-		protected internal virtual void OnActivate(EventArgs e)
-		{
-			EventHandler handler = (EventHandler) base.Events[_eventActivate];
-			if (handler != null)
-			{
-				handler(this, e);
-			}
-		}
-
-		/// <summary>
-		/// Raises the <see cref="Deactivate"/> event of the View control. 
-		/// </summary>
-		protected internal virtual void OnDeactivate(EventArgs e)
-		{
-			EventHandler handler = (EventHandler) base.Events[_eventDeactivate];
-			if (handler != null)
-			{
-				handler(this, e);
-			}
-		}
-
-		/// <summary>
-		/// Gets a value that indicates, if this control has been instantiated by a designer.
-		/// </summary>
-		protected bool DesignMode
-		{
-			get { return Context == null; }
-		}
-
-		/// <summary>
-		/// Gets or Sets a value that indicates, if this control is currently active.
-		/// </summary>
-		internal bool Active
-		{
-			get { return _active; }
-			set
-			{
-				_active = value;
-				base.Visible = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets a value that indicates, whether this view will be rendered as UI.
-		/// </summary>
-		public override bool Visible
-		{
-			get
-			{
-				if (Parent == null)
-				{
-					return Active;
-				}
-				if (Active)
-				{
-					return Parent.Visible;
-				}
-				return false;
-			}
-			set
-			{
-				if (!DesignMode)
-				{
-					throw new InvalidOperationException("View_CannotSetVisible");
-				}
-			}
-		}
-	}
-#endif // !NET_2_0
-}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ViewCollection.cs b/src/Spring/Spring.Web/Web/UI/Controls/ViewCollection.cs
deleted file mode 100644
index d1acf494..00000000
--- a/src/Spring/Spring.Web/Web/UI/Controls/ViewCollection.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-#region License
-
-/*
- * Copyright 2002-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-#region Imports
-
-using System;
-using System.Security.Permissions;
-using System.Web;
-using System.Web.UI;
-
-#endregion
-
-namespace Spring.Web.UI.Controls
-{
-#if !NET_2_0
-	/// <summary>
-	/// Represents a collection container that enables a <see cref="MultiView"/> control to maintain a list of its child controls.
-	/// </summary>
-	/// <author>Erich Eichinger</author>
-	[
-		AspNetHostingPermission(SecurityAction.LinkDemand, Level=AspNetHostingPermissionLevel.Minimal)
-			, AspNetHostingPermission(SecurityAction.InheritanceDemand, Level=AspNetHostingPermissionLevel.Minimal)]
-	public class ViewCollection : ControlCollection
-	{
-		/// <summary>
-		/// Initializes a new instance.
-		/// </summary>
-		/// <param name="owner"></param>
-		public ViewCollection(Control owner) : base(owner)
-		{
-		}
-
-		/// <summary>
-		/// Add the specified <see cref="View"/> control to the collection.
-		/// </summary>
-		public override void Add(Control v)
-		{
-			if (!(v is View))
-			{
-				throw new ArgumentException("ViewCollection_must_contain_view");
-			}
-			base.Add(v);
-		}
-
-		/// <summary>
-		/// Add the specified <see cref="View"/> control to the collection.
-		/// </summary>
-		public override void AddAt(int index, Control v)
-		{
-			if (!(v is View))
-			{
-				throw new ArgumentException("ViewCollection_must_contain_view");
-			}
-			base.AddAt(index, v);
-		}
-
-		/// <summary>
-		/// Obtain the specified <see cref="View"/> control from the collection.
-		/// </summary>
-		public new View this[int i]
-		{
-			get { return (View) base[i]; }
-		}
-	}
-#endif // !NET_2_0
-}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/MasterPage.cs b/src/Spring/Spring.Web/Web/UI/MasterPage.cs
index 9f01f33d..bed54222 100644
--- a/src/Spring/Spring.Web/Web/UI/MasterPage.cs
+++ b/src/Spring/Spring.Web/Web/UI/MasterPage.cs
@@ -26,80 +26,20 @@ using System.Collections.Specialized;
 using System.Web.UI;
 using Spring.Collections;
 using Spring.Validation;
-using Spring.Web.UI.Controls;
 using IValidator = Spring.Validation.IValidator;
 
-#if NET_2_0
 using Spring.Context;
 using Spring.Context.Support;
 using Spring.Globalization;
-using Spring.Util;
 using System.ComponentModel;
 using System.Globalization;
-using System.Reflection;
 using System.Resources;
-using System.Web;
-using System.Web.Compilation;
 using Spring.Web.Support;
-#endif
 
 #endregion Imports
 
 namespace Spring.Web.UI
 {
-#if !NET_2_0
-    
-    #region ASP.NET 1.1 Spring Master Page Implementation
-
-    /// <summary>
-    /// Spring.NET Master Page implementation for ASP.NET 1.1
-    /// </summary>
-    /// <author>Aleksandar Seovic</author>
-    public class MasterPage : UserControl
-    {
-        /// <summary>
-        /// Initializes master page.
-        /// </summary>
-        public void Initialize(Page childPage)
-        {
-            InitializeAsUserControl(childPage);
-            this.ID = "masterPage";
-
-            Control[] controls = new Control[childPage.Controls.Count];
-            childPage.Controls.CopyTo(controls, 0);
-
-            for (int i = 0; i < controls.Length; i++)
-            {
-                if (controls[i] is Content)
-                {
-                    Content content = (Content) controls[i];
-                    ContentPlaceHolder placeholder = (ContentPlaceHolder) this.FindControl(content.ContentPlaceHolderID);
-                    if (placeholder == null)
-                    {
-                        throw new ArgumentException("Content placeholder " + content.ContentPlaceHolderID + " does not exist in the master page.");
-                    }
-                    
-                    placeholder.Content = content;
-                }
-            }
-
-            childPage.Controls.AddAt(0, this);
-        }
-
-
-		/// <summary>
-		/// Delegate validation errors to the owning page.
-		/// </summary>
-    	public override IValidationErrors ValidationErrors
-    	{
-    		get { return Page.ValidationErrors; }
-    	}
-    }
-
-    #endregion    
-
-#else
-
     #region ASP.NET 2.0 Spring Master Page Implementation
     
     /// <summary>
@@ -674,6 +614,4 @@ namespace Spring.Web.UI
     }
 
     #endregion
-
-#endif
 }
diff --git a/src/Spring/Spring.Web/Web/UI/Page.cs b/src/Spring/Spring.Web/Web/UI/Page.cs
index edaede83..edf5122a 100644
--- a/src/Spring/Spring.Web/Web/UI/Page.cs
+++ b/src/Spring/Spring.Web/Web/UI/Page.cs
@@ -25,7 +25,6 @@ using System.Collections;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Globalization;
-using System.Reflection;
 using System.Resources;
 using System.Security.Permissions;
 using System.Threading;
@@ -41,9 +40,6 @@ using Spring.Objects;
 using Spring.Util;
 using Spring.Validation;
 using Spring.Web.Support;
-#if NET_2_0
-using System.Web.Compilation;
-#endif
 using IValidator = Spring.Validation.IValidator;
 
 #endregion
@@ -86,31 +82,11 @@ namespace Spring.Web.UI
         private static readonly object EventDataBindingsInitialized = new object();
         private static readonly object EventDataBound = new object();
         private static readonly object EventDataUnbound = new object();
-#if !NET_2_0
-        private static readonly object EventPreInit = new object();
-        private static readonly object EventInitComplete = new object();
-#else
-//        internal static readonly MethodInfo GetLocalResourceProvider =
-//                typeof( ResourceExpressionBuilder ).GetMethod( "GetLocalResourceProvider", BindingFlags.NonPublic | BindingFlags.Static, null,
-//                                                            new Type[] { typeof( TemplateControl ) }, null );
-#endif
 
         #endregion
 
         #region Instance Fields
 
-#if !NET_2_0
-        private static readonly FieldInfo _fiRequestValueCollection =
-            typeof(System.Web.UI.Page).GetField("_requestValueCollection",
-                                                BindingFlags.Instance | BindingFlags.NonPublic);
-
-        private bool passedPreInit = false;
-        private bool passedInit = false;
-        private bool passedTrackViewState = false;
-
-        private MasterPage master;
-        private String masterPageFile;
-#endif
         private object controller;
         private IDictionary sharedState;
 
@@ -147,72 +123,11 @@ namespace Spring.Web.UI
             InitializeNavigationSupport();
         }
 
-#if !NET_2_0
-        /// <summary>
-        /// Determines the type of request made for the Page class.
-        /// </summary>
-        /// <returns>
-        /// If the post back used the POST method, the form information is returned from the Context object.
-        /// If the postback used the GET method, the query string information is returned.
-        /// If the page is being requested for the first time, a null reference (Nothing in Visual Basic) is returned.
-        /// </returns>
-        /// <remarks>
-        /// Adds support for OnPreInit() in NET 1.1.<br/>
-        /// Overriding this method is the closest match to NET 2.0 OnPreInit()-behaviour.
-        /// </remarks>
-        protected override NameValueCollection DeterminePostBackMode()
-        {
-            NameValueCollection requestValueCollection = base.DeterminePostBackMode();
-            if (!passedPreInit)
-            {
-                _fiRequestValueCollection.SetValue(this, requestValueCollection);
-                passedPreInit = true;
-                OnPreInit(EventArgs.Empty);
-            }
-            return requestValueCollection;
-        }
-
-        /// <summary>
-        /// Overridden to add support for <see cref="OnInitComplete"/>.
-        /// </summary>
-        protected override void TrackViewState()
-        {
-            base.TrackViewState();
-            if (passedInit && !passedTrackViewState)
-            {
-                passedTrackViewState = true;
-                OnInitComplete(EventArgs.Empty);
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether view state is enabled for this page.
-        /// </summary>
-        protected internal bool IsViewStateEnabled
-        {
-            get
-            {
-                for (Control parent = this; parent != null; parent = parent.Parent)
-                {
-                    if (!parent.EnableViewState)
-                    {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        }
-#endif
-
         /// <summary>
         /// Initializes Spring.NET page internals and raises the PreInit event.
         /// </summary>
         /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-#if !NET_2_0
-        protected virtual void OnPreInit(EventArgs e)
-#else
         protected override void OnPreInit( EventArgs e )
-#endif
         {
             if (SharedState == null)
             {
@@ -220,36 +135,14 @@ namespace Spring.Web.UI
             }
             InitializeCulture();
             InitializeMessageSource();
-#if !NET_2_0
-            EventHandler handler = (EventHandler) base.Events[EventPreInit];
-            if (handler != null)
-            {
-                handler(this, e);
-            }
-#else
-            base.OnPreInit( e );
-#endif
-        }
 
-#if !NET_2_0
-        /// <summary>
-        /// PreInit event.
-        /// </summary>
-        public event EventHandler PreInit
-        {
-            add { base.Events.AddHandler(EventPreInit, value); }
-            remove { base.Events.RemoveHandler(EventPreInit, value); }
+            base.OnPreInit( e );
         }
-#endif
 
         /// <summary>
         /// Initializes the culture.
         /// </summary>
-#if !NET_2_0
-        protected virtual void InitializeCulture()
-#else
         protected override void InitializeCulture()
-#endif
         {
             CultureInfo userCulture = this.UserCulture;
             Thread.CurrentThread.CurrentUICulture = userCulture;
@@ -263,19 +156,6 @@ namespace Spring.Web.UI
             }
         }
 
-#if !NET_2_0
-        /// <summary>
-        /// Gets a value indicating whether this instance is in design mode.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> if this instance is in design mode; otherwise, <c>false</c>.
-        /// </value>
-        protected bool DesignMode
-        {
-            get { return this.Context == null; }
-        }
-#endif
-
         /// <summary>
         /// Initializes data model and controls.
         /// </summary>
@@ -292,48 +172,13 @@ namespace Spring.Web.UI
                 LoadModel( LoadModelFromPersistenceMedium() );
             }
 
-#if !NET_2_0
-            if (HasMaster)
-            {
-                Trace.Write(traceCategory, "Initialize Master");
-                master = (MasterPage) this.LoadControl(MasterPageFile);
-                master.Initialize(this);
-            }
-#endif
             base.OnInit( e );
 
             // initialize controls
             Trace.Write( traceCategory, "Initialize Controls" );
             OnInitializeControls( EventArgs.Empty );
-
-#if !NET_2_0
-            passedInit = true;
-#endif
         }
 
-
-#if !NET_2_0
-        /// <summary>
-        /// Raises the <see cref="InitComplete"/> event after page initialization.
-        /// </summary>
-        protected virtual void OnInitComplete(EventArgs e)
-        {
-            EventHandler handler = (EventHandler) base.Events[EventInitComplete];
-            if (handler != null)
-            {
-                handler(this, e);
-            }
-        }
-
-        /// <summary>
-        /// InitComplete event.
-        /// </summary>
-        public event EventHandler InitComplete
-        {
-            add { base.Events.AddHandler(EventInitComplete, value); }
-            remove { base.Events.RemoveHandler(EventInitComplete, value); }
-        }
-#endif
         /// <summary>
         /// Raises the <see cref="PreLoadViewState"/> event after page initialization.
         /// </summary>
@@ -562,7 +407,6 @@ namespace Spring.Web.UI
             return control;
         }
 
-#if NET_2_0
         /// <summary>
         /// Obtains a <see cref="T:System.Web.UI.UserControl"/> object by type
         /// and injects dependencies according to Spring config file.
@@ -578,7 +422,6 @@ namespace Spring.Web.UI
             control = WebDependencyInjectionUtils.InjectDependenciesRecursive( defaultApplicationContext, control );
             return control;
         }
-#endif
 
         #endregion
 
@@ -742,7 +585,6 @@ namespace Spring.Web.UI
 
         #endregion
 
-#if NET_2_0
         /// <summary>
         /// Overrides the default PreviousPage property to return an instance of <see cref="Spring.Web.UI.Page"/>,
         /// and to work properly during server-side transfers and executes.
@@ -751,7 +593,7 @@ namespace Spring.Web.UI
         {
             get { return this.Context.PreviousHandler as Page; }
         }
-#endif
+
         ///<summary>
         /// Publish <see cref="HttpContext"/> associated with this page for convenient usage in Binding Expressions
         ///</summary>
@@ -765,54 +607,6 @@ namespace Spring.Web.UI
 
         #region Master Page support
 
-#if !NET_2_0
-        /// <summary>
-        /// Reference to a master page template.
-        /// </summary>
-        /// <remarks>
-        /// <p>
-        /// Master page can be any user control that defines form element and one or more &lt;spring:ContentPlaceHolder/&gt; controls.
-        /// Placeholders in the master page can contain default content that will be replaced by the content defined in child pages.
-        /// </p>
-        /// <p>
-        /// Child pages should only define content they want to override using appropriate &lt;spring:Content/&gt; control
-        /// that references appropriate content placeholder in the master page. Child pages don't have to define
-        /// content elements for every placeholder in the master page. In that case, child page will simply inherit
-        /// default content from the placeholder.
-        /// </p>
-        /// </remarks>
-        [Browsable(false)]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public MasterPage Master
-        {
-            get { return master; }
-        }
-
-        /// <summary>
-        /// Convinience property that allows users to specify master page using its file name
-        /// </summary>
-        public String MasterPageFile
-        {
-            get { return masterPageFile; }
-            set { masterPageFile = value; }
-        }
-
-        /// <summary>
-        /// Renders this page, taking master page into account.
-        /// </summary>
-        /// <param name="writer">The <see langword="HtmlTextWriter"/> object that receives the server control content.</param>
-        protected override void Render(HtmlTextWriter writer)
-        {
-            if (HasMaster)
-            {
-                Master.RenderControl(writer);
-            }
-            else
-            {
-                base.Render(writer);
-            }
-        }
-#else
         /// <summary>
         /// Gets the master page that determines the overall look of the page.
         /// </summary>
@@ -823,8 +617,6 @@ namespace Spring.Web.UI
             get { return (MasterPage)base.Master; }
         }
 
-#endif
-
         /// <summary>
         /// Returns true if page uses master page, false otherwise.
         /// </summary>
@@ -1227,7 +1019,6 @@ namespace Spring.Web.UI
             base.Validate();
         }
 
-#if NET_2_0
         ///<summary>
         ///Instructs the validation controls in the specified validation group to validate their assigned information.
         ///</summary>
@@ -1237,7 +1028,6 @@ namespace Spring.Web.UI
         {
             base.Validate(validationGroup);
         }
-#endif
 
         /// <summary>
         /// Evaluates specified validators and returns <c>True</c> if all of them are valid.
@@ -1646,11 +1436,7 @@ namespace Spring.Web.UI
         /// <returns>Local ResourceManager instance.</returns>
         private ResourceManager GetLocalResourceManager()
         {
-#if !NET_2_0
-            return new ResourceManager(GetType().BaseType);
-#else
             return LocalResourceManager.GetLocalResourceManager(this);
-#endif
         }
 
         /// <summary>
diff --git a/src/Spring/Spring.Web/Web/UI/UserControl.cs b/src/Spring/Spring.Web/Web/UI/UserControl.cs
index 7e5ffd38..430cb017 100644
--- a/src/Spring/Spring.Web/Web/UI/UserControl.cs
+++ b/src/Spring/Spring.Web/Web/UI/UserControl.cs
@@ -25,17 +25,12 @@ using System.Collections;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Globalization;
-using System.Reflection;
 using System.Resources;
 using System.Web;
-#if NET_2_0
-using System.Web.Compilation;
-#endif
 using System.Web.UI;
 using Spring.Collections;
 using Spring.Context;
 using Spring.Context.Support;
-using Spring.Core;
 using Spring.DataBinding;
 using Spring.Globalization;
 using Spring.Util;
@@ -89,37 +84,6 @@ namespace Spring.Web.UI
             InitializeNavigationSupport();
         }
 
-#if !NET_2_0
-        /// <summary>
-        /// Gets a value indicating whether this instance is in design mode.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> if this instance is in design mode; otherwise, <c>false</c>.
-        /// </value>
-        protected bool DesignMode
-        {
-            get { return this.Context == null; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether view state is enabled for this page.
-        /// </summary>
-        protected internal bool IsViewStateEnabled
-        {
-            get
-            {
-                for (Control parent = this; parent != null; parent = parent.Parent)
-                {
-                    if (!parent.EnableViewState)
-                    {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        }
-#endif
-
         /// <summary>
         /// Initializes user control.
         /// </summary>
@@ -297,7 +261,6 @@ namespace Spring.Web.UI
             return control;
         }
 
-#if NET_2_0
         /// <summary>
         /// Obtains a <see cref="T:System.Web.UI.UserControl"/> object by type
         /// and injects dependencies according to Spring config file.
@@ -313,7 +276,6 @@ namespace Spring.Web.UI
             control = WebDependencyInjectionUtils.InjectDependenciesRecursive( defaultApplicationContext, control );
             return control;
         }
-#endif
 
         #endregion
 
@@ -1046,11 +1008,7 @@ namespace Spring.Web.UI
         /// <returns>Local ResourceManager instance.</returns>
         private ResourceManager GetLocalResourceManager()
         {
-#if !NET_2_0
-            return new ResourceManager(GetType().BaseType);
-#else
             return LocalResourceManager.GetLocalResourceManager(this);
-#endif
         }
 
         /// <summary>
diff --git a/templates/vsnet-2008/ProjectTemplates/SpringClassLibrary/SpringClassLibrary/SpringClassLibrary.csproj b/templates/vsnet-2008/ProjectTemplates/SpringClassLibrary/SpringClassLibrary/SpringClassLibrary.csproj
index 93eb2683..824681cb 100644
--- a/templates/vsnet-2008/ProjectTemplates/SpringClassLibrary/SpringClassLibrary/SpringClassLibrary.csproj
+++ b/templates/vsnet-2008/ProjectTemplates/SpringClassLibrary/SpringClassLibrary/SpringClassLibrary.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SpringClassLibrary</RootNamespace>
     <AssemblyName>SpringClassLibrary</AssemblyName>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/templates/vsnet-2008/SolutionTemplates/ado/App.AdoQuickStart/source/App.Service/App.Service.csproj b/templates/vsnet-2008/SolutionTemplates/ado/App.AdoQuickStart/source/App.Service/App.Service.csproj
index 03527006..b21e7860 100644
--- a/templates/vsnet-2008/SolutionTemplates/ado/App.AdoQuickStart/source/App.Service/App.Service.csproj
+++ b/templates/vsnet-2008/SolutionTemplates/ado/App.AdoQuickStart/source/App.Service/App.Service.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>App.Service</RootNamespace>
     <AssemblyName>App.Service</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/templates/vsnet-2008/SolutionTemplates/nhibernate/App.HibernateQuickStart/source/App.Service/App.Service.csproj b/templates/vsnet-2008/SolutionTemplates/nhibernate/App.HibernateQuickStart/source/App.Service/App.Service.csproj
index fcb2e809..2cabc1e6 100644
--- a/templates/vsnet-2008/SolutionTemplates/nhibernate/App.HibernateQuickStart/source/App.Service/App.Service.csproj
+++ b/templates/vsnet-2008/SolutionTemplates/nhibernate/App.HibernateQuickStart/source/App.Service/App.Service.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>App.Service</RootNamespace>
     <AssemblyName>App.Service</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/templates/vsnet-2008/SolutionTemplates/web/App.WebQuickStart/source/App.Service/App.Service.csproj b/templates/vsnet-2008/SolutionTemplates/web/App.WebQuickStart/source/App.Service/App.Service.csproj
index fcb2e809..2cabc1e6 100644
--- a/templates/vsnet-2008/SolutionTemplates/web/App.WebQuickStart/source/App.Service/App.Service.csproj
+++ b/templates/vsnet-2008/SolutionTemplates/web/App.WebQuickStart/source/App.Service/App.Service.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>App.Service</RootNamespace>
     <AssemblyName>App.Service</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/templates/vsnet-2008/SolutionTemplates/web/App.WebQuickStart/source/App.Web.References/App.Web.References.csproj b/templates/vsnet-2008/SolutionTemplates/web/App.WebQuickStart/source/App.Web.References/App.Web.References.csproj
index 209bd79e..b64834de 100644
--- a/templates/vsnet-2008/SolutionTemplates/web/App.WebQuickStart/source/App.Web.References/App.Web.References.csproj
+++ b/templates/vsnet-2008/SolutionTemplates/web/App.WebQuickStart/source/App.Web.References/App.Web.References.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>App.Web.References</RootNamespace>
     <AssemblyName>App.Web.References</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/test/Spring/CommonAssemblyInfo.cs b/test/Spring/CommonAssemblyInfo.cs
index 5e50cfc6..f841e7e1 100644
--- a/test/Spring/CommonAssemblyInfo.cs
+++ b/test/Spring/CommonAssemblyInfo.cs
@@ -28,10 +28,6 @@ using System.Runtime.CompilerServices;
 [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")]
 #endif
 
 //
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs
index 88cdaa19..fd2f7138 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs
@@ -699,7 +699,6 @@ namespace Spring.Aop.Framework.DynamicProxy
 
         #region ProxyGenericMethodWithRefOutParameters
 
-#if NET_2_0
         [Test]
         public void ProxyGenericMethodWithRefOutParametersWithDirectCall()
         {
@@ -799,7 +798,7 @@ namespace Spring.Aop.Framework.DynamicProxy
         internal class InternalRefOutGenericTestObject : PublicRefOutGenericTestObject
         {
         }
-#endif
+
         #endregion
 
         [Test]
@@ -816,7 +815,6 @@ namespace Spring.Aop.Framework.DynamicProxy
             Assert.AreEqual(target.ToString(), proxy.ToString(), "ToString() not equal");
         }
 
-#if NET_2_0
         [Test]
         public void InterceptGenericMethod()
         {
@@ -886,7 +884,6 @@ namespace Spring.Aop.Framework.DynamicProxy
 
             Assert.AreEqual(2, ni.Count);
         }
-#endif
 
         #region MultiThreadedProxyCreation
 
@@ -1060,7 +1057,6 @@ namespace Spring.Aop.Framework.DynamicProxy
             Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's parameter.");
         }
 
-#if NET_2_0
         [Test]
         public void ProxyTargetMethodReturnValueAttributes()
         {
@@ -1110,7 +1106,6 @@ namespace Spring.Aop.Framework.DynamicProxy
             Assert.IsNotNull(attrs);
             Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's return value.");
         }
-#endif
 
         public sealed class MarkerAttribute : Attribute
         {
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs
index 998bad98..cab6573f 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs
@@ -230,14 +230,12 @@ namespace Spring.Aop.Framework.DynamicProxy
  	        base.ProxyMethodWithRefOutParametersWithStandardReflection();
         }
 
-#if NET_2_0
         [Test]
         [ExpectedException(typeof(AopConfigException), ExpectedMessage="Cannot create decorator-based IAopProxy for a non visible class [Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+InternalRefOutGenericTestObject]")]
         public override void ProxyGenericMethodWithRefOutParametersWithStandardReflection()
         {
             base.ProxyGenericMethodWithRefOutParametersWithStandardReflection();
         }
-#endif
 
         #region Attributes
 
@@ -325,7 +323,6 @@ namespace Spring.Aop.Framework.DynamicProxy
             Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's parameter.");
         }
 
-#if NET_2_0
         [Test]
         public void ProxyTargetVirtualMethodReturnValueAttributes()
         {
@@ -367,7 +364,6 @@ namespace Spring.Aop.Framework.DynamicProxy
             Assert.IsNotNull(attrs);
             Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's return value.");
         }
-#endif
 
         #endregion
 
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs
index 9f16ffb7..168dab77 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs
@@ -146,7 +146,6 @@ namespace Spring.Aop.Framework.DynamicProxy
             }
         }
 
-#if NET_2_0
         [Test]
         public void InterceptVirtualGenericMethod()
         {
@@ -202,7 +201,6 @@ namespace Spring.Aop.Framework.DynamicProxy
                 return arg;
             }
         }
-#endif
 
         [Test]
         public void DoesNotInterceptFinalMethod()
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs
index a67f6c74..e1a78a17 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs
@@ -41,7 +41,6 @@ namespace Spring.Aop.Framework
 
 		}
 
-#if NET_2_0
         [Category("Performance")]
         [Test, Explicit]
         public void InstantiationPerformance()
@@ -56,6 +55,5 @@ namespace Spring.Aop.Framework
             watch.Stop();
             Console.WriteLine("Instantiation time: {0}ms", watch.ElapsedMilliseconds);
         }
-#endif
 	}
-}
\ No newline at end of file
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs
index 12e28cad..0507a8fd 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs
@@ -74,7 +74,7 @@ namespace Spring.Aop.Support
 			ExactMatchTests(pointcut);
 		}
 
-#if NET_2_0
+
         protected void ExactMatchWithGenericTypeTests(AbstractRegularExpressionMethodPointcut rpc)
         {
             // assumes rpc.setPattern("System.Collections.Generic.List<string>");
@@ -106,7 +106,6 @@ namespace Spring.Aop.Support
             Assert.IsTrue(pointcut.Matches(typeof(System.Collections.Generic.List<string>).GetMethod("Add"), typeof(int)));
             Assert.IsFalse(pointcut.Matches(typeof(System.Collections.Generic.List<string>).GetMethod("GetType"), typeof(Type)));
         }
-#endif
 
         protected void ExactMatchTests(AbstractRegularExpressionMethodPointcut rpc)
         {
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs
index 647248f0..6e86bffd 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs
@@ -153,7 +153,6 @@ namespace Spring.Aop.Target
             Assert.AreEqual (2, ((IThreadLocalTargetSourceStats) apartment).Objects);
         }
 
-#if NET_2_0
         private static bool multiThreadedTestFailed = false;
 
         [Test]
@@ -227,6 +226,5 @@ namespace Spring.Aop.Target
         }
 
         #endregion
-#endif
     }
 }
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs
index fb70d621..3671b8ce 100644
--- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs
@@ -146,7 +146,6 @@ namespace Spring.Aspects.Cache
             IList items = store.GetAll();
         }
 
-#if NET_2_0
         [Test(Description = "http://jira.springframework.org/browse/SPRNET-959")]
         public void UseMethodInfoForKeyGeneration()
         {
@@ -167,7 +166,6 @@ namespace Spring.Aspects.Cache
             // but it returns the NullValue marker created by the CacheResultAttribute
             Assert.IsNotNull(cache.Get("String_1"));
         }
-#endif
     }
 
     #region Inner Class : CacheParameterTarget
@@ -229,7 +227,6 @@ namespace Spring.Aspects.Cache
         }
     }
 
-#if NET_2_0
     public interface IGenericDao<T, IdT>
     {
         T Load(IdT id);
@@ -243,7 +240,6 @@ namespace Spring.Aspects.Cache
             return default(T);
         }
     }
-#endif
 
     #endregion
 }
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2008.csproj b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2008.csproj
index 5e229956..ed3834e9 100644
--- a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2008.csproj
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2008.csproj
@@ -22,7 +22,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Aop.Tests\Debug\</OutputPath>
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
index 53881f92..d3de9a16 100644
--- a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
@@ -11,9 +11,6 @@
 -->
 	<target name="build">
 		<!-- build Spring.Aop -->
-		<!-- use .NET 3.5 compiler for tests to allow lambdas etc -->
-		<property name="temp.nant.settings.currentframework" value="${nant.settings.currentframework}" />
-		<property name="nant.settings.currentframework" value="net-3.5" if="${nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-3.0'}" />
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -50,9 +47,6 @@
 			</references>
 		</csc>
 
-		<!-- restore old framework setting -->
-		<property name="nant.settings.currentframework" value="${temp.nant.settings.currentframework}" />
-
 		<copy todir="${current.bin.dir}">
 			<fileset basedir="${project::get-base-directory()}/Data">
 				<include name="**/*.xml" />
diff --git a/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs b/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs
index eca5b979..3ce32969 100644
--- a/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs
+++ b/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs
@@ -1,4 +1,3 @@
-#if NET_2_0
 #region License
 
 /*
@@ -91,4 +90,3 @@ namespace Spring.Collections.Generic
         
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/CommonTypes.cs b/test/Spring/Spring.Core.Tests/CommonTypes.cs
index d390dc57..f807cae2 100644
--- a/test/Spring/Spring.Core.Tests/CommonTypes.cs
+++ b/test/Spring/Spring.Core.Tests/CommonTypes.cs
@@ -28,9 +28,7 @@ namespace Spring
         public string Name;
         public string Nationality;
         public string[] Inventions;
-#if NET_2_0
         public DateTime? DateOfGraduation;
-#endif
         private DateTime dob;
         private Place pob;
 
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs
index 7731ffad..c1419408 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs
@@ -63,7 +63,6 @@ namespace Spring.Context.Support
             
         }
 
-#if NET_2_0
 	    [Test]
 	    public void ExecutesAllContextEventHandlersAndRethrowsExceptionsThrownDuringContextEventHandlingByDefault()
 	    {
@@ -93,7 +92,6 @@ namespace Spring.Context.Support
             Assert.AreEqual("dummy", resultException.Message);
             Assert.IsTrue(secondHandlerExecuted);
         }
-#endif
 
         [Test]
         public void DoesNotSearchParentContextForMessageSource()
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs
index 61cfeef8..74200d45 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs
@@ -117,11 +117,7 @@ namespace Spring.Context.Support
 		/// Expect failure when using a type that does not inherit from IApplicationContext
 		/// </summary>
 		[Test]
-#if NET_2_0
         [ExpectedException(typeof(ConfigurationErrorsException))]
-#else
-        [ExpectedException(typeof(ConfigurationException))]
-#endif
 		public void ContextNotOfCorrectType()
 		{
 			const string xmlData =
@@ -134,11 +130,7 @@ namespace Spring.Context.Support
 		}
 
 		[Test]
-#if NET_2_0
         [ExpectedException(typeof(ConfigurationErrorsException))]
-#else
-        [ExpectedException(typeof(ConfigurationException))]
-#endif
 		public void CreatedFromNullXmlElement()
 		{
 			ContextHandler ctxHandler = new ContextHandler();
@@ -159,11 +151,7 @@ namespace Spring.Context.Support
 			                "Default type is not the XmlApplicationContext type; it must be.");
 		}
 
-#if NET_2_0
         [ExpectedException(typeof(ConfigurationErrorsException))]
-#else
-        [ExpectedException(typeof(ConfigurationException))]
-#endif
         [Test(Description="SPRNET-105")]
 		public void ChokesIfChildContextsUseTheSameName()
 		{
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs
index 45a6e1d1..27b3437c 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs
@@ -201,7 +201,6 @@ namespace Spring.Context.Support
             Assert.AreEqual("Baia", to2.Name);
         }
 
-#if NET_2_0
         // TODO : Add support for .NET 1.x
         [Test]
         public void ClearWithConfigurationSection()
@@ -212,7 +211,6 @@ namespace Spring.Context.Support
 
             Assert.AreNotSame(ctx1, ctx2);
         }
-#endif
 
         [Test(Description = "SPRNET-105")]
         [ExpectedException(typeof(ApplicationContextException))]
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs
index f2118eb4..9169c3f0 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs
@@ -100,11 +100,7 @@ namespace Spring.Context.Support
 		}
 
 		[Test]
-#if NET_2_0
         [ExpectedException(typeof(ConfigurationErrorsException))]
-#else
-        [ExpectedException(typeof (ConfigurationException))]
-#endif
 		public void WithParserElementThatIsMissingTheTypeAttribute()
 		{
 			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
index d715d728..429a26a4 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
@@ -375,20 +375,6 @@ namespace Spring.Context.Support
             messageSource.GetMessage("MyNonExistantMessage", CultureInfo.CurrentCulture, new object[] { "Spring", ".NET" });
         }
 
-#if !NET_2_0
-		/// <summary>
-		/// Test resource whose value is null
-		/// </summary>
-		[Test]
-		public void ResourceSetMessageSourceGetNullResource()
-		{
-			messageSource.ResourceManagers = resourceManagerList;
-			object resource = messageSource.GetResourceObject("MyNullMessage", CultureInfo.InvariantCulture);
-			Assert.AreEqual(String.Empty, resource, "should've returned empty string");
-		}
-#endif
-
-#if NET_2_0
         /// <summary>
         /// Test resource whose value is null.
         /// </summary>
@@ -400,7 +386,6 @@ namespace Spring.Context.Support
             object resource = messageSource.GetResourceObject("MyNullMessage", CultureInfo.InvariantCulture);
             Assert.AreEqual(String.Empty, resource, "should've returned empty string");
         }
-#endif
 
         /// <summary>
         /// Exercise repeated requests to hit the cache of MessageSets.  Note order of test is not assured
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs
index b378612d..916f2bf7 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs
@@ -55,7 +55,6 @@ namespace Spring.Context.Support
 			Assert.AreEqual(typeof (TestObject), type, "The type alias was not registered by the TypeAliasesSectionHandler.");
 		}
 
-#if NET_2_0
         [Test]
         public void WithGenericType()
         {
@@ -80,7 +79,6 @@ namespace Spring.Context.Support
             TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
             handler.Create(null, null, BuildConfigurationSection(xml));
         }
-#endif
 
 		[Test]
 		[ExpectedException(typeof (TypeLoadException))]
@@ -179,11 +177,7 @@ namespace Spring.Context.Support
 		}
 
 		[Test]
-#if NET_2_0
         [ExpectedException(typeof(ConfigurationErrorsException))]
-#else
-        [ExpectedException(typeof (ConfigurationException))]
-#endif
 		public void WithAliasElementThatIsMissingTheNameAttribute()
 		{
 			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
@@ -196,11 +190,7 @@ namespace Spring.Context.Support
 		}
 
 		[Test]
-#if NET_2_0
         [ExpectedException(typeof(ConfigurationErrorsException))]
-#else
-        [ExpectedException(typeof (ConfigurationException))]
-#endif
 		public void WithAliasElementThatIsMissingTheTypeAttribute()
 		{
 			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
diff --git a/test/Spring/Spring.Core.Tests/Core/IO/EncodedResourceTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/EncodedResourceTests.cs
index e946d593..1c60c787 100644
--- a/test/Spring/Spring.Core.Tests/Core/IO/EncodedResourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Core/IO/EncodedResourceTests.cs
@@ -18,7 +18,6 @@
 
 #endregion
 
-using System;
 using System.IO;
 using System.Text;
 using NUnit.Framework;
@@ -52,7 +51,6 @@ namespace Spring.Core.IO
             Assert.AreEqual("test", reader.ReadToEnd());
         }
 
-#if NET_2_0
         [Test]
         public void OpensReaderWithAutoDetectEncoding()
         {
@@ -84,7 +82,7 @@ namespace Spring.Core.IO
             Assert.AreEqual(Encoding.UTF8.GetString(resourceData), actual);
             Assert.AreEqual(Encoding.UTF8.EncodingName, reader.CurrentEncoding.EncodingName);
         }
-#endif
+
         /// <summary>
         /// Returns the text bytes including the encoding's preamble (<see cref="Encoding.GetPreamble"/>), if any.
         /// </summary>
diff --git a/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs
index ff862902..f52e40ea 100644
--- a/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs
+++ b/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
@@ -99,5 +97,3 @@ namespace Spring.Core
         }
 	}
 }
-
-#endif
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs
index 91809806..99f9c49b 100644
--- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs
+++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs
@@ -18,13 +18,9 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
-using System.Data;
-
 using NUnit.Framework;
 using Spring.Objects;
 
@@ -130,5 +126,3 @@ namespace Spring.Core.TypeResolution
         }
     }
 }
-
-#endif
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs
index 1ea2f9b2..16a3d001 100644
--- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs
+++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs
@@ -24,10 +24,6 @@ using System;
 using NUnit.Framework;
 using Spring.Objects;
 
-#if NET_2_0
-using System.Collections.Generic;
-#endif
-
 #endregion
 
 namespace Spring.Core.TypeResolution
@@ -59,7 +55,6 @@ namespace Spring.Core.TypeResolution
             Assert.AreEqual(null, tah.AssemblyName);
         }
 
-#if NET_2_0
         [Test]
         public void CanTakeUnqualifiedGenericType()
         {
@@ -79,6 +74,5 @@ namespace Spring.Core.TypeResolution
             Assert.AreEqual(testType.FullName, tah.TypeName);
             Assert.AreEqual(testType.Assembly.FullName, tah.AssemblyName);
         }
-#endif
     }
-}
\ No newline at end of file
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs
index 072fbe4b..1c3db80b 100644
--- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs
+++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs
@@ -546,7 +546,6 @@ namespace Spring.Core.TypeResolution
 			                TypeRegistry.ResolveType(TypeRegistry.DoubleArrayAliasVB));
 		}
 
-#if NET_2_0
         [Test]
         public void ResolveNullableChar()
         {
@@ -722,7 +721,6 @@ namespace Spring.Core.TypeResolution
             Assert.AreEqual(typeof(double?[]),
                             TypeRegistry.ResolveType(TypeRegistry.NullableDoubleArrayAlias));
         }
-#endif
 	}
 
 	internal class Foo
diff --git a/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs b/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs
index 207c3f49..368405cd 100644
--- a/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs
+++ b/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs
@@ -24,7 +24,6 @@ using System.Collections;
 using NUnit.Framework;
 using Spring.Core;
 using Spring.Globalization.Formatters;
-using Spring.Objects;
 using Spring.Validation;
 
 namespace Spring.DataBinding
@@ -44,9 +43,7 @@ namespace Spring.DataBinding
             mgr = new BaseBindingManager();
             mgr.AddBinding("['name']", "Name");
             mgr.AddBinding("['dob']", "DOB");
-#if NET_2_0 // test nullable type
             mgr.AddBinding("['dateofgraduation']", "DateOfGraduation");
-#endif
             mgr.AddBinding("['inventions']", "Inventions");
             mgr.AddBinding("['cityOfBirth']", "PlaceOfBirth.City");
             mgr.AddBinding("['countryOfBirth']", "PlaceOfBirth.Country");
@@ -60,10 +57,9 @@ namespace Spring.DataBinding
 
             source["name"] = "Nikola Tesla";
             source["dob"] = new DateTime(1856, 7, 9);
-#if NET_2_0
+
             // I know this is pupin's graduation year but I need a date here
             source["dateofgraduation"] = new DateTime(1883,1,1);
-#endif
             source["inventions"] = new string[] {"One", "Two"};
 
             mgr.BindSourceToTarget(source, target, null);
@@ -97,10 +93,9 @@ namespace Spring.DataBinding
             source["name"] = "Nikola Tesla";
             source["dob"] = "1856-7-9";
             source["inventions"] = "One,Two";
-#if NET_2_0
+
             // I know this is pupin's graduation year but I need a date here
             source["dateofgraduation"] = "1883-1-1";
-#endif
 
             mgr.BindSourceToTarget(source, target, null);
 
@@ -125,7 +120,6 @@ namespace Spring.DataBinding
 
         }
 
-#if NET_2_0
         [Test]
         public void BindNullValues()
         {
@@ -167,7 +161,6 @@ namespace Spring.DataBinding
             mgr.BindSourceToTarget(source, target, null);
             Assert.IsNull(target.DateOfGraduation);
         }
-#endif
 
         [Test]
         public void UnhandledTypeConversionExceptionSourceToTarget()
diff --git a/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs b/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs
index d42eae65..7d334760 100644
--- a/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs
+++ b/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs
@@ -30,7 +30,6 @@ namespace Spring.DataBinding
     [TestFixture]
     public class SimpleExpressionBindingTests
     {
-#if NET_2_0
         private class BindToNullable_TestEntity
         {
             private Nullable<short> sortOrder;
@@ -46,7 +45,6 @@ namespace Spring.DataBinding
             new SimpleExpressionBinding("Text", "SortOrder").BindSourceToTarget(textBox, entity, null);
             Assert.IsNull(entity.SortOrder);
         }
-#endif
 
         [Test]
         [ExpectedException(typeof(ArgumentNullException))]
diff --git a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs
index c62cc543..b6c5eb6b 100644
--- a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs
+++ b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs
@@ -750,7 +750,6 @@ namespace Spring.Expressions
             Assert.AreEqual(typeof(ExpressionEvaluator), ExpressionEvaluator.GetValue(null, string.Format("T({0})", typeof(ExpressionEvaluator).AssemblyQualifiedName)));
         }
 
-#if NET_2_0
         /// <summary>
         /// Tests type node
         /// </summary>
@@ -787,7 +786,7 @@ namespace Spring.Expressions
         {
             Assert.AreEqual(typeof(int?[,]), ExpressionEvaluator.GetValue(null, "T(System.Nullable`1[[System.Int32, mscorlib]][,], mscorlib)"));
         }
-#endif
+
         /// <summary>
         /// Tests constructor node
         /// </summary>
@@ -1339,9 +1338,6 @@ namespace Spring.Expressions
         /// Tests LIKE operator.
         /// </summary>
         [Test]
-#if !NET_2_0
-        [ExpectedException(typeof(NotSupportedException))]
-#endif
         public void TestLikeOperator()
         {
             Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'A' like '?'"));
@@ -2084,8 +2080,6 @@ namespace Spring.Expressions
             ExpressionEvaluator.SetValue(null, "DateTime", 20);
         }
 
-#if NET_2_0
-
         /// <summary>
         /// Reproduce SPRNET-408.
         /// </summary>
@@ -2124,7 +2118,6 @@ namespace Spring.Expressions
             Assert.IsTrue((bool)ExpressionEvaluator.GetValue(test, "#root == null"));
             Assert.IsNull(ExpressionEvaluator.GetValue(test, "#root"));
         }
-#endif
 
         /// <summary>
         /// Reproduce SPRNET-462.
@@ -2980,12 +2973,10 @@ namespace Spring.Expressions
     internal class Foo
     {
         private FooType type;
-#if NET_2_0
         private Nullable<DateTime> nullableDate;
         private Nullable<Int32> nullableInt;
-#endif
-        public Foo()
-            : this(FooType.One)
+
+        public Foo() : this(FooType.One)
         {
         }
 
@@ -3031,8 +3022,6 @@ namespace Spring.Expressions
             get { return type; }
         }
 
-#if NET_2_0
-
         public DateTime? NullableDate
         {
             get { return nullableDate; }
@@ -3044,7 +3033,6 @@ namespace Spring.Expressions
             get { return nullableInt; }
             set { nullableInt = value; }
         }
-#endif
 
         public string MethodWithSimilarArguments(int flags, Bar[] bars)
         {
diff --git a/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs
index 57c3fa1b..430d85f1 100644
--- a/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs
+++ b/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs
@@ -79,7 +79,6 @@ namespace Spring.Expressions
             return string.Format("{0},{1},{2}", this.GetHashCode(), arg1, arg2);
         }
 
-#if NET_2_0
         [Category("Performance")]
         [Test, Explicit]
         public void ExecutesDelegatePerformance()
@@ -116,6 +115,5 @@ namespace Spring.Expressions
                 }
             }
         }
-#endif
     }
 }
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs
index 9bd018ac..3d0e8830 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs
@@ -426,7 +426,6 @@ namespace Spring.Objects.Factory
                 .RegisterSingleton(null, DBNull.Value);
         }
 
-#if NET_2_0
         [Test]
         public void GetSingletonNamesReflectsOrderOfRegistration()
         {
@@ -443,7 +442,6 @@ namespace Spring.Objects.Factory
             of.RegisterSingleton("B", new object());
             Assert.AreEqual(new string[] { "A", "C", "B" }, of.GetSingletonNames(typeof(object)));
         }
-#endif
 
         [Test]
         [ExpectedException(typeof(ArgumentNullException))]
@@ -674,8 +672,6 @@ namespace Spring.Objects.Factory
         }
     }
 
-
-#if NET_2_0
     [TestFixture]
     public class SPRNET_1338
     {
@@ -1031,6 +1027,4 @@ namespace Spring.Objects.Factory
         }
 
     }
-
-#endif
-}
\ No newline at end of file
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs
index cf5637ff..701e4497 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs
@@ -65,7 +65,7 @@ namespace Spring.Objects.Factory.Config
             // non-existant variable
             Assert.IsNull(vs.ResolveVariable("dummy"));
         }
-#if NET_2_0 && !NET_3_5
+#if !NET_3_5
         [Test]
         public void TestVariableResolutionFromApplicationSettingsSchema()
         {
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs
index 1e835d86..aba45986 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs
@@ -53,7 +53,6 @@ namespace Spring.Objects.Factory.Config
     </foo>
 </configuration>";
 
-#if NET_2_0
         /// <summary>
         /// Unfortunately ConfigurationManager doesn't accept uri's.
         /// </summary>
@@ -70,7 +69,6 @@ namespace Spring.Objects.Factory.Config
                 Assert.IsInstanceOf(typeof(ArgumentException), cfgex.InnerException);
             }
         }
-#endif
 
         [Test]
         public void ReadSunnyDay()
@@ -93,8 +91,6 @@ namespace Spring.Objects.Factory.Config
             string machineConfig = RuntimeEnvironment.SystemConfigurationFile;
         }
 
-#if NET_2_0
-
         [Test]
         public void GetSectionLocalSectionHandler()
         {
@@ -142,8 +138,6 @@ namespace Spring.Objects.Factory.Config
             }
         }
 
-#endif
-
         [Test]
         public void GetSectionSunnyDay()
         {
@@ -227,11 +221,7 @@ namespace Spring.Objects.Factory.Config
         }
 
         [Test]
-#if !NET_2_0
-        [ExpectedException(typeof(ConfigurationException), ExpectedMessage = "Cannot read config section 'ELNOMBRE' - section not found.")]
-#else
         [ExpectedException(typeof(ConfigurationErrorsException), ExpectedMessage = "Cannot read config section 'ELNOMBRE' - section not found.")]
-#endif
         public void TryReadFromNonExistantConfigSection()
         {
             using (Stream stream = new MemoryStream(Encoding.UTF8.GetBytes(SunnyDayXml)))
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs
index dc2a5d39..4bf5c0d7 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs
@@ -1,5 +1,3 @@
-#if NET_2_0
-
 #region License
 
 /*
@@ -51,5 +49,3 @@ namespace Spring.Objects.Factory.Config
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateObjectFactoryConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateObjectFactoryConfigurerTests.cs
index 5fb282c3..4613ff83 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateObjectFactoryConfigurerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateObjectFactoryConfigurerTests.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using NUnit.Framework;
 using Spring.Context;
 using Spring.Context.Support;
@@ -76,5 +74,3 @@ namespace Spring.Objects.Factory.Config
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryVariableSourceTests.cs
index 6ece0496..d00689a7 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryVariableSourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryVariableSourceTests.cs
@@ -123,18 +123,6 @@ namespace Spring.Objects.Factory.Config
             Assert.AreEqual("value2", dvs.ResolveVariable("key2"));
         }
 
-#if !NET_2_0
-        [Test]
-        public void Initialize_WithInlineDictionarySyntax()
-        {
-            DictionaryVariableSource dvs = new DictionaryVariableSource() { { "key1", "value1" }, { "key2", "value2" } };
-
-            Assert.AreEqual("value1", dvs.ResolveVariable("key1"));
-            Assert.AreEqual("value2", dvs.ResolveVariable("key2"));
-
-        }
-#endif
-
         [Test]
         public void Requesting_KeyNotFound_ThrowsException()
         {
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs
index a2f51563..51eeacfd 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs
@@ -38,7 +38,6 @@ namespace Spring.Objects.Factory.Config
 	[TestFixture]
 	public class MethodInvokingFactoryObjectTests
 	{
-#if NET_2_0
         [Test]
         public void InvokeGenericMethod()
         {
@@ -52,8 +51,8 @@ namespace Spring.Objects.Factory.Config
             Assert.IsNotNull(obj);
             Assert.IsTrue(obj is TestObject);
         }
-#endif
-		[Test]
+
+        [Test]
 		public void GetSingletonNonStatic()
 		{
 			TestClass1 tc1 = new TestClass1();
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs
index 6ff6233a..0008c2cc 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs
@@ -42,10 +42,8 @@ namespace Spring.Objects.Factory.Config
         {
             key = Registry.CurrentUser.CreateSubKey("RegistryVariableSourceTests");
             key.SetValue("name", "Aleks Seovic");
-#if NET_2_0 
             key.SetValue("computer_name", "%COMPUTERNAME% is the name of my computer", RegistryValueKind.ExpandString);
             key.SetValue("age", 32, RegistryValueKind.DWord);
-#endif            
 			key.SetValue("family", new string[] {"Marija", "Ana", "Nadja"});
             key.SetValue("bday", new byte[] {24, 8, 74});
 			key.Flush();
@@ -65,11 +63,9 @@ namespace Spring.Objects.Factory.Config
 
             // existing vars
             Assert.AreEqual("Aleks Seovic", rvs.ResolveVariable("name"));
-#if NET_2_0 
             Assert.AreEqual(Environment.GetEnvironmentVariable("COMPUTERNAME") + " is the name of my computer",
                             rvs.ResolveVariable("computer_name"));
             Assert.AreEqual("32", rvs.ResolveVariable("age"));
-#endif            
 			// multi_sz
 			Assert.AreEqual( "Marija,Ana,Nadja", rvs.ResolveVariable("family"));
 			// binary
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs
index 9a1f1e7b..7807dd56 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs
@@ -178,54 +178,14 @@ namespace Spring.Objects.Factory.Config
 
         private static IDisposable Record( MockRepository mocks )
         {
-#if NET_2_0
             return mocks.Record();
-#else
-            return new RecordModeChanger(mocks);
-#endif
         }
 
         private static IDisposable Playback( MockRepository mocks )
         {
-#if NET_2_0
             return mocks.Playback();
-#else
-            return new PlaybackModeChanger(mocks);
-#endif
         }
 
-#if !NET_2_0
-        private class RecordModeChanger : IDisposable
-        {
-            private MockRepository _mocks;
-
-            public RecordModeChanger(MockRepository mocks)
-            {
-                _mocks = mocks;
-            }
-
-            public void Dispose()
-            {
-                _mocks.ReplayAll();
-            }
-        }
-
-        private class PlaybackModeChanger : IDisposable
-        {
-            private MockRepository _mocks;
-
-            public PlaybackModeChanger(MockRepository mocks)
-            {
-                _mocks = mocks;
-            }
-
-            public void Dispose()
-            {
-                _mocks.VerifyAll();
-            }
-        }
-#endif
-
         #endregion Rhino.Mocks Compatibility Adapter
     }
 }
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs
index 85baa7be..45e29993 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs
@@ -162,7 +162,7 @@ namespace Spring.Objects.Factory
             IDictionary objs = lof.GetObjectsOfType(typeof(TestObject));
             Assert.AreEqual(1, objs.Count);
         }
-#if NET_2_0
+
         [Test(Description = "http://opensource2.atlassian.com/projects/spring/browse/SPRNET-112")]
         public void ObjectCreatedViaStaticGenericFactoryMethodUsesReturnTypeOfGenericFactoryMethodAsTheObjectType()
         {
@@ -188,7 +188,7 @@ namespace Spring.Objects.Factory
             IDictionary objs = lof.GetObjectsOfType(typeof(TestGenericObject<string, int>));
             Assert.AreEqual(1, objs.Count);
         }
-#endif
+
         /// <summary>
         /// Object instantiation through factory method should not require type attribute.
         /// </summary>
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs
index b84f69e2..84cf65cf 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs
@@ -75,7 +75,6 @@ namespace Spring.Objects.Factory
 			Assert.AreEqual(6, names.Count);
 		}
 
-#if NET_2_0
         [Test]
         public void ObjectNamesIncludingAncestorsPreserveOrderOfRegistration()
         {            
@@ -95,7 +94,6 @@ namespace Spring.Objects.Factory
 
             mocks.VerifyAll();
         }
-#endif
 
 		[Test]
         public void ObjectNamesForTypeIncludingAncestors()
@@ -126,7 +124,6 @@ namespace Spring.Objects.Factory
 			Assert.AreEqual(0, names.Count);
 		}
 
-#if NET_2_0
         [Test]
         public void ObjectNamesForTypeIncludingAncestorsPreserveOrderOfRegistration()
         {
@@ -169,7 +166,6 @@ namespace Spring.Objects.Factory
 
             mocks.VerifyAll();
         }
-#endif
 
 		[Test]
 		public void CountObjectsIncludingAncestorsWithNonHierarchicalFactory()
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedDictionaryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedDictionaryTests.cs
index 05cb9740..d0fdc81c 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedDictionaryTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ManagedDictionaryTests.cs
@@ -20,14 +20,11 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using NUnit.Framework;
 
 using Spring.Objects.Factory.Config;
 
-#if NET_2_0
-using System.Collections.Generic;
-#endif
-
 namespace Spring.Objects.Factory.Support
 {
     /// <summary>
@@ -102,7 +99,6 @@ namespace Spring.Objects.Factory.Support
             Assert.AreEqual("fork", mergedMap["one"]);
         }
 
-#if NET_2_0
         internal class InternalType
         {
             public string Value = "OK";
@@ -150,6 +146,5 @@ namespace Spring.Objects.Factory.Support
             Assert.AreEqual(1, resolved.Count);
             Assert.AreEqual(typeof(List<string>), resolved["key"].GetType());
         }
-#endif
     }
-}
\ No newline at end of file
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs
index 4efb39c5..e2088741 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs
@@ -719,7 +719,6 @@ namespace Spring.Objects.Factory.Xml
             Assert.IsTrue((bool)obj["3"].GetValue());
         }
 
-#if NET_2_0
         [Test]
         public void TypedGenericList()
         {
@@ -741,7 +740,6 @@ namespace Spring.Objects.Factory.Xml
             Assert.AreEqual("ALEKSANDAR SEOVIC", obj["2"].GetValue());
             Assert.IsTrue((bool)obj["3"].GetValue());
         }
-#endif
     }
 
     #region Helper classes
@@ -772,7 +770,6 @@ namespace Spring.Objects.Factory.Xml
         }
     }
 
-#if NET_2_0
     public class GenericExpressionHolder
     {
         private System.Collections.Generic.IList<IExpression> expressionsList;
@@ -798,11 +795,6 @@ namespace Spring.Objects.Factory.Xml
             get { return this.expressionsDictionary[key]; }
         }
     }
-#else
-    public class GenericExpressionHolder : NonGenericExpressionHolder
-    {}
-#endif
     
     #endregion
-    
-}
\ No newline at end of file
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs
index 98851191..d3f14717 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs
@@ -28,7 +28,6 @@ using Spring.Aop.Config;
 using Spring.Core.IO;
 using Spring.Objects.Factory.Config;
 using Spring.Objects.Factory.Support;
-using Spring.Validation;
 
 #endregion
 
@@ -68,7 +67,6 @@ namespace Spring.Objects.Factory.Xml
                     new DefaultListableObjectFactory());
             reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("/dev/null"));
         }
-#if NET_2_0
 
         [Test]
         public void AutoRegistersAllWellknownNamespaceParsers_Common()
@@ -90,10 +88,6 @@ namespace Spring.Objects.Factory.Xml
             }
         }
     
-#endif
-
-#if NET_3_0
-
         [Test]
         public void AutoRegistersAllWellknownNamespaceParsers_3_0()
         {
@@ -105,7 +99,6 @@ namespace Spring.Objects.Factory.Xml
                     string.Format("Parser for Namespace {0} could not be auto-registered.", ns));
             }
         }
-#endif
 
         [Test]
         [Ignore] //this test cannot co-exist with AutoRegistersAllWellknownNamespaceParsers b/c that test will have already loaded the Spring.Data ass'y
diff --git a/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs b/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs
index 416b8abd..a6eb6591 100644
--- a/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs
@@ -22,9 +22,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
 using System.Collections.Generic;
-#endif
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Globalization;
@@ -112,7 +110,6 @@ namespace Spring.Objects
 
         }
 
-#if NET_2_0	    
 	    public class GenericPerson
         {
             private List<string> favoriteNames = new List<string>();
@@ -143,7 +140,6 @@ namespace Spring.Objects
             }
 
         }
-#endif
 	    
         public class AltPerson
         {
diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs
index a374077a..713fc64f 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs
@@ -87,7 +87,6 @@ namespace Spring.Objects.Support
             Assert.AreEqual(27, (int)actual);
         }
 
-#if NET_2_0
         [Test]
         public void InvokeWithGenericStaticMethod()
         {
@@ -99,7 +98,6 @@ namespace Spring.Objects.Support
             Assert.IsNotNull(actual);
             Assert.AreEqual(typeof(TestObject), actual.GetType());
         }
-#endif
 
 		[Test]
 		public void InvokeWithOKArguments()
diff --git a/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs b/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs
index f9803c5f..37111cbc 100644
--- a/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs
@@ -18,11 +18,8 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
-using System;
 using System.Collections.Generic;
 
 #endregion
@@ -106,4 +103,3 @@ namespace Spring.Objects
         #endregion
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Proxy/AbstractProxyTypeBuilderTests.cs b/test/Spring/Spring.Core.Tests/Proxy/AbstractProxyTypeBuilderTests.cs
index aaac9280..73ae4aab 100644
--- a/test/Spring/Spring.Core.Tests/Proxy/AbstractProxyTypeBuilderTests.cs
+++ b/test/Spring/Spring.Core.Tests/Proxy/AbstractProxyTypeBuilderTests.cs
@@ -282,10 +282,6 @@ namespace Spring.Proxy
 #if !MONO
         // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=94803
         [Test]
-#if !NET_2_0
-        [Ignore("GetCustomAttributes() does not return SecurityAttribute in .NET 1.x")]
-#endif
-
         public void ProxySecurityAttribute()
         {
             IProxyTypeBuilder builder = GetProxyBuilder();
@@ -473,7 +469,6 @@ namespace Spring.Proxy
             Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's parameter.");
         }
 
-#if NET_2_0
         [Test]
         public void ProxyTargetMethodReturnValueAttributes()
         {
@@ -670,7 +665,6 @@ namespace Spring.Proxy
         }
 
         #endregion
-#endif
 
         protected abstract IProxyTypeBuilder GetProxyBuilder();
 
diff --git a/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs b/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs
index 2235cd79..464a343e 100644
--- a/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs
+++ b/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs
@@ -274,7 +274,6 @@ namespace Spring.Proxy
             Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's parameter.");
         }
 
-#if NET_2_0
         [Test]
         public void ProxyTargetVirtualMethodReturnValueAttributes()
         {
@@ -321,7 +320,6 @@ namespace Spring.Proxy
             Assert.IsNotNull(attrs);
             Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's return value.");
         }
-#endif
 
         protected override IProxyTypeBuilder GetProxyBuilder()
         {
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs
index a937c371..0c0ad558 100644
--- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs
@@ -127,7 +127,6 @@ namespace Spring.Reflection.Dynamic
             Assert.AreEqual("here we go...", myProperty.GetValue(null));
         }
 
-#if NET_2_0
         [Test, Ignore("test N/A anymore due to System.Reflection.Emit.DynamicMethod")]
         [ExpectedException(typeof(MethodAccessException))]
         public void TestForRestrictiveGetter()
@@ -164,7 +163,6 @@ namespace Spring.Reflection.Dynamic
             //this should never execute
             Assert.AreEqual(123, second.GetValue(something));
         }
-#endif
 
         #region Performance tests
 
@@ -341,7 +339,6 @@ namespace Spring.Reflection.Dynamic
         }
     }
 
-#if NET_2_0
     public class Something
     {
         public int First
@@ -372,7 +369,4 @@ namespace Spring.Reflection.Dynamic
         private int third;
 
     }
-#endif
-
 }
-
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs
index 503feb1e..30bb0226 100644
--- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs
@@ -132,9 +132,6 @@ namespace Spring.Reflection.Dynamic
             Assert.AreEqual(s1, s2);
         }
 
-
-#if NET_2_0
-
         [Test]
         public void CanReadPrivateReadOnlyField()
         {
@@ -165,7 +162,6 @@ namespace Spring.Reflection.Dynamic
                 Assert.IsTrue( sex.Message.IndexOf("ReflectionPermission") > -1 );
             }
         }
-#endif
 
         [Test]
         public void CannotSetStaticReadOnlyField()
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs
index 2e44c1a1..2bd73cd9 100644
--- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs
@@ -83,7 +83,6 @@ namespace Spring.Reflection.Dynamic
 
         #endregion
 
-#if NET_2_0
         private string RespectsPermissionsPrivateMethod()
         {
             return "Result";
@@ -131,7 +130,6 @@ namespace Spring.Reflection.Dynamic
             catch (MethodAccessException)
             { }
         }
-#endif
 
         [Test]
         public void TestInstanceMethods()
@@ -159,8 +157,6 @@ namespace Spring.Reflection.Dynamic
             Assert.IsFalse((bool)isNullOrEmpty.Invoke(null, new object[] { "Ana Maria" }));
         }
 
-#if NET_2_0
-
         internal class TheClassAsArgument { }
 
         internal class TheClassDerivedFromTheArgumentClass : TheClassAsArgument { }
@@ -192,7 +188,7 @@ namespace Spring.Reflection.Dynamic
 
             Assert.AreEqual(dt, dm.Invoke(null, dt));
         }
-#endif
+
         [Test]
         public void PassInvalidNumberOfArguments()
         {
@@ -340,7 +336,7 @@ namespace Spring.Reflection.Dynamic
             {
                 return arg;
             }
-#if NET_2_0
+
             public static object Invoke(object target, object[] args)
             {
                 return PassNullableArgumentStatic((DateTime?)(args[0]));
@@ -355,7 +351,6 @@ namespace Spring.Reflection.Dynamic
             {
                 return arg;
             }
-#endif
         }
         #endregion
     }
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs
index c225572c..5e1c5201 100644
--- a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs
@@ -25,7 +25,6 @@ using System.CodeDom.Compiler;
 using System.IO;
 using System.Reflection;
 using System.Text;
-using Microsoft.VisualBasic;
 using NUnit.Framework;
 using Spring.Util;
 
@@ -109,7 +108,6 @@ namespace Spring.Reflection.Dynamic
             Assert.AreEqual("Arg3", ThisArg2.GetValue(o));
         }
 
-#if NET_2_0
         [Test]
         public void TestForRestrictiveSetterWithSafeWrapper()
         {
@@ -143,7 +141,6 @@ namespace Spring.Reflection.Dynamic
             //this should not cause MethodAccessException, "first" is createtd using "CreateSafe"
             Assert.AreEqual(123, first.GetValue(something));
         }	
-#endif
 
         #region VB TestClass Code
 
@@ -166,14 +163,10 @@ namespace Spring.Reflection.Dynamic
                 args.GenerateInMemory = true;
                 args.GenerateExecutable = false;
                 args.IncludeDebugInformation = true;
-#if NET_2_0
+
                 CodeDomProvider provider = CodeDomProvider.CreateProvider( "VisualBasic" );
                 CompilerResults results = provider.CompileAssemblyFromSource( args, vbSourceCode );
-#else
-                CodeDomProvider provider = new VBCodeProvider();
-                ICodeCompiler compiler = provider.CreateCompiler();
-                CompilerResults results = compiler.CompileAssemblyFromSource( args, vbSourceCode );
-#endif
+
                 if (results.Errors.HasErrors)
                 {
                     StringBuilder sb = new StringBuilder();
diff --git a/test/Spring/Spring.Core.Tests/SecurityTemplate.cs b/test/Spring/Spring.Core.Tests/SecurityTemplate.cs
index 5500d111..28417310 100644
--- a/test/Spring/Spring.Core.Tests/SecurityTemplate.cs
+++ b/test/Spring/Spring.Core.Tests/SecurityTemplate.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 using System;
 using System.Configuration;
 using System.Data.SqlClient;
@@ -161,9 +159,7 @@ namespace Spring
                 securityPermissionFlag |= SecurityPermissionFlag.UnmanagedCode;
             }
             mediumTrustPermissionSet.AddPermission(new SecurityPermission(securityPermissionFlag));
-#if NET_2_0
             mediumTrustPermissionSet.AddPermission(new System.Net.Mail.SmtpPermission(System.Net.Mail.SmtpAccess.Connect));
-#endif
             mediumTrustPermissionSet.AddPermission(new SqlClientPermission(PermissionState.Unrestricted));
             mediumTrustPermissionSet.AddPermission(new WebPermission());
             pLevel.AddNamedPermissionSet(mediumTrustPermissionSet);
@@ -521,5 +517,3 @@ namespace Spring
 //        }
     }
 }
-
-#endif
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
index ad8eee70..6f6fff2c 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
@@ -22,7 +22,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Core.Tests\Debug\</OutputPath>
diff --git a/test/Spring/Spring.Core.Tests/TestResourceLoader.cs b/test/Spring/Spring.Core.Tests/TestResourceLoader.cs
index a578194d..93ccb3c9 100644
--- a/test/Spring/Spring.Core.Tests/TestResourceLoader.cs
+++ b/test/Spring/Spring.Core.Tests/TestResourceLoader.cs
@@ -111,15 +111,9 @@ namespace Spring
             using (Stream stm = GetStream(context, ext))
             {
 
-#if !NET_2_0
-                XmlValidatingReader validatingReader = new XmlValidatingReader(stm, XmlNodeType.Document, null);
-                validatingReader.ValidationType = ValidationType.Schema;
-                XmlSchemaCollection schemas = validatingReader.Schemas;
-#else
                 XmlReaderSettings settings = new XmlReaderSettings();
                 settings.ValidationType = ValidationType.Schema;
                 XmlSchemaSet schemas = settings.Schemas;
-#endif
 
                 foreach (IResource schemaResource in schemaResources)
                 {
@@ -133,9 +127,7 @@ namespace Spring
                     schemas.Add(targetNamespace, new XmlNodeReader(schemaDoc));
                 }
 
-#if NET_2_0
                 XmlReader validatingReader = XmlReader.Create(stm, settings);
-#endif
                 XmlDocument xmlDoc = new XmlDocument();
                 xmlDoc.Load(validatingReader);
                 validatingReader.Close();
diff --git a/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs b/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs
index 283b491c..8d792fb6 100644
--- a/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs
+++ b/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs
@@ -45,7 +45,6 @@ namespace Spring.Util
             Assert.AreEqual("Iron Brew", dude.Soda); // should have got through before exception was thrown
         }
 
-#if NET_2_0
         [Test]
         public void RaiseSwallowsExceptionRaisedByHandlerButCallsAllOtherHandlers()
         {
@@ -68,6 +67,5 @@ namespace Spring.Util
             Assert.IsTrue(secondCall);
             Assert.IsTrue(thirdCall);
         }
-#endif
     }
 }
diff --git a/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs
index 3017e863..81d3d8ac 100644
--- a/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs
+++ b/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs
@@ -169,28 +169,8 @@ namespace Spring.Util
         public void BitwiseOr()
         {
             Assert.AreEqual( ((Byte)2) | ((Byte)3), NumberUtils.BitwiseOr((Byte)2, (Byte)3));
-#if NET_2_0
             Assert.AreEqual(((SByte)2) | ((SByte)3), NumberUtils.BitwiseOr((SByte)2, (SByte)3));
-#else
-            try
-            {
-                NumberUtils.BitwiseOr((SByte)2, (SByte)3);
-                Assert.Fail();
-            }
-            catch (ArgumentException)
-            { }
-#endif
-#if NET_2_0
             Assert.AreEqual(((Int16)2) | ((Int16)3), NumberUtils.BitwiseOr((Int16)2, (Int16)3));
-#else
-            try 
-            {
-                NumberUtils.BitwiseOr((Int16) 2, (Int16) 3); 
-                Assert.Fail();
-            } 
-            catch(ArgumentException)
-            {}
-#endif
             Assert.AreEqual(((UInt16)2) | ((UInt16)3), NumberUtils.BitwiseOr((UInt16)2, (UInt16)3));
             Assert.AreEqual(((Int32)2) | ((Int32)3), NumberUtils.BitwiseOr((Int32)2, (Int32)3));
             Assert.AreEqual(((UInt32)2) | ((UInt32)3), NumberUtils.BitwiseOr((UInt32)2, (UInt32)3));
diff --git a/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs
index f2ebb57a..863b312f 100644
--- a/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs
+++ b/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs
@@ -22,16 +22,12 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
 using System.Collections.Generic;
-#endif
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Security.Policy;
 using NUnit.Framework;
 using Spring.Objects;
-using Spring.Objects.Factory;
-using Spring.Util;
 
 #endregion
 
@@ -134,7 +130,6 @@ namespace Spring.Util
             }
         }
 
-#if NET_2_0
         [Test]
         [ExpectedException(typeof(FatalReflectionException))]
         public void InstantiateTypeWithOpenGenericType()
@@ -147,7 +142,6 @@ namespace Spring.Util
         {
 //            ObjectUtils.InstantiateType(typeof(Dictionary<string, int>), new object[] { new object() } );
         }
-#endif
 
         [Test]
         [ExpectedException(typeof(FatalReflectionException))]
diff --git a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs
index cf3c275e..bc8d1218 100644
--- a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs
+++ b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs
@@ -53,7 +53,6 @@ namespace Spring.Util
 			Assert.AreEqual(i1, i2);
 		}
 
-#if NET_2_0
 		[Test]
 		public void MediumTrustAllowsCopyingBetweenTypesFromSameModule()
 		{
@@ -92,7 +91,6 @@ namespace Spring.Util
                 ReflectionUtils.MemberwiseCopy(a, b);
             }
         }
-#endif
     }
 	
 	#region Test Support Classes
diff --git a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs
index 0a19184d..a9989224 100644
--- a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs
+++ b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs
@@ -36,9 +36,7 @@ using Spring.Objects.Factory.Attributes;
 
 #endregion
 
-#if NET_2_0
 [assembly: InternalsVisibleTo("ReflectionUtils.IsTypeVisible.AssemblyTestName")]
-#endif
 
 namespace Spring.Util
 {
@@ -227,12 +225,9 @@ namespace Spring.Util
             {
             }
 
-#if NET_2_0
-
             public void MethodWithNullableIntegerArg(int? nullableInteger)
             {
             }
-#endif
         }
 
         #endregion
@@ -546,7 +541,7 @@ namespace Spring.Util
 
             // TODO : actually emit the attribute and check it...
         }
-#if NET_2_0
+
         [Test]
         public void CreatCustomAttriubtesFromCustomAttributeData()
         {
@@ -641,7 +636,6 @@ namespace Spring.Util
             }
         }
 
-
         internal class TestClassHavingAttributeWithEnumArraySetInConstructor : IHaveSomeMethod
         {
 
@@ -736,8 +730,6 @@ namespace Spring.Util
 
         }
 
-
-#endif
         [Test]
         public void CreateCustomAttributeUsingDefaultValuesForTheConstructor()
         {
@@ -926,8 +918,6 @@ namespace Spring.Util
             Assert.AreSame(candidateMethods[1], resolvedMethod);
         }
 
-#if NET_2_0
-
         [Test]
         public void GetMethodByArgumentValuesMatchesNullableArgs()
         {
@@ -957,8 +947,6 @@ namespace Spring.Util
             Assert.AreSame(candidateMethods[3], resolvedMethod);
         }
 
-#endif
-
         [Test]
         public void GetConstructorByArgumentValuesResolvesToExactMatchIfAvailable()
         {
@@ -1104,7 +1092,6 @@ namespace Spring.Util
             Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
         }
 
-#if NET_2_0
         private static readonly string FRIENDLY_ASSEMBLY_NAME = "ReflectionUtils.IsTypeVisible.AssemblyTestName";
 
         [Test]
@@ -1205,9 +1192,6 @@ namespace Spring.Util
             Assert.That(ReflectionUtils.IsNullableType(type), Is.False);
         }
 
-
-#endif
-
         [Test]
         public void GetCustomAttributesOnType()
         {
@@ -1268,7 +1252,6 @@ namespace Spring.Util
             Assert.AreEqual(ex, appEx);
         }
 
-#if NET_2_0
         [Test]
         public void CanGetFriendlyNamesForGenericTypes()
         {
@@ -1276,7 +1259,7 @@ namespace Spring.Util
 
             Assert.AreEqual("System.Collections.Generic.List<System.Collections.Generic.Dictionary<string, int>>", ReflectionUtils.GetTypeFriendlyName(t));
         }
-#endif
+
         #endregion
 
         #region Helper Methods
@@ -1520,12 +1503,11 @@ namespace Spring.Util
         {
             return "AssignableMatch";
         }
-#if NET_2_0
+
         public string MethodWithNullableArgument(int? nullableInteger)
         {
             return "NullableArgumentMatch";
         }
-#endif
     }
 
     public sealed class MyCustomAttribute : Attribute
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs
index 376f5290..cf865956 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs
@@ -1,4 +1,3 @@
-#if NET_2_0
 #region License
 
 /*
@@ -265,4 +264,3 @@ namespace Spring.Data
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs
index d1098841..1c6a8ec7 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs
@@ -19,8 +19,6 @@
 #endregion
 
 
-#if NET_2_0
-
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -125,4 +123,3 @@ namespace Spring.Data.Generic
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs
index 7faa5cda..d23b258e 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs
@@ -19,8 +19,6 @@
 #endregion
 
 
-#if NET_2_0
-
 using System.Collections.Generic;
 using Spring.Objects;
 
@@ -31,5 +29,3 @@ namespace Spring.Data.Generic
         IList<TestObject> FindAll();
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs
index e45c9114..734e3ee0 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs
@@ -19,8 +19,6 @@
 #endregion
 
 
-#if NET_2_0
-
 using System.Collections.Generic;
 using System.Data;
 using Spring.Objects;
@@ -51,5 +49,3 @@ namespace Spring.Data.Generic
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs
index 28f9612c..189c09fa 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs
@@ -19,11 +19,8 @@
 #endregion
 
 
-#if NET_2_0
-
 using System.Data;
 using Spring.Objects;
-using Spring.Data.Generic;
 
 namespace Spring.Data.Generic
 {
@@ -47,5 +44,3 @@ namespace Spring.Data.Generic
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs
index e91d6e18..b7bfe6a9 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs
@@ -18,8 +18,6 @@
 
 #endregion
 
-#if NET_2_0
-
 #region Imports
 
 using System;
@@ -171,4 +169,3 @@ namespace Spring.Data
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs
index 3a74b806..f58027e5 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs
@@ -19,8 +19,6 @@
 #endregion
 
 
-#if NET_2_0
-
 #region Imports
 
 using System;
@@ -30,7 +28,6 @@ using System.Reflection;
 using NUnit.Framework;
 using Spring.Data.Common;
 using Spring.Data.Generic;
-using Spring.Data.Objects.Generic;
 using Spring.Objects;
 
 #endregion
@@ -175,5 +172,3 @@ namespace Spring.Data.Objects.Generic
 
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs
index 343164db..771ac065 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs
@@ -19,8 +19,6 @@
 #endregion
 
 
-#if NET_2_0
-
 using System;
 using System.Data;
 using Spring.Data.Generic;
@@ -49,5 +47,3 @@ namespace Spring.Data.Objects.Generic
         }
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs
index 338c5502..fbaa45b8 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs
@@ -18,12 +18,11 @@
 
 #endregion
 
-#if NET_2_0 && !MONO
+#if !MONO
 
 #region Imports
 
 using System;
-//using System.Collections;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
@@ -33,7 +32,6 @@ using NUnit.Framework;
 using Spring.Data.Common;
 using Spring.Data.Generic;
 using Spring.Data.Objects;
-//using Sybase.Data.AseClient;
 
 #endregion
 
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs
index a4c35ea0..b879d6a4 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs
@@ -18,20 +18,15 @@
 
 #endregion
 
-#if NET_2_0
 #region Imports
 
 using System;
 using System.Data.SqlClient;
 using System.Transactions;
 using NUnit.Framework;
-using Spring.Aop.Config;
 using Spring.Context;
 using Spring.Context.Support;
-using Spring.Data.Config;
 using Spring.Objects;
-using Spring.Objects.Factory.Xml;
-using Spring.Transaction.Config;
 
 #endregion
 
@@ -94,4 +89,3 @@ namespace Spring.Data
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj
index db5fb50b..e7fb4673 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj
@@ -22,7 +22,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.Integration.Tests\Debug\</OutputPath>
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs
index bcf3953b..245eefb0 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs
@@ -88,13 +88,9 @@ namespace Spring.Data.NHibernate
 
             ISessionFactory sf = ctx["SessionFactory"] as ISessionFactory;
             IDbProvider dbProvider = SessionFactoryUtils.GetDbProvider(sf);
-#if NET_2_0            
+
             Assert.AreEqual("Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0",
                                 dbProvider.DbMetadata.ProductName);
-#else
-            Assert.AreEqual("Microsoft SQL Server, provider V1.0.5000.0 in framework .NET V1.1",
-                    dbProvider.DbMetadata.ProductName);
-#endif            
         }
 
 	    
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2008.csproj
index da4d7d75..8a61c091 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2008.csproj
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2010.csproj
index d52b0498..03127d4c 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2010.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2008.csproj
index e55c941d..1c774c2c 100644
--- a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2008.csproj
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate.Tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build
index 503380e4..b92caaf3 100644
--- a/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build
@@ -38,11 +38,10 @@
         <include name="System.Data.dll" />
         <include name="System.EnterpriseServices.dll" />
         <include name="*.dll" />
-        <include name="Spring.Data.NHibernate20.dll" />
-        <exclude name="Spring.Data.NHibernate.dll" />
-        <exclude name="Spring.Data.NHibernate12*.dll" />
-        <exclude name="Spring.Data.NHibernate21*.dll" />
-        <exclude name="Spring.Data.NHibernate*.Tests.dll" />
+		<exclude name="Spring.Data.NHibernate1*.dll" />
+		<exclude name="Spring.Data.NHibernate21*.dll" />
+		<exclude name="Spring.Data.NHibernate3*.dll" />
+		<exclude name="Spring.Data.NHibernate*Tests*.dll" />
 		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
       </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
diff --git a/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2010.csproj
index 590b9fe5..c5d2947b 100644
--- a/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2010.csproj
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate20.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NH_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate20.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0,NH_2_0</DefineConstants>
+    <DefineConstants>TRACE;NH_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build b/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build
index 8570c3b2..a50a24d4 100644
--- a/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build
@@ -39,11 +39,10 @@
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
 				<include name="*.dll" />
-				<include name="Spring.Data.NHibernate20.dll" />
-				<exclude name="Spring.Data.NHibernate.dll" />
-				<exclude name="Spring.Data.NHibernate12*.dll" />
+				<exclude name="Spring.Data.NHibernate1*.dll" />
 				<exclude name="Spring.Data.NHibernate21*.dll" />
-				<exclude name="Spring.Data.NHibernate*.Tests.dll" />
+				<exclude name="Spring.Data.NHibernate3*.dll" />
+				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
 				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build
index 0874bffa..46216742 100644
--- a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.build
@@ -38,11 +38,10 @@
         <include name="System.Data.dll" />
         <include name="System.EnterpriseServices.dll" />
         <include name="*.dll" />
-        <include name="Spring.Data.NHibernate21.dll" />
-        <exclude name="Spring.Data.NHibernate.dll" />
-        <exclude name="Spring.Data.NHibernate12*.dll" />
-        <exclude name="Spring.Data.NHibernate20*.dll" />
-        <exclude name="Spring.Data.NHibernate*.Tests.dll" />
+		<exclude name="Spring.Data.NHibernate1*.dll" />
+		<exclude name="Spring.Data.NHibernate20*.dll" />
+		<exclude name="Spring.Data.NHibernate3*.dll" />
+		<exclude name="Spring.Data.NHibernate*Tests*.dll" />
 		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
       </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build
index c6b20170..79767e80 100644
--- a/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.build
@@ -39,10 +39,10 @@
         <include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
 				<include name="*.dll" />
-        <include name="Spring.Data.NHibernate21.dll" />
-        <exclude name="Spring.Data.NHibernate.dll" />
-        <exclude name="Spring.Data.NHibernate12*.dll" />
-        <exclude name="Spring.Data.NHibernate20*.dll" />
+				<exclude name="Spring.Data.NHibernate1*.dll" />
+				<exclude name="Spring.Data.NHibernate20*.dll" />
+				<exclude name="Spring.Data.NHibernate3*.dll" />
+				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
 				<exclude name="Spring.Data.NHibernate*.Tests.dll" />
 				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
 			</references>
diff --git a/test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.2010.csproj
index c800a062..b3234f41 100644
--- a/test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Data.NHibernate30.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.build
index 138557b8..50fa6e78 100644
--- a/test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate30.Integration.Tests/Spring.Data.NHibernate30.Integration.Tests.build
@@ -32,11 +32,11 @@
 				<include name="NHibernate.dll" />
 				<include name="*.dll" />
 				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate.Tests.dll" />
-				<exclude name="Spring.Data.NHibernate.dll" />
-				<exclude name="Spring.Data.NHibernate12.dll" />
-				<exclude name="Spring.Data.NHibernate20.dll" />
-				<exclude name="Spring.Data.NHibernate21.dll" />
+				<exclude name="Spring.Data.NHibernate1*.dll" />
+				<exclude name="Spring.Data.NHibernate2*.dll" />
+				<exclude name="Spring.Data.NHibernate31*.dll" />
+				<exclude name="Spring.Data.NHibernate32*.dll" />
+				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
 				<exclude name="CloverRuntime.dll" />
 				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
 			</references>
diff --git a/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2008.csproj
index 49a3b1f5..fcff0e5b 100644
--- a/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2008.csproj
+++ b/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2008.csproj
@@ -23,7 +23,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate30.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0,NET_2_1</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2010.csproj
index 758ecdcf..321e0de7 100644
--- a/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2010.csproj
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate30.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0,NET_2_1</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.build b/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.build
index 074db797..a96acb3e 100644
--- a/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.build
@@ -32,10 +32,11 @@
 				<include name="NHibernate.dll" />
 				<include name="*.dll" />
 				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate.dll" />
-				<exclude name="Spring.Data.NHibernate12.dll" />
-				<exclude name="Spring.Data.NHibernate20.dll" />
-				<exclude name="Spring.Data.NHibernate21.dll" />
+				<exclude name="Spring.Data.NHibernate1*.dll" />
+				<exclude name="Spring.Data.NHibernate2*.dll" />
+				<exclude name="Spring.Data.NHibernate31*.dll" />
+				<exclude name="Spring.Data.NHibernate32*.dll" />
+				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
 				<exclude name="CloverRuntime.dll" />
 				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
 			</references>
diff --git a/test/Spring/Spring.Data.NHibernate31.Integration.Tests/Spring.Data.NHibernate31.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate31.Integration.Tests/Spring.Data.NHibernate31.Integration.Tests.build
index f0f56044..516a331f 100644
--- a/test/Spring/Spring.Data.NHibernate31.Integration.Tests/Spring.Data.NHibernate31.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate31.Integration.Tests/Spring.Data.NHibernate31.Integration.Tests.build
@@ -32,11 +32,11 @@
 				<include name="NHibernate.dll" />
 				<include name="*.dll" />
 				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate.Tests.dll" />
-				<exclude name="Spring.Data.NHibernate.dll" />
-				<exclude name="Spring.Data.NHibernate12.dll" />
-				<exclude name="Spring.Data.NHibernate20.dll" />
-				<exclude name="Spring.Data.NHibernate21.dll" />
+				<exclude name="Spring.Data.NHibernate1*.dll" />
+				<exclude name="Spring.Data.NHibernate2*.dll" />
+				<exclude name="Spring.Data.NHibernate30*.dll" />
+				<exclude name="Spring.Data.NHibernate32*.dll" />
+				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
 				<exclude name="CloverRuntime.dll" />
 				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
 			</references>
diff --git a/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.2008.csproj
index 56d9506d..9367aa77 100644
--- a/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.2008.csproj
+++ b/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.2008.csproj
@@ -23,7 +23,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate31.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0,NET_2_1</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0,NET_2_0,NH_2_0,NH_2_1</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.2010.csproj
index ae0338d5..d2673413 100644
--- a/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.2010.csproj
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate31.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0,NET_2_1</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.build b/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.build
index ed6e9894..d0842320 100644
--- a/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate31.Tests/Spring.Data.NHibernate31.Tests.build
@@ -32,10 +32,11 @@
 				<include name="NHibernate.dll" />
 				<include name="*.dll" />
 				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate.dll" />
-				<exclude name="Spring.Data.NHibernate12.dll" />
-				<exclude name="Spring.Data.NHibernate20.dll" />
-				<exclude name="Spring.Data.NHibernate21.dll" />
+				<exclude name="Spring.Data.NHibernate1*.dll" />
+				<exclude name="Spring.Data.NHibernate2*.dll" />
+				<exclude name="Spring.Data.NHibernate30*.dll" />
+				<exclude name="Spring.Data.NHibernate32*.dll" />
+				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
 				<exclude name="CloverRuntime.dll" />
 				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
 			</references>
diff --git a/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build
index c2528203..44391d29 100644
--- a/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build
@@ -32,11 +32,11 @@
 				<include name="NHibernate.dll" />
 				<include name="*.dll" />
 				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate.Tests.dll" />
-				<exclude name="Spring.Data.NHibernate.dll" />
-				<exclude name="Spring.Data.NHibernate12.dll" />
-				<exclude name="Spring.Data.NHibernate20.dll" />
-				<exclude name="Spring.Data.NHibernate21.dll" />
+				<exclude name="Spring.Data.NHibernate1*.dll" />
+				<exclude name="Spring.Data.NHibernate2*.dll" />
+				<exclude name="Spring.Data.NHibernate30*.dll" />
+				<exclude name="Spring.Data.NHibernate31*.dll" />
+				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
 				<exclude name="CloverRuntime.dll" />
 				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
 			</references>
diff --git a/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2008.csproj
index 65c128bf..0f4daed2 100644
--- a/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2008.csproj
+++ b/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2008.csproj
@@ -23,7 +23,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0,NET_2_1</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0,NET_2_0,NH_2_0,NH_2_1</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2010.csproj
index e6782109..25d71273 100644
--- a/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2010.csproj
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate32.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0,NET_2_1</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build b/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build
index dfe3973d..873067f3 100644
--- a/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build
@@ -32,10 +32,11 @@
 				<include name="NHibernate.dll" />
 				<include name="*.dll" />
 				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate.dll" />
-				<exclude name="Spring.Data.NHibernate12.dll" />
-				<exclude name="Spring.Data.NHibernate20.dll" />
-				<exclude name="Spring.Data.NHibernate21.dll" />
+				<exclude name="Spring.Data.NHibernate1*.dll" />
+				<exclude name="Spring.Data.NHibernate2*.dll" />
+				<exclude name="Spring.Data.NHibernate30*.dll" />
+				<exclude name="Spring.Data.NHibernate31*.dll" />
+				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
 				<exclude name="CloverRuntime.dll" />
 				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
 			</references>
diff --git a/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs b/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs
index 14c9a769..a42f4ab9 100644
--- a/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs
+++ b/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs
@@ -18,11 +18,9 @@
 
 #endregion
 
-#if (NET_2_0)
 #region Imports
 
 using System.Data;
-using System.Data.OracleClient;
 using NUnit.Framework;
 
 #endregion
@@ -72,4 +70,3 @@ namespace Spring.Data.Common
 
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs b/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs
index 25f0d869..5263ac65 100644
--- a/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs
+++ b/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs
@@ -74,8 +74,6 @@ namespace Spring.Data.Common
             ctx = new XmlApplicationContext("assembly://Spring.Data.Tests/Spring.Data.Common/DbProviderFactoryTests.xml");
         }
 
-#if NET_2_0   
-     
         [Test]
         public void ThreadSafety()
         {
@@ -154,7 +152,6 @@ namespace Spring.Data.Common
             Assert.IsNotNull(provider.CreateParameter());
             Assert.AreEqual(":Foo", provider.CreateParameterName("Foo"));
         }
-#endif
 
 #if NET_4_0
        
diff --git a/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs
index 9c26fd59..1ac46e7d 100644
--- a/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs
+++ b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs
@@ -1,5 +1,3 @@
-#if NET_2_0
-
 #region License
 
 /*
@@ -22,11 +20,8 @@
 
 #region Imports
 
-using System.Reflection;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Spring.Data.Core;
-using Spring.Objects;
 using Spring.Transaction;
 using Spring.Transaction.Support;
 
@@ -152,4 +147,3 @@ namespace Spring.Data.Core
 
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs
index 47bab5a3..34004da9 100644
--- a/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs
+++ b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs
@@ -1,5 +1,3 @@
-#if NET_2_0
-
 #region License
 
 /*
@@ -192,4 +190,3 @@ namespace Spring.Data.Core
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj
index c47162df..7f2d3d81 100644
--- a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj
+++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj
@@ -20,7 +20,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Spring</RootNamespace>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.Tests\Debug\</OutputPath>
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
index c4b12bd6..3a69050d 100644
--- a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
+++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
@@ -11,9 +11,6 @@
  -->
 	<target name="build">
 		<!-- build Spring.Data.Tests -->
-		<!-- use .NET 3.5 compiler for tests to allow lambdas etc -->
-		<property name="temp.nant.settings.currentframework" value="${nant.settings.currentframework}" />
-		<property name="nant.settings.currentframework" value="net-3.5" if="${nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-3.0'}" />
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -45,9 +42,6 @@
 			</references>
 		</csc>
 
-		<!-- restore old framework setting -->
-		<property name="nant.settings.currentframework" value="${temp.nant.settings.currentframework}" />
-
 		<copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
                       tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
 	</target>
diff --git a/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs b/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs
index b0ab0f78..5a6b1412 100644
--- a/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs
+++ b/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs
@@ -98,7 +98,6 @@ namespace Spring.Support
 
         public bool IsDataAccessException(Exception e)
         {
-#if NET_2_0
             if (e is System.Data.Common.DbException)
             {
                 return true;
@@ -107,9 +106,6 @@ namespace Spring.Support
             {
                 return false;
             }
-#else       
-            return IsDataAccessExceptionBCL11(e);
-#endif
         }
 
 	    public bool IsDataAccessExceptionBCL11(Exception e)
diff --git a/test/Spring/Spring.Data.Tests/Transaction/CommonTypes.cs b/test/Spring/Spring.Data.Tests/Transaction/CommonTypes.cs
index c094dc8c..3de383cd 100644
--- a/test/Spring/Spring.Data.Tests/Transaction/CommonTypes.cs
+++ b/test/Spring/Spring.Data.Tests/Transaction/CommonTypes.cs
@@ -171,11 +171,9 @@ namespace Spring.Transaction
 		private TransactionPropagation _transactionPropagation = TransactionPropagation.NotSupported;
 		private bool _readOnly = false;
         private string _name = null;
-#if NET_2_0
         private System.Transactions.EnterpriseServicesInteropOption _esInteropOption;
 
-#endif
-		#region ITransactionDefinition Members
+        #region ITransactionDefinition Members
 
 		public bool ReadOnly
 		{
@@ -229,14 +227,11 @@ namespace Spring.Transaction
             }
         }
 
-
-#if NET_2_0
         public System.Transactions.EnterpriseServicesInteropOption EnterpriseServicesInteropOption
         {
             get { return _esInteropOption; }
             set { _esInteropOption = value; }
         }
-#endif
 
 		#endregion
 
diff --git a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.csproj b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.csproj
index 0a6fe1ce..8223f590 100644
--- a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.csproj
+++ b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging.Ems.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkSubset>
     </TargetFrameworkSubset>
diff --git a/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2010.csproj b/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2010.csproj
index 175a598b..e3e65eae 100644
--- a/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2010.csproj
+++ b/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2010.csproj
@@ -15,7 +15,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>http://localhost/Spring.Messaging.Ems.Tests/</PublishUrl>
     <Install>true</Install>
diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.csproj b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.csproj
index c9ebca8b..a6d84f35 100644
--- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.csproj
+++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging.Nms.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkSubset>
     </TargetFrameworkSubset>
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs
index 0b0eee5b..404221f7 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs
@@ -20,11 +20,9 @@
 
 #region Imports
 
-using System;
 using Apache.NMS;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Spring.Messaging.Nms.Connections;
 using Spring.Messaging.Nms.Core;
 using Spring.Transaction;
 using Spring.Transaction.Support;
@@ -96,7 +94,6 @@ namespace Spring.Messaging.Nms.Connections
         /**
          * TODO because using anonymous delegates - refactor to support .net 1.1 later.
          */
-#if NET_2_0
         [Test]
         public void ParticipatingTransactionWithCommit()
         {
@@ -262,7 +259,6 @@ namespace Spring.Messaging.Nms.Connections
             mocks.VerifyAll();
 
         }
-#endif
 
         private static void SetupRollbackExpectations(IConnection connection, IConnectionFactory connectionFactory, ISession session)
         {
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj
index 4e6a5f12..3bafbba3 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging.Nms.Tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs
index efa91289..6ee7ffb5 100644
--- a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs
+++ b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs
@@ -51,9 +51,6 @@ namespace Spring.Messaging.Core
             base.SetUp();
         }
 
-
-
-#if NET_2_0 || NET_3_0
         [Test]
         public void MessageCreator()
         {
@@ -82,8 +79,6 @@ namespace Spring.Messaging.Core
 
         }
 
-
-#endif
         public class SimpleCreator
         {
             public MessageQueue CreateQueue()
@@ -92,8 +87,6 @@ namespace Spring.Messaging.Core
             }
         }
   
-        
-  
         [Test]
         [ExpectedException(typeof (ArgumentNullException))]
         public void NoMessageQueueNameSpecified()
@@ -199,7 +192,7 @@ namespace Spring.Messaging.Core
             ReceiveHelloWorld(messageQueueObjectName, q, 2);
             ReceiveHelloWorld(messageQueueObjectName, q, 3);
         }
-#if NET_2_0
+
         private static void SendUsingMessageTx(string messageQueueObjectName, MessageQueueTemplate q)
         {
             IPlatformTransactionManager txManager = new MessageQueueTransactionManager();
@@ -233,7 +226,7 @@ namespace Spring.Messaging.Core
                                                 return null;
                                             });
         }
-#endif
+
         #endregion
 
         protected override string[] ConfigLocations
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj
index fe83a0bb..a7fb0b1d 100644
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj
+++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging.Tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.2010.csproj b/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.2010.csproj
index 0f791206..a18bf6fc 100644
--- a/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.2010.csproj
+++ b/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Scheduling.Quartz.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build
index 2376a32c..a8a5f888 100644
--- a/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build
@@ -11,10 +11,6 @@
     -->
 	<target name="build">
 
-		<!-- use .NET 3.5 compiler for tests to allow lambdas etc -->
-		<property name="temp.nant.settings.currentframework" value="${nant.settings.currentframework}" />
-		<property name="nant.settings.currentframework" value="net-3.5" if="${nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-3.0'}" />
-
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -34,9 +30,6 @@
 				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
 			</references>
 		</csc>
-
-		<!-- restore old framework setting -->
-		<property name="nant.settings.currentframework" value="${temp.nant.settings.currentframework}" />
 		
 		<copy todir="${current.bin.dir}" verbose="true">
 			<fileset basedir="${project::get-base-directory()}">
diff --git a/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.2008.csproj b/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.2008.csproj
index a83dc9e2..d7d2945f 100644
--- a/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.2008.csproj
+++ b/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Scheduling.Quartz20.Tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.build b/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.build
index 42bad8f1..bc84554a 100644
--- a/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.build
+++ b/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.build
@@ -18,10 +18,6 @@
 			</fileset>
 		</copy>		
 
-		<!-- use .NET 3.5 compiler for tests to allow lambdas etc -->
-		<property name="temp.nant.settings.currentframework" value="${nant.settings.currentframework}" />
-		<property name="nant.settings.currentframework" value="net-3.5" if="${nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'net-3.0'}" />
-		
 		<csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
 		     optimize="${build.optimize}"
@@ -41,9 +37,6 @@
 			</references>
 		</csc>
 
-		<!-- restore old framework setting -->
-		<property name="nant.settings.currentframework" value="${temp.nant.settings.currentframework}" />
-		
 		<copy todir="${current.bin.dir}">
 			<fileset basedir="${project::get-name()}/Data">
 				<include name="**/*.xml" />
diff --git a/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs b/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs
index e294ebb6..c6bf59a7 100644
--- a/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs
+++ b/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs
@@ -1,14 +1,34 @@
-
+#region License
+
+/*
+ * Copyright © 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#endregion
+
+using System.Configuration;
+using System.Configuration.Internal;
+using System.IO;
+using Common.Logging;
+using Common.Logging.Simple;
+using NUnit.Framework;
+using Spring.Util;
+
 namespace Spring.EnterpriseServices
 {
-#if NET_2_0
-    using System.Configuration;
-    using System.Configuration.Internal;
-    using System.IO;
-    using Common.Logging;
-    using Common.Logging.Simple;
-    using NUnit.Framework;
-    using Spring.Util;
+
 
     [TestFixture]
     public class ExeConfigurationSystemTests
@@ -41,5 +61,4 @@ namespace Spring.EnterpriseServices
             }
         }
     }
-#endif
 }
diff --git a/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs b/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs
index 3d7f5a07..82bcc04a 100644
--- a/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs
+++ b/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs
@@ -131,7 +131,6 @@ namespace Spring.EnterpriseServices
             }
         }
 
-#if NET_2_0
         [Test, Explicit("causes troubles due to registry pollution by COM registration")]
         public void CanExportAopProxyToServer()
         {
@@ -154,7 +153,6 @@ namespace Spring.EnterpriseServices
                 exporter.UnregisterServicedComponents(assemblyFile);
             }
         }
-#endif
 
         private Type ExportObject(EnterpriseServicesExporter exporter, FileInfo assemblyFile, IConfigurableApplicationContext appCtx, string objectName)
         {
diff --git a/test/Spring/Spring.Services.Tests/Remoting/BaseRemotingTestFixture.cs b/test/Spring/Spring.Services.Tests/Remoting/BaseRemotingTestFixture.cs
index aeaa5478..4909e768 100644
--- a/test/Spring/Spring.Services.Tests/Remoting/BaseRemotingTestFixture.cs
+++ b/test/Spring/Spring.Services.Tests/Remoting/BaseRemotingTestFixture.cs
@@ -30,11 +30,7 @@ namespace Spring.Remoting
                         }
 
                         channel = new TcpChannel(8005);
-#if !NET_2_0 
-                        ChannelServices.RegisterChannel(channel);
-#else
                         ChannelServices.RegisterChannel(channel, false);
-#endif
                     }
                     catch
                     {
diff --git a/test/Spring/Spring.Services.Tests/ServiceModel/Config/ChannelFactoryObjectDefinitionParserTests.cs b/test/Spring/Spring.Services.Tests/ServiceModel/Config/ChannelFactoryObjectDefinitionParserTests.cs
index f1e9104e..660fe48a 100644
--- a/test/Spring/Spring.Services.Tests/ServiceModel/Config/ChannelFactoryObjectDefinitionParserTests.cs
+++ b/test/Spring/Spring.Services.Tests/ServiceModel/Config/ChannelFactoryObjectDefinitionParserTests.cs
@@ -1,4 +1,3 @@
-#if NET_3_0
 #region License
 
 /*
@@ -146,4 +145,3 @@ namespace Spring.ServiceModel.Config
         #endregion
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/ServiceModel/Config/WcfNamespaceParserTests.cs b/test/Spring/Spring.Services.Tests/ServiceModel/Config/WcfNamespaceParserTests.cs
index 7e2125a8..a2f62e4b 100644
--- a/test/Spring/Spring.Services.Tests/ServiceModel/Config/WcfNamespaceParserTests.cs
+++ b/test/Spring/Spring.Services.Tests/ServiceModel/Config/WcfNamespaceParserTests.cs
@@ -1,5 +1,4 @@
-#if NET_3_0
-#region License
+#region License
 
 /*
  * Copyright 2002-2010 the original author or authors.
@@ -46,4 +45,3 @@ namespace Spring.ServiceModel.Config
         }
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs b/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs
index 80e852b4..240fbd4c 100644
--- a/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs
+++ b/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs
@@ -1,4 +1,3 @@
-#if NET_3_0
 #region License
 
 /*
@@ -29,8 +28,6 @@ using System.Net.Security;
 using System.ServiceModel;
 
 using NUnit.Framework;
-using Spring.Objects.Factory.Config;
-using Spring.ServiceModel;
 using Spring.Core.IO;
 using Spring.Objects.Factory;
 using Spring.Objects.Factory.Xml;
@@ -394,4 +391,3 @@ namespace Spring.ServiceModel
         #endregion
     }
 }
-#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/ServiceModel/SpringServiceHostTests.cs b/test/Spring/Spring.Services.Tests/ServiceModel/SpringServiceHostTests.cs
index 60ce2886..f556da4b 100644
--- a/test/Spring/Spring.Services.Tests/ServiceModel/SpringServiceHostTests.cs
+++ b/test/Spring/Spring.Services.Tests/ServiceModel/SpringServiceHostTests.cs
@@ -1,4 +1,3 @@
-#if NET_3_0
 #region License
 
 /*
@@ -59,5 +58,3 @@ namespace Spring.ServiceModel
         }
     }
 }
-
-#endif // NET_3_0
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2008.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2008.csproj
index 69b2c4d4..91125c39 100644
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2008.csproj
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2008.csproj
@@ -22,7 +22,7 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Services.Tests\Debug\</OutputPath>
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
index 7aa77fef..98a4fefa 100644
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
@@ -23,9 +23,9 @@
           <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="System.Web.Extensions.dll" if="${net-3.5}"/>
-			<exclude name="System.Web.Extensions.dll" if="${net-4.0}"/>	
-			<exclude name="Quartz.dll" if="${net-3.5}"/>
-			<exclude name="Quartz.dll" if="${net-4.0}"/>	
+          <exclude name="System.Web.Extensions.dll" if="${net-4.0}"/>	
+          <exclude name="Quartz.dll" if="${net-3.5}"/>
+          <exclude name="Quartz.dll" if="${net-4.0}"/>	
 		  <exclude name="Spring.Services.dll"/>
           <exclude name="Spring.Services.pdb"/>
           <exclude name="Spring.Services.xml"/>
@@ -55,7 +55,7 @@
       </resources>
       <references basedir="${current.bin.dir}">
         <include name="*.dll" />
-        <include if="${net-3.0.installed and net-3.0}" name="${net-3.0.ReferenceInstallPath}\System.ServiceModel.dll" />
+        <include name="System.ServiceModel.dll" />
         <exclude name="${project::get-name()}.dll" />
         <exclude name="CloverRuntime.dll" />
 		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
diff --git a/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs b/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs
index 80b31e9e..a0bcfbf9 100644
--- a/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs
+++ b/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs
@@ -26,12 +26,8 @@ using System.Xml.Serialization;
 using System.Web.Services;
 using System.Web.Services.Protocols;
 using System.Web.Services.Description;
-#if NET_3_0
 using System.ServiceModel;
 using System.ServiceModel.Description;
-using System.Runtime.Serialization;
-#endif
-
 using NUnit.Framework;
 using Spring.Core.IO;
 using Spring.Context;
@@ -172,7 +168,6 @@ namespace Spring.Web.Services
             ObjectUtils.InstantiateType(proxyType);
         }
 
-#if NET_2_0
         [Test]
         public void DocumentLiteralWithNamedOutParameter()
         {
@@ -450,7 +445,6 @@ namespace Spring.Web.Services
             // Try to instantiate the proxy type
             ObjectUtils.InstantiateType(proxyType);
         }
-#endif
 
         [Test]
         public void WrapProxyType()
@@ -569,7 +563,6 @@ namespace Spring.Web.Services
 
         #endregion
 
-#if NET_3_0
         public void WcfBasicHttpBinding()
         {
             using (ServiceHost host = new ServiceHost(typeof(WcfServiceImpl), new Uri("http://localhost:8000/WcfBasicHttpBinding/Service")))
@@ -613,7 +606,6 @@ namespace Spring.Web.Services
                 return count.ToString();
             }
         }
-#endif
 
         #region Test Classes
 
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj
index 5f63a339..87ec4b52 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj
+++ b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Template.Velocity.Tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkSubset>
     </TargetFrameworkSubset>
diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2008.csproj b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2008.csproj
index 1a9769d3..f627c577 100644
--- a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2008.csproj
+++ b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2008.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Testing.Microsoft.Tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkSubset>
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2008.csproj b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2008.csproj
index 62ecee19..546695f1 100644
--- a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2008.csproj
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2008.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Spring.Testing.NUnit.Tests</AssemblyName>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs b/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs
index d796cf4b..b8b3c6cf 100644
--- a/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs
+++ b/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs
@@ -139,11 +139,7 @@ namespace Spring.Context.Support
         }
 
         [Test]
-#if NET_2_0
         [ExpectedException(typeof(ConfigurationErrorsException))]
-#else
-        [ExpectedException(typeof(System.Configuration.ConfigurationException))]
-#endif
         public void ThrowsOnUnapplicableModuleTemplate()
         {
             StaticApplicationContext appContext = CreateTestContext();
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2008.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2008.csproj
index c51c6ed2..0df5423b 100644
--- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2008.csproj
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2008.csproj
@@ -37,7 +37,7 @@
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Tests\Debug\</OutputPath>
diff --git a/test/Spring/Spring.Web.Tests/TestSupport/SessionMock.cs b/test/Spring/Spring.Web.Tests/TestSupport/SessionMock.cs
index 8a0b3168..ac119afd 100644
--- a/test/Spring/Spring.Web.Tests/TestSupport/SessionMock.cs
+++ b/test/Spring/Spring.Web.Tests/TestSupport/SessionMock.cs
@@ -17,9 +17,8 @@ namespace Spring.TestSupport
         private SessionStateMode _mode;
         private string _sessionID;
         private int _codePage;
-#if NET_2_0
         private HttpCookieMode _cookieMode;
-#endif
+
         public SessionMock() : base(CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default)
         {
             Reset();
@@ -32,9 +31,7 @@ namespace Spring.TestSupport
             _isCookieless = false;
             _mode = SessionStateMode.InProc;
             _codePage = -1;
-#if NET_2_0
             _cookieMode = HttpCookieMode.AutoDetect;
-#endif
         }
 
         public void Abandon()
@@ -78,12 +75,10 @@ namespace Spring.TestSupport
             set { _codePage = value; }
         }
 
-#if NET_2_0
         public HttpCookieMode CookieMode
         {
             get { return _cookieMode; }
             set { _cookieMode = value; }
         }
-#endif
     }
 }
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs b/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs
index 32c6a7b0..f33cb20c 100644
--- a/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs
+++ b/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs
@@ -76,7 +76,6 @@ namespace Spring.TestSupport
             HttpContext ctx = new HttpContext(wr);
             HttpContext.Current = ctx;
             HttpBrowserCapabilities browser = new HttpBrowserCapabilities();
-#if NET_2_0
             browser.Capabilities = new CaseInsensitiveHashtable(); //CollectionsUtil.CreateCaseInsensitiveHashtable();
             browser.Capabilities[string.Empty] = "Test User Agent"; // string.Empty is the key for "user agent"
 
@@ -85,7 +84,7 @@ namespace Spring.TestSupport
             object cachedPathData = ExpressionEvaluator.GetValue(null, "T(System.Web.CachedPathData).GetRootWebPathData()");
             ExpressionEvaluator.SetValue(cachedPathData, "_virtualPath", virtualPathObject);
             ExpressionEvaluator.SetValue(cachedPathData, "_physicalPath", appPath);
-#endif
+
             ctx.Request.Browser = browser;
             string filePath = ctx.Request.FilePath;
             _wr = wr;
diff --git a/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs b/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs
index 98003325..96a5cd07 100644
--- a/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs
+++ b/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs
@@ -21,21 +21,15 @@
 #region Imports
 
 using System;
-using System.Collections.Specialized;
 using System.Data;
 using System.Web.UI.WebControls;
-using Common.Logging;
-using Common.Logging.Simple;
 using NUnit.Framework;
 using Spring.Context;
 using Spring.Context.Support;
-using Spring.Objects.Factory.Support;
 using Spring.TestSupport;
 
-#if NET_2_0
 using System.Collections;
 using System.Collections.Generic;
-#endif
 
 #endregion
 
@@ -124,7 +118,6 @@ namespace Spring.Util
             }
         }
 
-#if NET_2_0
         [Test, Explicit]
         public void TestHashtableVsDictionary()
         {
@@ -155,6 +148,5 @@ namespace Spring.Util
                 }
             }
         }
-#endif
     }
 }
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs b/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs
index 65e7535b..1dc7b4fc 100644
--- a/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs
+++ b/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs
@@ -121,7 +121,6 @@ namespace Spring.Web.Services
             Assert.AreEqual(wse.Namespace, wsa.Namespace);
         }
 
-#if NET_2_0
         [Test]
         public void CreatesDefaultWebServiceBindingAttribute()
         {
@@ -170,7 +169,6 @@ namespace Spring.Web.Services
             WebServiceBindingAttribute wsba = attrs[0] as WebServiceBindingAttribute;
             Assert.AreEqual(WsiProfiles.None, wsba.ConformsTo);
         }
-#endif
 
         [Test]
         public void CreatesDefaultWebMethodAttributeWithNoDecoratedMethod()
@@ -315,9 +313,7 @@ namespace Spring.Web.Services
         }
 
         [WebService(Name = "Decorated service")]
-#if NET_2_0
         [WebServiceBinding(ConformsTo=WsiProfiles.None)]
-#endif
         public class DecoratedService : IService
         {
             [WebMethod(Description="SomeMethod description")]
diff --git a/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs
index 58d292eb..118a9f81 100644
--- a/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs
+++ b/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs
@@ -23,8 +23,6 @@ using NUnit.Framework;
 using NUnitAspEx.Client;
 using Spring.TestSupport;
 
-#if NET_2_0
-
 namespace Spring.Web.Support
 {
     /// <summary>
@@ -56,5 +54,3 @@ namespace Spring.Web.Support
         }
     }
 }
-
-#endif // NET_2_0
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs
index 2b33fc20..a38618a3 100644
--- a/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs
+++ b/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs
@@ -92,17 +92,11 @@ namespace Spring.Web.Support
                     IHttpHandlerFactory phf = (IHttpHandlerFactory)Activator.CreateInstance(typeof(System.Web.UI.Page).Assembly.GetType("System.Web.UI.PageHandlerFactory"), true);
                     phf.GetHandler(HttpContext.Current, "GET", ctx.HttpWorkerRequest.GetFilePath(), ctx.HttpWorkerRequest.GetFilePathTranslated());
                 }
-#if NET_2_0
                 catch (HttpException e)
                 {
                     Assert.AreEqual(404, e.GetHttpCode());
                     Assert.IsTrue(e.Message.IndexOf(ctx.HttpWorkerRequest.GetFilePath()) > 0);
                 }
-#else
-                catch (FileNotFoundException)
-                {
-                }
-#endif
             }
         }
 
@@ -126,21 +120,15 @@ namespace Spring.Web.Support
                     IHttpHandlerFactory phf = new PageHandlerFactory();
                     phf.GetHandler(HttpContext.Current, "GET", ctx.HttpWorkerRequest.GetFilePath(), ctx.HttpWorkerRequest.GetFilePathTranslated());
                 }
-#if NET_2_0
                 catch (HttpException e)
                 {
                     Assert.AreEqual(404, e.GetHttpCode());
                     Assert.IsTrue(e.Message.IndexOf(ctx.HttpWorkerRequest.GetFilePath()) > 0);
                 }
-#else
-                catch (FileNotFoundException)
-                {
-                }
-#endif
             }
         }
 
-#if NET_2_0 && ! NET_4_0
+#if !NET_4_0
         [Test]
         public void TransferAfterSetResult()
         {
diff --git a/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs
index 61ff926a..ca13e2b7 100644
--- a/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs
+++ b/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs
@@ -41,7 +41,6 @@ namespace Spring.Web.UI.Controls
     {
         private const string CRLF = "\r\n";
 
-#if NET_2_0
         [Test]
         public void DontRenderHeadTagIfNestedWithinStandardHeadControl()
         {
@@ -61,7 +60,6 @@ namespace Spring.Web.UI.Controls
                 Assert.AreEqual(expect, result);
             }
         }
-#endif
 
         [Test]
         public void StyleBlockRendersTypeAttribute()
diff --git a/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs
index ea0efa92..2597dc48 100644
--- a/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs
+++ b/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs
@@ -75,7 +75,6 @@ namespace Spring.Web.UI
             Page child;
             MockValidator mockValidator;
 
-#if NET_2_0
             child = new Page();
             mockValidator = new MockValidator();
             mockValidator.ValidationGroup = "theValidationGroup";
@@ -83,7 +82,6 @@ namespace Spring.Web.UI
 
             child.Validate(mockValidator.ValidationGroup);
             Assert.IsTrue(mockValidator.WasCalled);
-#endif
 
             child = new Page();
             mockValidator = new MockValidator();