diff --git a/Spring.Net.2003.sln b/Spring.Net.2003.sln
index f338bda2..2449db86 100644
--- a/Spring.Net.2003.sln
+++ b/Spring.Net.2003.sln
@@ -47,10 +47,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2003",
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.2003", "src\Spring\Spring.Data.NHibernate\Spring.Data.NHibernate.2003.csproj", "{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.Tests.2003", "test\Spring\Spring.Data.NHibernate.Tests\Spring.Data.NHibernate.Tests.2003.csproj", "{8755D942-7828-4971-835B-37A5992C06C9}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@@ -68,6 +64,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz.20
 	EndProjectSection
 EndProject
 Global
+	GlobalSection(VisualSVN) = preSolution
+	EndGlobalSection
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug-1.1 = Debug-1.1
 		Release-1.1 = Release-1.1
@@ -123,10 +121,6 @@ Global
 		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Debug-1.1.Build.0 = Debug-1.1|.NET
 		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Release-1.1.ActiveCfg = Release-1.1|.NET
 		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Release-1.1.Build.0 = Release-1.1|.NET
-		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
-		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Debug-1.1.Build.0 = Debug-1.1|.NET
-		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Release-1.1.ActiveCfg = Release-1.1|.NET
-		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Release-1.1.Build.0 = Release-1.1|.NET
 		{8755D942-7828-4971-835B-37A5992C06C9}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
 		{8755D942-7828-4971-835B-37A5992C06C9}.Debug-1.1.Build.0 = Debug-1.1|.NET
 		{8755D942-7828-4971-835B-37A5992C06C9}.Release-1.1.ActiveCfg = Release-1.1|.NET
@@ -145,6 +139,7 @@ Global
 		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Release-1.1.Build.0 = Release-1.1|.NET
 	EndGlobalSection
 	GlobalSection(SolutionItems) = postSolution
+		common-project.include = common-project.include
 		doc\NamespaceSummary.xml = doc\NamespaceSummary.xml
 		Spring.build = Spring.build
 		Spring.include = Spring.include
diff --git a/src/Spring/Spring.Aop/Spring.Aop.2003.csproj b/src/Spring/Spring.Aop/Spring.Aop.2003.csproj
index 48e698ac..53846051 100644
--- a/src/Spring/Spring.Aop/Spring.Aop.2003.csproj
+++ b/src/Spring/Spring.Aop/Spring.Aop.2003.csproj
@@ -88,11 +88,6 @@
                     Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
-                <Reference
-                    Name = "antlr.runtime"
-                    AssemblyName = "antlr.runtime"
-                    HintPath = "..\..\..\lib\Net\1.1\antlr.runtime.dll"
-                />
             </References>
         </Build>
         <Files>
@@ -383,59 +378,142 @@
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\AbstractAdvisorAutoProxyCreator.cs"
-                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\AbstractAutoProxyCreator.cs"
-                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\AbstractFilteringAutoProxyCreator.cs"
-                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\AttributeAutoProxyCreator.cs"
-                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\DefaultAdvisorAutoProxyCreator.cs"
-                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\IAdvisorRetrievalHelper.cs"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\InfrastructureAdvisorAutoProxyCreator.cs"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\InheritanceBasedAopConfigurer.cs"
-                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\ITargetSourceCreator.cs"
-                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\ObjectFactoryAdvisorRetrievalHelper.cs"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\ObjectNameAutoProxyCreator.cs"
-                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\PointcutFilteringAutoProxyCreator.cs"
-                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\TypeNameAutoProxyCreator.cs"
-                    SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\all-wcprops"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\entries"
+                    BuildAction = "None"
+                />
+                <Folder RelPath = "Aop\Framework\AutoProxy\.svn\prop-base\" />
+                <Folder RelPath = "Aop\Framework\AutoProxy\.svn\props\" />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\AbstractAdvisorAutoProxyCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\AbstractAutoProxyCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\AbstractFilteringAutoProxyCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\AttributeAutoProxyCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\DefaultAdvisorAutoProxyCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\IAdvisorRetrievalHelper.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\InfrastructureAdvisorAutoProxyCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\InheritanceBasedAopConfigurer.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\ITargetSourceCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\ObjectFactoryAdvisorRetrievalHelper.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\ObjectNameAutoProxyCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\PointcutFilteringAutoProxyCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\.svn\text-base\TypeNameAutoProxyCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <Folder RelPath = "Aop\Framework\AutoProxy\.svn\tmp\prop-base\" />
+                <Folder RelPath = "Aop\Framework\AutoProxy\.svn\tmp\props\" />
+                <Folder RelPath = "Aop\Framework\AutoProxy\.svn\tmp\text-base\" />
                 <File
                     RelPath = "Aop\Framework\AutoProxy\Target\AbstractPrototypeTargetSourceCreator.cs"
-                    SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\Target\.svn\all-wcprops"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\Target\.svn\entries"
+                    BuildAction = "None"
+                />
+                <Folder RelPath = "Aop\Framework\AutoProxy\Target\.svn\prop-base\" />
+                <Folder RelPath = "Aop\Framework\AutoProxy\Target\.svn\props\" />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\Target\.svn\text-base\AbstractPrototypeTargetSourceCreator.cs.svn-base"
+                    BuildAction = "None"
+                />
+                <Folder RelPath = "Aop\Framework\AutoProxy\Target\.svn\tmp\prop-base\" />
+                <Folder RelPath = "Aop\Framework\AutoProxy\Target\.svn\tmp\props\" />
+                <Folder RelPath = "Aop\Framework\AutoProxy\Target\.svn\tmp\text-base\" />
                 <File
                     RelPath = "Aop\Framework\DynamicProxy\AbstractAopProxyMethodBuilder.cs"
                     SubType = "Code"
diff --git a/src/Spring/Spring.Core/Spring.Core.2003.csproj b/src/Spring/Spring.Core/Spring.Core.2003.csproj
index f2259e82..4f69da10 100644
--- a/src/Spring/Spring.Core/Spring.Core.2003.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2003.csproj
@@ -34,7 +34,7 @@
                     FileAlignment = "4096"
                     IncrementalBuild = "false"
                     NoStdLib = "false"
-                    NoWarn = "219, 162, 675"
+                    NoWarn = "219, 162, 675,1591"
                     Optimize = "false"
                     OutputPath = "..\..\..\build\VS.Net.2003\Spring.Core\Debug-1.1\"
                     RegisterForComInterop = "false"
@@ -597,6 +597,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Core\IO\EncodedResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Core\IO\FileSystemResource.cs"
                     SubType = "Code"
@@ -1161,10 +1166,520 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Expressions\Parser\ExpressionParserTokenTypes.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Expressions\Parser\ExpressionParserTokenTypes.txt"
                     BuildAction = "None"
                 />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ANTLRException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ANTLRPanicException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ASTFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ASTNodeCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ASTNULLType.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ASTPair.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ASTVisitor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\BaseAST.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ByteBuffer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\CharBuffer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\CharQueue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\CharScanner.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\CharStreamException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\CharStreamIOException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\CommonAST.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\CommonASTWithHiddenTokens.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\CommonHiddenStreamToken.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\CommonToken.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\DefaultFileLineFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\DumpASTVisitor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\FileLineFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\IHiddenStreamToken.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\InputBuffer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\IToken.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\LexerSharedInputState.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\LLkParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\MismatchedCharException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\MismatchedTokenException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\NoViableAltException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\NoViableAltForCharException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\Parser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ParserSharedInputState.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ParseTree.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ParseTreeRule.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\ParseTreeToken.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\RecognitionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\SemanticException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\StringUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\SupportClass.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\Token.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenBuffer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenQueue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenStream.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenStreamBasicFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenStreamException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenStreamHiddenTokenFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenStreamIOException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenStreamRecognitionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenStreamRetryException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenStreamRewriteEngine.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenStreamSelector.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TokenWithIndex.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TreeParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\TreeParserSharedInputState.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\collections\AST.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\collections\impl\ASTArray.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\collections\impl\BitSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ANTLREventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\DebuggingCharScanner.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\DebuggingInputBuffer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\DebuggingParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\GuessingEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ICharScannerDebugSubject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\IDebugSubject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\InputBufferEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\InputBufferEventSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\InputBufferListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\InputBufferListenerBase.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\InputBufferReporter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\IParserDebugSubject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\Listener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\LLkDebuggingParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\MessageEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\MessageListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\MessageListenerBase.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\NewLineEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\NewLineListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserController.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserEventSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserListenerBase.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserMatchEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserMatchListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserMatchListenerBase.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserReporter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserTokenEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserTokenListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParserTokenListenerBase.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ParseTreeDebugParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\ScannerEventSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\SemanticPredicateEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\SemanticPredicateListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\SemanticPredicateListenerBase.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\SyntacticPredicateEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\SyntacticPredicateListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\SyntacticPredicateListenerBase.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\TraceEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\TraceListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\TraceListenerBase.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\antlr\debug\Tracer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Expressions\Processors\AverageAggregator.cs"
                     SubType = "Code"
@@ -1335,6 +1850,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Objects\IMergable.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Objects\IObjectWrapper.cs"
                     SubType = "Code"
@@ -1570,6 +2090,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Objects\Factory\Config\DictionaryVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Objects\Factory\Config\EnvironmentVariableMode.cs"
                     SubType = "Code"
@@ -1920,6 +2445,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Objects\Factory\Support\ManagedNameValueCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Objects\Factory\Support\ManagedSet.cs"
                     SubType = "Code"
@@ -1965,11 +2495,6 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
-                <File
-                    RelPath = "Objects\Factory\Support\ReplacedMethodOverride.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Objects\Factory\Support\RootObjectDefinition.cs"
                     SubType = "Code"
@@ -2081,12 +2606,17 @@
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Objects\Factory\Xml\spring-objects-1.1.xsd"
+                    RelPath = "Objects\Factory\Xml\ReplacedMethodOverride.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\spring-objects-1.3.xsd"
                     BuildAction = "EmbeddedResource"
                 />
                 <File
-                    RelPath = "Objects\Factory\Xml\spring-objects-1.1.xsx"
-                    DependentUpon = "spring-objects-1.1.xsd"
+                    RelPath = "Objects\Factory\Xml\spring-objects-1.3.xsx"
+                    DependentUpon = "spring-objects-1.3.xsd"
                     BuildAction = "None"
                 />
                 <File
@@ -2419,6 +2949,7 @@
                 />
                 <File
                     RelPath = "Util\IChainableConfigSystem.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
@@ -2586,13 +3117,18 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Validation\Actions\ExceptionAction.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Validation\Actions\ExpressionAction.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Validation\Config\spring-validation-1.1.xsd"
+                    RelPath = "Validation\Config\spring-validation-1.3.xsd"
                     BuildAction = "EmbeddedResource"
                 />
                 <File
diff --git a/src/Spring/Spring.Data/Spring.Data.2003.csproj b/src/Spring/Spring.Data/Spring.Data.2003.csproj
index 81254db4..f7984b5d 100644
--- a/src/Spring/Spring.Data/Spring.Data.2003.csproj
+++ b/src/Spring/Spring.Data/Spring.Data.2003.csproj
@@ -193,6 +193,16 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Dao\NonTransientDataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\NonTransientDataAccessResourceException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Dao\ObjectOptimisticLockingFailureException.cs"
                     SubType = "Code"
@@ -218,6 +228,16 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Dao\TransientDataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\TransientDataAccessResourceException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Dao\TypeMismatchDataAccessException.cs"
                     SubType = "Code"
@@ -288,6 +308,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Data\DuplicateKeyException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Data\IAdoOperations.cs"
                     SubType = "Code"
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2003.csproj b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2003.csproj
index c551dce0..43d022b4 100644
--- a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2003.csproj
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2003.csproj
@@ -1,7 +1,7 @@
 <VisualStudioProject>
     <CSHARP
         ProjectType = "Local"
-        ProductVersion = "7.10.3077"
+        ProductVersion = "7.10.6030"
         SchemaVersion = "2.0"
         ProjectGuid = "{6B8639E3-88BB-4F7B-9F23-699E84C30D58}"
     >
@@ -109,6 +109,16 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Testing\Ado\IPlatformTransaction.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Testing\Ado\SimpleAdoTestUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Testing\NUnit\AbstractDependencyInjectionSpringContextTests.cs"
                     SubType = "Code"
diff --git a/src/Spring/Spring.Web/Spring.Web.2003.csproj b/src/Spring/Spring.Web/Spring.Web.2003.csproj
index 13777a87..5a4c2d03 100644
--- a/src/Spring/Spring.Web/Spring.Web.2003.csproj
+++ b/src/Spring/Spring.Web/Spring.Web.2003.csproj
@@ -210,6 +210,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Objects\Factory\Support\IWebObjectNameGenerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Objects\Factory\Support\ObjectScope.cs"
                     SubType = "Code"
@@ -240,6 +245,21 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Objects\Factory\Xml\WebObjectDefinitionDocumentReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\WebObjectDefinitionParserHelper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\WebObjectDefinitionReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Objects\Factory\Xml\WebObjectsNamespaceParser.cs"
                     SubType = "Code"
@@ -270,6 +290,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Util\SecurityCritical.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Util\VirtualEnvironment.cs"
                     SubType = "Code"
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2003.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2003.csproj
index 1bc5fcc2..782d4b03 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2003.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2003.csproj
@@ -1177,6 +1177,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Objects\TestTransparentProxyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Objects\TypeMismatchExceptionTests.cs"
                     SubType = "Code"
@@ -2002,11 +2007,6 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
-                <File
-                    RelPath = "Validation\ValidationConfigParserTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Validation\ValidationErrorsTests.cs"
                     SubType = "Code"
@@ -2017,6 +2017,19 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "Validation\ValidationNamespaceParserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidationNamespaceParserTests_WhenConfigFileIsNotValid.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Validation\ValidationNamespaceParserTests_WhenConfigFileIsValid.xml"
+                    BuildAction = "Content"
+                />
                 <File
                     RelPath = "Validation\ValidatorGroupTests.cs"
                     SubType = "Code"
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2003.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2003.csproj
index deacee02..0e231691 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2003.csproj
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2003.csproj
@@ -118,11 +118,6 @@
         </Build>
         <Files>
             <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Spring.Data.Integration.Tests.build"
                     BuildAction = "None"
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2003.csproj b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2003.csproj
index a662e23d..2c562b07 100644
--- a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2003.csproj
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2003.csproj
@@ -89,11 +89,6 @@
                     Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
-                <Reference
-                    Name = "Spring.Data.NHibernate.2003"
-                    Project = "{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
                 <Reference
                     Name = "Spring.Aop.2003"
                     Project = "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
@@ -110,29 +105,39 @@
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
                 <Reference
-                    Name = "Castle.DynamicProxy"
-                    AssemblyName = "Castle.DynamicProxy"
-                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\Castle.DynamicProxy.dll"
-                />
-                <Reference
-                    Name = "Iesi.Collections"
-                    AssemblyName = "Iesi.Collections"
-                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\Iesi.Collections.dll"
-                />
-                <Reference
-                    Name = "log4net"
-                    AssemblyName = "log4net"
-                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\log4net.dll"
+                    Name = "Rhino.Mocks"
+                    AssemblyName = "Rhino.Mocks"
+                    HintPath = "..\..\..\lib\Net\1.1\Rhino.Mocks.dll"
                 />
                 <Reference
                     Name = "NHibernate"
                     AssemblyName = "NHibernate"
-                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\NHibernate.dll"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\NHibernate.dll"
                 />
                 <Reference
-                    Name = "Rhino.Mocks"
-                    AssemblyName = "Rhino.Mocks"
-                    HintPath = "..\..\..\lib\Net\1.1\Rhino.Mocks.dll"
+                    Name = "Castle.DynamicProxy"
+                    AssemblyName = "Castle.DynamicProxy"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\Castle.DynamicProxy.dll"
+                />
+                <Reference
+                    Name = "HashCodeProvider"
+                    AssemblyName = "HashCodeProvider"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\HashCodeProvider.dll"
+                />
+                <Reference
+                    Name = "Iesi.Collections"
+                    AssemblyName = "Iesi.Collections"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\Iesi.Collections.dll"
+                />
+                <Reference
+                    Name = "log4net"
+                    AssemblyName = "log4net"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\log4net.dll"
+                />
+                <Reference
+                    Name = "Spring.Data.NHibernate12.2003"
+                    Project = "{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
             </References>
         </Build>
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj
index 78c4ef9d..bab40c93 100644
--- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj
@@ -149,11 +149,6 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
-                <File
-                    RelPath = "MyNUnitAddinHelper.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
                 <File
                     RelPath = "Spring.Web.Tests.build"
                     BuildAction = "None"
@@ -197,7 +192,7 @@
                 <File
                     RelPath = "Data\Spring\Objects\Factory\Support\TestForm.aspx.cs"
                     DependentUpon = "TestForm.aspx"
-                    SubType = "Code"
+                    SubType = "ASPXCodeBehind"
                     BuildAction = "Compile"
                 />
                 <File
@@ -284,6 +279,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "TestSupport\WebApplicationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Threading\HttpContextStorageTests.cs"
                     SubType = "Code"
@@ -316,7 +316,7 @@
                 />
                 <File
                     RelPath = "Web\Support\ControlInterceptionTests.cs"
-                    SubType = "Code"
+                    SubType = "ASPXCodeBehind"
                     BuildAction = "Compile"
                 />
                 <File
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
index 5af3ca4b..93e2d9df 100644
--- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
@@ -15,6 +15,7 @@
             output="${current.bin.dir}/${project::get-name()}.dll" doc="${current.bin.dir}/${project::get-name()}.xml">
             <nowarn>
                 <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
+                <warning number="${nowarn.numbers.test},1587" if="${nant.settings.currentframework=='mono-2.0'}"/>
             </nowarn>
             <sources failonempty="true">
                 <include name="**/*.cs" />
@@ -30,6 +31,12 @@
             </resources>
             <references basedir="${current.bin.dir}">
                 <include name="*.dll" />
+		<include name="System.Configuration.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="System.Drawing.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="System.Xml.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="System.Web.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="System.Web.Services.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+		<include name="System.Data.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
                 <exclude name="${project::get-name()}.dll" />
                 <exclude name="CloverRuntime.dll" />
                 <include name="${lib.dir}/nunit.core.interfaces.dll" />