diff --git a/Spring.Net.2005.sln b/Spring.Net.2005.sln
index 9d299764..4e867a54 100644
--- a/Spring.Net.2005.sln
+++ b/Spring.Net.2005.sln
@@ -84,12 +84,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2005",
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.Integration.Tests.2005", "test\Spring\Spring.Data.NHibernate.Integration.Tests\Spring.Data.NHibernate.Integration.Tests.2005.csproj", "{4A07E150-ED90-407C-8CAD-4760444DDFD9}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate12.2005", "src\Spring\Spring.Data.NHibernate12\Spring.Data.NHibernate12.2005.csproj", "{90F2D070-6F98-4926-A626-BD7A6071D6D9}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
diff --git a/Spring.build b/Spring.build
index 58278f93..5ad6f88e 100644
--- a/Spring.build
+++ b/Spring.build
@@ -30,6 +30,10 @@ Build properties that may be set:
   values: bool: true|false
   set this to true to run integration tests
 
+"test.full":
+  values: bool: true|false
+  set this to true to run all available tests (example solutions, integration tests, etc.)
+
 Additional Remarks:
 ===================
 
@@ -72,6 +76,9 @@ Commandline Examples:
   <property name="spring.basedir" value="${project::get-base-directory()}"/>
   <property name="tool.dir" value="${project::get-base-directory()}/build-support/tools"/>
 
+  <!-- turn on all tests if test.full specified -->
+  <property name="test.integration.data" value="${property::exists('test.full') and test.full}" />
+
   <!-- default location of mstest executable and reference assemblies -->
   <readregistry property="vs-net.mstest.bin.dir" key="SOFTWARE\Microsoft\VisualStudio\9.0\InstallDir" hive="LocalMachine" failonerror="false"/>
   <!--
@@ -153,14 +160,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 1.0 -->
-    <if test="${framework::exists('net-1.0')}">
-      <property name="nant.settings.currentframework" value="net-1.0"/>
-      <call target="display-target-framework"/>
-    </if>
-    <if test="${not framework::exists('net-1.0')}">
-      <echo message=".NET Framework 1.0 runtime is not available."/>
-    </if>
     <!-- .NET Framework 1.1 -->
     <if test="${framework::exists('net-1.1')}">
       <property name="nant.settings.currentframework" value="net-1.1"/>
@@ -267,7 +266,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-1.0"/>
     <call target="compile-build-1.1"/>
     <call target="compile-build-2.0"/>
     <call target="compile-build-3.0"/>
@@ -279,21 +277,6 @@ Commandline Examples:
 
   </target>
 
-  <target name="compile-build-1.0" description="Builds for .NET 1.0 if available">
-    <if test="${framework::exists('net-1.0')}">
-      <call target="compile-net-1.0"/>
-    </if>
-
-    <if test="${not framework::exists('net-1.0')}">
-      <if test="${property::exists('project.build.package') and project.build.package}">
-        <fail message="The .NET Framework 1.0 is not available."/>
-      </if>
-      <if test="${not(property::exists('project.build.package') and project.build.package)}">
-        <echo message="The .NET Framework 1.0 is not available. Build skipped."/>
-      </if>
-    </if>
-  </target>
-
   <target name="compile-build-1.1" description="Builds for .NET 1.1 if available">>
     <if test="${framework::exists('net-1.1')}">
       <call target="compile-net-1.1"/>
@@ -433,6 +416,8 @@ Commandline Examples:
     <nant buildfile="test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build" target="test" if="${build-aop and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Data.Tests/Spring.Data.Tests.build" target="test" if="${build-data and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build" target="test" if="${build-data and not net-3.0}"/>
+    <!-- nant buildfile="test/Spring/Spring.Data.NHibernate12.Tests/Spring.Data.NHibernate12.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0') and not net-3.0}"/ -->
+    <!-- nant buildfile="test/Spring/Spring.Data.NHibernate12.Integration.Tests/Spring.Data.NHibernate12.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0') and not net-3.0}"/ -->
     <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' and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build" target="test"
@@ -462,25 +447,9 @@ Commandline Examples:
 
   </target>
 
