diff --git a/Spring.build b/Spring.build
index 9b36bd74..16d79133 100644
--- a/Spring.build
+++ b/Spring.build
@@ -404,9 +404,12 @@ Commandline Examples:
     <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-3.5' 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.Scheduling.Quartz20/Spring.Scheduling.Quartz20.build" target="build" if="${build-quartz}"/>
+	-->
     <nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq}"/>
     <nant buildfile="src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build" target="build" if="${build-velocity}"/>
 
@@ -459,6 +462,9 @@ Commandline Examples:
     <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}"/>
+    <!--
+	<nant buildfile="test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.build" target="build" if="${build-quartz}"/>
+	-->
     <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq}"/>
     <nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="test" if="${build-velocity}"/>
 
@@ -1362,11 +1368,10 @@ Commandline Examples:
           <include name="*/*/Spring.Messaging.xml"/>
           <include name="*/*/Spring.Messaging.pdb"/>
 
-		  <!--
           <include name="*/*/Spring.Scheduling.Quartz.dll"/>
           <include name="*/*/Spring.Scheduling.Quartz.xml"/>
           <include name="*/*/Spring.Scheduling.Quartz.pdb"/>
-		  -->
+
           <include name="*/*/Spring.Scheduling.Quartz20.dll"/>
           <include name="*/*/Spring.Scheduling.Quartz20.xml"/>
           <include name="*/*/Spring.Scheduling.Quartz20.pdb"/>
@@ -1386,14 +1391,12 @@ Commandline Examples:
             <include name="*/Spring.Services.xml"/>
             <include name="*/Spring.Services.pdb"/>
 			
-		  <!--
-          <include name="*/*/Spring.Scheduling.Quartz.dll"/>
-          <include name="*/*/Spring.Scheduling.Quartz.xml"/>
-          <include name="*/*/Spring.Scheduling.Quartz.pdb"/>
-		  -->
-          <include name="*/*/Spring.Scheduling.Quartz20.dll"/>
-          <include name="*/*/Spring.Scheduling.Quartz20.xml"/>
-          <include name="*/*/Spring.Scheduling.Quartz20.pdb"/>
+			<include name="*/*/Spring.Scheduling.Quartz.dll"/>
+			<include name="*/*/Spring.Scheduling.Quartz.xml"/>
+			<include name="*/*/Spring.Scheduling.Quartz.pdb"/>
+			<include name="*/*/Spring.Scheduling.Quartz20.dll"/>
+			<include name="*/*/Spring.Scheduling.Quartz20.xml"/>
+			<include name="*/*/Spring.Scheduling.Quartz20.pdb"/>
 			
 			<include name="*/Spring.Web.Mvc.dll"/>
             <include name="*/Spring.Web.Mvc.xml"/>
diff --git a/build-support/solutions.build.nant b/build-support/solutions.build.nant
index 1759449b..0a10f9bb 100644
--- a/build-support/solutions.build.nant
+++ b/build-support/solutions.build.nant
@@ -36,8 +36,7 @@ Rebuilding Solutions using Nant and "solutions.build":
   <property name="buildconfiguration" value="Debug" />
 
   <target name="RebuildAllSolutions" description="Rebuild all Solutions">
-	<call target="RebuildAllSolutions-1.1" if="${property::exists('vs2003.install.dir')}" />
-    <call target="RebuildAllSolutions-2.0" if="${property::exists('vs2008.install.dir')}" />
+    <call target="RebuildAllSolutions-3.5" if="${property::exists('vs2008.install.dir')}" />
 	<call target="RebuildAllSolutions-4.0" if="${property::exists('vs2010.install.dir')}" />
   </target>
 
@@ -64,45 +63,17 @@ Rebuilding Solutions using Nant and "solutions.build":
     </delete>
   </target>
 
