diff --git a/Spring.build b/Spring.build
index 1826cacb..0a9ea98f 100644
--- a/Spring.build
+++ b/Spring.build
@@ -22,8 +22,10 @@ Build properties that may be set:
         signs all assemblies. Requires the key file $/Spring.Net.snk to be in place
 "package.version":
         set the package version
-"build-testing-mstest":
-        set to true if local machine has VS.NET 2008 MSTest installed
+"build-testing-ems":
+        set to true if you want to build Tibco EMS support (you need to copy tibco.ems.dll and tibco.ems.admin.dll into /lib/net/2.0 first)
+"build-testing-microsoft":
+        set to true if local machine has VS.NET 2008 MSTest installed (you need to copy Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll to /lib/net/2.0 first)
 -->
 
   <!-- global project settings -->
@@ -46,7 +48,6 @@ Build properties that may be set:
   <include buildfile="${spring.basedir}/Spring.include"/>
 
   <property name="package.version" value="0.0.0" overwrite="false"/>
-  <property name="using-clover" value="false"/>
   <!-- change this to sync the sdk doc version generated -->
   <property name="package.version.docs" value="${package.version}" />
   <!-- make system environment variables available as NAnt properties -->
@@ -378,8 +379,8 @@ Build properties that may be set:
     <nant buildfile="src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services}"/>
-    <nant buildfile="src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build" target="build" if="${build-testing and not net-3.0}"/>
-    <nant buildfile="src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build" target="build" if="${build-testing-mstest  and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
+    <nant buildfile="src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build" target="build" if="${build-testing-nunit and not net-3.0}"/>
+    <nant buildfile="src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build" target="build" if="${build-testing-microsoft  and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build" target="build" if="${build-ems and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-nms and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.build" target="build" if="${build-quartz and not net-3.0}"/>
@@ -407,8 +408,8 @@ Build properties that may be set:
                  if="${build-data and nant.settings.currentframework == 'net-3.5' and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
     <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web and not net-3.0}"/>