-  <target name="compile-net-1.0" description="Builds .NET Framework 1.0 version"
-          depends="set-net-1.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
-
-    <call target="copykeys" if="${project.build.sign}"/>
-    <call target="common.generate-assemblyinfo"/>
-    <!-- disable namespaces not supported in net-1.0 -->
-    <property name="build-web" value="false" overwrite="true" />
-    <property name="build-nms" value="false" overwrite="true" />
-    <property name="build-ems" 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" />
-    <property name="build-testing-microsoft" value="false" overwrite="true" />
-    <call target="compile-test" />
-  </target>
 
   <target name="compile-net-1.1" description="Builds .NET Framework 1.1 version"
-          depends="set-net-1.1-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
+          depends="set-net-1.1-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-ems" value="false" overwrite="true" />
@@ -493,14 +462,14 @@ 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, TestInit">
+          depends="set-net-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
     <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, TestInit">
+          depends="set-net-3.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-ems" value="false" overwrite="true" />
@@ -513,7 +482,7 @@ Commandline Examples:
   </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, TestInit">
+        depends="set-net-3.5-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-ems" value="false" overwrite="true" />
@@ -526,7 +495,7 @@ Commandline Examples:
   </target>
 
   <target name="compile-mono-2.0" description="Builds MONO Framework 2.0 version"
-          depends="set-mono-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
+          depends="set-mono-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-ems" value="false" overwrite="true" />
@@ -579,24 +548,7 @@ Commandline Examples:
     <echo message="Compiling debug configuration for all runtime configurations."/>
     <property name="nant.target.root.name" value="build"/>
     <call target="build-all-function"/>
-  </target>
-
-  <target name="build-1.0">
-    <call target="set-build-namespaces-release"/>
-    <echo message="------------------------"/>
-    <echo message="Building .NET 1.0 DEBUG "/>
-    <echo message="----------------------- "/>
-    <call target="set-debug-build-configuration"/>
-    <call target="compile-build-1.0"/>
-
-    <if test="${property::exists('project.build.package') and project.build.package}">
-      <echo message="--------------------------"/>
-      <echo message="Building .NET 1.0 RELEASE "/>
-      <echo message="--------------------------"/>
-      <call target="set-release-build-configuration"/>
-      <call target="compile-build-1.0"/>
-    </if>
-
+    <call target="build-solutions" if="${test.full}" />
   </target>
 
   <target name="build-1.1">
@@ -830,6 +782,7 @@ Commandline Examples:
 
     <call target="doc"/>
 
+
     <call target="package-release-files"/>
 
   </target>
@@ -900,7 +853,10 @@ Commandline Examples:
     <property name="nant.target.root.name" value="daily-build"/>
     <property name="project.build.sign" value="true"/>
     <!-- call target="copykeys"/ -->
+    <!-- build all binaries -->
     <call target="build-all-function"/>
+    <!-- build all vs solutions -->
+    <call target="build-solutions" />
     <call target="package-cvs"/>
     <!-- only copy the supporting tools directory for the daily build. -->
     <call target="package-tools"/>
@@ -910,7 +866,6 @@ Commandline Examples:
   <target name="build-all-function" description="Build what is in cvs taking into account approrpiate clr versions and root target name">
 
     <!-- net-1.0 dropped since 1.3.0 -->
-    <!-- call target="${nant.target.root.name}-1.0" / -->
     <call target="${nant.target.root.name}-1.1" />
     <call target="${nant.target.root.name}-2.0" />
     <call target="${nant.target.root.name}-3.0" />
@@ -922,17 +877,6 @@ Commandline Examples:
 
   </target>
 
-  <target name="daily-build-1.0">
-    <call target="set-build-namespaces-all"/>
-    <call target="set-package-configuration"/>
-
-    <call target="set-debug-build-configuration"/>
-    <call target="compile-build-1.0"/>
-    <call target="set-release-build-configuration"/>
-    <call target="compile-build-1.0"/>
-
-  </target>
-
   <target name="daily-build-1.1">
     <call target="set-build-namespaces-all"/>
     <call target="set-package-configuration"/>
@@ -1096,138 +1040,8 @@ Commandline Examples:
       </fileset>
     </copy>
 