-  <target name="RebuildAllSolutions-1.1" depends="Clean">
-
-    <!-- build examples -->
-    <foreach item="File" property="filename">
-      <in>
-        <items basedir="${root.dir}/examples">
-          <include name="**/*.2003.sln" />
-          <exclude name="**/SpringAir.2003.sln" />
-          <!-- unfort. doesn't work -->
-          <exclude name="**/Spring.Calculator.2003.sln" />
-          <!-- need virtual directory to be setup in IIS -->
-        </items>
-      </in>
-      <do>
-        <property name="solutionfile" value="${filename}" />
-        <property name="solutionconfiguration" value="${buildconfiguration}" />
-        <call target="RebuildSolution-1.1" />
-      </do>
-    </foreach>
-
-    <!-- build "main" solution (extra call because of configuration 'debug-1.1') -->
-    <property name="solutionfile" value="${root.dir}/Spring.NET.2003.sln" />
-    <property name="solutionconfiguration" value="${buildconfiguration}-1.1" />
-    <call target="RebuildSolution-1.1" />
-
-  </target>
-
-  <target name="RebuildAllSolutions-2.0" depends="Clean">
+  <target name="RebuildAllSolutions-3.5" depends="Clean">
     <!-- build "main" solution -->
 
     <property name="solutionfile" value="${root.dir}/Spring.NET.2008.sln" />
     <property name="solutionconfiguration" value="${buildconfiguration}" />
-    <call target="RebuildSolution-2.0" />
+    <call target="RebuildSolution-3.5" />
 
 
     <foreach item="File" property="filename">
       <in>
         <items basedir="${root.dir}">
-          <!-- <include name="examples/Spring/**/*.2005.sln" /> -->
           <include name="examples/Spring/**/*.2008.sln" />
           <include name="examples/Spring/Spring.Data.NHibernate/Spring.Northwind.sln" />
           <!-- Does not build on bamboo server SPRNET-1283 -->
@@ -111,21 +82,16 @@ Rebuilding Solutions using Nant and "solutions.build":
           <!-- <include name="*.2005.sln" /> -->
           <include name="*.2008.sln" />
           <exclude name="Spring.NET.2008.sln"/>
+          <exclude name="examples/Spring/Spring.EmsQuickStart/**/*.sln" unless="${build-ems}"/>
         </items>
       </in>
       <do>
         <property name="solutionfile" value="${filename}" />
         <property name="solutionconfiguration" value="${buildconfiguration}" />
-        <call target="RebuildSolution-2.0" />
+        <call target="RebuildSolution-3.5" />
       </do>
     </foreach>
 
-    <!-- build "main" solution -->
-    <!--
-    <property name="solutionfile" value="${root.dir}/Spring.NET.2005.sln" />
-    <property name="solutionconfiguration" value="${buildconfiguration}" />
-    <call target="RebuildSolution-2.0" />
-    -->
   </target>
 
     <target name="RebuildAllSolutions-4.0" depends="Clean">
@@ -143,6 +109,8 @@ Rebuilding Solutions using Nant and "solutions.build":
           <include name="examples/Spring/**/*.2010.sln" />
           <exclude name="examples/Spring/Spring.Calculator/**/*.2010.sln"/>
           <exclude name="Spring.NET.2010.sln"/>
+          <exclude name="examples/Spring/Spring.EmsQuickStart/**/*.sln" unless="${build-ems}"/>
+          <exclude name="examples/**/Spring.Examples.Pool.2010.sln"/>
         </items>
       </in>
       <do>
@@ -152,35 +120,11 @@ Rebuilding Solutions using Nant and "solutions.build":
       </do>
     </foreach>
 
-    <!-- build "main" solution -->
-    <!--
-    <property name="solutionfile" value="${root.dir}/Spring.NET.2005.sln" />
-    <property name="solutionconfiguration" value="${buildconfiguration}" />
-    <call target="RebuildSolution-2.0" />
-    -->
   </target>
   
