diff --git a/build-support/solutions.build.nant b/build-support/solutions.build.nant
index d204a66b..460d66a5 100644
--- a/build-support/solutions.build.nant
+++ b/build-support/solutions.build.nant
@@ -21,7 +21,7 @@ Rebuilding Solutions using Nant and "solutions.build":
 
         <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" />
+	<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" />
 
@@ -69,8 +69,8 @@ Rebuilding Solutions using Nant and "solutions.build":
 		    <in>
 		        <items basedir="examples/Spring">
 		            <include name="**/*.2005.sln" />
+		            <include name="**/*.2008.sln" />
 		            <include name="Spring.Data.NHibernate/Spring.Northwind.sln" />
-		            <include name="Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln" />
 		        </items>
 		    </in>
 		    <do>
@@ -80,11 +80,16 @@ Rebuilding Solutions using Nant and "solutions.build":
 		    </do>
 		</foreach>
 
-		<!-- build "main" solution (extra call because of configuration 'debug-1.1') -->
+		<!-- build "main" solution -->
 		<property name="solutionfile" value="Spring.NET.2005.sln" />
 		<property name="solutionconfiguration" value="${buildconfiguration}" />
 		<call target="RebuildSolution-2.0" />
 
+		<!-- build "main" solution -->
+		<property name="solutionfile" value="Spring.NET.2008.sln" />
+		<property name="solutionconfiguration" value="${buildconfiguration}" />
+		<call target="RebuildSolution-2.0" />
+
 	</target>
 
 	<target name="RebuildSolution-1.1" description="rebuilds a given VS2003 solution file">
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
new file mode 100644
index 00000000..afafa575
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Properties/AssemblyInfo.cs
@@ -0,0 +1,32 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Spring.Northwind.Web.References")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Spring.Northwind.Web.References")]
+[assembly: AssemblyCopyright("Copyright ©  2009")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
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 2aef7062..50887444 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
@@ -77,6 +77,11 @@
     </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/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 c478ea8b..8a063d46 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
@@ -72,6 +72,11 @@
     </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
index b5d04179..d866a00d 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
@@ -82,10 +82,6 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Spring.Aspects\Spring.Aspects.csproj">
-      <Project>{53B04C54-63EA-45AA-BB83-8950AF3C5D68}</Project>
-      <Name>Spring.Aspects</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj">
       <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
       <Name>Spring.Northwind.Dao.NHibernate</Name>
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Gateways/EmsSyncStockServiceGateway.cs b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Gateways/EmsSyncStockServiceGateway.cs
index b66c4003..a34cf419 100644
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Gateways/EmsSyncStockServiceGateway.cs
+++ b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Gateways/EmsSyncStockServiceGateway.cs
@@ -19,7 +19,7 @@
 #endregion
 
 
-using Spring.Messaging.Ems.Cor;e
+using Spring.Messaging.Ems.Core;
 using Spring.EmsQuickStart.Common.Data;
 
 namespace Spring.EmsQuickStart.Client.Gateways
diff --git a/src/Spring/Spring.Aop/Spring.Aop.2005.csproj b/src/Spring/Spring.Aop/Spring.Aop.2005.csproj
index a38571b2..63fb8552 100644
--- a/src/Spring/Spring.Aop/Spring.Aop.2005.csproj
+++ b/src/Spring/Spring.Aop/Spring.Aop.2005.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -23,6 +23,11 @@
     <StartupObject>
     </StartupObject>
     <SignAssembly>false</SignAssembly>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2005\Spring.Aop\Debug\</OutputPath>
diff --git a/src/Spring/Spring.Core/Spring.Core.2005.csproj b/src/Spring/Spring.Core/Spring.Core.2005.csproj
index 65f7088f..c9e1eded 100644
--- a/src/Spring/Spring.Core/Spring.Core.2005.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2005.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -22,6 +22,11 @@
     <StartupObject>
     </StartupObject>
     <SignAssembly>false</SignAssembly>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2005\Spring.Core\Debug\</OutputPath>
@@ -103,6 +108,7 @@
     <Compile Include="Collections\DictionarySet.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Collections\Generic\ReadOnlyDictionary.cs" />
     <Compile Include="Collections\HashedSet.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -167,9 +173,7 @@
     <Compile Include="Context\IApplicationEventPublisher.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Context\IConfigurableApplicationContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="Context\IConfigurableApplicationContext.cs" />
     <Compile Include="Context\IHierarchicalMessageSource.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -255,6 +259,8 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Core\Conventions.cs" />
+    <Compile Include="Core\IO\EncodedResource.cs" />
+    <Compile Include="Core\MethodArgumentsCriteria.cs" />
     <Compile Include="Core\IO\AbstractResource.cs" />
     <Compile Include="Core\IO\AssemblyResource.cs" />
     <Compile Include="Core\IO\ConfigSectionResource.cs" />
@@ -284,11 +290,12 @@
     <Compile Include="Core\IOrdered.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Core\MethodArgumentsCriteria.cs" />
     <Compile Include="Core\MethodInvocationException.cs" />
     <Compile Include="Core\MethodParameter.cs" />
     <Compile Include="Core\MethodParametersCountCriteria.cs" />
-    <Compile Include="Core\MethodParametersCriteria.cs" />
+    <Compile Include="Core\MethodParametersCriteria.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Core\MethodReturnTypeCriteria.cs" />
     <Compile Include="Core\NotReadablePropertyException.cs" />
     <Compile Include="Core\NotWritablePropertyException.cs" />
@@ -442,9 +449,9 @@
     <Compile Include="Expressions\Parser\antlr\TokenWithIndex.cs" />
     <Compile Include="Expressions\Parser\antlr\TreeParser.cs" />
     <Compile Include="Expressions\Parser\antlr\TreeParserSharedInputState.cs" />
+    <Compile Include="Expressions\SyntaxErrorException.cs" />
     <Compile Include="Expressions\Parser\ExpressionLexer.cs" />
     <Compile Include="Expressions\Parser\ExpressionParser.cs" />
-    <Compile Include="Expressions\Parser\ExpressionParserTokenTypes.cs" />
     <Compile Include="Expressions\Processors\AverageAggregator.cs" />
     <Compile Include="Expressions\Processors\ConversionProcessor.cs" />
     <Compile Include="Expressions\Processors\NonNullProcessor.cs" />
@@ -591,7 +598,6 @@
     <Compile Include="Expressions\StringLiteralNode.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Expressions\SyntaxErrorException.cs" />
     <Compile Include="Expressions\TernaryNode.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -692,7 +698,6 @@
     <Compile Include="Objects\Factory\Xml\NamespaceParserSupport.cs" />
     <Compile Include="Objects\Factory\Xml\ObjectDefinitionParserHelper.cs" />
     <Compile Include="Objects\Factory\Xml\ParserContext.cs" />
-    <Compile Include="Objects\Factory\Xml\ReplacedMethodOverride.cs" />
     <Compile Include="Objects\Factory\Xml\XmlReaderContext.cs" />
     <Compile Include="Objects\FatalObjectException.cs" />
     <Compile Include="Objects\IMergable.cs" />
@@ -944,6 +949,9 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Objects\Factory\Support\PropertiesObjectDefinitionReader.cs" />
+    <Compile Include="Objects\Factory\Xml\ReplacedMethodOverride.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Objects\Factory\Support\RootObjectDefinition.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -1126,17 +1134,18 @@
     <Compile Include="Util\StringUtils.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Validation\Actions\ExceptionAction.cs" />
+    <Compile Include="Validation\BaseSimpleValidator.cs" />
+    <Compile Include="Validation\BaseValidatorGroup.cs" />
     <Compile Include="Validation\Actions\ErrorMessageAction.cs" />
     <Compile Include="Validation\Actions\ExpressionAction.cs" />
     <Compile Include="Validation\AnyValidatorGroup.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Validation\BaseSimpleValidator.cs" />
     <Compile Include="Validation\BaseValidationAction.cs" />
     <Compile Include="Validation\BaseValidator.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Validation\BaseValidatorGroup.cs" />
     <Compile Include="Validation\Config\ValidationNamespaceParser.cs" />
     <Compile Include="Validation\ErrorMessage.cs" />
     <Compile Include="Validation\ExclusiveValidatorGroup.cs">
@@ -1172,34 +1181,28 @@
     </Compile>
     <None Include="Expressions\Expression.g" />
     <EmbeddedResource Include="Objects\Factory\Xml\spring-tool-1.1.xsd">
-      <SubType>Designer</SubType>
+      <SubType>
+      </SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.1.xsd">
-      <SubType>Designer</SubType>
+      <SubType>
+      </SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.3.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="Objects\Factory\Xml\spring-objects-1.3.xsx">
-      <DependentUpon>spring-objects-1.3.xsd</DependentUpon>
-    </None>
+    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.3.xsd" />
     <None Include="Spring.Core.build" />
-    <None Include="Validation\Config\spring-validation-1.1.xsx">
-      <DependentUpon>spring-validation-1.1.xsd</DependentUpon>
-    </None>
-    <EmbeddedResource Include="Validation\Config\spring-validation-1.1.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
+    <EmbeddedResource Include="Validation\Config\spring-validation-1.3.xsd" />
+    <EmbeddedResource Include="Validation\Config\spring-validation-1.1.xsd" />
     <EmbeddedResource Include="Resources\Strings.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="README_ANTLR.txt" />
     <Content Include="Expressions\Parser\ExpressionParserTokenTypes.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>rem $(ProjectDir)\..\..\..\tools\antlr-2.7.6\antlr-2.7.6.exe -o $(ProjectDir)\Expressions\Parser $(ProjectDir)\Expressions\Expression.g
+    <PreBuildEvent>$(ProjectDir)..\..\..\build-support\tools\antlr-2.7.6\antlr-2.7.6.exe -o $(ProjectDir)Expressions\Parser $(ProjectDir)Expressions\Expression.g
 </PreBuildEvent>
     <PostBuildEvent>
     </PostBuildEvent>
diff --git a/src/Spring/Spring.Data/Spring.Data.2005.csproj b/src/Spring/Spring.Data/Spring.Data.2005.csproj
index 3722360a..b8c0651c 100644
--- a/src/Spring/Spring.Data/Spring.Data.2005.csproj
+++ b/src/Spring/Spring.Data/Spring.Data.2005.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -22,6 +22,11 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>
     </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data\Debug\</OutputPath>
diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2005.csproj b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2005.csproj
index b55c90bf..1593499a 100644
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2005.csproj
+++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2005.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
     <AssemblyName>Spring.Messaging.Ems</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -19,6 +24,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\..\..\build\VS.NET.2005\Spring.Messaging.Ems\Debug\Spring.Messaging.Ems.xml</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>1591,0618</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,7 +36,7 @@
     <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>
@@ -42,20 +49,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2005.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2005.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2005</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Messaging\Ems\Common\CertificateStoreConfig.cs" />
     <Compile Include="Messaging\Ems\Common\EmsConnection.cs" />
     <Compile Include="Messaging\Ems\Common\EmsConnectionFactory.cs" />
@@ -120,12 +116,27 @@
     <Compile Include="Messaging\Ems\Support\EmsUtils.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Messaging\Ems\Config\spring-ems-1.3.xsd">
-      <SubType>Designer</SubType>
-    </None>
+    <EmbeddedResource Include="Messaging\Ems\Config\spring-ems-1.3.xsd">
+      <SubType>
+      </SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </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.Messaging.Ems/Spring.Messaging.Ems.2008.csproj b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj
index f2385f1b..2ab998f0 100644
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj
+++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj
@@ -79,10 +79,10 @@
     <Compile Include="Messaging\Ems\Common\EmsTopicSubscriber.cs" />
     <Compile Include="Messaging\Ems\Common\IConnection.cs" />
     <Compile Include="Messaging\Ems\Common\IConnectionFactory.cs" />
+    <Compile Include="Messaging\Ems\Common\IEmsSSLStoreType.cs" />
     <Compile Include="Messaging\Ems\Common\IMessageConsumer.cs" />
     <Compile Include="Messaging\Ems\Common\IMessageProducer.cs" />
     <Compile Include="Messaging\Ems\Common\ISession.cs" />
-    <Compile Include="Messaging\Ems\Common\IEmsSSLStoreType.cs" />
     <Compile Include="Messaging\Ems\Common\ITopicSubscriber.cs" />
     <Compile Include="Messaging\Ems\Config\MessageListenerContainerObjectDefinitionParser.cs" />
     <Compile Include="Messaging\Ems\Config\EmsNamespaceParser.cs" />
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2005.csproj b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2005.csproj
index 3deea103..3926b582 100644
--- a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2005.csproj
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2005.csproj
@@ -47,6 +47,8 @@
       <Link>CommonAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Testing\Ado\IPlatformTransaction.cs" />
+    <Compile Include="Testing\Ado\SimpleAdoTestUtils.cs" />
     <Compile Include="Testing\NUnit\AbstractDependencyInjectionSpringContextTests.cs" />
     <Compile Include="Testing\NUnit\AbstractSpringContextTests.cs" />
     <Compile Include="Testing\NUnit\AbstractTransactionalDbProviderSpringContextTests.cs" />
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2005.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2005.csproj
index 70f4d245..b6029949 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2005.csproj
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2005.csproj
@@ -117,7 +117,6 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Data\AccountCreditDao.cs" />
     <Compile Include="Data\AccountDebitDao.cs" />
     <Compile Include="Data\AccountManager.cs" />
@@ -127,7 +126,7 @@
     <Compile Include="Data\AutoDeclarativeTxTests.cs" />
     <Compile Include="Data\CallCreateTestObject.cs" />
     <Compile Include="Data\ConsoleLoggingAroundAdvice.cs" />
-    <Compile Include="Data\Objects\Generic\MappingVacationQuery.cs" />
+    <Compile Include="Data\OracleAdoTemplateTests.cs" />
     <Compile Include="Data\TestTxIsolationLevelTests.cs" />
     <Compile Include="Data\Generic\GenericAdoTemplateTests.cs" />
     <Compile Include="Data\Generic\ITestObjectDao.cs" />
@@ -179,6 +178,7 @@
     <EmbeddedResource Include="Data\templateTests.xml" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Spring.Data.Integration.Tests.build" />
     <None Include="Spring.Data.Integration.Tests.dll.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -186,6 +186,12 @@
   <ItemGroup>
     <EmbeddedResource Include="Data\TestTxIsolationLevel.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Data\CreateTestObject.sql" />
+    <Content Include="Data\CreditsDebitsSchema.sql" />
+    <Content Include="Data\DTC1.1AppContext.xml" />
+    <Content Include="Data\testobjects-sqlserver.sql" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj
index 27f79066..0ed0f81d 100644
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj
+++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj
@@ -14,16 +14,16 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Messaging.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Messaging.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -79,12 +79,15 @@
     <EmbeddedResource Include="Messaging\queue-context.xml" />
     <EmbeddedResource Include="Messaging\Core\MessageQueueTemplateTests.xml" />
     <EmbeddedResource Include="Messaging\Listener\DistributedTxMessageListenerContainerTests.xml" />
+    <EmbeddedResource Include="Messaging\Core\MessageQueueMetadataCacheTests.xml" />
     <Content Include="Spring.Messaging.Tests.dll.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Messaging\Core\MessageQueueMetadataCacheTests.cs" />
     <Compile Include="Messaging\Core\ThreadingTests.cs" />
+    <Compile Include="Messaging\Listener\Adapter\MessageListenerAdapterTests.cs" />
     <Compile Include="Messaging\Listener\DistributedTxMessageListenerContainerTests.cs" />
     <Compile Include="Messaging\Listener\LoggingExceptionHandler.cs" />
     <Compile Include="Messaging\Listener\NonTransactionalMessageListenerContainerTests.cs">
@@ -102,8 +105,11 @@
     </Compile>
     <Compile Include="Messaging\Support\MessageAlreadyProcessedException.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Messaging.Tests.build" />
+  </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/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2005.csproj b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2005.csproj
index ae4af770..53dbd57e 100644
--- a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2005.csproj
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2005.csproj
@@ -38,12 +38,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="Rhino.Mocks, Version=3.4.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Testing\Ado\SimpleAdoTestUtilsTests.cs" />
     <Compile Include="Testing\NUnit\AbstractDependencyInjectionSpringContextTestsTests.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -68,13 +73,11 @@
       <Name>Spring.Data.Tests.2005</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Testing\NUnit\TestApplicationContext.xml" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Spring.Testing.NUnit.Tests.dll.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <EmbeddedResource Include="Testing\NUnit\TestApplicationContext.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.