-    <!-- copy built assemblies -->
-    <mkdir dir="${current.package.dir}/bin/net"/>
-    <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
-      <copy todir="${current.package.dir}/bin/net">
-        <fileset basedir="./build/net">
-          <include name="**/Spring.Core.dll"/>
-          <include name="**/Spring.Core.xml"/>
-          <include name="**/Spring.Core.pdb"/>
-
-          <include name="**/Spring.Aop.dll"/>
-          <include name="**/Spring.Aop.xml"/>
-          <include name="**/Spring.Aop.pdb"/>
-
-          <include name="**/Spring.Data.dll"/>
-          <include name="**/Spring.Data.xml"/>
-          <include name="**/Spring.Data.pdb"/>
-
-          <include name="**/Spring.Data.NHibernate12.dll"/>
-          <include name="**/Spring.Data.NHibernate12.xml"/>
-          <include name="**/Spring.Data.NHibernate12.pdb"/>
-
-          <include name="**/Spring.Data.NHibernate20.dll"/>
-          <include name="**/Spring.Data.NHibernate20.xml"/>
-          <include name="**/Spring.Data.NHibernate20.pdb"/>
-
-          <include name="**/Spring.Data.NHibernate21.dll"/>
-          <include name="**/Spring.Data.NHibernate21.xml"/>
-          <include name="**/Spring.Data.NHibernate21.pdb"/>
-
-          <include name="**/Spring.Web.dll"/>
-          <include name="**/Spring.Web.xml"/>
-          <include name="**/Spring.Web.pdb"/>
-
-          <include name="**/Spring.Web.Extensions.dll"/>
-          <include name="**/Spring.Web.Extensions.xml"/>
-          <include name="**/Spring.Web.Extensions.pdb"/>
-
-          <include name="**/Spring.Services.dll"/>
-          <include name="**/Spring.Services.xml"/>
-          <include name="**/Spring.Services.pdb"/>
-
-          <include name="**/Spring.Testing.NUnit.dll"/>
-          <include name="**/Spring.Testing.NUnit.xml"/>
-          <include name="**/Spring.Testing.NUnit.pdb"/>
-
-          <include name="**/Spring.Testing.Microsoft.dll"/>
-          <include name="**/Spring.Testing.Microsoft.xml"/>
-          <include name="**/Spring.Testing.Microsoft.pdb"/>
-
-          <include name="**/Spring.Messaging.Ems.dll"/>
-          <include name="**/Spring.Messaging.Ems.xml"/>
-          <include name="**/Spring.Messaging.Ems.pdb"/>
-
-          <include name="**/Spring.Messaging.Nms.dll"/>
-          <include name="**/Spring.Messaging.Nms.xml"/>
-          <include name="**/Spring.Messaging.Nms.pdb"/>
-
-          <include name="**/Spring.Messaging.dll"/>
-          <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.Template.Velocity.dll"/>
-          <include name="**/Spring.Template.Velocity.xml"/>
-          <include name="**/Spring.Template.Velocity.pdb"/>
-
-          <include name="**/Common.Logging.dll"/>
-
-          <exclude name="**/3.0/**"/>
-          <exclude name="**/3.5/**"/>
-          <exclude name="**/release/Spring/**"/>
-          <exclude name="**/debug/Spring/**"/>
-          <exclude name="**/examples/**"/>
-          <exclude name="**/results/**"/>
-          <exclude name="mono/**"/>
-          <exclude name="mono/**"/>
-        </fileset>
-      </copy>
-    </if>
-
-    <!-- copy over .NET 3.0 build of Spring.Services -->
-    <if test="${net-3.0.installed}">
-      <copy todir="${current.package.dir}/bin/net">
-        <fileset basedir="./build/net">
-          <include name="**/Spring.Services.dll"/>
-          <include name="**/Spring.Services.xml"/>
-          <include name="**/Spring.Services.pdb"/>
-        </fileset>
-      </copy>
-    </if>
-
-
-    <if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
-      <copy todir="${current.package.dir}/bin/net">
-        <fileset basedir="./build/net">
-          <include name="**/Spring.Services.*.exe"/>
-          <include name="**/Spring.*.dll"/>
-          <include name="**/Spring.*.xml"/>
-          <include name="**/Spring.*.pdb"/>
-          <include name="**/log4net.dll"/>
-          <include name="**/log4net.xml"/>
-          <include name="**/log4net.pdb"/>
-          <include name="**/Common.Logging.dll"/>
-          <include name="**/Common.Logging.xml"/>
-          <exclude name="**/examples/**"/>
-          <exclude name="**/results/**"/>
-          <exclude name="**/Spring.*.Tests.dll"/>
-          <exclude name="**/Spring.*.Tests.xml"/>
-          <exclude name="**/Spring.*.Tests.pdb"/>
-          <exclude name="**/Spring.Examples.*"/>
-        </fileset>
-      </copy>
-    </if>
-
-    <delete>
-      <fileset basedir="${current.package.dir}/bin/net">
-        <include name="**/es/**"/>
-        <include name="**/PT-BR/**"/>
-        <include name="**/pt-BR/**"/>
-        <include name="**/sr/**"/>
-        <include name="**/sr-SP-Cyrl/**"/>
-        <include name="**/sr-Cyrl-CS/**"/>
-        <include name="**/mpollack*/**"/>
-        <include name="**/results/**"/>
-        <include name="**/release/Spring/**"/>
-        <include name="**/debug/Spring/**"/>
-        <include name="**/debug/bin/**"/>
-      </fileset>
-    </delete>
+    <!-- copy spring binaries -->
+    <call target="package-release-files-spring.binaries" />
 
     <!-- copy user reference documentation -->
     <mkdir dir="${current.package.dir}/doc/reference"/>