-  
-  <target name="RebuildSolution-1.1" description="rebuilds a given VS2003 solution file">
-    <!-- "c:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\devenv.exe" Spring.NET.2003.sln /rebuild Debug-1.1 /out solutions.build-1.1.log -->
-    <echo message="Rebuilding .NET 1.1 Solution ${solutionfile}" />
-    <exec program="${devenv11.exe}" basedir="${devenv11.exe}" verbose="true">
-      <arg value="${solutionfile}" />
-      <arg line="/rebuild ${solutionconfiguration}" />
-      <arg line="/out solutions.build-1.1.log" />
-    </exec>
-    <!--
-    <solution configuration="${solutionconfiguration}" solutionfile="${solutionfile}">
-      <webmap>
-          <map url="http://localhost/Spring.Calculator.2003" path="examples\Spring\Spring.Calculator\src\Spring.Calculator.Web.2003" />
-          <map url="http://localhost/SpringAir.2003" path="examples\Spring\SpringAir\src\SpringAir.Web.2003" />
-      </webmap>
-    </solution>
-    -->
-  </target>
-
-  <target name="RebuildSolution-2.0" description="rebuilds a given VS2008 solution file">
-    <echo message="Rebuilding .NET 2.0 Solution ${solutionfile}" />
+ 
+  <target name="RebuildSolution-3.5" description="rebuilds a given VS2008 solution file">
+    <echo message="Rebuilding .NET 3.5 Solution ${solutionfile}" />
     <exec program="${msbuild.exe}">
       <arg value="${solutionfile}"/>
       <arg line="/nologo" />
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.2010.sln b/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.2010.sln
index 599e052e..318b839e 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.2010.sln
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.2010.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.Northwind.Web", "src\Spring.Northwind.Web\", "{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}"
 	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv3.5"
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
 		ProjectReferences = "{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}|Spring.Northwind.Dao.dll;{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}|Spring.Northwind.Dao.NHibernate.dll;{9E15876F-E9E0-43B7-9874-B54F163757D6}|Spring.Northwind.Service.dll;{FD89FEBE-4914-45F3-9123-B2CB954810DD}|Spring.Northwind.Web.References.dll;"
 		Debug.AspNetCompiler.VirtualPath = "/Spring.Northwind.Web"
 		Debug.AspNetCompiler.PhysicalPath = "src\Spring.Northwind.Web\"
@@ -43,16 +43,16 @@ Global
 		Release|Mixed Platforms = Release|Mixed Platforms
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|.NET.ActiveCfg = Debug|.NET
-		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|.NET.Build.0 = Debug|.NET
-		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|Any CPU.ActiveCfg = Debug|.NET
-		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
-		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|Mixed Platforms.Build.0 = Debug|.NET
-		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|.NET.ActiveCfg = Debug|.NET
-		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|.NET.Build.0 = Debug|.NET
-		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|Any CPU.ActiveCfg = Debug|.NET
-		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
-		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|Mixed Platforms.Build.0 = Debug|.NET
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|.NET.ActiveCfg = Debug|Any CPU
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
 		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.config b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.config
index 38bab582..9bcb7b2d 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.config
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.config
@@ -8,78 +8,77 @@
     \Windows\Microsoft.Net\Framework\v2.x\Config
 -->
 <configuration>