-    <nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${not net-3.0}"/>
-    <nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${build-testing-mstest  and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${build-testing-nunit and not net-3.0}"/>
+    <nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${build-testing-microsoft  and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="build" if="${build-quartz and not net-3.0}"/>
@@ -416,9 +417,7 @@ Build properties that may be set:
     <nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="test" if="${build-velocity and not net-3.0}"/>
 
     <!-- build examples -->
-
-    <nant buildfile="examples/Spring/Spring.Examples.build" target="build" if="${build-examples and not using-clover and not net-3.0}"/>
-
+    <nant buildfile="examples/Spring/Spring.Examples.build" target="build" if="${build-examples and not net-3.0}"/>
 
   </target>
 
@@ -874,6 +873,7 @@ Build properties that may be set:
     <call target="${nant.target.root.name}-1.1" />
     <call target="${nant.target.root.name}-2.0" />
     <call target="${nant.target.root.name}-3.0" />
+    <call target="${nant.target.root.name}-3.5" />
 
     <!-- ignore Mono 2.0 for now -->
     <!-- <call target="${nant.target.root.name}-mono-2.0" /> -->
@@ -922,6 +922,15 @@ Build properties that may be set:
     <call target="compile-build-3.0"/>
   </target>
 
+  <target name="daily-build-3.5">
+    <call target="set-build-namespaces-all"/>
+    <call target="set-package-configuration"/>
+    <call target="set-debug-build-configuration"/>
+    <call target="compile-build-3.5"/>
+    <call target="set-release-build-configuration"/>
+    <call target="compile-build-3.5"/>
+  </target>
+
 
   <!-- Target to use when packaging everything in CVS -->
   <target name="package-cvs" description="Build and Package distribution">
@@ -1385,12 +1394,10 @@ Build properties that may be set:
   <target name="set-user-overrides" unless="${target::has-executed('set-user-overrides')}">
     <!--
              Per-user custom properties; we load any custom properties and / or
-             property overrides here... for instance, if a developer has installed
-             their Clover.NET executable into 'D:\dev_utils\Cenqua\Clover.NET', he or
-             she would use the following custom properties file...
+             property overrides here...
 
              <project name="MyCustomSpring.NETProperties">
-                <property name="Clover.home" value="D:\dev_utils\Cenqua\Clover.NET"/>
+                <property name="build-testing-microsoft" value="true"/>
              </project>
 
              These custom properties are loaded from a single file named
@@ -1419,8 +1426,8 @@ Build properties that may be set:
     <property name="build-aop" value="true" overwrite="false" />
     <property name="build-data" value="true" overwrite="false"/>
     <property name="build-services" value="true" overwrite="false" />
-    <property name="build-testing" value="true" overwrite="false" />
-    <property name="build-testing-mstest" value="false" overwrite="false"/>
+    <property name="build-testing-nunit" value="true" overwrite="false" />
+    <property name="build-testing-microsoft" value="false" overwrite="false"/>
     <property name="build-web" value="true" overwrite="false" />
     <property name="build-nms" value="true" overwrite="false" />
     <property name="build-ems" value="false" overwrite="false" />
@@ -1456,8 +1463,8 @@ Build properties that may be set:
     <property name="build-aop" value="true"/>
     <property name="build-data" value="true"/>
     <property name="build-services" value="true"/>
-    <property name="build-testing" value="true"/>
-    <property name="build-testing-mstest" value="false" overwrite="false"/>
+    <property name="build-testing-nunit" value="true"/>
+    <property name="build-testing-microsoft" value="false" overwrite="false"/>
     <property name="build-web" value="true"/>
     <property name="build-examples" value="true"/>
     <property name="build-nms" value="true" />
diff --git a/readme.txt b/readme.txt
index 9788f33c..4e39479d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,29 +1,29 @@
-THE SPRING.NET FRAMEWORK, Release 1.2.0  (November 10, 2008)
+THE SPRING.NET FRAMEWORK, Release 1.3.0RC1  (July 31, 2009)
 --------------------------------------------------------------------
 http://www.springframework.net/
 
 
 1. INTRODUCTION
 
-The 1.2 release of Spring.NET contains
+The 1.3.0RC release of Spring.NET contains
 
-     * A full featured Inversion of Control container 
+     * A full featured Inversion of Control container
      * An Aspect Oriented Programming framework
      * Expression Language for lightweight scripting
      * UI-agnostic validation framework
-     * ASP.NET Framework 
+     * ASP.NET Framework
        - Dependency Injection for pages and user controls, bi-directional data binding, and more.
      * Declarative transaction management abstraction
        - Declarative transaction management via use of common XML configuration and attributes across different transaction APIs
      * ADO.NET framework
        - Simplifies use of ADO.NET.  DAO support classes and integration with Spring's declarative transaction management functionality
-     * Portable Service Abstractions  
+     * Portable Service Abstractions
        - Export plain .NET objects via .NET Remoting, Web Service or .NET Serviced Component and create client side proxies based on endpoint URL and service interface.
      * NHibernate Integation
        - NHibernate 1.0 and 1.2 integration to simplify use of NHibernate and participate in Spring's declarative transaction management functionality.
      * ASP.NET AJAX Integration
        - Exporter to expose plain object on which Dependency Injection and AOP have been applied to JavaScript.
-     * NUnit integration 
+     * NUnit integration
        - Provides Dependency Injection of test cases and Spring container loading and caching. .  Data access and transaction management features aid with integration testing.
      * WCF integration
        - Provides Dependency Injection and applicatin of AOP advice to WCF services
@@ -35,7 +35,7 @@ The 1.2 release of Spring.NET contains
      * NMS integration
        - Simplifies the use of NMS by providing helper classes for message sending and receiving.
 
-Spring.NET is a port of the Java based Spring Framework. In turn, the Java/J2EE Spring Framework is based on code published in "Expert One-on-One J2EE Design and Development" by Rod Johnson (Wrox, 2002). 
+Spring.NET is a port of the Java based Spring Framework. In turn, the Java/J2EE Spring Framework is based on code published in "Expert One-on-One J2EE Design and Development" by Rod Johnson (Wrox, 2002).
 
 
 2. KNOWN ISSUES
@@ -59,7 +59,7 @@ Release contents:
 
 debug build is done using /DEBUG:full and release build using /DEBUG:pdbonly flags.
 
-The VS.NET solution for the framework and examples are provided.  
+The VS.NET solution for the framework and examples are provided.
 
 Latest info is available at the public website: http://www.springframework.net/
 
@@ -73,7 +73,7 @@ The Spring Framework is released under the terms of the Apache Software License
 The "bin" directory contains the following distinct dll files for use in applications. Dependencies are those other than on the .NET BCL.
 
 * "Spring.Core" (~615 KB)
-- Contents: Inversion of control container. Collection classes. 
+- Contents: Inversion of control container. Collection classes.
 - Dependencies: antlr.runtime, Common.Logging
 
 * "Spring.Aop" (~150 KB)
@@ -96,6 +96,10 @@ The "bin" directory contains the following distinct dll files for use in applica
 - Contents: NHibernate 2.0 RC1 integration
 - Dependencies: Spring.Core, Spring.Aop, Spring.Data, NHibernate
 
+* "Spring.Data.NHibernate21" (~90 KB)
+- Contents: NHibernate 2.1 integration
+- Dependencies: Spring.Core, Spring.Aop, Spring.Data, NHibernate
+
 * "Spring.Services" (~70 KB)
 - Contents: Web Services, Remoting, and Enterprise Component based services.
 - Dependencies: Spring.Core, Spring.Aop
@@ -153,7 +157,6 @@ VS.NET
 ------
 There are four solution file for different version of VS.NET
 
-* Spring.Net.2002.sln for use with VS.NET 2002
 * Spring.Net.2003.sln for use with VS.NET 2003
 * Spring.Net.2005.sln for use with VS.NET 2005
 * Spring.Net.2008.sln for use with VS.NET 2008
@@ -161,7 +164,7 @@ There are four solution file for different version of VS.NET
 NAnt
 ----
 
-A NAnt build script can be obtained via CVS or nightly builds.   You will need to 
+A NAnt build script can be obtained via CVS or nightly builds.   You will need to
 get the supporting tools directory from CVS as well.
 
 To build the source and run the unit tests type
@@ -184,7 +187,7 @@ documentation and make a final release build. Refer to the Spring.NET Wiki at
 http://opensource.atlassian.com/confluence/spring/display/NET/Docbook+Reference
 for information on how to install the docbook toolchain.
 
-Innovasys Document X! is used to generate the SDK documentation.
+NDoc3 and InnovaSys Document X! are used to generate the SDK documentation.
 
 
 7. Support
@@ -202,7 +205,7 @@ A Fisheye repository browser is located at http://fisheye1.cenqua.com/viewrep/sp
 InnovaSys Document X!
 ---------------------
 InnovSys has kindly provided a license to generate the SDK documentation and supporting utilities for
-integration with Visual Studio. 
+integration with Visual Studio.
 
 
 
diff --git a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.2008.csproj b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.2008.csproj
index 98da2659..c941ab19 100644
--- a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.2008.csproj
+++ b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.2008.csproj
@@ -34,22 +34,22 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Testing.Microsoft\Debug\</OutputPath>
+    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Testing.Microsoft\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\build\VS.NET.2005\Spring.Testing.Microsoft\Debug\Spring.Testing.Microsoft.xml</DocumentationFile>
+    <DocumentationFile>..\..\..\build\VS.NET.2008\Spring.Testing.Microsoft\Debug\Spring.Testing.Microsoft.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Testing.Microsoft\Release\</OutputPath>
+    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Testing.Microsoft\Release\</OutputPath>
     <DefineConstants>TRACE;NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
     </Reference>
@@ -105,7 +105,7 @@
     </ProjectReference>
   </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/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
new file mode 100644
index 00000000..e55ea671
--- /dev/null
+++ b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
@@ -0,0 +1,36 @@
+<?xml version="1.0" ?>
+<project name="Spring.Testing.Microsoft" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+    <target name="build">
+        <csc target="library" define="${current.build.defines.csc}"
+                warnaserror="false"
+            debug="${current.build.debug}"
+            output="${current.bin.dir}/${project::get-name()}.dll"
+            doc="${current.bin.dir}/${project::get-name()}.xml"
+            >
+            <arg line="${compiler.args}"/>
+            <nowarn>
+                <warning number="219" />
+                <warning number="162" />
+                <warning number="1591" />
+            </nowarn>
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+                <include name="../GenCommonAssemblyInfo.cs" />
+            </sources>
+		        <references basedir="${current.bin.dir}">
+			        <include name="System.Data.dll" />
+			        <include name="*.dll" />
+			        <include name="Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
+			        <exclude name="${project::get-name()}.dll" />
+		        </references>
+        </csc>
+    </target>
+
+</project>
+
diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
new file mode 100644
index 00000000..2ae83006
--- /dev/null
+++ b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
@@ -0,0 +1,54 @@
+<?xml version="1.0" ?>
+<project name="Spring.Testing.Microsoft.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+
+    <include buildfile="${spring.basedir}/common-project.include" />
+
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+		<!-- build Spring.Data.Tests -->
+		<csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+                     output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
+			        <include name="**/*.xml" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="*.dll" />
+			    <include name="Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
+				<exclude name="${project::get-name()}.dll" />
+			</references>
+		</csc>
+
+                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
+	</target>
+
+    <target name="test" depends="build">
+        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
+        <call target="common.run-tests" />
+    </target>
+<!--
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+		</nunit2outproc>
+	</target>
+-->
+</project>