@@ -1268,6 +1082,15 @@ Commandline Examples:
       </copy>
     </if>
 
+    <mkdir dir="${current.package.dir}/lib/NHibernate10"/>
+    <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
+      <copy todir="${current.package.dir}/lib/NHibernate10">
+        <fileset basedir="lib/NHibernate10">
+          <include name="**/*.dll"/>
+          <include name="**/*.license.txt"/>
+        </fileset>
+      </copy>
+    </if>
 
     <mkdir dir="${current.package.dir}/lib/NHibernate12"/>
     <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
@@ -1386,8 +1209,141 @@ Commandline Examples:
         </fileset>
     </copy>
 
+  </target>
 
+<!-- copy spring binaries from build dir to package bin dir -->
+  <target name="package-release-files-spring.binaries">
+    <!-- copy built assemblies -->
+    <mkdir dir="${current.package.dir}/bin/net"/>
+    <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
+      <copy todir="${current.package.dir}/bin/net">
+        <fileset basedir="./build/net">
 
+          <include name="*/*/Common.Logging.dll"/>
+
+          <include name="*/*/Spring.Core.dll"/>
+          <include name="*/*/Spring.Core.xml"/>
+          <include name="*/*/Spring.Core.pdb"/>
+
+          <include name="*/*/Spring.Aop.dll"/>
+          <include name="*/*/Spring.Aop.xml"/>
+          <include name="*/*/Spring.Aop.pdb"/>
+
+          <include name="*/*/Spring.Data.dll"/>
+          <include name="*/*/Spring.Data.xml"/>
+          <include name="*/*/Spring.Data.pdb"/>
+
+          <include name="*/*/Spring.Data.NHibernate12.dll"/>
+          <include name="*/*/Spring.Data.NHibernate12.xml"/>
+          <include name="*/*/Spring.Data.NHibernate12.pdb"/>
+
+          <include name="*/*/Spring.Data.NHibernate20.dll"/>
+          <include name="*/*/Spring.Data.NHibernate20.xml"/>
+          <include name="*/*/Spring.Data.NHibernate20.pdb"/>
+
+          <include name="*/*/Spring.Data.NHibernate21.dll"/>
+          <include name="*/*/Spring.Data.NHibernate21.xml"/>
+          <include name="*/*/Spring.Data.NHibernate21.pdb"/>
+
+          <include name="*/*/Spring.Web.dll"/>
+          <include name="*/*/Spring.Web.xml"/>
+          <include name="*/*/Spring.Web.pdb"/>
+
+          <include name="*/*/Spring.Web.Extensions.dll"/>
+          <include name="*/*/Spring.Web.Extensions.xml"/>
+          <include name="*/*/Spring.Web.Extensions.pdb"/>
+
+          <include name="*/*/Spring.Services.dll"/>
+          <include name="*/*/Spring.Services.xml"/>
+          <include name="*/*/Spring.Services.pdb"/>
+
+          <include name="*/*/Spring.Testing.NUnit.dll"/>
+          <include name="*/*/Spring.Testing.NUnit.xml"/>
+          <include name="*/*/Spring.Testing.NUnit.pdb"/>
+
+          <include name="*/*/Spring.Testing.Microsoft.dll"/>
+          <include name="*/*/Spring.Testing.Microsoft.xml"/>
+          <include name="*/*/Spring.Testing.Microsoft.pdb"/>
+
+          <include name="*/*/Spring.Messaging.Ems.dll"/>
+          <include name="*/*/Spring.Messaging.Ems.xml"/>
+          <include name="*/*/Spring.Messaging.Ems.pdb"/>
+
+          <include name="*/*/Spring.Messaging.Nms.dll"/>
+          <include name="*/*/Spring.Messaging.Nms.xml"/>
+          <include name="*/*/Spring.Messaging.Nms.pdb"/>
+
+          <include name="*/*/Spring.Messaging.dll"/>
+          <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.Template.Velocity.dll"/>
+          <include name="*/*/Spring.Template.Velocity.xml"/>
+          <include name="*/*/Spring.Template.Velocity.pdb"/>
+
+<!--
+          <exclude name="**/3.0/**"/>
+          <exclude name="**/release/Spring/**"/>
+          <exclude name="**/debug/Spring/**"/>
+          <exclude name="**/examples/**"/>
+          <exclude name="**/results/**"/>
+          <exclude name="mono/**"/>
+          <exclude name="mono/**"/>
+-->
+        </fileset>
+      </copy>
+    </if>
+<!--
+    <if test="${net-3.0.installed}">
+      <copy todir="${current.package.dir}/bin/net">
+        <fileset basedir="./build/net">
+          <include name="**/Spring.Services.dll"/>
+          <include name="**/Spring.Services.xml"/>
+          <include name="**/Spring.Services.pdb"/>
+        </fileset>
+      </copy>
+    </if>
+    <if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
+      <copy todir="${current.package.dir}/bin/net">
+        <fileset basedir="./build/net">
+          <include name="**/Spring.Services.*.exe"/>
+          <include name="**/Spring.*.dll"/>
+          <include name="**/Spring.*.xml"/>
+          <include name="**/Spring.*.pdb"/>
+          <include name="**/log4net.dll"/>
+          <include name="**/log4net.xml"/>
+          <include name="**/log4net.pdb"/>
+          <include name="**/Common.Logging.dll"/>
+          <include name="**/Common.Logging.xml"/>
+          <exclude name="**/examples/**"/>
+          <exclude name="**/results/**"/>
+          <exclude name="**/Spring.*.Tests.dll"/>
+          <exclude name="**/Spring.*.Tests.xml"/>
+          <exclude name="**/Spring.*.Tests.pdb"/>
+          <exclude name="**/Spring.Examples.*"/>
+        </fileset>
+      </copy>
+    </if>
+    <delete>
+      <fileset basedir="${current.package.dir}/bin/net">
+        <include name="**/es/**"/>
+        <include name="**/PT-BR/**"/>
+        <include name="**/pt-BR/**"/>
+        <include name="**/sr/**"/>
+        <include name="**/sr-SP-Cyrl/**"/>
+        <include name="**/sr-Cyrl-CS/**"/>
+        <include name="**/mpollack*/**"/>
+        <include name="**/results/**"/>
+        <include name="**/release/Spring/**"/>
+        <include name="**/debug/Spring/**"/>
+        <include name="**/debug/bin/**"/>
+      </fileset>
+    </delete>
+-->
   </target>
 
   <target name="package-sdkdocs" depends="set-package-configuration">