-	<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="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
-		</sectionGroup>
-		<section name="databaseSettings" type="System.Configuration.NameValueSectionHandler"/>
-	</configSections>
-	<common>
-		<logging>
-			<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
-				<!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL-->
-				<!-- otherwise BasicConfigurer.Configure is used   -->
-				<!-- log4net configuration file is specified with key configFile-->
-				<arg key="configType" value="FILE-WATCH"/>
-				<arg key="configFile" value="~/Config/Log4Net.xml"/>
-			</factoryAdapter>
-		</logging>
-	</common>
-	<spring>
-		<parsers>
-			<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
-			<parser type="Spring.Transaction.Config.TxNamespaceParser, Spring.Data"/>
-		</parsers>
-		<context>
-			<resource uri="~/Config/Aspects.xml"/>
-			<resource uri="assembly://Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao/Dao.xml"/>
-			<resource uri="assembly://Spring.Northwind.Service/Spring.Northwind.Service/Services.xml"/>
-			<resource uri="~/Web.xml"/>
-		</context>
-	</spring>
-	<!-- These properties are referenced in Dao.xml -->
-	<databaseSettings>
-		<add key="db.datasource" value=".\SQLEXPRESS; Integrated Security=true; AttachDbFilename=|DataDirectory|northwnd.mdf; User Instance=true;"/>
-		<add key="db.user" value="springqa"/>
-		<add key="db.password" value="springqa"/>
-		<add key="db.database" value="Northwind"/>
-	</databaseSettings>
-	<appSettings>
-		<add key="Spring.Data.NHibernate.Support.OpenSessionInViewModule.SessionFactoryObjectName" value="NHibernateSessionFactory"/>
-	</appSettings>
-	<connectionStrings/>
-	<system.web>
-		<httpModules>
-			<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
-			<add name="OpenSessionInView" type="Spring.Data.NHibernate.Support.OpenSessionInViewModule, Spring.Data.NHibernate21"/>
-		</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="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
-		</httpHandlers>
-		<compilation debug="true">
-			<assemblies>
-				<add assembly="System.Data.OracleClient, 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.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-				<add assembly="System.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
-				<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-				<add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-				<add assembly="System.Data.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-				<add assembly="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-				<add assembly="System.Data.Services.Client, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-				<add assembly="System.Data.Services.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-				<add assembly="System.Data.Entity, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-				<add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/></assemblies></compilation>
-		<pages theme="Spring">
-			<controls>
-				<add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web"/>
-			</controls>
-		</pages>
-	</system.web>
-</configuration>
+  <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="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
+    </sectionGroup>
+    <section name="databaseSettings" type="System.Configuration.NameValueSectionHandler"/>
+  </configSections>
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
+        <!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL-->
+        <!-- otherwise BasicConfigurer.Configure is used   -->
+        <!-- log4net configuration file is specified with key configFile-->
+        <arg key="configType" value="FILE-WATCH"/>
+        <arg key="configFile" value="~/Config/Log4Net.xml"/>
+      </factoryAdapter>
+    </logging>
+  </common>
+  <spring>
+    <parsers>
+      <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
+      <parser type="Spring.Transaction.Config.TxNamespaceParser, Spring.Data"/>
+    </parsers>
+    <context>
+      <resource uri="~/Config/Aspects.xml"/>
+      <resource uri="assembly://Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao/Dao.xml"/>
+      <resource uri="assembly://Spring.Northwind.Service/Spring.Northwind.Service/Services.xml"/>
+      <resource uri="~/Web.xml"/>
+    </context>
+  </spring>
+  <!-- These properties are referenced in Dao.xml -->
+  <databaseSettings>
+    <add key="db.datasource" value=".\SQLEXPRESS; Integrated Security=true; AttachDbFilename=|DataDirectory|northwnd.mdf; User Instance=true;"/>
+    <add key="db.user" value="springqa"/>
+    <add key="db.password" value="springqa"/>
+    <add key="db.database" value="Northwind"/>
+  </databaseSettings>
+  <appSettings>
+    <add key="Spring.Data.NHibernate.Support.OpenSessionInViewModule.SessionFactoryObjectName" value="NHibernateSessionFactory"/>
+  </appSettings>
+  <connectionStrings/>
+  <system.web>
+    <httpModules>
+      <add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+      <add name="OpenSessionInView" type="Spring.Data.NHibernate.Support.OpenSessionInViewModule, Spring.Data.NHibernate21"/>
+    </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" targetFramework="4.0">
+      <assemblies>
+        <add assembly="System.Data.OracleClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Data.Services.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Data.Services.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+      </assemblies>
+    </compilation>
+    <pages theme="Spring" controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
+      <controls>
+        <add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web"/>
+      </controls>
+    </pages>
+  </system.web>
+</configuration>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Mvc3QuickStart/src/Spring.Mvc3QuickStart/Spring.Mvc3QuickStart.csproj b/examples/Spring/Spring.Mvc3QuickStart/src/Spring.Mvc3QuickStart/Spring.Mvc3QuickStart.csproj
index 4bd6661e..2334ce80 100644
--- a/examples/Spring/Spring.Mvc3QuickStart/src/Spring.Mvc3QuickStart/Spring.Mvc3QuickStart.csproj
+++ b/examples/Spring/Spring.Mvc3QuickStart/src/Spring.Mvc3QuickStart/Spring.Mvc3QuickStart.csproj
@@ -39,7 +39,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Spring.Web.Mvc3">
-      <HintPath>..\..\..\..\..\bin\net\4.0\release\Spring.Web.Mvc3.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Web.Mvc3.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
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 946dc507..f140f9d3 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
@@ -44,29 +44,20 @@
       <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>
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Web.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.ComponentModel.DataAnnotations">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.Mvc" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.Routing" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
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 b01253ba..52dcd92e 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
@@ -99,13 +99,13 @@
     </Reference>
     <Reference Include="Quartz">
       <Name>Quartz</Name>