@@ -1615,10 +1571,26 @@ Commandline Examples:
     </fileset>
   </target>
 
-  <!-- Set up test environment -->
-  <target name="TestInit">
-      <!-- custom task for testing under different runtimes -->
-    <!-- loadtasks assembly="${spring.basedir}/build-support/tools/NAnt.NUnit2OutProc.Task/NAnt.NUnit2OutProcTasks.dll" / -->
+  <!-- build all Visual Studio Solutions -->
+  <target name="build-solutions">
+    <!-- some examples are linked against the "bin" dir of the distribution so copy them from 'build' to 'bin' -->
+    <delete dir="${spring.basedir}/bin" />
+
+    <property name="current.package.dir" value="${spring.basedir}" />
+    <call target="package-release-files-spring.binaries" />
+
+    <!-- rebuild all solutions -->
+    <nant buildfile="build-support/solutions.build.nant">
+      <properties>
+        <property name="root.dir" value="${spring.basedir}" />
+      </properties>
+    </nant>
+    <!-- be nice and cleanup after building -->
+    <nant buildfile="build-support/solutions.build.nant" target="Clean">
+      <properties>
+        <property name="root.dir" value="${spring.basedir}" />
+      </properties>
+    </nant>
   </target>
 
 </project>
diff --git a/build-support/solutions.build.nant b/build-support/solutions.build.nant
index 460d66a5..11e072fc 100644
--- a/build-support/solutions.build.nant
+++ b/build-support/solutions.build.nant
@@ -19,107 +19,127 @@ Rebuilding Solutions using Nant and "solutions.build":
 -->
 <project name="Spring.NET Examples" default="RebuildAllSolutions">
 