-      <HintPath>..\..\..\..\lib\Quartz10\net\2.0\Quartz.dll</HintPath>
+      <HintPath>..\..\..\..\lib\Quartz10\net\3.5\Quartz.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core">
       <SpecificVersion>False</SpecificVersion>
       <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">
+    <Reference Include="Spring.Scheduling.Quartz">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\bin\net\4.0\debug\Spring.Scheduling.Quartz.dll</HintPath>
     </Reference>
diff --git a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2010.sln b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2010.sln
index 3b398c8a..2ed39d84 100644
--- a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2010.sln
+++ b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2010.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.2005", "src\Spring.WebQuickStart.2005\", "{B4F56253-6425-4065-8A93-EF88F8730E57}"
 	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv2.0"
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
 		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
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv2.0"
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
 		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\"
@@ -67,26 +67,26 @@ Global
 		Release|Mixed Platforms = Release|Mixed Platforms
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|.NET.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|.NET.Build.0 = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Any CPU.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.Build.0 = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|.NET.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|.NET.Build.0 = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Any CPU.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.Build.0 = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|.NET.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|.NET.Build.0 = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Any CPU.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.Build.0 = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|.NET.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|.NET.Build.0 = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Any CPU.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.Build.0 = Debug|.NET
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|.NET.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|.NET.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
 		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = 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
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 737b5871..8254e49b 100644
--- a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Web.Config
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Web.Config
@@ -1,116 +1,82 @@
 <?xml version="1.0"?>
 <configuration>
-	<configSections>
-		<sectionGroup name="spring">
-			<section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web" requirePermission="false"/>
-			<section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" requirePermission="false"/>
-		</sectionGroup>
-		<sectionGroup name="common">
-			<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" requirePermission="false"/>
-		</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>
-	<!-- to see logging output in the attached debugger -->
-	<common>
-		<logging>
-			<factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
-				<arg key="level" value="ALL"/>
-			</factoryAdapter>
-		</logging>
-	</common>
-	<system.web>
-		<securityPolicy>
-			<trustLevel name="Custom" policyFile="web_mediumtrust.config"/>
-		</securityPolicy>
-		<trust level="Full"/>
-		<!-- install Spring assemblies in GAC and change to level to 'Custom' to run in partial trust -->
-		<globalization culture="en-US" uiCulture="en-US"/>
-		<customErrors mode="Off"/>
-		<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>
-		<pages>
-			<controls>
-				<add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web"/>
-				<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>
-		<!--
+  <configSections>
+    <sectionGroup name="spring">
+      <section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web" requirePermission="false"/>
+      <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" requirePermission="false"/>
+    </sectionGroup>
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <!-- to see logging output in the attached debugger -->
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
+        <arg key="level" value="ALL"/>
+      </factoryAdapter>
+    </logging>
+  </common>
+  <system.web>
+    <securityPolicy>
+      <trustLevel name="Custom" policyFile="web_mediumtrust.config"/>
+    </securityPolicy>
+    <trust level="Full"/>
+    <!-- install Spring assemblies in GAC and change to level to 'Custom' to run in partial trust -->
+    <globalization culture="en-US" uiCulture="en-US"/>
+    <customErrors mode="Off"/>
+    <compilation debug="true" targetFramework="4.0">
+      <assemblies>
+        <add assembly="System.DirectoryServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+      </assemblies>
+    </compilation>
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
+      <controls>
+        <add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web"/>
+      </controls>
+    </pages>
+    <!--
     The following needs to be configured in order to enable Spring.NET Web Framework features
     -->