-        <property name="vs2003.install.dir.key" value="SOFTWARE\Microsoft\VisualStudio\7.1\InstallDir"/>
-        <readregistry property="vs2003.install.dir" key="${vs2003.install.dir.key}" hive="LocalMachine" failonerror="false"/>
-	<property name="devenv11.exe" value="${vs2003.install.dir}devenv.exe" failonerror="false" />
-	<property name="msbuild.exe" value="C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild.exe"/>
-	<property name="buildconfiguration" value="Debug" />
+  <property name="root.dir" value="${project::get-base-directory()}\.." overwrite="false" />
 
-	<target name="RebuildAllSolutions" description="Rebuild all Solutions">
-		<call target="RebuildAllSolutions-1.1" />
-		<call target="RebuildAllSolutions-2.0" />
-	</target>
+  <property name="vs2003.install.dir.key" value="SOFTWARE\Microsoft\VisualStudio\7.1\InstallDir"/>
+  <readregistry property="vs2003.install.dir" key="${vs2003.install.dir.key}" hive="LocalMachine" failonerror="false"/>
+  <property name="devenv11.exe" value="${vs2003.install.dir}devenv.exe" if="${property::exists('vs2003.install.dir')}" />
 
-	<target name="Clean">
-		<delete>
-		    <fileset basedir="examples">
-		        <include name="**/bin/**/*.*" />
-		        <include name="**/obj/**/*.*" />
-		        <exclude name="**/bin/*.refresh" />
-		    </fileset>
-		</delete>
-	</target>
+  <readregistry property="net35.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\InstallPath" hive="LocalMachine" failonerror="true"/>
+  <property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>
 
-	<target name="RebuildAllSolutions-1.1" depends="Clean">
+  <property name="buildconfiguration" value="Debug" />
 
-		<!-- build examples -->
-		<foreach item="File" property="filename">
-		    <in>
-		        <items basedir="examples">
-		            <include name="**/*.2003.sln" />
-		            <exclude name="**/SpringAir.2003.sln" />  <!-- unfort. doesn't work -->
-		        </items>
-		    </in>
-		    <do>
-						<property name="solutionfile" value="${filename}" />
-						<property name="solutionconfiguration" value="${buildconfiguration}" />
-						<call target="RebuildSolution-1.1" />
-		    </do>
-		</foreach>
+  <target name="RebuildAllSolutions" description="Rebuild all Solutions">
+    <call target="RebuildAllSolutions-1.1" if="${property::exists('vs2003.install.dir')}" />
+    <call target="RebuildAllSolutions-2.0"  />
+  </target>
 