-		<httpModules>
-			<add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
-			<!-- this custom module is only for DI demonstration purposes -->
-			<add name="HtmlCommentAppender" type="HtmlCommentAppenderModule"/>
-			<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"/>
-			<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>
-			<remove name="ScriptModule"/><add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
-			<add name="HtmlCommentAppender" type="HtmlCommentAppenderModule"/>
-			<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>
-	<!-- demonstrates how to configure IHttpModule instances -->
-	<spring>
-		<context>
-			<resource uri="config://spring/objects"/>
-		</context>
-		<objects xmlns="http://www.springframework.net">
-			<!-- configure our custom HttpModule -->
-			<object name="HttpApplicationConfigurer" type="Spring.Context.Support.HttpApplicationConfigurer, Spring.Web">
-				<property name="ModuleTemplates">
-					<dictionary>
-						<entry key="HtmlCommentAppender">
-							<!-- this name must match the module name -->
-							<object>
-								<!-- select "view source" in your browser on any page to see the appended html comment -->
-								<property name="AppendText" value="My configured comment!"/>
-							</object>
-						</entry>
-					</dictionary>
-				</property>
-			</object>
-		</objects>
-	</spring>
-	<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>
+    <httpModules>
+      <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>
+    <httpHandlers>
+      <add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false"/>
+    <modules>
+      <add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+      <add name="HtmlCommentAppender" type="HtmlCommentAppenderModule"/>
+    </modules>
+    <handlers>
+      <add name="SpringPageHandler" verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+    </handlers>
+  </system.webServer>
+  <!-- demonstrates how to configure IHttpModule instances -->
+  <spring>
+    <context>
+      <resource uri="config://spring/objects"/>
+    </context>
+    <objects xmlns="http://www.springframework.net">
+      <!-- configure our custom HttpModule -->
+      <object name="HttpApplicationConfigurer" type="Spring.Context.Support.HttpApplicationConfigurer, Spring.Web">
+        <property name="ModuleTemplates">
+          <dictionary>
+            <entry key="HtmlCommentAppender">
+              <!-- this name must match the module name -->
+              <object>
+                <!-- select "view source" in your browser on any page to see the appended html comment -->
+                <property name="AppendText" value="My configured comment!"/>
+              </object>
+            </entry>
+          </dictionary>
+        </property>
+      </object>
+    </objects>
+  </spring>
+</configuration>
\ No newline at end of file
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 89c4fbd6..e496a9c2 100644
--- a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.config
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.config
@@ -1,94 +1,81 @@
 <?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>
-		<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>
-		<!---->
-		<!--
+  <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" targetFramework="4.0">
+      <assemblies>
+        <add assembly="System.DirectoryServices, Version=4.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>
+    <!---->
+    <!--
     <healthMonitoring enabled="true">
       <providers>
         <add name="AspNetTextFileWebEventProvider" type="TextFileWebEventProvider" logFileName="~/App_Data/MyTest.txt"/>
@@ -99,38 +86,15 @@
       </rules>
     </healthMonitoring>
 -->
-		<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>
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
+  </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>
\ No newline at end of file