-		<!-- build "main" solution (extra call because of configuration 'debug-1.1') -->
-		<property name="solutionfile" value="Spring.NET.2003.sln" />
-		<property name="solutionconfiguration" value="${buildconfiguration}-1.1" />
-		<call target="RebuildSolution-1.1" />
+  <target name="Clean">
+    <foreach item="Folder" property="dirname">
+        <in>
+            <items basedir="${root.dir}">
+                <include name="examples/**/obj" />
+                <include name="examples/**/PreCompiledWeb" />
+                <include name="build/VS.NET.*" />
+            </items>
+        </in>
+        <do>
+            <delete dir="${dirname}" />
+        </do>
+    </foreach>
+    <delete>
+        <fileset basedir="${root.dir}">
+            <include name="examples/**/bin/**/*.*" />
+            <exclude name="examples/**/bin/*.refresh" />
+        </fileset>
+    </delete>
+  </target>
 
-	</target>
+  <target name="RebuildAllSolutions-1.1" depends="Clean">
 
-	<target name="RebuildAllSolutions-2.0" dependes="Clean">
-		<foreach item="File" property="filename">
-		    <in>
-		        <items basedir="examples/Spring">
-		            <include name="**/*.2005.sln" />
-		            <include name="**/*.2008.sln" />
-		            <include name="Spring.Data.NHibernate/Spring.Northwind.sln" />
-		        </items>
-		    </in>
-		    <do>
-						<property name="solutionfile" value="${filename}" />
-						<property name="solutionconfiguration" value="${buildconfiguration}" />
-						<call target="RebuildSolution-2.0" />
-		    </do>
-		</foreach>
+    <!-- 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 -->
+            </items>
+        </in>
+        <do>
+            <property name="solutionfile" value="${filename}" />
+            <property name="solutionconfiguration" value="${buildconfiguration}" />
+            <call target="RebuildSolution-1.1" />
+        </do>
+    </foreach>
 
-		<!-- build "main" solution -->
-		<property name="solutionfile" value="Spring.NET.2005.sln" />
-		<property name="solutionconfiguration" value="${buildconfiguration}" />
-		<call target="RebuildSolution-2.0" />
+    <!-- build "main" solution (extra call because of configuration 'debug-1.1') -->
+    <property name="solutionfile" value="Spring.NET.2003.sln" />
+    <property name="solutionconfiguration" value="${buildconfiguration}-1.1" />
+    <call target="RebuildSolution-1.1" />
 
-		<!-- build "main" solution -->
-		<property name="solutionfile" value="Spring.NET.2008.sln" />
-		<property name="solutionconfiguration" value="${buildconfiguration}" />
-		<call target="RebuildSolution-2.0" />
+  </target>
 
-	</target>
+  <target name="RebuildAllSolutions-2.0" depends="Clean">
+    <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" />
+                <include name="*.2005.sln" />
+                <include name="*.2008.sln" />
+            </items>
+        </in>
+        <do>
+            <property name="solutionfile" value="${filename}" />
+            <property name="solutionconfiguration" value="${buildconfiguration}" />
+            <call target="RebuildSolution-2.0" />
+        </do>
+    </foreach>
 
-	<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 VS2003 Solution ${solutionfile}" />
-		<exec program="${devenv11.exe}" basedir="${devenv11.exe}">
-			<arg value="${solutionfile}" />
-			<arg line="/rebuild ${solutionconfiguration}" />
-			<arg line="/out solutions.build-1.1.log" />
-		</exec>
+    <!-- build "main" solution -->
 <!--
-		<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>
+    <property name="solutionfile" value="${root.dir}/Spring.NET.2005.sln" />
+    <property name="solutionconfiguration" value="${buildconfiguration}" />
+    <call target="RebuildSolution-2.0" />
 -->
-	</target>
-
-	<target name="RebuildSolution-2.0" description="rebuilds a given VS2005 solution file">
-		<echo message="Rebuilding VS2005 Solution ${solutionfile}" />
-		<exec program="${msbuild.exe}">
+    <!-- build "main" solution -->
 <!--
-			<arg value="/property:OutDir=${output.dir}/"/>
+    <property name="solutionfile" value="${root.dir}/Spring.NET.2008.sln" />
+    <property name="solutionconfiguration" value="${buildconfiguration}" />
+    <call target="RebuildSolution-2.0" />
 -->
-			<arg value="${solutionfile}"/>
-			<arg line="/nologo" />
-			<arg line="/property:Configuration=${solutionconfiguration}"/>
-		</exec>
-	</target>
+  </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 VS2003 Solution ${solutionfile}" />
+    <exec program="${devenv11.exe}" basedir="${devenv11.exe}">
+      <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 VS2005 solution file">
+    <echo message="Rebuilding VS2005 Solution ${solutionfile}" />
+    <exec program="${msbuild.exe}">
+<!--
+      <arg value="/property:OutDir=${output.dir}/"/>
+-->
+      <arg value="${solutionfile}"/>
+      <arg line="/nologo" />
+      <arg line="/property:Configuration=${solutionconfiguration}"/>
+    </exec>
+  </target>
 
 </project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/lib/net/2.0/log4net.dll b/examples/Spring/Spring.Data.NHibernate.Northwind/lib/net/2.0/log4net.dll
deleted file mode 100644
index ffc57e11..00000000
Binary files a/examples/Spring/Spring.Data.NHibernate.Northwind/lib/net/2.0/log4net.dll and /dev/null differ
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 83353425..19b08694 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
@@ -33,31 +33,31 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+    <Reference Include="Common.Logging">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+    <Reference Include="Iesi.Collections">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\Iesi.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+    <Reference Include="log4net">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+    <Reference Include="NHibernate">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Data">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Data.NHibernate21, Version=1.1.1.20093, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Data.NHibernate21">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
     </Reference>
@@ -96,7 +96,7 @@
     <EmbeddedResource Include="Dao\Dao.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Antlr3.Runtime.dll b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Antlr3.Runtime.dll
deleted file mode 100644
index 637fc3e3..00000000
Binary files a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Antlr3.Runtime.dll and /dev/null differ
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/LinFu.DynamicProxy.dll b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/LinFu.DynamicProxy.dll
deleted file mode 100644
index 22225220..00000000
Binary files a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/LinFu.DynamicProxy.dll and /dev/null differ
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/NHibernate.ByteCode.LinFu.dll b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/NHibernate.ByteCode.LinFu.dll
deleted file mode 100644
index 015189d9..00000000
Binary files a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/NHibernate.ByteCode.LinFu.dll and /dev/null differ
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Properties/AssemblyInfo.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Properties/AssemblyInfo.cs
index afafa575..ff14b9d5 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Properties/AssemblyInfo.cs
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Properties/AssemblyInfo.cs
@@ -30,3 +30,9 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+
+class LinkThem
+{
+  private Spring.Data.NHibernate.HibernateTemplate ht = null;
+  private Spring.Web.UI.Page page = null;
+}
\ No newline at end of file
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 50887444..952ca6fb 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
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>.</OutputPath>
+    <OutputPath>./bin</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -27,54 +27,59 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>.</OutputPath>
+    <OutputPath>./bin</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Antlr3.Runtime, Version=3.1.0.39271, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
+    <Reference Include="Antlr3.Runtime, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\Antlr3.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+    <Reference Include="Common.Logging, Culture=neutral, PublicKeyToken=af08829b84f0328e">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+    <Reference Include="Common.Logging.Log4Net, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\net\2.0\Common.Logging.Log4Net.dll</HintPath>
     </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+    <Reference Include="Iesi.Collections, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\Iesi.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+    <Reference Include="log4net, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
+      <HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="NHibernate, Version=2.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+    <Reference Include="NHibernate, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Core, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Data, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Data.NHibernate21, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate21.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Web, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
+    <Reference Include="System.Data.SQLite, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\net\2.0\System.Data.SQLite.DLL</HintPath>
     </Reference>
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
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 8a063d46..baa68e83 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
@@ -60,12 +60,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\2.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>
+    </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>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\net\2.0\System.Data.SQLite.DLL</HintPath>