diff --git a/Build.cmd b/Build.cmd
index b4b3c369..be2343dd 100644
--- a/Build.cmd
+++ b/Build.cmd
@@ -4,7 +4,7 @@
 @echo ...
 @echo Running full Build Script, capturing output to buildlog.txt file...
 @echo Start Time: %time%
-build-support\tools\nant\bin\nant %1 %2 %3 %4 %5 %6 %7 %8 %9 > buildlog.txt
+build-support\tools\nant\bin\nant -D:test.withcoverage=false %1 %2 %3 %4 %5 %6 %7 %8 %9 > buildlog.txt
 @echo .
 @echo ..
 @echo ...
diff --git a/Spring.Net.2008.sln b/Spring.Net.2008.sln
deleted file mode 100644
index 6feb4d7e..00000000
--- a/Spring.Net.2008.sln
+++ /dev/null
@@ -1,442 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
-	ProjectSection(SolutionItems) = preProject
-		BreakingChanges.txt = BreakingChanges.txt
-		changelog.txt = changelog.txt
-		common-project.include = common-project.include
-		readme.txt = readme.txt
-		Spring.build = Spring.build
-		Spring.include = Spring.include
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.Tests.2008", "test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.2008.csproj", "{2111596A-0327-4C9D-8919-294FBD988A23}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.2008", "src\Spring\Spring.Services\Spring.Services.2008.csproj", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.Tests.2008", "test\Spring\Spring.Services.Tests\Spring.Services.Tests.2008.csproj", "{4374F018-9738-46BF-A399-4594CEE75B21}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.2008", "src\Spring\Spring.Web\Spring.Web.2008.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Tests.2008", "test\Spring\Spring.Web.Tests\Spring.Web.Tests.2008.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2008", "test\Spring\Spring.Data.Tests\Spring.Data.Tests.2008.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Integration.Tests.2008", "test\Spring\Spring.Data.Integration.Tests\Spring.Data.Integration.Tests.2008.csproj", "{91766D21-C568-459F-9BEA-759B011F23CF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Extensions.2008", "src\Spring\Spring.Web.Extensions\Spring.Web.Extensions.2008.csproj", "{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2008", "src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj", "{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.Tests.2008", "test\Spring\Spring.Testing.NUnit.Tests\Spring.Testing.NUnit.Tests.2008.csproj", "{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.2008", "src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2008.csproj", "{AEB1578C-9018-4D49-B440-789F38DD2F29}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.Tests.2008", "test\Spring\Spring.Messaging.Nms.Tests\Spring.Messaging.Nms.Tests.2008.csproj", "{FA7A6931-7DBE-4A32-A312-51FAD2E80332}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.2008", "src\Spring\Spring.Messaging\Spring.Messaging.2008.csproj", "{0E23AE41-D8D8-41C2-84A2-D35564049F0D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Tests.2008", "test\Spring\Spring.Messaging.Tests\Spring.Messaging.Tests.2008.csproj", "{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Template.Velocity.2008", "src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2008.csproj", "{BF3AB954-8375-407C-9E98-4C51D8072784}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Template.Velocity.Tests", "test\Spring\Spring.Template.Velocity.Tests\Spring.Template.Velocity.Tests.csproj", "{10405837-CB67-40D8-9326-84C9383983E2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.Microsoft.2008", "src\Spring\Spring.Testing.Microsoft\Spring.Testing.Microsoft.2008.csproj", "{2E10A8D3-B8FF-4699-90B8-E621659C58DD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.Microsoft.Tests.2008", "test\Spring\Spring.Testing.Microsoft.Tests\Spring.Testing.Microsoft.Tests.2008.csproj", "{7321149A-47C6-4FBA-9D1A-26FD6815381B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate32.2008", "src\Spring\Spring.Data.NHibernate32\Spring.Data.NHibernate32.2008.csproj", "{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate32.Tests.2008", "test\Spring\Spring.Data.NHibernate32.Tests\Spring.Data.NHibernate32.Tests.2008.csproj", "{231512F3-4F1D-45E1-BADE-D01F68DB9A80}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate33.2008", "src\Spring\Spring.Data.NHibernate33\Spring.Data.NHibernate33.2008.csproj", "{67EA5988-C54E-4348-BFFB-E4A61F26143C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate33.Tests.2008", "test\Spring\Spring.Data.NHibernate33.Tests\Spring.Data.NHibernate33.Tests.2008.csproj", "{B48B00A6-8E4C-4953-9B82-7121A08AC57C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz21.2008", "src\Spring\Spring.Scheduling.Quartz21\Spring.Scheduling.Quartz21.2008.csproj", "{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz21.Tests.2008", "test\Spring\Spring.Scheduling.Quartz21.Tests\Spring.Scheduling.Quartz21.Tests.2008.csproj", "{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate32.2008", "src\Spring\Spring.Web.Conversation.NHibernate32\Spring.Web.Conversation.NHibernate32.2008.csproj", "{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate33.2008", "src\Spring\Spring.Web.Conversation.NHibernate33\Spring.Web.Conversation.NHibernate33.2008.csproj", "{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate32.Tests.2008", "test\Spring\Spring.Web.Conversation.NHibernate32.Tests\Spring.Web.Conversation.NHibernate32.Tests.2008.csproj", "{2FB16852-22AD-4A5B-885A-97136265CC46}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate33.Tests.2008", "test\Spring\Spring.Web.Conversation.NHibernate33.Tests\Spring.Web.Conversation.NHibernate33.Tests.2008.csproj", "{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|.NET.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|.NET.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|.NET.Build.0 = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|.NET.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|.NET.Build.0 = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|.NET.Build.0 = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|.NET.ActiveCfg = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|.NET.Build.0 = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|.NET.Build.0 = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|.NET.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|.NET.Build.0 = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|.NET.Build.0 = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|.NET.ActiveCfg = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|.NET.Build.0 = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|.NET.ActiveCfg = Release|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|.NET.ActiveCfg = Release|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|.NET.ActiveCfg = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|.NET.ActiveCfg = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Release|.NET.ActiveCfg = Release|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|.NET.ActiveCfg = Release|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{67EA5988-C54E-4348-BFFB-E4A61F26143C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{67EA5988-C54E-4348-BFFB-E4A61F26143C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67EA5988-C54E-4348-BFFB-E4A61F26143C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67EA5988-C54E-4348-BFFB-E4A61F26143C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{67EA5988-C54E-4348-BFFB-E4A61F26143C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{67EA5988-C54E-4348-BFFB-E4A61F26143C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{67EA5988-C54E-4348-BFFB-E4A61F26143C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67EA5988-C54E-4348-BFFB-E4A61F26143C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{67EA5988-C54E-4348-BFFB-E4A61F26143C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{67EA5988-C54E-4348-BFFB-E4A61F26143C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B48B00A6-8E4C-4953-9B82-7121A08AC57C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Release|.NET.ActiveCfg = Release|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Release|.NET.ActiveCfg = Release|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}.Release|.NET.ActiveCfg = Release|Any CPU
-		{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|.NET.ActiveCfg = Release|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2FB16852-22AD-4A5B-885A-97136265CC46}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2FB16852-22AD-4A5B-885A-97136265CC46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FB16852-22AD-4A5B-885A-97136265CC46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FB16852-22AD-4A5B-885A-97136265CC46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2FB16852-22AD-4A5B-885A-97136265CC46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2FB16852-22AD-4A5B-885A-97136265CC46}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2FB16852-22AD-4A5B-885A-97136265CC46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2FB16852-22AD-4A5B-885A-97136265CC46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2FB16852-22AD-4A5B-885A-97136265CC46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2FB16852-22AD-4A5B-885A-97136265CC46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|.NET.ActiveCfg = Release|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		NAntAddinLastFileName = Spring.build
-	EndGlobalSection
-EndGlobal
diff --git a/Spring.Net.2010.sln b/Spring.Net.2010.sln
index a5d985c6..401f9941 100644
--- a/Spring.Net.2010.sln
+++ b/Spring.Net.2010.sln
@@ -1,5 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2010
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
 	ProjectSection(SolutionItems) = preProject
 		BreakingChanges.txt = BreakingChanges.txt
@@ -53,10 +55,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Template.Velocity.20
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Template.Velocity.Tests.2010", "test\Spring\Spring.Template.Velocity.Tests\Spring.Template.Velocity.Tests.2010.csproj", "{10405837-CB67-40D8-9326-84C9383983E2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Mvc.2010", "src\Spring\Spring.Web.Mvc\Spring.Web.Mvc.2010.csproj", "{5166CE3A-14BE-478A-88DA-729A39DE1E29}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Mvc.Tests.2010", "test\Spring\Spring.Web.Mvc.Tests\Spring.Web.Mvc.Tests.2010.csproj", "{D4032434-D9A8-437B-95E8-9D4DE0AD9932}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Mvc3.2010", "src\Spring\Spring.Web.Mvc3\Spring.Web.Mvc3.2010.csproj", "{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Mvc3.Tests.2010", "test\Spring\Spring.Web.Mvc3.Tests\Spring.Web.Mvc3.Tests.2010.csproj", "{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}"
@@ -102,9 +100,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate33.Tests.2010", "test\Spring\Spring.Web.Conversation.NHibernate33.Tests\Spring.Web.Conversation.NHibernate33.Tests.2010.csproj", "{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}"
 EndProject
 Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = Spring.Net.2010.vsmdi
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
 		Debug|Any CPU = Debug|Any CPU
@@ -342,26 +337,6 @@ Global
 		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5166CE3A-14BE-478A-88DA-729A39DE1E29}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{5166CE3A-14BE-478A-88DA-729A39DE1E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5166CE3A-14BE-478A-88DA-729A39DE1E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5166CE3A-14BE-478A-88DA-729A39DE1E29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5166CE3A-14BE-478A-88DA-729A39DE1E29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5166CE3A-14BE-478A-88DA-729A39DE1E29}.Release|.NET.ActiveCfg = Release|Any CPU
-		{5166CE3A-14BE-478A-88DA-729A39DE1E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5166CE3A-14BE-478A-88DA-729A39DE1E29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5166CE3A-14BE-478A-88DA-729A39DE1E29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5166CE3A-14BE-478A-88DA-729A39DE1E29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D4032434-D9A8-437B-95E8-9D4DE0AD9932}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{D4032434-D9A8-437B-95E8-9D4DE0AD9932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4032434-D9A8-437B-95E8-9D4DE0AD9932}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4032434-D9A8-437B-95E8-9D4DE0AD9932}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D4032434-D9A8-437B-95E8-9D4DE0AD9932}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D4032434-D9A8-437B-95E8-9D4DE0AD9932}.Release|.NET.ActiveCfg = Release|Any CPU
-		{D4032434-D9A8-437B-95E8-9D4DE0AD9932}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4032434-D9A8-437B-95E8-9D4DE0AD9932}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4032434-D9A8-437B-95E8-9D4DE0AD9932}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D4032434-D9A8-437B-95E8-9D4DE0AD9932}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -581,4 +556,7 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		NAntAddinLastFileName = Spring.build
 	EndGlobalSection
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = Spring.Net.2010.vsmdi
+	EndGlobalSection
 EndGlobal
diff --git a/Spring.build b/Spring.build
index c43da243..2e4fdb65 100644
--- a/Spring.build
+++ b/Spring.build
@@ -138,7 +138,7 @@ Commandline Examples:
   <property name="project.build.package" value="false"/>
   <property name="project.build.sign" value="false" overwrite="false" />
   
-  <property name="test.withcoverage" value="false" overwrite="true" />
+  <property name="test.withcoverage" value="true" overwrite="false" />
   <!-- what coverage tool to use: ncover or opencover -->
   <property name="test.coverage.tool" value="opencover" overwrite="false" />
 
@@ -448,8 +448,10 @@ Commandline Examples:
     <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq}"/>
     <nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="test" if="${build-velocity}"/>
     <!--"Spring.ConversationWA.NH*.Tests.dll" should be at last to prevent the other tests are compiled with reference to this-->
-    <nant buildfile="test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.build" target="test" if="${build-conversation}"/>
-    <nant buildfile="test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.build" target="test" if="${build-conversation}"/>
+	
+	<!-- conversation tests disabled for now because with .NET 4.5 installed NUnitAsp does not seem to work anymore -->
+    <nant buildfile="test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.build" target="test" if="${build-conversation and nant.settings.currentframework == 'net-3.5'}"/>
+    <nant buildfile="test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.build" target="test" if="${build-conversation and nant.settings.currentframework == 'net-3.5'}"/>
 
     <!-- Main solutions and examples are compiled via task build-solutions -->
 
@@ -472,8 +474,6 @@ Commandline Examples:
   <target name="compile-net-3.5" description="Builds .NET Framework 3.5 version"
         depends="set-net-3.5-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
 		
-	<property name="test.withcoverage" value="true" overwrite="true"/>		  
-
 	<if test="${property::exists('mstest.exe')}">
 		<property name="mstest.exe.current" value="${string::replace(property::get-value('mstest.exe'), 'Microsoft Visual Studio 10.0', 'Microsoft Visual Studio 9.0')}" />
 	</if>
@@ -589,7 +589,7 @@ Commandline Examples:
  
   <!-- Top level targets -->
   <!-- target for developers to do just debug build and test everything in CVS -->
-  <target name="test" description="build an test">
+  <target name="test" description="build and test">
     <echo message="Compiling debug configuration for all runtime configurations."/>
     <property name="nant.target.root.name" value="build"/>
     <call target="build-all-function"/>
diff --git a/build-support/solutions.build.nant b/build-support/solutions.build.nant
index e99b9fc9..079df9e0 100644
--- a/build-support/solutions.build.nant
+++ b/build-support/solutions.build.nant
@@ -35,23 +35,11 @@ Rebuilding Solutions using Nant and "solutions.build":
   <readregistry property="net35.install.dir" key="${reg.software.prefix}\NET Framework Setup\NDP\v3.5\InstallPath" hive="LocalMachine" failonerror="true"/>
   <readregistry property="net40.install.dir" key="${reg.software.prefix}\NET Framework Setup\NDP\v4\Full\InstallPath" hive="LocalMachine" failonerror="true"/>
 
-  <readregistry property="vs2008.install.dir" key="${reg.software.prefix}\VisualStudio\9.0\InstallDir" hive="LocalMachine" failonerror="false"/>
-  <if test="${not property::exists('vs2008.install.dir')}">
-    <readregistry property="vs2010.install.dir" key="${reg.software.prefix}\VWDExpress\9.0\InstallDir" hive="LocalMachine" failonerror="false"/>
-  </if>
-  
-  <readregistry property="vs2010.install.dir" key="${reg.software.prefix}\VisualStudio\10.0\InstallDir" hive="LocalMachine" failonerror="false"/>
-  <if test="${not property::exists('vs2010.install.dir')}">
-    <readregistry property="vs2010.install.dir" key="${reg.software.prefix}\VWDExpress\10.0\InstallDir" hive="LocalMachine" failonerror="false"/>
-  </if>
-
   <property name="msbuild.exe" value="${net40.install.dir}\msbuild.exe"/>
   
   <property name="buildconfiguration" value="Debug" />
 
   <echo message="reg.software.prefix: '${reg.software.prefix}'"/>
-  <echo message="vs2008.install.dir:  '${vs2008.install.dir}'"/>
-  <echo message="vs2010.install.dir:  '${vs2010.install.dir}'"/>
   <echo message="msbuild.exe:         '${msbuild.exe}'"/>
   
   <target name="RebuildAllSolutions" description="Rebuild all Solutions">
@@ -60,10 +48,8 @@ Rebuilding Solutions using Nant and "solutions.build":
       command ResGen ..." on "Win 7 64".
       See: http://social.msdn.microsoft.com/Forums/en-US/msbuild/thread/e8c1d26a-5e77-4422-bbc8-f0b7f25702d2/
     -->
-    <property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>
-    <call target="RebuildAllSolutions-3.5" if="${property::exists('vs2008.install.dir')}" />
     <property name="msbuild.exe" value="${net40.install.dir}\msbuild.exe"/>
-    <call target="RebuildAllSolutions-4.0" if="${property::exists('vs2010.install.dir')}" />
+    <call target="RebuildAllSolutions-4.0" />
   </target>
 
   <target name="Clean">
@@ -92,7 +78,7 @@ Rebuilding Solutions using Nant and "solutions.build":
   <target name="RebuildAllSolutions-3.5" depends="Clean">
     <!-- build "main" solution -->
 
-    <property name="solutionfile" value="${root.dir}/Spring.NET.2008.sln" />
+    <property name="solutionfile" value="${root.dir}/Spring.NET.2010.sln" />
     <property name="solutionconfiguration" value="${buildconfiguration}" />
     <call target="RebuildSolution-3.5" />
 
@@ -100,16 +86,10 @@ Rebuilding Solutions using Nant and "solutions.build":
     <foreach item="File" property="filename">
       <in>
         <items basedir="${root.dir}">
-          <include name="examples/Spring/**/*.2008.sln" />
           <include name="examples/Spring/Spring.Data.NHibernate/Spring.Northwind.sln" />
-          <!-- Does not build on bamboo server SPRNET-1283 -->
-          <exclude name="examples/Spring/Spring.MsmqQuickStart/**/*.2005.sln"/>
-          <exclude name="examples/Spring/Spring.Calculator/**/*.2008.sln"/>
-          <!-- <include name="*.2005.sln" /> -->
-          <include name="*.2008.sln" />
-          <exclude name="Spring.NET.2008.sln"/>
+          <include name="*.2010.sln" />
           <exclude name="examples/Spring/Spring.EmsQuickStart/**/*.sln" unless="${build-ems}"/>
-          <exclude name="examples/**/Spring.Examples.Pool.2008.sln"/>
+          <exclude name="examples/**/Spring.Examples.Pool.2010.sln"/>
 		</items>
       </in>
       <do>
@@ -134,7 +114,6 @@ Rebuilding Solutions using Nant and "solutions.build":
         <items basedir="${root.dir}">
           <!-- <include name="examples/Spring/**/*.2005.sln" /> -->
           <include name="examples/Spring/**/*.2010.sln" />
-          <exclude name="examples/Spring/Spring.Calculator/**/*.2010.sln"/>
           <exclude name="Spring.NET.2010.sln"/>
           <exclude name="examples/Spring/Spring.EmsQuickStart/**/*.sln" unless="${build-ems}"/>
           <exclude name="examples/**/Spring.Examples.Pool.2010.sln"/>
diff --git a/build-support/solutions/Spring.Net.Core.2008.sln b/build-support/solutions/Spring.Net.Core.2008.sln
deleted file mode 100644
index e05fe669..00000000
--- a/build-support/solutions/Spring.Net.Core.2008.sln
+++ /dev/null
@@ -1,157 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.2008", "..\..\src\Spring\Spring.Web\Spring.Web.2008.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Tests.2008", "..\..\test\Spring\Spring.Web.Tests\Spring.Web.Tests.2008.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Extensions.2008", "..\..\src\Spring\Spring.Web.Extensions\Spring.Web.Extensions.2008.csproj", "{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.Tests.2008", "..\..\test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.2008.csproj", "{2111596A-0327-4C9D-8919-294FBD988A23}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.2008", "..\..\src\Spring\Spring.Services\Spring.Services.2008.csproj", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.Tests.2008", "..\..\test\Spring\Spring.Services.Tests\Spring.Services.Tests.2008.csproj", "{4374F018-9738-46BF-A399-4594CEE75B21}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2008", "..\..\test\Spring\Spring.Data.Tests\Spring.Data.Tests.2008.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D8C99188-BAC7-4308-B898-6409EA6933B2}"
-	ProjectSection(SolutionItems) = preProject
-		..\..\BreakingChanges-1.3.txt = ..\..\BreakingChanges-1.3.txt
-		..\..\changelog.txt = ..\..\changelog.txt
-		..\..\readme.txt = ..\..\readme.txt
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|.NET.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|.NET.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build-support/solutions/Spring.Net.Messaging.Ems.2008.sln b/build-support/solutions/Spring.Net.Messaging.Ems.2008.sln
deleted file mode 100644
index b703d098..00000000
--- a/build-support/solutions/Spring.Net.Messaging.Ems.2008.sln
+++ /dev/null
@@ -1,163 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
-	ProjectSection(SolutionItems) = preProject
-		Spring.build = Spring.build
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2008", "..\..\test\Spring\Spring.Data.Tests\Spring.Data.Tests.2008.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Ems.2008", "..\..\src\Spring\Spring.Messaging.Ems\Spring.Messaging.Ems.2008.csproj", "{900E3839-301E-48B1-BAEB-B6645620ACFF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Ems.Tests.2008", "..\..\test\Spring\Spring.Messaging.Ems.Tests\Spring.Messaging.Ems.Tests.2008.csproj", "{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2008", "..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj", "{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.2008", "..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2008.csproj", "{AEB1578C-9018-4D49-B440-789F38DD2F29}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.Tests.2008", "..\..\test\Spring\Spring.Messaging.Nms.Tests\Spring.Messaging.Nms.Tests.2008.csproj", "{FA7A6931-7DBE-4A32-A312-51FAD2E80332}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Ems.Integration.Tests", "..\..\test\Spring\Spring.Messaging.Ems.Integration.Tests\Spring.Messaging.Ems.Integration.Tests.csproj", "{FA934E92-C8C2-428A-BE2A-26818F17A787}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|.NET.ActiveCfg = Release|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}.Release|.NET.ActiveCfg = Release|Any CPU
-		{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		NAntAddinLastFileName = Spring.build
-	EndGlobalSection
-EndGlobal
diff --git a/build-support/solutions/Spring.Net.Messaging.Nms.2008.sln b/build-support/solutions/Spring.Net.Messaging.Nms.2008.sln
deleted file mode 100644
index 6ad03937..00000000
--- a/build-support/solutions/Spring.Net.Messaging.Nms.2008.sln
+++ /dev/null
@@ -1,138 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.Tests.2008", "..\..\test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.2008.csproj", "{2111596A-0327-4C9D-8919-294FBD988A23}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2008", "..\..\test\Spring\Spring.Data.Tests\Spring.Data.Tests.2008.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.2008", "..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2008.csproj", "{AEB1578C-9018-4D49-B440-789F38DD2F29}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.Tests.2008", "..\..\test\Spring\Spring.Messaging.Nms.Tests\Spring.Messaging.Nms.Tests.2008.csproj", "{FA7A6931-7DBE-4A32-A312-51FAD2E80332}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2008", "..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj", "{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.Integration.Tests", "..\..\test\Spring\Spring.Messaging.Nms.Integration.Tests\Spring.Messaging.Nms.Integration.Tests.csproj", "{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|.NET.ActiveCfg = Release|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build-support/solutions/Spring.Net.NHibernate.2008.sln b/build-support/solutions/Spring.Net.NHibernate.2008.sln
deleted file mode 100644
index 68685a11..00000000
--- a/build-support/solutions/Spring.Net.NHibernate.2008.sln
+++ /dev/null
@@ -1,118 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
-	ProjectSection(SolutionItems) = preProject
-		..\..\Spring.build = ..\..\Spring.build
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate32.Integration.Tests.2008", "..\..\test\Spring\Spring.Data.NHibernate32.Integration.Tests\Spring.Data.NHibernate32.Integration.Tests.2008.csproj", "{CD6A49DE-745C-4360-AADF-3539CFEC6639}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate32.Tests.2008", "..\..\test\Spring\Spring.Data.NHibernate32.Tests\Spring.Data.NHibernate32.Tests.2008.csproj", "{231512F3-4F1D-45E1-BADE-D01F68DB9A80}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate32.2008", "..\..\src\Spring\Spring.Data.NHibernate32\Spring.Data.NHibernate32.2008.csproj", "{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2008", "..\..\test\Spring\Spring.Data.Tests\Spring.Data.Tests.2008.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CD6A49DE-745C-4360-AADF-3539CFEC6639}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{CD6A49DE-745C-4360-AADF-3539CFEC6639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD6A49DE-745C-4360-AADF-3539CFEC6639}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CD6A49DE-745C-4360-AADF-3539CFEC6639}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CD6A49DE-745C-4360-AADF-3539CFEC6639}.Release|.NET.ActiveCfg = Release|Any CPU
-		{CD6A49DE-745C-4360-AADF-3539CFEC6639}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CD6A49DE-745C-4360-AADF-3539CFEC6639}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|.NET.ActiveCfg = Release|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{231512F3-4F1D-45E1-BADE-D01F68DB9A80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Release|.NET.ActiveCfg = Release|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		NAntAddinLastFileName = Spring.build
-	EndGlobalSection
-EndGlobal
diff --git a/build-support/solutions/Spring.Net.Quartz.2008.sln b/build-support/solutions/Spring.Net.Quartz.2008.sln
deleted file mode 100644
index e916e82f..00000000
--- a/build-support/solutions/Spring.Net.Quartz.2008.sln
+++ /dev/null
@@ -1,128 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
-	ProjectSection(SolutionItems) = preProject
-		Spring.build = Spring.build
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{438FE108-6F55-4C8A-8BF4-C85D0906D134}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5ECE7B2B-6975-4800-982E-618794909499}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz21.Integration.Tests.2008", "..\..\test\Spring\Spring.Scheduling.Quartz21.Integration.Tests\Spring.Scheduling.Quartz21.Integration.Tests.2008.csproj", "{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz21.Tests.2008", "..\..\test\Spring\Spring.Scheduling.Quartz21.Tests\Spring.Scheduling.Quartz21.Tests.2008.csproj", "{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz21.2008", "..\..\src\Spring\Spring.Scheduling.Quartz21\Spring.Scheduling.Quartz21.2008.csproj", "{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|.NET.ActiveCfg = Release|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Release|.NET.ActiveCfg = Release|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Release|.NET.ActiveCfg = Release|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84} = {438FE108-6F55-4C8A-8BF4-C85D0906D134}
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C} = {438FE108-6F55-4C8A-8BF4-C85D0906D134}
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40} = {438FE108-6F55-4C8A-8BF4-C85D0906D134}
-		{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0} = {438FE108-6F55-4C8A-8BF4-C85D0906D134}
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904} = {5ECE7B2B-6975-4800-982E-618794909499}
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26} = {5ECE7B2B-6975-4800-982E-618794909499}
-		{47E7DF97-2515-4F2F-BBFD-0A4C205800DE} = {5ECE7B2B-6975-4800-982E-618794909499}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		NAntAddinLastFileName = Spring.build
-	EndGlobalSection
-EndGlobal
diff --git a/build-support/solutions/Spring.Net.Template.2008.sln b/build-support/solutions/Spring.Net.Template.2008.sln
deleted file mode 100644
index 77472186..00000000
--- a/build-support/solutions/Spring.Net.Template.2008.sln
+++ /dev/null
@@ -1,66 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Template.Velocity.2008", "..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2008.csproj", "{BF3AB954-8375-407C-9E98-4C51D8072784}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Template.Velocity.Tests", "..\..\test\Spring\Spring.Template.Velocity.Tests\Spring.Template.Velocity.Tests.csproj", "{10405837-CB67-40D8-9326-84C9383983E2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|.NET.ActiveCfg = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build-support/solutions/Spring.Net.Testing.2008.sln b/build-support/solutions/Spring.Net.Testing.2008.sln
deleted file mode 100644
index ed8593fd..00000000
--- a/build-support/solutions/Spring.Net.Testing.2008.sln
+++ /dev/null
@@ -1,219 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.2008", "..\..\src\Spring\Spring.Web\Spring.Web.2008.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Tests.2008", "..\..\test\Spring\Spring.Web.Tests\Spring.Web.Tests.2008.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Extensions.2008", "..\..\src\Spring\Spring.Web.Extensions\Spring.Web.Extensions.2008.csproj", "{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.Tests.2008", "..\..\test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.2008.csproj", "{2111596A-0327-4C9D-8919-294FBD988A23}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.2008", "..\..\src\Spring\Spring.Services\Spring.Services.2008.csproj", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.Tests.2008", "..\..\test\Spring\Spring.Services.Tests\Spring.Services.Tests.2008.csproj", "{4374F018-9738-46BF-A399-4594CEE75B21}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2008", "..\..\test\Spring\Spring.Data.Tests\Spring.Data.Tests.2008.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Template.Velocity.2008", "..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2008.csproj", "{BF3AB954-8375-407C-9E98-4C51D8072784}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.Microsoft.2008", "..\..\src\Spring\Spring.Testing.Microsoft\Spring.Testing.Microsoft.2008.csproj", "{2E10A8D3-B8FF-4699-90B8-E621659C58DD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2008", "..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj", "{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.Tests.2008", "..\..\test\Spring\Spring.Testing.NUnit.Tests\Spring.Testing.NUnit.Tests.2008.csproj", "{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4C57E34D-F471-43D2-8253-F75A60969E9C}"
-	ProjectSection(SolutionItems) = preProject
-		LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
-		Spring.Net.Testing.2008.vsmdi = Spring.Net.Testing.2008.vsmdi
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.Microsoft.Tests.2008", "..\..\test\Spring\Spring.Testing.Microsoft.Tests\Spring.Testing.Microsoft.Tests.2008.csproj", "{7321149A-47C6-4FBA-9D1A-26FD6815381B}"
-EndProject
-Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = Spring.Net.Testing.2008.vsmdi
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|.NET.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|.NET.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|.NET.ActiveCfg = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|.NET.ActiveCfg = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build-support/solutions/Spring.Net.Testing.2008.vsmdi b/build-support/solutions/Spring.Net.Testing.2008.vsmdi
deleted file mode 100644
index 854396aa..00000000
--- a/build-support/solutions/Spring.Net.Testing.2008.vsmdi
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2006">
-  <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
-    <RunConfiguration id="2f7969af-da92-4539-ac9d-76a6393f0ab9" name="Local Test Run" storage="localtestrun.testrunconfig" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common,   PublicKeyToken=b03f5f7f11d50a3a" />
-  </TestList>
-</TestLists>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2008.sln b/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2008.sln
deleted file mode 100644
index a7e5bfca..00000000
--- a/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2008.sln
+++ /dev/null
@@ -1,66 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{919AF8FE-423F-4A8C-BDA4-CB8B39D64780}"
-	ProjectSection(SolutionItems) = preProject
-		readme.txt = readme.txt
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Common.2008", "src\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2008.csproj", "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step1.2008", "src\Spring.AopQuickStart.Step1\Spring.AopQuickStart.Step1.2008.csproj", "{1B3559A0-5274-4968-A628-77F036984F02}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step2.2008", "src\Spring.AopQuickStart.Step2\Spring.AopQuickStart.Step2.2008.csproj", "{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step3.2008", "src\Spring.AopQuickStart.Step3\Spring.AopQuickStart.Step3.2008.csproj", "{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step4.2008", "src\Spring.AopQuickStart.Step4\Spring.AopQuickStart.Step4.2008.csproj", "{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step5.2008", "src\Spring.AopQuickStart.Step5\Spring.AopQuickStart.Step5.2008.csproj", "{61086108-3EB7-4ACE-B4B6-B4B60AB76108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step6.2008", "src\Spring.AopQuickStart.Step6\Spring.AopQuickStart.Step6.2008.csproj", "{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step7.2008", "src\Spring.AopQuickStart.Step7\Spring.AopQuickStart.Step7.2008.csproj", "{0077A8CA-4C09-42B1-B227-91095CE4CCA2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B3559A0-5274-4968-A628-77F036984F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B3559A0-5274-4968-A628-77F036984F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B3559A0-5274-4968-A628-77F036984F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B3559A0-5274-4968-A628-77F036984F02}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2008.csproj
deleted file mode 100644
index d207882e..00000000
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2008.csproj
+++ /dev/null
@@ -1,109 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.AopQuickStart.Common</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Aspects\ConsoleLoggingAroundAdvice.cs" />
-    <Compile Include="Aspects\ConsoleLoggingBeforeAdvice.cs" />
-    <Compile Include="Aspects\ConsoleLoggingAfterAdvice.cs" />
-    <Compile Include="Aspects\ConsoleLoggingThrowsAdvice.cs" />
-    <Compile Include="Commands\ICommand.cs" />
-    <Compile Include="Commands\ServiceCommand.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2008.csproj
deleted file mode 100644
index 2d7fbe88..00000000
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2008.csproj
+++ /dev/null
@@ -1,68 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1B3559A0-5274-4968-A628-77F036984F02}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <AssemblyName>Spring.AopQuickStart.Step1</AssemblyName>
-    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\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;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2008.csproj">
-      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
-      <Name>Spring.AopQuickStart.Common.2008</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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2008.csproj
deleted file mode 100644
index b4afc9f3..00000000
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2008.csproj
+++ /dev/null
@@ -1,71 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <AssemblyName>Spring.AopQuickStart.Step2</AssemblyName>
-    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\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;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2008.csproj">
-      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
-      <Name>Spring.AopQuickStart.Common.2008</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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2008.csproj
deleted file mode 100644
index 40dbc7e9..00000000
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2008.csproj
+++ /dev/null
@@ -1,71 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <AssemblyName>Spring.AopQuickStart.Step3</AssemblyName>
-    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\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;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2008.csproj">
-      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
-      <Name>Spring.AopQuickStart.Common.2008</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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2008.csproj
deleted file mode 100644
index d098fda0..00000000
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2008.csproj
+++ /dev/null
@@ -1,76 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <AssemblyName>Spring.AopQuickStart.Step4</AssemblyName>
-    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\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;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Aspects\ConsoleLoggingAdvice.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Attributes\ConsoleLoggingAttribute.cs" />
-    <Compile Include="Commands\AnotherServiceCommand.cs" />
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2008.csproj">
-      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
-      <Name>Spring.AopQuickStart.Common.2008</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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2008.csproj
deleted file mode 100644
index 16b3f89b..00000000
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2008.csproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{61086108-3EB7-4ACE-B4B6-B4B60AB76108}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <AssemblyName>Spring.AopQuickStart.Step5</AssemblyName>
-    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\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;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Aspects\ExpressionDynamicPointcutAdvisor.cs" />
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2008.csproj">
-      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
-      <Name>Spring.AopQuickStart.Common.2008</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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2008.csproj
deleted file mode 100644
index bb79fc95..00000000
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2008.csproj
+++ /dev/null
@@ -1,70 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <AssemblyName>Spring.AopQuickStart.Step6</AssemblyName>
-    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\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;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Contact.cs" />
-    <Compile Include="IIsModified.cs" />
-    <Compile Include="IsModifiedMixin.cs" />
-    <Compile Include="ModificationAdvice.cs" />
-    <Compile Include="ModificationAdvisor.cs" />
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2008.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2008.csproj
deleted file mode 100644
index 0699a280..00000000
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2008.csproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0077A8CA-4C09-42B1-B227-91095CE4CCA2}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <AssemblyName>Spring.AopQuickStart.Step7</AssemblyName>
-    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\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;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Commands\AnotherServiceCommand.cs" />
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2008.csproj">
-      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
-      <Name>Spring.AopQuickStart.Common.2008</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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.CachingQuickStart/Spring.CachingQuickStart.2008.sln b/examples/Spring/Spring.CachingQuickStart/Spring.CachingQuickStart.2008.sln
deleted file mode 100644
index 5861b8d8..00000000
--- a/examples/Spring/Spring.CachingQuickStart/Spring.CachingQuickStart.2008.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.CachingQuickStart.Web", "src\Spring.CachingQuickStart.Web\Spring.CachingQuickStart.Web.2008.csproj", "{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.2008.csproj b/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.2008.csproj
deleted file mode 100644
index 01bb7b17..00000000
--- a/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.2008.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.CachingQuickStart</RootNamespace>
-    <AssemblyName>Spring.CachingQuickStart.Web</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.3.1.20711, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.3.1.20711, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web, Version=1.3.1.20711, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Default.aspx" />
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Services\IMovieService.cs" />
-    <Compile Include="Services\Movie.cs" />
-    <Compile Include="Services\MovieService.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Spring.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>54312</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/Spring.Calculator.2008.sln b/examples/Spring/Spring.Calculator/Spring.Calculator.2008.sln
deleted file mode 100644
index d1162d6a..00000000
--- a/examples/Spring/Spring.Calculator/Spring.Calculator.2008.sln
+++ /dev/null
@@ -1,107 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B1FF7E1F-9BF9-4EB3-B38C-39A0E3EA4D0A}"
-	ProjectSection(SolutionItems) = preProject
-		readme.txt = readme.txt
-		SpringCalculator.snk = SpringCalculator.snk
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Services.2008", "src\Spring.Calculator.Services\Spring.Calculator.Services.2008.csproj", "{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Contract.2008", "src\Spring.Calculator.Contract\Spring.Calculator.Contract.2008.csproj", "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RemoteApp.2008", "src\Spring.Calculator.RemoteApp\Spring.Calculator.RemoteApp.2008.csproj", "{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.ClientApp.2008", "src\Spring.Calculator.ClientApp\Spring.Calculator.ClientApp.2008.csproj", "{F202BB75-CEFD-400B-9CD3-0914F466EBF5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aspects.2008", "src\Spring.Aspects\Spring.Aspects.2008.csproj", "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RegisterComponentServices.2008", "src\Spring.Calculator.RegisterComponentServices\Spring.Calculator.RegisterComponentServices.2008.csproj", "{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Web.2008", "src\Spring.Calculator.Web\Spring.Calculator.Web.2008.csproj", "{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|.NET.ActiveCfg = Release|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|.NET.ActiveCfg = Release|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|.NET.ActiveCfg = Release|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|.NET.ActiveCfg = Release|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|.NET.ActiveCfg = Release|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|.NET.ActiveCfg = Release|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Release|.NET.ActiveCfg = Release|Any CPU
-		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj
deleted file mode 100644
index cc8d4da6..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2008.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Aspects</AssemblyName>
-    <AssemblyOriginatorKeyFile>../../Spring.Calculator.snk</AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring.Aspects</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SignAssembly>false</SignAssembly>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Logging\ConsoleLoggingAroundAdvice.cs" />
-    <Compile Include="Logging\CommonLoggingAroundAdvice.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj
deleted file mode 100644
index f4266852..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2008.csproj
+++ /dev/null
@@ -1,142 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F202BB75-CEFD-400B-9CD3-0914F466EBF5}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Calculator.ClientApp</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Spring.Calculator.ClientApp</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2008.csproj">
-      <Name>Spring.Aspects.2008</Name>
-      <Project>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2008.csproj">
-      <Name>Spring.Calculator.Contract.2008</Name>
-      <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2008.csproj">
-      <Name>Spring.Calculator.Services.2008</Name>
-      <Project>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>system</Name>
-    </Reference>
-    <Reference Include="System.Web.Services">
-      <Name>system.web.services</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <EmbeddedResource Include="Config\WebServices\calculatorService.wsdl" />
-    <Compile Include="Program.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="Config\EnterpriseServices\enterpriseServices.xml" />
-    <EmbeddedResource Include="Config\InProcess\inProcess.xml" />
-    <EmbeddedResource Include="Config\Remoting\cao-aop.xml" />
-    <EmbeddedResource Include="Config\Remoting\cao-ctor-aop.xml" />
-    <EmbeddedResource Include="Config\Remoting\cao-ctor.xml" />
-    <EmbeddedResource Include="Config\Remoting\cao.xml" />
-    <EmbeddedResource Include="Config\Remoting\saoSingleCall-aop.xml" />
-    <EmbeddedResource Include="Config\Remoting\saoSingleCall.xml" />
-    <EmbeddedResource Include="Config\Remoting\saoSingleton-aop.xml" />
-    <EmbeddedResource Include="Config\Remoting\saoSingleton.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Config\WebServices\webServices-aop.xml" />
-    <EmbeddedResource Include="Config\WebServices\webServices.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2008.csproj
deleted file mode 100644
index d97cc691..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2008.csproj
+++ /dev/null
@@ -1,94 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Calculator.Contract</AssemblyName>
-    <AssemblyOriginatorKeyFile>../../Spring.Calculator.snk</AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring.Calculator</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SignAssembly>true</SignAssembly>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Domain\DivisionResult.cs" />
-    <Compile Include="Interfaces\IAdvancedCalculator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interfaces\ICalculator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj
deleted file mode 100644
index c04dd18f..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2008.csproj
+++ /dev/null
@@ -1,125 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Calculator.RegisterComponentServices</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Spring.Calculator.RegisterComponentServices</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkSubset>Full</TargetFrameworkSubset>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="Spring.Calculator.EnterpriseServices.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Spring.Calculator.EnterpriseServices.exe.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Spring.Calculator.RegisterComponentServices.build" />
-    <Compile Include="Program.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2008.csproj">
-      <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
-      <Name>Spring.Calculator.Contract.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2008.csproj">
-      <Project>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</Project>
-      <Name>Spring.Calculator.Services.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\services.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj
deleted file mode 100644
index 2547826e..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2008.csproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Calculator.RemoteApp</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Spring.Calculator.RemoteApp</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkSubset>Full</TargetFrameworkSubset>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <Compile Include="Program.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="Config\cao-aop.xml" />
-    <EmbeddedResource Include="Config\cao.xml" />
-    <EmbeddedResource Include="Config\saoSingleCall-aop.xml" />
-    <EmbeddedResource Include="Config\saoSingleCall.xml" />
-    <EmbeddedResource Include="Config\saoSingleton-aop.xml" />
-    <EmbeddedResource Include="Config\saoSingleton.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2008.csproj">
-      <Project>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</Project>
-      <Name>Spring.Aspects.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2008.csproj">
-      <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
-      <Name>Spring.Calculator.Contract.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2008.csproj">
-      <Project>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</Project>
-      <Name>Spring.Calculator.Services.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2008.csproj
deleted file mode 100644
index 33c318c6..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2008.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Calculator.Services</AssemblyName>
-    <AssemblyOriginatorKeyFile>../../Spring.Calculator.snk</AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring.Calculator</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SignAssembly>true</SignAssembly>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Services\AdvancedCalculator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Services\Calculator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2008.csproj">
-      <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
-      <Name>Spring.Calculator.Contract.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj
deleted file mode 100644
index 7ba4db9b..00000000
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2008.csproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C89AD3E9-1B03-4CCC-ADA2-7681C6976AD8}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.Calculator</RootNamespace>
-    <AssemblyName>Spring.Calculator.Web</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\Common.Logging.Log4Net.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Aop, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services, Version=0.0.0.35883, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web, Version=0.0.0.20883, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\webServices-aop.xml" />
-    <Content Include="Config\webServices.xml" />
-    <Content Include="Default.aspx" />
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2008.csproj">
-      <Project>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</Project>
-      <Name>Spring.Aspects.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2008.csproj">
-      <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
-      <Name>Spring.Calculator.Contract.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2008.csproj">
-      <Project>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</Project>
-      <Name>Spring.Calculator.Services.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>43085</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.CodeConfig.Migration/Spring.CodeConfig.Migration.2008.sln b/examples/Spring/Spring.CodeConfig.Migration/Spring.CodeConfig.Migration.2008.sln
deleted file mode 100644
index b6a039db..00000000
--- a/examples/Spring/Spring.CodeConfig.Migration/Spring.CodeConfig.Migration.2008.sln
+++ /dev/null
@@ -1,32 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primes", "src\Primes\Primes.2008.csproj", "{865E1A8E-88F3-48D8-869F-B584C5A36740}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primes.Tests", "test\Primes.Tests\Primes.Tests.2008.csproj", "{32476935-0852-4A11-B938-4D202D8B4454}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringApp", "src\SpringApp\SpringApp.2008.csproj", "{08A8AC17-E5E1-48FC-9958-76ECA8C08D71}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{865E1A8E-88F3-48D8-869F-B584C5A36740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{865E1A8E-88F3-48D8-869F-B584C5A36740}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{865E1A8E-88F3-48D8-869F-B584C5A36740}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{865E1A8E-88F3-48D8-869F-B584C5A36740}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32476935-0852-4A11-B938-4D202D8B4454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32476935-0852-4A11-B938-4D202D8B4454}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32476935-0852-4A11-B938-4D202D8B4454}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32476935-0852-4A11-B938-4D202D8B4454}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08A8AC17-E5E1-48FC-9958-76ECA8C08D71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08A8AC17-E5E1-48FC-9958-76ECA8C08D71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08A8AC17-E5E1-48FC-9958-76ECA8C08D71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08A8AC17-E5E1-48FC-9958-76ECA8C08D71}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.2008.csproj b/examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.2008.csproj
deleted file mode 100644
index 510f82cf..00000000
--- a/examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.2008.csproj
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{865E1A8E-88F3-48D8-869F-B584C5A36740}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Primes</RootNamespace>
-    <AssemblyName>Primes</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="IOutputFormatter.cs" />
-    <Compile Include="IPrimeGenerator.cs" />
-    <Compile Include="LinqPrimeGenerator.cs" />
-    <Compile Include="OutputFormatter.cs" />
-    <Compile Include="PrimeEvaluationEngine.cs" />
-    <Compile Include="PrimeGenerator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ConsoleReport.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.2008.csproj b/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.2008.csproj
deleted file mode 100644
index f6ea59c8..00000000
--- a/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.2008.csproj
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{08A8AC17-E5E1-48FC-9958-76ECA8C08D71}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SpringApp</RootNamespace>
-    <AssemblyName>SpringApp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\net\3.5\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="PrimesConfiguration.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="application-context.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Primes\Primes.2008.csproj">
-      <Project>{865E1A8E-88F3-48D8-869F-B584C5A36740}</Project>
-      <Name>Primes</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.2008.csproj b/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.2008.csproj
deleted file mode 100644
index b12d4a36..00000000
--- a/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.2008.csproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{32476935-0852-4A11-B938-4D202D8B4454}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Primes</RootNamespace>
-    <AssemblyName>Primes.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Primes\EvaluationEngine\When_Candidate_Is_Even.cs" />
-    <Compile Include="Primes\EvaluationEngine\When_Candidate_Is_Negative.cs" />
-    <Compile Include="Primes\EvaluationEngine\When_Candidate_Is_One.cs" />
-    <Compile Include="Primes\EvaluationEngine\When_Candidate_Is_Two.cs" />
-    <Compile Include="Primes\EvaluationEngine\When_Candidate_Is_Zero.cs" />
-    <Compile Include="Primes\EvaluationEngine\When_Constructing_PrimeEvaluator.cs" />
-    <Compile Include="Primes\EvaluationEngine\When_Number_is_evaluated.cs" />
-    <Compile Include="Primes\Formatter\When_Constructing_Formatter.cs" />
-    <Compile Include="Primes\Formatter\When_Formatting_Output.cs" />
-    <Compile Include="Primes\Generator\When_Calculating_Range_Of_Primes.cs" />
-    <Compile Include="Primes\Generator\When_Constructing_Generator.cs" />
-    <Compile Include="Primes\Generator\When_No_Primes_Found_In_Range.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Primes\Primes.2008.csproj">
-      <Project>{865E1A8E-88F3-48D8-869F-B584C5A36740}</Project>
-      <Name>Primes</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.2008.sln b/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.2008.sln
deleted file mode 100644
index aaf16ce2..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.2008.sln
+++ /dev/null
@@ -1,93 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Service.2008", "src\Spring.Northwind.Service\Spring.Northwind.Service.2008.csproj", "{9E15876F-E9E0-43B7-9874-B54F163757D6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Dao.2008", "src\Spring.Northwind.Dao\Spring.Northwind.Dao.2008.csproj", "{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Dao.NHibernate.2008", "src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.2008.csproj", "{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.IntegrationTests.2008", "test\Spring.Northwind.IntegrationTests\Spring.Northwind.IntegrationTests.2008.csproj", "{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Web.2008", "src\Spring.Northwind.Web\Spring.Northwind.Web.2008.csproj", "{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Web.Conversation.2008", "src\Spring.Northwind.Web.Conversation\Spring.Northwind.Web.Conversation.2008.csproj", "{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|.NET.ActiveCfg = Release|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|.NET.ActiveCfg = Release|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|.NET.ActiveCfg = Release|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}.Release|.NET.ActiveCfg = Release|Any CPU
-		{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		NAntAddinLastFileName = 
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2008.csproj
deleted file mode 100644
index 81581a4c..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2008.csproj
+++ /dev/null
@@ -1,109 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.Northwind</RootNamespace>
-    <AssemblyName>Spring.Northwind.Dao.NHibernate</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\NHibernate32\net\3.5\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data.NHibernate32">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate32.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Dao\NHibernate\CustomLocalSessionFactoryObject.cs" />
-    <Compile Include="Dao\NHibernate\HibernateCustomerDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Dao\NHibernate\HibernateDao.cs" />
-    <Compile Include="Dao\NHibernate\HibernateOrderDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Dao\NHibernate\HibernateProductDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Mappings\Customer.hbm.xml" />
-    <EmbeddedResource Include="Mappings\Order.hbm.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.2008.csproj">
-      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
-      <Name>Spring.Northwind.Dao</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Mappings\OrderDetail.hbm.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Dao\Dao.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Dao\DaoConversation.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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2008.csproj
deleted file mode 100644
index 9e479d32..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2008.csproj
+++ /dev/null
@@ -1,69 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.Northwind</RootNamespace>
-    <AssemblyName>Spring.Northwind.Dao</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Dao\ICustomerDao.cs" />
-    <Compile Include="Dao\IDao.cs" />
-    <Compile Include="Dao\IOrderDao.cs" />
-    <Compile Include="Dao\IProductDao.cs" />
-    <Compile Include="Dao\ISupportsDeleteDao.cs" />
-    <Compile Include="Dao\ISupportsSave.cs" />
-    <Compile Include="Domain\Customer.cs" />
-    <Compile Include="Domain\DefaultCustomerClassificationCalculator.cs" />
-    <Compile Include="Domain\ICustomer.cs" />
-    <Compile Include="Domain\ICustomerClassificationCalculator.cs" />
-    <Compile Include="Domain\Order.cs" />
-    <Compile Include="Domain\OrderDetail.cs" />
-    <Compile Include="Domain\Product.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Domain\DomainClassDiagram.cd" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2008.csproj
deleted file mode 100644
index 9486ef90..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2008.csproj
+++ /dev/null
@@ -1,79 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9E15876F-E9E0-43B7-9874-B54F163757D6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.Northwind</RootNamespace>
-    <AssemblyName>Spring.Northwind.Service</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Service\FedExShippingService.cs" />
-    <Compile Include="Service\IFulfillmentService.cs" />
-    <Compile Include="Service\IShippingService.cs" />
-    <Compile Include="Service\FulfillmentService.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.2008.csproj">
-      <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
-      <Name>Spring.Northwind.Dao.NHibernate</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.2008.csproj">
-      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
-      <Name>Spring.Northwind.Dao</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Service\Services.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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2008.csproj.user b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2008.csproj.user
deleted file mode 100644
index e98b7a34..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2008.csproj.user
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishUrlHistory />
-    <InstallUrlHistory />
-    <SupportUrlHistory />
-    <UpdateUrlHistory />
-    <BootstrapperUrlHistory />
-    <ErrorReportUrlHistory />
-    <FallbackCulture>en-US</FallbackCulture>
-    <VerifyUploadedFiles>false</VerifyUploadedFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.2008.csproj
deleted file mode 100644
index a75436f1..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.2008.csproj
+++ /dev/null
@@ -1,238 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8DCDA20D-DF9F-4723-9649-BC6934B36DC4}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.Northwind.Web</RootNamespace>
-    <AssemblyName>Spring.Northwind.Web</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\Common.Logging.Log4Net.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\NHibernate32\net\3.5\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=3.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Aop, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web.Conversation.NHibernate32, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.Conversation.NHibernate32.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data.NHibernate32, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate32.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\System.Data.SQLite.DLL</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Extensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="CSS\style.css" />
-    <Content Include="CustomerEditor.aspx" />
-    <Content Include="CustomerList.aspx" />
-    <Content Include="CustomerOrders.aspx" />
-    <Content Include="CustomerView.aspx" />
-    <Content Include="Default.aspx" />
-    <Content Include="FulfillmentResult.aspx" />
-    <Content Include="Global.asax" />
-    <Content Include="Img\bg-spring.png" />
-    <Content Include="Img\footern.gif" />
-    <Content Include="Img\header-spring.png" />
-    <Content Include="Img\logo.png" />
-    <Content Include="Img\springNet_release.png" />
-    <Content Include="Logs\log.txt" />
-    <Content Include="Web.net40.config" />
-    <Content Include="Web.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConversationPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CustomerEditor.aspx.designer.cs">
-      <DependentUpon>CustomerEditor.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CustomerList.aspx.designer.cs">
-      <DependentUpon>CustomerList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CustomerOrders.aspx.designer.cs">
-      <DependentUpon>CustomerOrders.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CustomerView.aspx.designer.cs">
-      <DependentUpon>CustomerView.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="FulfillmentResult.aspx.designer.cs">
-      <DependentUpon>FulfillmentResult.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Controller\ICustomerEditController.cs" />
-    <Compile Include="Controller\NHibernateCustomerEditController.cs" />
-    <Compile Include="CustomerEditor.aspx.cs">
-      <DependentUpon>CustomerEditor.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CustomerList.aspx.cs">
-      <DependentUpon>CustomerList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CustomerOrders.aspx.cs">
-      <DependentUpon>CustomerOrders.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CustomerView.aspx.cs">
-      <DependentUpon>CustomerView.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="FulfillmentResult.aspx.cs">
-      <DependentUpon>FulfillmentResult.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Shared\MasterPage.master.cs">
-      <DependentUpon>MasterPage.master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Shared\MasterPage.master.designer.cs">
-      <DependentUpon>MasterPage.master</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_Themes\Spring\Spring.skin" />
-    <Content Include="Config\Aspects.xml" />
-    <Content Include="Config\Log4Net.xml" />
-    <Content Include="Shared\MasterPage.master" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.2008.csproj">
-      <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
-      <Name>Spring.Northwind.Dao.NHibernate.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.2008.csproj">
-      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
-      <Name>Spring.Northwind.Dao.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Northwind.Service\Spring.Northwind.Service.2008.csproj">
-      <Project>{9E15876F-E9E0-43B7-9874-B54F163757D6}</Project>
-      <Name>Spring.Northwind.Service.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.net30.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>60934</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PostBuildEvent>copy "$(ProjectDir)Web.net30.config"  "$(ProjectDir)Web.config" /Y</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Spring.Northwind.Web.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Spring.Northwind.Web.2008.csproj
deleted file mode 100644
index d9f4e207..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Spring.Northwind.Web.2008.csproj
+++ /dev/null
@@ -1,231 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.Northwind.Web</RootNamespace>
-    <AssemblyName>Spring.Northwind.Web</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\Common.Logging.Log4Net.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\NHibernate32\net\3.5\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=3.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Aop, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data.NHibernate32, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate32.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\System.Data.SQLite.DLL</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Extensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="CSS\style.css" />
-    <Content Include="CustomerEditor.aspx" />
-    <Content Include="CustomerList.aspx" />
-    <Content Include="CustomerOrders.aspx" />
-    <Content Include="CustomerView.aspx" />
-    <Content Include="Default.aspx" />
-    <Content Include="FulfillmentResult.aspx" />
-    <Content Include="Global.asax" />
-    <Content Include="Img\bg-spring.png" />
-    <Content Include="Img\footern.gif" />
-    <Content Include="Img\header-spring.png" />
-    <Content Include="Img\logo.png" />
-    <Content Include="Img\springNet_release.png" />
-    <Content Include="Logs\log.txt" />
-    <Content Include="Web.net40.config" />
-    <Content Include="Web.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomerEditor.aspx.designer.cs">
-      <DependentUpon>CustomerEditor.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CustomerList.aspx.designer.cs">
-      <DependentUpon>CustomerList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CustomerOrders.aspx.designer.cs">
-      <DependentUpon>CustomerOrders.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CustomerView.aspx.designer.cs">
-      <DependentUpon>CustomerView.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="FulfillmentResult.aspx.designer.cs">
-      <DependentUpon>FulfillmentResult.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Controller\ICustomerEditController.cs" />
-    <Compile Include="Controller\NHibernateCustomerEditController.cs" />
-    <Compile Include="CustomerEditor.aspx.cs">
-      <DependentUpon>CustomerEditor.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CustomerList.aspx.cs">
-      <DependentUpon>CustomerList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CustomerOrders.aspx.cs">
-      <DependentUpon>CustomerOrders.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CustomerView.aspx.cs">
-      <DependentUpon>CustomerView.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="FulfillmentResult.aspx.cs">
-      <DependentUpon>FulfillmentResult.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Shared\MasterPage.master.cs">
-      <DependentUpon>MasterPage.master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Shared\MasterPage.master.designer.cs">
-      <DependentUpon>MasterPage.master</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_Themes\Spring\Spring.skin" />
-    <Content Include="Config\Aspects.xml" />
-    <Content Include="Config\Log4Net.xml" />
-    <Content Include="Shared\MasterPage.master" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.2008.csproj">
-      <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
-      <Name>Spring.Northwind.Dao.NHibernate.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.2008.csproj">
-      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
-      <Name>Spring.Northwind.Dao.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Northwind.Service\Spring.Northwind.Service.2008.csproj">
-      <Project>{9E15876F-E9E0-43B7-9874-B54F163757D6}</Project>
-      <Name>Spring.Northwind.Service.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.net30.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>2937</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PostBuildEvent>copy "$(ProjectDir)Web.net30.config"  "$(ProjectDir)Web.config" /Y</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2008.csproj
deleted file mode 100644
index 0fb3ac5c..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2008.csproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.Northwind</RootNamespace>
-    <AssemblyName>Spring.Northwind.IntegrationTests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\NHibernate32\net\3.5\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data.NHibernate32, Version=1.1.2.20153, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate32.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Testing.NUnit, Version=1.1.2.20153, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Testing.NUnit.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="IntegrationTests\AbstractDaoIntegrationTests.cs" />
-    <Compile Include="IntegrationTests\FulfillmentServiceTests.cs" />
-    <Compile Include="IntegrationTests\NorthwindIntegrationTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.2008.csproj">
-      <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
-      <Name>Spring.Northwind.Dao.NHibernate</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Spring.Northwind.Dao\Spring.Northwind.Dao.2008.csproj">
-      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
-      <Name>Spring.Northwind.Dao</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Spring.Northwind.Service\Spring.Northwind.Service.2008.csproj">
-      <Project>{9E15876F-E9E0-43B7-9874-B54F163757D6}</Project>
-      <Name>Spring.Northwind.Service</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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>rem echo "Copying .xml files for tests"
-rem xcopy  "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Northwind.IntegrationTests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2008.sln b/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2008.sln
deleted file mode 100644
index 7d8b6f3c..00000000
--- a/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2008.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.DataQuickStart.2008", "src\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2008.csproj", "{92B2A60E-D3B9-4647-8CFE-AC19611869F6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.DataQuickStart.Tests.2008", "test\Spring\Spring.DataQuickStart.Tests\Spring.DataQuickStart.Tests.2008.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2008.csproj b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2008.csproj
deleted file mode 100644
index a6d689c8..00000000
--- a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2008.csproj
+++ /dev/null
@@ -1,87 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{92B2A60E-D3B9-4647-8CFE-AC19611869F6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.DataQuickStart</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DataQuickStart\Dao\GenericTemplate\CommandCallbackDao.cs" />
-    <Compile Include="DataQuickStart\Dao\GenericTemplate\CustOrdersDetailStoredProc.cs" />
-    <Compile Include="DataQuickStart\Dao\GenericTemplate\OrderDetailRowMapper.cs" />
-    <Compile Include="DataQuickStart\Dao\Template\OrderDetailRowMapper.cs" />
-    <Compile Include="DataQuickStart\Dao\Template\CustOrdersDetailStoredProc.cs" />
-    <Compile Include="DataQuickStart\Dao\GenericTemplate\QueryForObjectDao.cs" />
-    <Compile Include="DataQuickStart\Dao\GenericTemplate\RowCallbackDao.cs" />
-    <Compile Include="DataQuickStart\Dao\Template\CommandCallbackDao.cs" />
-    <Compile Include="DataQuickStart\Dao\Template\CustomerRowMapper.cs" />
-    <Compile Include="DataQuickStart\Dao\Template\CustomerDataSetDao.cs" />
-    <Compile Include="DataQuickStart\Dao\Template\QueryForObjectDao.cs" />
-    <Compile Include="DataQuickStart\Dao\Template\ResultSetExtractorDao.cs" />
-    <Compile Include="DataQuickStart\Dao\Template\RowCallbackDao.cs" />
-    <Compile Include="DataQuickStart\Dao\Template\RowMapperDao.cs" />
-    <Compile Include="DataQuickStart\Domain\Customer.cs" />
-    <Compile Include="DataQuickStart\Dao\GenericTemplate\CustomerRowMapper.cs" />
-    <Compile Include="DataQuickStart\Dao\GenericTemplate\ResultSetExtractorDao.cs" />
-    <Compile Include="DataQuickStart\Dao\GenericTemplate\RowMapperDao.cs" />
-    <Compile Include="DataQuickStart\Domain\OrderDetails.cs" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2008.csproj b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2008.csproj
deleted file mode 100644
index f72df61b..00000000
--- a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2008.csproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.DataQuickStart.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2008.csproj">
-      <Project>{92B2A60E-D3B9-4647-8CFE-AC19611869F6}</Project>
-      <Name>Spring.DataQuickStart.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DataQuickStart\GenericTemplate\ExampleTests.cs" />
-    <Compile Include="DataQuickStart\Template\ExampleTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="DataQuickStart\GenericTemplate\ExampleTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="DataQuickStart\Template\ExampleTests.xml" />
-    <Content Include="Spring.DataQuickStart.Tests.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.EmsQuickStart/Spring.EmsQuickStart.2008.sln b/examples/Spring/Spring.EmsQuickStart/Spring.EmsQuickStart.2008.sln
deleted file mode 100644
index b5b54e5c..00000000
--- a/examples/Spring/Spring.EmsQuickStart/Spring.EmsQuickStart.2008.sln
+++ /dev/null
@@ -1,32 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.EmsQuickStart.Common", "src\Spring\Spring.EmsQuickStart.Common\Spring.EmsQuickStart.Common.csproj", "{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.EmsQuickStart.Server", "src\Spring\Spring.EmsQuickStart.Server\Spring.EmsQuickStart.Server.csproj", "{85E7B947-8153-45E4-B572-BEDB191F1FB2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.EmsQuickStart.Client", "src\Spring\Spring.EmsQuickStart.Client\Spring.EmsQuickStart.Client.csproj", "{87D0B725-A652-4A6B-A95F-197F7155769F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Integration.Tests/Spring.EmsQuickStart.Integration.Tests.2008.csproj b/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Integration.Tests/Spring.EmsQuickStart.Integration.Tests.2008.csproj
deleted file mode 100644
index 3fd04660..00000000
--- a/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Integration.Tests/Spring.EmsQuickStart.Integration.Tests.2008.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<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>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E641F51F-1B51-4B94-B419-F902EABCE4D4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.EmsQuickStart.Integration.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Integration.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>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Integration.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Tests/Spring.EmsQuickStart.Tests.2008.csproj b/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Tests/Spring.EmsQuickStart.Tests.2008.csproj
deleted file mode 100644
index 193b3070..00000000
--- a/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Tests/Spring.EmsQuickStart.Tests.2008.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<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>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.EmsQuickStart.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.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>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2008.csproj b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2008.csproj
deleted file mode 100644
index ad320dfc..00000000
--- a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2008.csproj
+++ /dev/null
@@ -1,127 +0,0 @@
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C261D9ED-85C3-4B35-BE48-7156F5B17430}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Examples.Pool</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>0.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="LinqBridge, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c2b14eb747628076, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>lib\net\2.0\LinqBridge.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Threading, Version=1.0.0.19912, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>lib\net\2.0\Spring.Threading.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Web">
-      <Name>System.Web</Name>
-    </Reference>
-    <Reference Include="System.Web.Services">
-      <Name>System.Web.Services</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Examples\Pool\Grep.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Examples\Pool\PooledQueuedExecutor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2008.sln b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2008.sln
deleted file mode 100644
index 73c2f878..00000000
--- a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2008.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Examples.Pool.2008", "Spring.Examples.Pool.2008.csproj", "{C261D9ED-85C3-4B35-BE48-7156F5B17430}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2008.sln b/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2008.sln
deleted file mode 100644
index 3a978ed1..00000000
--- a/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2008.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.AppContext.2008", "src\Spring.IocQuickStart.AppContext.2008.csproj", "{880EA873-E951-465A-AC5B-BA899A2C744E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{880EA873-E951-465A-AC5B-BA899A2C744E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{880EA873-E951-465A-AC5B-BA899A2C744E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{880EA873-E951-465A-AC5B-BA899A2C744E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{880EA873-E951-465A-AC5B-BA899A2C744E}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2008.csproj b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2008.csproj
deleted file mode 100644
index 4919eed6..00000000
--- a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2008.csproj
+++ /dev/null
@@ -1,135 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{880EA873-E951-465A-AC5B-BA899A2C744E}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.IocQuickStart.AppContext</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>Spring.IocQuickStart</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <Name>System.Windows.Forms</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <EmbeddedResource Include="AppContext\Images.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="AppContext\MyResource.es.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="AppContext\MyResource.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="AppContext\Person.resx">
-      <DependentUpon>Person.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="AppContext\ResourcesDisplayForm.resx">
-      <DependentUpon>ResourcesDisplayForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="AppContext\Keys.cs" />
-    <Compile Include="AppContext\Program.cs" />
-    <Compile Include="AppContext\Person.cs" />
-    <Compile Include="AppContext\ResourcesDisplayForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2008.sln b/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2008.sln
deleted file mode 100644
index 6ca04949..00000000
--- a/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2008.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.EventRegistry.2008", "src\Spring.IocQuickStart.EventRegistry.2008.csproj", "{0D35F19E-308E-4A0B-88B1-7E7C2D665053}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2008.csproj b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2008.csproj
deleted file mode 100644
index 30bc04a9..00000000
--- a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2008.csproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0D35F19E-308E-4A0B-88B1-7E7C2D665053}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.IocQuickStart.EventRegistry</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Spring.IocQuickStart</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>Spring.IocQuickStart.EventRegistry.Program</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="EventRegistry\MyClientEventArgs.cs" />
-    <Compile Include="EventRegistry\MyEventPublisher.cs" />
-    <Compile Include="EventRegistry\MyEventSubscriber.cs" />
-    <Compile Include="EventRegistry\Program.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2008.sln b/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2008.sln
deleted file mode 100644
index 408ae949..00000000
--- a/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2008.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.MovieFinder.2008", "src\Spring.IocQuickStart.MovieFinder.2008.csproj", "{C261D9ED-85C3-4B35-BE48-7156F5B17430}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2008.csproj b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2008.csproj
deleted file mode 100644
index 0d3922b2..00000000
--- a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2008.csproj
+++ /dev/null
@@ -1,124 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C261D9ED-85C3-4B35-BE48-7156F5B17430}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.IocQuickStart.MovieFinder</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Spring.IocQuickStart</RootNamespace>
-    <RunPostBuildEvent>Always</RunPostBuildEvent>
-    <StartupObject>Spring.IocQuickStart.MovieFinder.Program</StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging.Log4Net, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\net\2.0\Common.Logging.Log4Net.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="MovieFinder\AppContext.xml" />
-    <EmbeddedResource Include="MovieFinder\AppContextContribution.xml" />
-    <Content Include="MovieFinder\movies.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MovieFinder\ColonDelimitedMovieFinder.cs" />
-    <Compile Include="MovieFinder\IMovieFinder.cs" />
-    <Compile Include="MovieFinder\Movie.cs" />
-    <Compile Include="MovieFinder\Program.cs" />
-    <Compile Include="MovieFinder\MovieLister.cs" />
-    <Compile Include="MovieFinder\SimpleMovieFinder.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>echo "Copying movies.txt file for MovieFinder"
-copy "$(ProjectDir)MovieFinder\movies.txt" "$(TargetDir)" /y </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.MsmqQuickStart/Spring.MsmqQuickStart.2008.sln b/examples/Spring/Spring.MsmqQuickStart/Spring.MsmqQuickStart.2008.sln
deleted file mode 100644
index e21d228e..00000000
--- a/examples/Spring/Spring.MsmqQuickStart/Spring.MsmqQuickStart.2008.sln
+++ /dev/null
@@ -1,32 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.MsmqQuickStart.Common.2008", "src\Spring\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.2008.csproj", "{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.MsmqQuickStart.Server.2008", "src\Spring\Spring.MsmqQuickStart.Server\Spring.MsmqQuickStart.Server.2008.csproj", "{85E7B947-8153-45E4-B572-BEDB191F1FB2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.MsmqQuickStart.Client.2008", "src\Spring\Spring.MsmqQuickStart.Client\Spring.MsmqQuickStart.Client.2008.csproj", "{87D0B725-A652-4A6B-A95F-197F7155769F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2008.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2008.csproj
deleted file mode 100644
index e8e6937c..00000000
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2008.csproj
+++ /dev/null
@@ -1,171 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{87D0B725-A652-4A6B-A95F-197F7155769F}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.MsmqQuickStart.Client</RootNamespace>
-    <AssemblyName>Spring.MsmqQuickStart.Client</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Gateways\IStockService.cs" />
-    <Compile Include="Gateways\MsmqStockServiceGateway.cs" />
-    <Compile Include="Handlers\StockAppHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\StockForm.resx">
-      <DependentUpon>StockForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="UI\StockController.cs" />
-    <Compile Include="UI\StockForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\StockForm.designer.cs">
-      <DependentUpon>StockForm.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.2008.csproj">
-      <Project>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</Project>
-      <Name>Spring.MsmqQuickStart.Common.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\Application.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Messaging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2008.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2008.csproj
deleted file mode 100644
index 6184d7bf..00000000
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2008.csproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.MsmqQuickStart.Common</RootNamespace>
-    <AssemblyName>Spring.MsmqQuickStart.Common</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Data\TradeResponse.cs">
-      <DependentUpon>TradeResponse.xsd</DependentUpon>
-    </Compile>
-    <Compile Include="Data\TradeRequest.cs">
-      <DependentUpon>TradeRequest.xsd</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Data\TradeResponse.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Data\TradeResponse.xsx">
-      <DependentUpon>TradeResponse.xsd</DependentUpon>
-    </None>
-    <None Include="Data\TradeRequest.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Data\TradeRequest.xsx">
-      <DependentUpon>TradeRequest.xsd</DependentUpon>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2008.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2008.csproj
deleted file mode 100644
index c3e7a882..00000000
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2008.csproj
+++ /dev/null
@@ -1,148 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{85E7B947-8153-45E4-B572-BEDB191F1FB2}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.MsmqQuickStart.Server</RootNamespace>
-    <AssemblyName>Spring.MsmqQuickStart.Server</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Gateways\IMarketDataService.cs" />
-    <Compile Include="Gateways\MarketDataServiceGateway.cs" />
-    <Compile Include="Handlers\StockAppHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\ICreditCheckService.cs" />
-    <Compile Include="Services\IExecutionVenueService.cs" />
-    <Compile Include="Services\ITradingService.cs" />
-    <Compile Include="Services\Stubs\CreditCheckServiceStub.cs" />
-    <Compile Include="Services\Stubs\ExecutionVenueServiceStub.cs" />
-    <Compile Include="Services\Stubs\TradingServiceStub.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.2008.csproj">
-      <Project>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</Project>
-      <Name>Spring.MsmqQuickStart.Common.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\ServiceStubs.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Messaging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Handlers.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/Spring.NmsQuickStart.2008.sln b/examples/Spring/Spring.NmsQuickStart/Spring.NmsQuickStart.2008.sln
deleted file mode 100644
index 64eed66e..00000000
--- a/examples/Spring/Spring.NmsQuickStart/Spring.NmsQuickStart.2008.sln
+++ /dev/null
@@ -1,68 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Integration.Tests.2008", "test\Spring\Spring.NmsQuickStart.Integration.Tests\Spring.NmsQuickStart.Integration.Tests.2008.csproj", "{E641F51F-1B51-4B94-B419-F902EABCE4D4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Tests.2008", "test\Spring\Spring.NmsQuickStart.Tests\Spring.NmsQuickStart.Tests.2008.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Common.2008", "src\Spring\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.2008.csproj", "{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Server.2008", "src\Spring\Spring.NmsQuickStart.Server\Spring.NmsQuickStart.Server.2008.csproj", "{85E7B947-8153-45E4-B572-BEDB191F1FB2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Client.2008", "src\Spring\Spring.NmsQuickStart.Client\Spring.NmsQuickStart.Client.2008.csproj", "{87D0B725-A652-4A6B-A95F-197F7155769F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.2008", "..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2008.csproj", "{AEB1578C-9018-4D49-B440-789F38DD2F29}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2008.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2008.csproj
deleted file mode 100644
index 2545e355..00000000
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2008.csproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{87D0B725-A652-4A6B-A95F-197F7155769F}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.NmsQuickStart.Client</RootNamespace>
-    <AssemblyName>Spring.NmsQuickStart.Client</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Apache.NMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.dll</HintPath>
-    </Reference>
-    <Reference Include="Apache.NMS.ActiveMQ, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.ActiveMQ.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-   <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Nms, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.Nms.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Gateways\IStockService.cs" />
-    <Compile Include="Gateways\NmsStockServiceGateway.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Gateways\RequestReplyNmsTemplate.cs" />
-    <Compile Include="Handlers\StockAppHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\StockForm.resx">
-      <DependentUpon>StockForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="UI\StockController.cs" />
-    <Compile Include="UI\StockForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\StockForm.designer.cs">
-      <DependentUpon>StockForm.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.2008.csproj">
-      <Project>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</Project>
-      <Name>Spring.NmsQuickStart.Common.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\Application.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Messaging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2008.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2008.csproj
deleted file mode 100644
index 22c8a3b3..00000000
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2008.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.NmsQuickStart.Common</RootNamespace>
-    <AssemblyName>Spring.NmsQuickStart.Common</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Apache.NMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.dll</HintPath>
-    </Reference>
-    <Reference Include="Apache.NMS.ActiveMQ, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.ActiveMQ.dll</HintPath>
-    </Reference>
-   <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Nms, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.Nms.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Converters\ITypeMapper.cs" />
-    <Compile Include="Converters\TypeMapper.cs" />
-    <Compile Include="Converters\XmlMessageConverter.cs" />
-    <Compile Include="Data\TradeResponse.cs">
-      <DependentUpon>TradeResponse.xsd</DependentUpon>
-    </Compile>
-    <Compile Include="Data\TradeRequest.cs">
-      <DependentUpon>TradeRequest.xsd</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Data\TradeResponse.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Data\TradeResponse.xsx">
-      <DependentUpon>TradeResponse.xsd</DependentUpon>
-    </None>
-    <None Include="Data\TradeRequest.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Data\TradeRequest.xsx">
-      <DependentUpon>TradeRequest.xsd</DependentUpon>
-    </None>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2008.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2008.csproj
deleted file mode 100644
index 6aeb09e3..00000000
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2008.csproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{85E7B947-8153-45E4-B572-BEDB191F1FB2}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.NmsQuickStart.Server</RootNamespace>
-    <AssemblyName>Spring.NmsQuickStart.Server</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Apache.NMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.dll</HintPath>
-    </Reference>
-    <Reference Include="Apache.NMS.ActiveMQ, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.ActiveMQ.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-   <Reference Include="Spring.Aop, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Nms, Version=1.2.0.20336, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.Nms.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Gateways\IMarketDataService.cs" />
-    <Compile Include="Gateways\MarketDataServiceGateway.cs" />
-    <Compile Include="Handlers\LoggingExceptionListener.cs" />
-    <Compile Include="Handlers\StockAppHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\ICreditCheckService.cs" />
-    <Compile Include="Services\IExecutionVenueService.cs" />
-    <Compile Include="Services\ITradingService.cs" />
-    <Compile Include="Services\Stubs\CreditCheckServiceStub.cs" />
-    <Compile Include="Services\Stubs\ExecutionVenueServiceStub.cs" />
-    <Compile Include="Services\Stubs\TradingServiceStub.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.2008.csproj">
-      <Project>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</Project>
-      <Name>Spring.NmsQuickStart.Common.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\ServiceStubs.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Messaging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Handlers.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2008.csproj b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2008.csproj
deleted file mode 100644
index f35693f5..00000000
--- a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2008.csproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E641F51F-1B51-4B94-B419-F902EABCE4D4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.NmsQuickStart.Integration.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.NmsQuickStart.Integration.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>..\..\..\build\VS.NET.2008\Spring.NmsQuickStart.Integration.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2008.csproj b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2008.csproj
deleted file mode 100644
index fd74f384..00000000
--- a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2008.csproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.NmsQuickStart.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.NmsQuickStart.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>..\..\..\build\VS.NET.2008\Spring.NmsQuickStart.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Scheduling.Quartz.Example/Spring.Scheduling.Quartz.Example.2008.sln b/examples/Spring/Spring.Scheduling.Quartz.Example/Spring.Scheduling.Quartz.Example.2008.sln
deleted file mode 100644
index 2a4954a7..00000000
--- a/examples/Spring/Spring.Scheduling.Quartz.Example/Spring.Scheduling.Quartz.Example.2008.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz.Example.2008", "src\Spring.Scheduling.Quartz.Example.2008.csproj", "{0C0D8C65-90DE-4914-9940-4C684C54971B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2008.csproj b/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2008.csproj
deleted file mode 100644
index feb6d5f0..00000000
--- a/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2008.csproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0C0D8C65-90DE-4914-9940-4C684C54971B}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Scheduling.Quartz.Example</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Spring.Scheduling.Quartz.Example</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz.Example\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-	</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz.Example\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="C5">
-      <Name>C5</Name>
-      <HintPath>..\..\..\..\lib\Quartz21\net\3.5\C5.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging">
-      <Name>Common.Logging</Name>
-      <HintPath>..\..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Quartz">
-      <Name>Quartz</Name>
-      <HintPath>..\..\..\..\lib\Quartz21\net\3.5\Quartz.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Scheduling.Quartz21">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\bin\net\3.5\debug\Spring.Scheduling.Quartz21.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App.config" />
-    <Content Include="spring-objects.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Compile Include="AdminService.cs" />
-    <Compile Include="ExampleJob.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Program.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2008.sln b/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2008.sln
deleted file mode 100644
index 2fe345e3..00000000
--- a/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2008.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.TxQuickStart.2008", "src\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2008.csproj", "{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.TxQuickStart.Tests.2008", "test\Spring\Spring.TxQuickStart.Tests\Spring.TxQuickStart.Tests.2008.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2008.csproj b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2008.csproj
deleted file mode 100644
index 1b3bcc04..00000000
--- a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2008.csproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.TxQuickStart</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="TxQuickStart\Dao\Ado\AccountCreditDao.cs" />
-    <Compile Include="TxQuickStart\Dao\Ado\AccountDebitDao.cs" />
-    <Compile Include="TxQuickStart\Services\AccountManager.cs" />
-    <Compile Include="TxQuickStart\Dao\IAccountCreditDao.cs" />
-    <Compile Include="TxQuickStart\Dao\IAccountDebitDao.cs" />
-    <Compile Include="TxQuickStart\Services\IAccountManager.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TxQuickStart\application-config.xml" />
-    <Content Include="TxQuickStart\CreditsDebitsSchema.sql" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2008.csproj b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2008.csproj
deleted file mode 100644
index c94be0b3..00000000
--- a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2008.csproj
+++ /dev/null
@@ -1,107 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.TxQuickStart.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.Log4Net.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2008.csproj">
-      <Project>{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}</Project>
-      <Name>Spring.TxQuickStart.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TxQuickStart\system-test-local-config.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="TxQuickStart\AccountManagerTests.cs" />
-    <Compile Include="TxQuickStart\Services\AccountManagerUnitTests.cs" />
-    <Compile Include="TxQuickStart\Services\StubAccountCreditDao.cs" />
-    <Compile Include="TxQuickStart\Services\StubAccountDebitDao.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.TxQuickStart.Tests.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TxQuickStart\aspects-config.xml" />
-    <EmbeddedResource Include="TxQuickStart\system-test-dtc-config.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TxQuickStart\system-test-dtc-es-config.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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln b/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln
deleted file mode 100644
index a7962996..00000000
--- a/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln
+++ /dev/null
@@ -1,81 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ClientApp.2008", "src\Spring.WcfQuickStart.ClientApp\Spring.WcfQuickStart.ClientApp.2008.csproj", "{D58B3101-4433-49C5-B41B-51134424FC42}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EEC5B531-104B-44E6-975B-44C0C8973405} = {EEC5B531-104B-44E6-975B-44C0C8973405}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ServerApp.2008", "src\Spring.WcfQuickStart.ServerApp\Spring.WcfQuickStart.ServerApp.2008.csproj", "{27AAD98C-4281-4DD4-9E20-1371C58C5283}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ServerWeb.2008", "src\Spring.WcfQuickStart.ServerWeb\Spring.WcfQuickStart.ServerWeb.2008.csproj", "{EEC5B531-104B-44E6-975B-44C0C8973405}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Contracts.2008", "src\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2008.csproj", "{53263837-0643-45FE-96A2-46D425E1A36F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Aspects.2008", "src\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2008.csproj", "{B52BBAA3-1B30-4905-827C-1D81EBA56A15}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|.NET.ActiveCfg = Release|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|.NET.ActiveCfg = Release|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|.NET.ActiveCfg = Release|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|.NET.ActiveCfg = Release|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|.NET.ActiveCfg = Release|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj
deleted file mode 100644
index 2e712ffa..00000000
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
-    <AssemblyName>Spring.WcfQuickStart.Aspects</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SimplePerformanceInterceptor.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj
deleted file mode 100644
index e1e6ef3f..00000000
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj
+++ /dev/null
@@ -1,107 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D58B3101-4433-49C5-B41B-51134424FC42}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
-    <AssemblyName>Spring.WcfQuickStart.ClientApp</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <PublishUrl>http://localhost/Spring.WcfQuickStart.ClientApp/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Config\ServerApp.xml" />
-    <EmbeddedResource Include="Config\ServerWeb.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2008.csproj">
-      <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
-      <Name>Spring.WcfQuickStart.Aspects</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2008.csproj">
-      <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
-      <Name>Spring.WcfQuickStart.Contracts</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Config\Aspects.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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2008.csproj
deleted file mode 100644
index 1139972e..00000000
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2008.csproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{53263837-0643-45FE-96A2-46D425E1A36F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
-    <AssemblyName>Spring.WcfQuickStart.Contracts</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.ServiceModel">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AbstractCalculatorService.cs" />
-    <Compile Include="ICalculator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj
deleted file mode 100644
index ce8a38f7..00000000
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2008.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{27AAD98C-4281-4DD4-9E20-1371C58C5283}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
-    <AssemblyName>Spring.WcfQuickStart.ServerApp</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <PublishUrl>http://localhost/Spring.WcfQuickStart.ServerApp/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CalculatorService.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2008.csproj">
-      <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
-      <Name>Spring.WcfQuickStart.Aspects</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2008.csproj">
-      <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
-      <Name>Spring.WcfQuickStart.Contracts</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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj
deleted file mode 100644
index 593dc80e..00000000
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2008.csproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EEC5B531-104B-44E6-975B-44C0C8973405}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
-    <AssemblyName>Spring.WcfQuickStart.ServerWeb</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_3_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.0\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=0.0.0.20000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.ServiceModel">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Calculator.svc" />
-    <Compile Include="CalculatorService.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2008.csproj">
-      <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
-      <Name>Spring.WcfQuickStart.Aspects</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2008.csproj">
-      <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
-      <Name>Spring.WcfQuickStart.Contracts</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>2637</DevelopmentServerPort>
-          <DevelopmentServerVPath>/Spring.WcfQuickStart.ServerWeb/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.2008.sln b/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.2008.sln
deleted file mode 100644
index 669ac7e1..00000000
--- a/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.2008.sln
+++ /dev/null
@@ -1,49 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.Web.Extensions.Example.2008", "src\Spring.Web.Extensions.Example.2008\", "{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFramework = "3.5"
-		ProjectReferences = ""
-		Debug.AspNetCompiler.VirtualPath = "/Spring.Web.Extensions.Example.2008"
-		Debug.AspNetCompiler.PhysicalPath = "src\Spring.Web.Extensions.Example.2008\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Web.Extensions.Example.2008\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/Spring.Web.Extensions.Example.2008"
-		Release.AspNetCompiler.PhysicalPath = "src\Spring.Web.Extensions.Example.2008\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Web.Extensions.Example.2008\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "3792"
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|.NET.ActiveCfg = Debug|.NET
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|.NET.Build.0 = Debug|.NET
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Any CPU.ActiveCfg = Debug|.NET
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Mixed Platforms.Build.0 = Debug|.NET
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|.NET.ActiveCfg = Debug|.NET
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|.NET.Build.0 = Debug|.NET
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Any CPU.ActiveCfg = Debug|.NET
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Mixed Platforms.Build.0 = Debug|.NET
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/App_Code/ContactService.cs b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/App_Code/ContactService.cs
deleted file mode 100644
index a0687b33..00000000
--- a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/App_Code/ContactService.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-
-#region Imports
-
-using System;
-using System.Collections.Generic;
-
-#endregion
-
-/// <summary>
-/// Default implementation of the <see cref="IContactService"/>
-/// service interface.
-/// </summary>
-/// <author>Bruno Baia</author>
-/// <version>$Id: ContactService.cs,v 1.1 2007/05/31 18:34:54 markpollack Exp $</version>
-public class ContactService : IContactService
-{
-    private List<string> _emails;
-
-    /// <summary>
-    /// List of emails addresses for all contacts.
-    /// </summary>
-    public List<string> Emails
-    {
-        get { return _emails; }
-        set { _emails = value; }
-    }
-
-    /// <summary>
-    /// Creates a new instance of the <see cref="ContactService"/> class.
-    /// </summary>
-    public ContactService()
-    {
-    }
-
-    /// <summary>
-    /// Returns an array of emails, with a maximum of <paramref name="count"/> 
-    /// values, that complete the given <paramref name="prefixText"/>.
-    /// </summary>
-    /// <param name="prefixText">Text entered by the user.</param>
-    /// <param name="count">Maximum number of possible values.</param>
-    /// <returns>The array of emails for completing the text.</returns>
-    public string[] GetEmails(string prefixText, int count)
-    {
-        List<String> emails = new List<string>();
-        int i = 0;
-        foreach (string email in _emails)
-        {
-            if (email.ToLower().StartsWith(prefixText.ToLower()))
-            {
-                emails.Add(email);
-                if (++i == count) break;
-            }
-        }
-
-        return emails.ToArray();
-    }
-}
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/App_Code/IContactService.cs b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/App_Code/IContactService.cs
deleted file mode 100644
index 7c83f77d..00000000
--- a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/App_Code/IContactService.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-/// <summary>
-/// Service interface for contact management.
-/// </summary>
-/// <author>Bruno Baia</author>
-/// <version>$Id: IContactService.cs,v 1.1 2007/05/31 18:34:54 markpollack Exp $</version>
-public interface IContactService
-{
-    /// <summary>
-    /// Returns an array of emails, with a maximum of <paramref name="count"/> 
-    /// values, that complete the given <paramref name="prefixText"/>.
-    /// </summary>
-    /// <remarks>
-    /// This signature method is required 
-    /// to apply the auto-completion behavior.
-    /// </remarks>
-    /// <param name="prefixText">Text entered by the user.</param>
-    /// <param name="count">Maximum number of possible values.</param>
-    /// <returns>The array of emails for completing the text.</returns>
-    string[] GetEmails(string prefixText, int count);
-}
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/App_Code/StringArrayFilterAdvice.cs b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/App_Code/StringArrayFilterAdvice.cs
deleted file mode 100644
index 4f925150..00000000
--- a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/App_Code/StringArrayFilterAdvice.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-#region Imports
-
-using System;
-using System.Collections.Generic;
-
-using AopAlliance.Intercept;
-using Spring.Util;
-
-#endregion
-
-/// <summary>
-/// A simple interception around advice that filters 
-/// a string array matching a given pattern.
-/// </summary>
-/// <author>Bruno Baia</author>
-/// <version>$Id: StringArrayFilterAdvice.cs,v 1.1 2007/05/31 18:34:54 markpollack Exp $</version>
-public class StringArrayFilterAdvice : IMethodInterceptor
-{
-    private string _pattern = string.Empty;
-
-    /// <summary>
-    /// A pattern to be used for filtering a string array.
-    /// </summary>
-    public string Pattern
-    {
-        get { return _pattern; }
-        set { _pattern = value; }
-    }
-
-    /// <summary>
-    /// Creates a new instance of the <see cref="StringArrayFilterAdvice"/> class.
-    /// </summary>
-    public StringArrayFilterAdvice()
-    {
-    }
-
-    #region IMethodInterceptor Members
-
-    public object Invoke(IMethodInvocation invocation)
-    {
-        if (invocation.Method.ReturnType != typeof(string[]))
-            throw new NotSupportedException(
-                "StringArrayFilterAdvice must be applied on methods " +
-                "that return an array of string.");
-
-        string[] stringArray = (string[])invocation.Proceed();
-
-        if (_pattern.Length > 0)
-        {
-            List<string> strings = new List<string>();
-            foreach (string item in stringArray)
-            {
-                if (PatternMatchUtils.SimpleMatch(_pattern, item))
-                {
-                    strings.Add(item);
-                }
-            }
-
-            return strings.ToArray();
-        }
-
-        return stringArray;
-    }
-
-    #endregion
-}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Common.Logging.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Common.Logging.dll.refresh
deleted file mode 100644
index a91d5b04..00000000
Binary files a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Common.Logging.dll.refresh and /dev/null differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Aop.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Aop.dll.refresh
deleted file mode 100644
index 3740476d..00000000
Binary files a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Aop.dll.refresh and /dev/null differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Core.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Core.dll.refresh
deleted file mode 100644
index 55351ab3..00000000
Binary files a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Core.dll.refresh and /dev/null differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Web.Extensions.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Web.Extensions.dll.refresh
deleted file mode 100644
index 0840ea46..00000000
Binary files a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Web.Extensions.dll.refresh and /dev/null differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Web.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Web.dll.refresh
deleted file mode 100644
index 0054fdbf..00000000
Binary files a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Bin/Spring.Web.dll.refresh and /dev/null differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/ContactWebServiceMethods.js b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/ContactWebServiceMethods.js
deleted file mode 100644
index 8029c670..00000000
--- a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/ContactWebServiceMethods.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// JScript File
-
-// This function calls the Contact Web service method 
-// passing simple type parameters and the callback function  
-function GetEmails(prefix, count)
-{
-    ContactWebService.GetEmails(prefix, count, GetEmailsOnSucceeded);
-}
-
-// This is the callback function invoked if the Web service succeeded.
-// It accepts the result object as a parameter.
-function GetEmailsOnSucceeded(result, eventArgs)
-{
-    // Page element to display feedback.
-    var ResultSpan = document.getElementById("ResultSpan");
-    ResultSpan.innerHTML = '';
-    var i = 0;
-    for(email in result)
-    {
-        ResultSpan.innerHTML += (result[i] + '<br />');
-        i++;
-    }
-}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Default.aspx b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Default.aspx
deleted file mode 100644
index 598134d9..00000000
--- a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Default.aspx
+++ /dev/null
@@ -1,46 +0,0 @@
-<%@ Page Language="C#" %>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <title>ASP.NET AJAX 1.0 integration with Spring.NET</title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <asp:ScriptManager runat="server" ID="scriptManager">
-            <Scripts>
-                <asp:ScriptReference Path="ContactWebServiceMethods.js" />
-            </Scripts>
-            <Services>
-                <asp:ServiceReference Path="ContactWebService.asmx" />
-            </Services>
-        </asp:ScriptManager>
-        <div>
-            <p>
-                Web Service available at this url : <a href="ContactWebService.asmx">ContactWebService.asmx</a>
-                <br />
-                <br />
-                Client scripts generated at this url : <a href="ContactWebService.asmx/js">ContactWebService.asmx/js</a>
-                & <a href="ContactWebService.asmx/jsdebug">ContactWebService.asmx/jsdebug</a>
-            </p>
-            <hr />
-            <p>
-                This sample demonstrates the use of client script with a web service created by
-                Spring.NET's WebServiceExporter.
-            </p>
-            <p>
-                Email :
-                <input id="emailInput" name="emailInput" type="text" />
-                <button onclick="GetEmails(emailInput.value, 10); return false;">
-                    Search</button>
-                (Hint : type the letter 'b' or 'm')
-            </p>
-            <p>
-                Results :
-                <br />
-                <span id="ResultSpan" />
-            </p>
-        </div>
-    </form>
-</body>
-</html>
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Spring.config b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Spring.config
deleted file mode 100644
index 95c90614..00000000
--- a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Spring.config
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<objects xmlns="http://www.springframework.net">
-  <description>Object definitions.</description>
-
-  <!-- Creates an advisor (advice + pointcut). -->
-  <object id="StringArrayFilterAspect" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor, Spring.Aop">
-    <property name="advice">
-      <object type="StringArrayFilterAdvice">
-        <property name="Pattern" value="*spring.net"/>
-      </object>
-    </property>
-    <property name="patterns">
-      <list>
-        <value>GetEmails</value>
-      </list>
-    </property>
-  </object>
-
-  <!-- Defines the contact service. -->
-  <object id="ContactService" type="ContactService">
-    <property name="Emails">
-      <list element-type="string">
-        <value>manuel@spring.pt</value>
-        <value>bruno@spring.net</value>
-        <value>marie@spring.net</value>
-        <value>brice@spring.net</value>
-        <value>bertrand@spring.net</value>
-        <value>marcel@spring.net</value>
-        <value>bernadette@spring.net</value>
-        <value>bruno@spring.pt</value>
-        <value>baptiste@spring.net</value>
-        <value>brad@spring.net</value>
-        <value>marc@spring.net</value>
-        <value>barbie@spring.net</value>
-        <value>bernie@spring.net</value>
-        <value>betty@spring.net</value>
-        <value>maria@spring.pt</value>
-      </list>
-    </property>
-  </object>
-
-  <!-- Applies AOP on the contact service. -->
-  <object id="ContactServiceWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
-    <property name="target" ref="ContactService"/>
-    <property name="interceptorNames">
-      <list>
-        <value>StringArrayFilterAspect</value>
-      </list>
-    </property>
-  </object>
-
-  <!-- Exports contact service (weaved or not) as a web service. -->
-  <object id="ContactWebService" type="Spring.Web.Services.WebServiceExporter, Spring.Web">
-    <!--<property name="TargetName" value="ContactService"/>-->
-    <property name="TargetName" value="ContactServiceWeaved"/>
-    <property name="Namespace" value="http://Spring.Examples.Atlas/ContactService"/>
-    <property name="Description" value="Contact Web Services"/>
-    <property name="TypeAttributes">
-      <list>
-        <object type="System.Web.Script.Services.ScriptServiceAttribute, System.Web.Extensions"/>
-      </list>
-    </property>
-  </object>
-
-</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Web.config b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Web.config
deleted file mode 100644
index 28c91597..00000000
--- a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2008/Web.config
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-	<configSections>
-		<sectionGroup name="spring">
-			<section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
-		</sectionGroup>
-		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
-					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-				</sectionGroup>
-			</sectionGroup>
-		</sectionGroup>
-	</configSections>
-	<spring>
-		<context>
-			<resource uri="~/Spring.config"/>
-		</context>
-	</spring>
-	<system.web>
-		<pages>
-			<controls>
-				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-				<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-			</controls>
-		</pages>
-		<!--
-          Set compilation debug="true" to insert debugging
-          symbols into the compiled page. Because this
-          affects performance, set this value to true only
-          during development.
-    -->
-		<compilation debug="true">
-			<assemblies>
-				<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-				<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-			</assemblies>
-		</compilation>
-		<httpHandlers>
-			<remove verb="*" path="*.asmx"/>
-			<!--<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>-->
-      <add verb="*" path="*.asmx" validate="false" type="Spring.Web.Script.Services.ScriptHandlerFactory, Spring.Web.Extensions"/>
-			<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-			<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
-		</httpHandlers>
-		<httpModules>
-			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-			<add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
-		</httpModules>
-	</system.web>
-</configuration>
diff --git a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2008.sln b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2008.sln
deleted file mode 100644
index 498e0be9..00000000
--- a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2008.sln
+++ /dev/null
@@ -1,154 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.2005", "src\Spring.WebQuickStart.2005\", "{B4F56253-6425-4065-8A93-EF88F8730E57}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFramework = "3.5"
-		ProjectReferences = "{BA4789EB-281A-48EA-8763-28B9F0596A18}|Spring.Web.dll;{710961A3-0DF4-49E4-A26E-F5B9C044AC84}|Spring.Core.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.2005"
-		Debug.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.2005\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.2005\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.2005"
-		Release.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.2005\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.2005\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "4724"
-		DefaultWebSiteLanguage = "Visual C#"
-	EndProjectSection
-EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.Providers", "src\Spring.WebQuickStart.Providers\", "{F42A333D-D305-4649-8B5A-6F5862F0F62A}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFramework = "3.5"
-		ProjectReferences = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}|Spring.Core.dll;{BA4789EB-281A-48EA-8763-28B9F0596A18}|Spring.Web.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.Providers"
-		Debug.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.Providers\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.Providers\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.Providers"
-		Release.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.Providers\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.Providers\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "1343"
-		DefaultWebSiteLanguage = "Visual C#"
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2008", "..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2008", "..\..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2008.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.2008", "..\..\..\src\Spring\Spring.Web\Spring.Web.2008.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Tests.2008", "..\..\..\test\Spring\Spring.Web.Tests\Spring.Web.Tests.2008.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2008", "..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2008", "..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|.NET.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|.NET.Build.0 = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Any CPU.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.Build.0 = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|.NET.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|.NET.Build.0 = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Any CPU.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.Build.0 = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|.NET.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|.NET.Build.0 = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Any CPU.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.Build.0 = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|.NET.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|.NET.Build.0 = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Any CPU.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.Build.0 = Debug|.NET
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/SpringAir/SpringAir.2008.sln b/examples/Spring/SpringAir/SpringAir.2008.sln
deleted file mode 100644
index 17acabb4..00000000
--- a/examples/Spring/SpringAir/SpringAir.2008.sln
+++ /dev/null
@@ -1,110 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "SpringAir.Web.2005", "src\SpringAir.Web.2005\", "{839602F5-8077-497D-9CCB-C9F02741CA55}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFramework = "3.5"
-		ProjectReferences = "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}|SpringAir.Core.dll;{78B285FE-27F3-44F4-84B1-7A589AB48EF3}|SpringAir.Data.Ado.dll;{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}|SpringAir.Web.2008.References.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/SpringAir.Web.2005"
-		Debug.AspNetCompiler.PhysicalPath = "src\SpringAir.Web.2005\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\SpringAir.Web.2005\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/SpringAir.Web.2005"
-		Release.AspNetCompiler.PhysicalPath = "src\SpringAir.Web.2005\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\SpringAir.Web.2005\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "4816"
-		DefaultWebSiteLanguage = "Visual C#"
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Core.2008", "src\SpringAir.Core\SpringAir.Core.2008.csproj", "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Core.Tests.2008", "test\SpringAir.Core.Tests\SpringAir.Core.Tests.2008.csproj", "{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Data.Ado.2008", "src\SpringAir.Data.Ado\SpringAir.Data.Ado.2008.csproj", "{78B285FE-27F3-44F4-84B1-7A589AB48EF3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Data.Ado.Tests.2008", "test\SpringAir.Data.Ado.Tests\SpringAir.Data.Ado.Tests.2008.csproj", "{B0A6F98E-5363-4575-BB6B-A84E91895468}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Web.2008.References", "src\SpringAir.Web.2005.References\SpringAir.Web.2008.References.csproj", "{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|.NET.ActiveCfg = Debug|.NET
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|.NET.Build.0 = Debug|.NET
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Any CPU.ActiveCfg = Debug|.NET
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Mixed Platforms.Build.0 = Debug|.NET
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|.NET.ActiveCfg = Debug|.NET
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|.NET.Build.0 = Debug|.NET
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Any CPU.ActiveCfg = Debug|.NET
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Mixed Platforms.Build.0 = Debug|.NET
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|.NET.ActiveCfg = Release|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|.NET.ActiveCfg = Release|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|.NET.ActiveCfg = Release|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|.NET.ActiveCfg = Release|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2008.csproj b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2008.csproj
deleted file mode 100644
index 87acc9f5..00000000
--- a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2008.csproj
+++ /dev/null
@@ -1,175 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>SpringAir.Core</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>SpringAir</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core, Version=1.1.1.20001, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\IAircraftDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\IAirportDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\IFlightDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\Aircraft.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\Airport.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\AirportCollection.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\Cabin.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\CabinClass.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\Entity.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\Flight.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\FlightCollection.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\FlightSuggestions.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\Itinerary.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\Passenger.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\Reservation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\ReservationConfirmation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\Seat.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\TimeRange.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\Trip.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\TripMode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\TripPoint.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Service\CannotConfirmReservationException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Service\DefaultBookingAgent.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Service\IBookingAgent.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <None Include="SpringAir.Core.build" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2008.csproj b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2008.csproj
deleted file mode 100644
index 0aa5cbcc..00000000
--- a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2008.csproj
+++ /dev/null
@@ -1,134 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{78B285FE-27F3-44F4-84B1-7A589AB48EF3}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>SpringAir.Data.Ado</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>SpringAir</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\Ado\AircraftDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\Ado\AircraftMapper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\Ado\AirportDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\Ado\AirportMapper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\Ado\FlightDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <None Include="SpringAir.Data.Ado.build" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SpringAir.Core\SpringAir.Core.2008.csproj">
-      <Project>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</Project>
-      <Name>SpringAir.Core.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2008.References.csproj b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2008.References.csproj
deleted file mode 100644
index 690bee89..00000000
--- a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2008.References.csproj
+++ /dev/null
@@ -1,86 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>SpringAir</RootNamespace>
-    <AssemblyName>SpringAir.Web.2005.References</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>./bin</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>.</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SpringAir.Core\SpringAir.Core.2008.csproj">
-      <Project>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</Project>
-      <Name>SpringAir.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SpringAir.Data.Ado\SpringAir.Data.Ado.2008.csproj">
-      <Project>{78B285FE-27F3-44F4-84B1-7A589AB48EF3}</Project>
-      <Name>SpringAir.Data.Ado.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2008.csproj b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2008.csproj
deleted file mode 100644
index bd154402..00000000
--- a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2008.csproj
+++ /dev/null
@@ -1,131 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>SpringAir.Core.Tests</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>SpringAir</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\FlightCollectionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\FlightSuggestionsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\FlightTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\ReservationConfirmationTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Domain\TimeRangeTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Service\BookingAgentIntegrationTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Service\DefaultBookingAgentIntegrationTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <None Include="SpringAir.Core.Tests.build" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\SpringAir.Core\SpringAir.Core.2008.csproj">
-      <Project>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</Project>
-      <Name>SpringAir.Core.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2008.csproj b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2008.csproj
deleted file mode 100644
index 8f4842c2..00000000
--- a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2008.csproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B0A6F98E-5363-4575-BB6B-A84E91895468}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>SpringAir.Data.Ado.Tests</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>SpringAir</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\Ado\AircraftDaoTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\Ado\AirportDaoTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\Ado\FlightDaoTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <None Include="SpringAir.Data.Ado.Tests.build" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\SpringAir.Core\SpringAir.Core.2008.csproj">
-      <Project>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</Project>
-      <Name>SpringAir.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\SpringAir.Data.Ado\SpringAir.Data.Ado.2008.csproj">
-      <Project>{78B285FE-27F3-44F4-84B1-7A589AB48EF3}</Project>
-      <Name>SpringAir.Data.Ado.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Spring.Aop.2008.csproj b/src/Spring/Spring.Aop/Spring.Aop.2008.csproj
deleted file mode 100644
index e12fc8cd..00000000
--- a/src/Spring/Spring.Aop/Spring.Aop.2008.csproj
+++ /dev/null
@@ -1,474 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Aop</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <SignAssembly>false</SignAssembly>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <PublishUrl>http://localhost/Spring.Aop/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Aop\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;DEBUG_DYNAMIC</DefineConstants>
-    <DocumentationFile>Spring.Aop.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Aop\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AopAlliance\Aop\AspectException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AopAlliance\Aop\IAdvice.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AopAlliance\Intercept\IConstructorInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AopAlliance\Intercept\IConstructorInvocation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AopAlliance\Intercept\IInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AopAlliance\Intercept\IInvocation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AopAlliance\Intercept\IJoinpoint.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AopAlliance\Intercept\IMethodInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AopAlliance\Intercept\IMethodInvocation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Config\AopNamespaceParser.cs" />
-    <Compile Include="Aop\Config\AopNamespaceUtils.cs" />
-    <Compile Include="Aop\Config\ConfigObjectDefinitionParser.cs" />
-    <Compile Include="Aop\Framework\AopUtils.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\AbstractFilteringAutoProxyCreator.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\AttributeAutoProxyCreator.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\IAdvisorRetrievalHelper.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\InfrastructureAdvisorAutoProxyCreator.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\InheritanceBasedAopConfigurer.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\ObjectFactoryAdvisorRetrievalHelper.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\PointcutFilteringAutoProxyCreator.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\TypeNameAutoProxyCreator.cs" />
-    <Compile Include="Aop\Framework\DynamicMethodInvocation.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\AbstractAopProxyFactory.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\CachedAopProxyFactory.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\DefaultAopProxyFactory.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\InheritanceAopProxyTypeBuilder.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\BaseAopProxyMethodBuilder.cs" />
-    <Compile Include="Aop\IAdvisors.cs" />
-    <Compile Include="Aop\Framework\AbstractMethodInvocation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\AdvisorAdapterRegistrationManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\AfterReturningAdviceAdapter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\AfterReturningAdviceInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\BeforeAdviceAdapter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\DefaultAdvisorAdapterRegistry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\GlobalAdvisorAdapterRegistry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\IAdvisorAdapter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\IAdvisorAdapterRegistry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\MethodBeforeAdviceInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\ThrowsAdviceAdapter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\ThrowsAdviceInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\UnknownAdviceTypeException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\AdvisedSupport.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\AdvisorChainFactoryUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\AopConfigException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\AopContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\AutoProxy\AbstractAdvisorAutoProxyCreator.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\AbstractAutoProxyCreator.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\DefaultAdvisorAutoProxyCreator.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\ITargetSourceCreator.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\ObjectNameAutoProxyCreator.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\Target\AbstractPrototypeTargetSourceCreator.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\AbstractAopProxyMethodBuilder.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\AbstractAopProxyTypeBuilder.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\AdvisedProxy.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\CompositionAopProxyTypeBuilder.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\BaseCompositionAopProxy.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\IAdvisedProxyMethodBuilder.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\IAopProxyTypeGenerator.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\DecoratorAopProxyTypeBuilder.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\IntroductionProxyMethodBuilder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\DynamicProxy\TargetAopProxyMethodBuilder.cs" />
-    <Compile Include="Aop\Framework\HashtableCachingAdvisorChainFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\IAdvised.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\IAdvisedSupportListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\IAdvisorChainFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\IAopProxy.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\IAopProxyFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\InterceptorAndDynamicMethodMatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\ITargetAware.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\ProxyConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\ProxyFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\ProxyFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\ReflectiveMethodInvocation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\IAdvisor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\IAfterReturningAdvice.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\IBeforeAdvice.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\IIntroductionAdvisor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\IIntroductionInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\IMethodBeforeAdvice.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\IMethodMatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\IPointcut.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\IPointcutAdvisor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\ITargetSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\IThrowsAdvice.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\ITypeFilter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\AbstractGenericPointcutAdvisor.cs" />
-    <Compile Include="Aop\Support\AbstractObjectFactoryPointcutAdvisor.cs" />
-    <Compile Include="Aop\Support\AbstractPointcutAdvisor.cs" />
-    <Compile Include="Aop\Support\AbstractRegularExpressionMethodPointcut.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\AttributeMatchingPointcut.cs" />
-    <Compile Include="Aop\Support\AttributeMatchMethodPointcut.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\AttributeMatchMethodPointcutAdvisor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\AttributeMethodMatcher.cs" />
-    <Compile Include="Aop\Support\AttributeTypeFilter.cs" />
-    <Compile Include="Aop\Support\ComposablePointcut.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\ControlFlowPointcut.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\DefaultIntroductionAdvisor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\DefaultObjectFactoryPointcutAdvisor.cs" />
-    <Compile Include="Aop\Support\DefaultPointcutAdvisor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\DynamicMethodMatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\DynamicMethodMatcherPointcutAdvisor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\MethodMatchers.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\NameMatchMethodPointcut.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\NameMatchMethodPointcutAdvisor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\Pointcuts.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\RegularExpressionMethodPointcutAdvisor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\RootTypeFilter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\SdkRegularExpressionMethodPointcut.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\StaticMethodMatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\StaticMethodMatcherPointcut.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\StaticMethodMatcherPointcutAdvisor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\TypeFilters.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\TypeNameTypeFilter.cs" />
-    <Compile Include="Aop\Support\UnionPointcut.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\AbstractPoolingTargetSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\AbstractPrototypeTargetSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\EmptyTargetSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\HotSwappableTargetSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\IThreadLocalTargetSourceStats.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\PoolingConfig.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\PrototypeTargetSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\SimplePoolTargetSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\SingletonTargetSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\ThreadLocalTargetSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\TrueMethodMatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\TruePointcut.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\TrueTypeFilter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aspects\AbstractExceptionHandlerAdvice.cs" />
-    <Compile Include="Aspects\Cache\CacheAspect.cs" />
-    <Compile Include="Aspects\Cache\BaseCacheAdvice.cs" />
-    <Compile Include="Aspects\Cache\CacheResultAdvice.cs" />
-    <Compile Include="Aspects\Cache\CacheParameterAdvice.cs" />
-    <Compile Include="Aspects\Cache\CacheResultAdvisor.cs" />
-    <Compile Include="Aspects\Cache\CacheParameterAdvisor.cs" />
-    <Compile Include="Aspects\Cache\InvalidateCacheAdvisor.cs" />
-    <Compile Include="Aspects\Cache\InvalidateCacheAdvice.cs" />
-    <Compile Include="Aspects\Exceptions\ExceptionHandlerAdvice.cs" />
-    <Compile Include="Aspects\Exceptions\ExecuteSpelExceptionHandler.cs" />
-    <Compile Include="Aspects\Exceptions\LogExceptionHandler.cs" />
-    <Compile Include="Aspects\Exceptions\ReturnValueExceptionHandler.cs" />
-    <Compile Include="Aspects\Exceptions\SwallowExceptionHandler.cs" />
-    <Compile Include="Aspects\Exceptions\TranslationExceptionHandler.cs" />
-    <Compile Include="Aspects\Logging\AbstractLoggingAdvice.cs" />
-    <Compile Include="Aspects\Logging\SimpleLoggingAdvice.cs" />
-    <Compile Include="Aspects\ParsedAdviceExpression.cs" />
-    <Compile Include="Aspects\RetryAdvice.cs" />
-    <Compile Include="Aspects\AbstractExceptionHandler.cs" />
-    <Compile Include="Aspects\IExceptionHandler.cs" />
-    <Compile Include="Aspects\RetryExceptionHandler.cs" />
-    <Compile Include="Aspects\Validation\ParameterValidationAdvisor.cs" />
-    <Compile Include="Aspects\Validation\ParameterValidationAdvice.cs" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="Aop\Config\spring-aop-1.1.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-    <None Include="Aop\Config\spring-aop-1.1.xsx">
-      <DependentUpon>spring-aop-1.1.xsd</DependentUpon>
-    </None>
-    <None Include="Spring.Aop.build" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Spring.Aop.build b/src/Spring/Spring.Aop/Spring.Aop.build
index 12470d03..fc26e181 100644
--- a/src/Spring/Spring.Aop/Spring.Aop.build
+++ b/src/Spring/Spring.Aop/Spring.Aop.build
@@ -13,8 +13,10 @@
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
 		     output="${current.bin.dir}/${project::get-name()}.dll"
-                     doc="${current.bin.dir}/${project::get-name()}.xml"
-		     >
+             doc="${current.bin.dir}/${project::get-name()}.xml"
+   			 nostdlib="true"
+			 noconfig="true"
+			>
 			<arg line="${compiler.args}"/>
 			<nowarn>
 				<warning number="${nowarn.numbers}" />
@@ -29,11 +31,16 @@
             		<resources basedir="." prefix="Spring.Aop.Config">
                 	  <include name="Aop\Config\spring-aop-1.1.xsd" />
 	                </resources>
-			<references basedir="${current.bin.dir}">
-				<include name="Common.Logging.dll"/>
-				<include name="antlr.runtime.dll"/>
-				<include name="Spring.Core.dll" />
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
+                <include name="System.Xml.dll"/>
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/antlr.runtime.dll"/>
+				<include name="${current.bin.dir}/Spring.Core.dll" />
 			</references>
 		</csc>
 	</target>
diff --git a/src/Spring/Spring.Core/Spring.Core.2008.csproj b/src/Spring/Spring.Core/Spring.Core.2008.csproj
deleted file mode 100644
index e262ff9b..00000000
--- a/src/Spring/Spring.Core/Spring.Core.2008.csproj
+++ /dev/null
@@ -1,1292 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Core</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <PublishUrl>http://localhost/Spring.Core/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\..\Spring.Net.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Core\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;DEBUG_DYNAMIC_DISABLED</DefineConstants>
-    <DocumentationFile>Spring.Core.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>219, 162, 618, 1591</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningsAsErrors>1591</WarningsAsErrors>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Core\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Caching\BaseCacheAttribute.cs" />
-    <Compile Include="Caching\AbstractCache.cs" />
-    <Compile Include="Caching\CacheResultAttribute.cs" />
-    <Compile Include="Caching\CacheResultItemsAttribute.cs" />
-    <Compile Include="Caching\CacheParameterAttribute.cs" />
-    <Compile Include="Caching\InvalidateCacheAttribute.cs" />
-    <Compile Include="Caching\NonExpiringCache.cs" />
-    <Compile Include="Caching\ICache.cs" />
-    <Compile Include="Collections\AbstractQueue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\CaseInsensitiveHashtable.cs" />
-    <Compile Include="Collections\DictionarySet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\Generic\DictionarySet.cs" />
-    <Compile Include="Collections\Generic\HashedSet.cs" />
-    <Compile Include="Collections\Generic\ImmutableSet.cs" />
-    <Compile Include="Collections\Generic\ISet.cs" />
-    <Compile Include="Collections\Generic\OrderedSet.cs" />
-    <Compile Include="Collections\Generic\ReadOnlyDictionary.cs" />
-    <Compile Include="Collections\Generic\Set.cs" />
-    <Compile Include="Collections\Generic\SortedSet.cs" />
-    <Compile Include="Collections\Generic\SynchronizedSet.cs" />
-    <Compile Include="Collections\HashedSet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\HybridSet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\ImmutableSet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\IQueue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\ISet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\LinkedList.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\ListSet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\NoElementsException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\PriorityQueue.cs" />
-    <Compile Include="Collections\Set.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\SortedSet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\SynchronizedDictionaryEnumerator.cs" />
-    <Compile Include="Collections\SynchronizedEnumerator.cs" />
-    <Compile Include="Collections\SynchronizedHashtable.cs" />
-    <Compile Include="Collections\SynchronizedSet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\ApplicationContextException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\ApplicationEventArgs.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\EventListenerAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Events\ConsoleListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Events\ContextEventArgs.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\IApplicationContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\IApplicationContextAware.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\IApplicationEventListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\IApplicationEventPublisher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\IConfigurableApplicationContext.cs" />
-    <Compile Include="Context\IHierarchicalMessageSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\ILifecycle.cs" />
-    <Compile Include="Context\IMessageSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\IMessageSourceAware.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\IMessageSourceResolvable.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\IResourceLoaderAware.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\NoSuchMessageException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\AbstractApplicationContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\AbstractMessageSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\AbstractXmlApplicationContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\AbstractXmlApplicationContextArgs.cs" />
-    <Compile Include="Context\Support\ApplicationContextAwareProcessor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\ApplicationObjectSupport.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\ContextHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\ContextRegistry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\NamespaceParsersSectionHandler.cs" />
-    <Compile Include="Context\Support\GenericApplicationContext.cs" />
-    <Compile Include="Context\Support\TypeConvertersSectionHandler.cs" />
-    <Compile Include="Context\Support\DefaultMessageSourceResolvable.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\DefaultSectionHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\DelegatingMessageSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\MessageSourceAccessor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\MessageSourceResolvableVisitor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\NullMessageSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\ResourceSetMessageSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\ResourceHandlersSectionHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\StaticApplicationContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\StaticMessageSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\TypeAliasesSectionHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\XmlApplicationContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\XmlApplicationContextArgs.cs" />
-    <Compile Include="Core\AttributeAccessorSupport.cs" />	
-    <Compile Include="Core\CannotLoadObjectTypeException.cs" />
-    <Compile Include="Core\ComposedCriteria.cs" />
-    <Compile Include="Core\ControlFlowFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Conventions.cs" />
-    <Compile Include="Core\IAttributeAccessor.cs" />
-    <Compile Include="Core\IO\EncodedResource.cs" />
-    <Compile Include="Core\IPriorityOrdered.cs" />
-    <Compile Include="Core\MethodArgumentsCriteria.cs" />
-    <Compile Include="Core\IO\AbstractResource.cs" />
-    <Compile Include="Core\IO\AssemblyResource.cs" />
-    <Compile Include="Core\IO\ConfigSectionResource.cs" />
-    <Compile Include="Core\IO\ConfigurableResourceLoader.cs" />
-    <Compile Include="Core\IO\FileSystemResource.cs" />
-    <Compile Include="Core\IO\IInputStreamSource.cs" />
-    <Compile Include="Core\IO\InputStreamResource.cs" />
-    <Compile Include="Core\IO\IResource.cs" />
-    <Compile Include="Core\IO\IResourceLoader.cs" />
-    <Compile Include="Core\IO\ResourceConverter.cs" />
-    <Compile Include="Core\IO\ResourceHandlerRegistry.cs" />
-    <Compile Include="Core\IO\StringResource.cs" />
-    <Compile Include="Core\IO\UrlResource.cs" />
-    <Compile Include="Core\MethodNameMatchCriteria.cs" />
-    <Compile Include="Core\MethodGenericArgumentsCountCriteria.cs" />
-    <Compile Include="Core\CriteriaMemberFilter.cs" />
-    <Compile Include="Core\IControlFlow.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\ICriteria.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\IErrorCoded.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\InvalidPropertyException.cs" />
-    <Compile Include="Core\IOrdered.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\MethodInvocationException.cs" />
-    <Compile Include="Core\MethodParameter.cs" />
-    <Compile Include="Core\MethodParametersCountCriteria.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" />
-    <Compile Include="Core\NullValueInNestedPathException.cs" />
-    <Compile Include="Core\OrderComparator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\PropertyAccessException.cs" />
-    <Compile Include="Core\PropertyChangeEventArgs.cs" />
-    <Compile Include="Core\RegularExpressionCriteria.cs" />
-    <Compile Include="Core\RegularExpressionEventNameCriteria.cs" />
-    <Compile Include="Core\RegularExpressionMethodNameCriteria.cs" />
-    <Compile Include="Core\TypeConversion\TypeConversionUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\TypeConversion\CredentialConverter.cs" />
-    <Compile Include="Core\TypeConversion\CustomNumberConverter.cs" />
-    <Compile Include="Core\TypeConversion\FileInfoConverter.cs" />
-    <Compile Include="Core\TypeConversion\NameValueConverter.cs" />
-    <Compile Include="Core\TypeConversion\RegexConverter.cs" />
-    <Compile Include="Core\TypeConversion\RegistryKeyConverter.cs" />
-    <Compile Include="Core\TypeConversion\ResourceManagerConverter.cs" />
-    <Compile Include="Core\TypeConversion\RGBColorConverter.cs" />
-    <Compile Include="Core\TypeConversion\RuntimeTypeConverter.cs" />
-    <Compile Include="Core\TypeConversion\StreamConverter.cs" />
-    <Compile Include="Core\TypeConversion\StringArrayConverter.cs" />
-    <Compile Include="Core\TypeConversion\TimeSpanConverter.cs" />
-    <Compile Include="Core\TypeConversion\TypeConverterRegistry.cs" />
-    <Compile Include="Core\TypeConversion\UriConverter.cs" />
-    <Compile Include="Core\TypeMismatchException.cs" />
-    <Compile Include="Core\TypeResolution\CachedTypeResolver.cs" />
-    <Compile Include="Core\TypeResolution\GenericArgumentsHolder.cs" />
-    <Compile Include="Core\TypeResolution\TypeAssemblyHolder.cs" />
-    <Compile Include="Core\TypeResolution\GenericTypeResolver.cs" />
-    <Compile Include="Core\TypeResolution\ITypeResolver.cs" />
-    <Compile Include="Core\TypeResolution\TypeResolutionUtils.cs" />
-    <Compile Include="Core\TypeResolution\TypeRegistry.cs" />
-    <Compile Include="Core\TypeResolution\TypeResolver.cs" />
-    <Compile Include="DataBinding\AbstractBinding.cs" />
-    <Compile Include="DataBinding\AbstractSimpleBinding.cs" />
-    <Compile Include="DataBinding\BaseBindingContainer.cs" />
-    <Compile Include="DataBinding\BindingErrorMessage.cs" />
-    <Compile Include="DataBinding\IBindingContainer.cs" />
-    <Compile Include="DataBinding\ListBinding.cs" />
-    <Compile Include="DataBinding\SimpleExpressionBinding.cs" />
-    <Compile Include="DataBinding\BindingDirection.cs" />
-    <Compile Include="DataBinding\BaseBindingManager.cs" />
-    <Compile Include="DataBinding\IBinding.cs" />
-    <Compile Include="DataBinding\IDataBound.cs" />
-    <Compile Include="Expressions\DefaultNode.cs" />
-    <Compile Include="Expressions\ExpressionConverter.cs" />
-    <Compile Include="Expressions\OpXOR.cs" />
-    <Compile Include="Expressions\Parser\antlr\ANTLRException.cs" />
-    <Compile Include="Expressions\Parser\antlr\ANTLRPanicException.cs" />
-    <Compile Include="Expressions\Parser\antlr\ASTFactory.cs" />
-    <Compile Include="Expressions\Parser\antlr\ASTNodeCreator.cs" />
-    <Compile Include="Expressions\Parser\antlr\ASTNULLType.cs" />
-    <Compile Include="Expressions\Parser\antlr\ASTPair.cs" />
-    <Compile Include="Expressions\Parser\antlr\ASTVisitor.cs" />
-    <Compile Include="Expressions\Parser\antlr\BaseAST.cs" />
-    <Compile Include="Expressions\Parser\antlr\ByteBuffer.cs" />
-    <Compile Include="Expressions\Parser\antlr\CharBuffer.cs" />
-    <Compile Include="Expressions\Parser\antlr\CharQueue.cs" />
-    <Compile Include="Expressions\Parser\antlr\CharScanner.cs" />
-    <Compile Include="Expressions\Parser\antlr\CharStreamException.cs" />
-    <Compile Include="Expressions\Parser\antlr\CharStreamIOException.cs" />
-    <Compile Include="Expressions\Parser\antlr\collections\AST.cs" />
-    <Compile Include="Expressions\Parser\antlr\collections\impl\ASTArray.cs" />
-    <Compile Include="Expressions\Parser\antlr\collections\impl\BitSet.cs" />
-    <Compile Include="Expressions\Parser\antlr\CommonAST.cs" />
-    <Compile Include="Expressions\Parser\antlr\CommonASTWithHiddenTokens.cs" />
-    <Compile Include="Expressions\Parser\antlr\CommonHiddenStreamToken.cs" />
-    <Compile Include="Expressions\Parser\antlr\CommonToken.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ANTLREventArgs.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\DebuggingCharScanner.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\DebuggingInputBuffer.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\DebuggingParser.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\GuessingEventArgs.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ICharScannerDebugSubject.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\IDebugSubject.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\InputBufferEventArgs.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\InputBufferEventSupport.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\InputBufferListener.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\InputBufferListenerBase.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\InputBufferReporter.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\IParserDebugSubject.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\Listener.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\LLkDebuggingParser.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\MessageEventArgs.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\MessageListener.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\MessageListenerBase.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\NewLineEventArgs.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\NewLineListener.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserController.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserEventSupport.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserListener.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserListenerBase.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserMatchEventArgs.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserMatchListener.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserMatchListenerBase.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserReporter.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserTokenEventArgs.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserTokenListener.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParserTokenListenerBase.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ParseTreeDebugParser.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\ScannerEventSupport.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\SemanticPredicateEventArgs.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\SemanticPredicateListener.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\SemanticPredicateListenerBase.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\SyntacticPredicateEventArgs.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\SyntacticPredicateListener.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\SyntacticPredicateListenerBase.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\TraceEventArgs.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\TraceListener.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\TraceListenerBase.cs" />
-    <Compile Include="Expressions\Parser\antlr\debug\Tracer.cs" />
-    <Compile Include="Expressions\Parser\antlr\DefaultFileLineFormatter.cs" />
-    <Compile Include="Expressions\Parser\antlr\DumpASTVisitor.cs" />
-    <Compile Include="Expressions\Parser\antlr\FileLineFormatter.cs" />
-    <Compile Include="Expressions\Parser\antlr\IHiddenStreamToken.cs" />
-    <Compile Include="Expressions\Parser\antlr\InputBuffer.cs" />
-    <Compile Include="Expressions\Parser\antlr\IToken.cs" />
-    <Compile Include="Expressions\Parser\antlr\LexerSharedInputState.cs" />
-    <Compile Include="Expressions\Parser\antlr\LLkParser.cs" />
-    <Compile Include="Expressions\Parser\antlr\MismatchedCharException.cs" />
-    <Compile Include="Expressions\Parser\antlr\MismatchedTokenException.cs" />
-    <Compile Include="Expressions\Parser\antlr\NoViableAltException.cs" />
-    <Compile Include="Expressions\Parser\antlr\NoViableAltForCharException.cs" />
-    <Compile Include="Expressions\Parser\antlr\Parser.cs" />
-    <Compile Include="Expressions\Parser\antlr\ParserSharedInputState.cs" />
-    <Compile Include="Expressions\Parser\antlr\ParseTree.cs" />
-    <Compile Include="Expressions\Parser\antlr\ParseTreeRule.cs" />
-    <Compile Include="Expressions\Parser\antlr\ParseTreeToken.cs" />
-    <Compile Include="Expressions\Parser\antlr\RecognitionException.cs" />
-    <Compile Include="Expressions\Parser\antlr\SemanticException.cs" />
-    <Compile Include="Expressions\Parser\antlr\StringUtils.cs" />
-    <Compile Include="Expressions\Parser\antlr\SupportClass.cs" />
-    <Compile Include="Expressions\Parser\antlr\Token.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenBuffer.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenCreator.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenQueue.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenStream.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenStreamBasicFilter.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenStreamException.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenStreamHiddenTokenFilter.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenStreamIOException.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenStreamRecognitionException.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenStreamRetryException.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenStreamRewriteEngine.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenStreamSelector.cs" />
-    <Compile Include="Expressions\Parser\antlr\TokenWithIndex.cs" />
-    <Compile Include="Expressions\Parser\antlr\TreeParser.cs" />
-    <Compile Include="Expressions\Parser\antlr\TreeParserSharedInputState.cs" />
-    <Compile Include="Expressions\Processors\DateConversionProcessor.cs" />
-    <Compile Include="Expressions\Processors\IMethodCallProcessor.cs" />
-    <Compile Include="Expressions\SyntaxErrorException.cs" />
-    <Compile Include="Expressions\Parser\ExpressionLexer.cs" />
-    <Compile Include="Expressions\Parser\ExpressionParser.cs" />
-    <Compile Include="Expressions\Processors\AverageAggregator.cs" />
-    <Compile Include="Expressions\Processors\ConversionProcessor.cs" />
-    <Compile Include="Expressions\Processors\NonNullProcessor.cs" />
-    <Compile Include="Expressions\Processors\OrderByProcessor.cs" />
-    <Compile Include="Expressions\Processors\DistinctProcessor.cs" />
-    <Compile Include="Expressions\Processors\ReverseProcessor.cs" />
-    <Compile Include="Expressions\Processors\SortProcessor.cs" />
-    <Compile Include="Expressions\Processors\CountAggregator.cs" />
-    <Compile Include="Expressions\Processors\SumAggregator.cs" />
-    <Compile Include="Expressions\Processors\MinAggregator.cs" />
-    <Compile Include="Expressions\Processors\MaxAggregator.cs" />
-    <Compile Include="Expressions\Processors\ICollectionProcessor.cs" />
-    <Compile Include="Expressions\ArrayConstructorNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\AssignNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\BaseNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\BinaryOperator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\BooleanLiteralNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\ConstructorNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\AttributeNode.cs" />
-    <Compile Include="Expressions\LocalFunctionNode.cs" />
-    <Compile Include="Expressions\FunctionNode.cs" />
-    <Compile Include="Expressions\LocalVariableNode.cs" />
-    <Compile Include="Expressions\LambdaExpressionNode.cs" />
-    <Compile Include="Expressions\OpBetween.cs" />
-    <Compile Include="Expressions\OpMatches.cs" />
-    <Compile Include="Expressions\OpLike.cs" />
-    <Compile Include="Expressions\OpIs.cs" />
-    <Compile Include="Expressions\SelectionLastNode.cs" />
-    <Compile Include="Expressions\SelectionFirstNode.cs" />
-    <Compile Include="Expressions\SelectionNode.cs" />
-    <Compile Include="Expressions\MapEntryNode.cs" />
-    <Compile Include="Expressions\MapInitializerNode.cs" />
-    <Compile Include="Expressions\ListInitializerNode.cs" />
-    <Compile Include="Expressions\OpIn.cs" />
-    <Compile Include="Expressions\QualifiedIdentifier.cs" />
-    <Compile Include="Expressions\NamedArgumentNode.cs" />
-    <Compile Include="Expressions\Expression.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\ExpressionEvaluator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\ExpressionListNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\HexLiteralNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\IExpression.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\IndexerNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\IntLiteralNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\MethodNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\NodeWithArguments.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\NullLiteralNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpADD.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpAND.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpDIVIDE.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpEqual.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpGreater.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpGreaterOrEqual.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpLess.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpLessOrEqual.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpMODULUS.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpMULTIPLY.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpNOT.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpNotEqual.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpOR.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpPOWER.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpSUBTRACT.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpUnaryMinus.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\OpUnaryPlus.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\ProjectionNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\PropertyOrFieldNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\RealLiteralNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\ReferenceNode.cs" />
-    <Compile Include="Expressions\SpringAST.cs" />
-    <Compile Include="Expressions\StringLiteralNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\TernaryNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\TypeNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\UnaryOperator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\VariableNode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\AbstractLocalizer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\AbstractResourceCache.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\Formatters\BooleanFormatter.cs" />
-    <Compile Include="Globalization\Formatters\CurrencyFormatter.cs" />
-    <Compile Include="Globalization\Formatters\DateTimeFormatter.cs" />
-    <Compile Include="Globalization\Formatters\FilteringFormatter.cs" />
-    <Compile Include="Globalization\Formatters\FloatFormatter.cs" />
-    <Compile Include="Globalization\Formatters\HasTextFilteringFormatter.cs" />
-    <Compile Include="Globalization\Formatters\IntegerFormatter.cs" />
-    <Compile Include="Globalization\Formatters\NullFormatter.cs" />
-    <Compile Include="Globalization\Formatters\NumberFormatter.cs" />
-    <Compile Include="Globalization\Formatters\PercentFormatter.cs" />
-    <Compile Include="Globalization\ICultureResolver.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\IFormatter.cs" />
-    <Compile Include="Globalization\ILocalizer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\IResourceCache.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\Localizers\ResourceSetLocalizer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\NullResourceCache.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\Resolvers\DefaultCultureResolver.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\Resource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Attributes\InitDestroyAttributeObjectPostProcessor.cs" />
-    <Compile Include="Objects\Factory\Attributes\PostConstructAttribute.cs" />
-    <Compile Include="Objects\Factory\Attributes\PreDestroyAttribute.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowiredAttribute.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowiredAttributeObjectPostProcessor.cs" />
-    <Compile Include="Objects\Factory\Attributes\InjectionMetadata.cs" />
-    <Compile Include="Objects\Factory\Attributes\QualifierAnnotationAutowireCandidateResolver.cs" />
-    <Compile Include="Objects\Factory\Attributes\QualifierAttribute.cs" />	
-    <Compile Include="Objects\Factory\Attributes\RequiredAttribute.cs" />
-    <Compile Include="Objects\Factory\Attributes\RequiredAttributeObjectPostProcessor.cs" />
-    <Compile Include="Objects\Factory\Attributes\ValueAttribute.cs" />	
-    <Compile Include="Objects\Factory\Config\AbstractConfigurer.cs" />
-    <Compile Include="Objects\Factory\Config\CommandLineArgsVariableSource.cs" />
-    <Compile Include="Objects\Factory\Config\ConfigSectionVariableSource.cs" />
-    <Compile Include="Objects\Factory\Config\ConnectionStringsVariableSource.cs" />
-    <Compile Include="Objects\Factory\Config\ConfigurableVariableSource.cs" />
-    <Compile Include="Objects\Factory\Config\ICustomValueReferenceHolder.cs" />
-    <Compile Include="Objects\Factory\Config\DelegateObjectFactoryConfigurer.cs" />
-    <Compile Include="Objects\Factory\Config\DependencyDescriptor.cs" />
-    <Compile Include="Objects\Factory\Config\DictionaryVariableSource.cs" />
-    <Compile Include="Objects\Factory\Config\IConfigurableFactoryObject.cs" />
-    <Compile Include="Objects\Factory\Config\InstantiationAwareObjectPostProcessorAdapter.cs" />
-    <Compile Include="Objects\Factory\Config\ISingletonObjectRegistry.cs" />
-    <Compile Include="Objects\Factory\Config\ObjectDefinitionHolder.cs" />
-    <Compile Include="Objects\Factory\Config\ObjectDefinitionVisitor.cs" />
-    <Compile Include="Objects\Factory\Config\ObjectRole.cs" />
-    <Compile Include="Objects\Factory\Config\ResourceHandlerConfigurer.cs" />
-    <Compile Include="Objects\Factory\Config\SharedStateAwareProcessor.cs" />
-    <Compile Include="Objects\Factory\Config\SmartInstantiationAwareObjectPostProcessor.cs" />
-    <Compile Include="Objects\Factory\Config\TypeAliasConfigurer.cs" />
-    <Compile Include="Objects\Factory\Config\PropertyFileVariableSource.cs" />
-    <Compile Include="Objects\Factory\Config\SpecialFolderVariableSource.cs" />
-    <Compile Include="Objects\Factory\Config\RegistryVariableSource.cs" />
-    <Compile Include="Objects\Factory\Config\EnvironmentVariableSource.cs" />
-    <Compile Include="Objects\Factory\Config\ExpressionHolder.cs" />
-    <Compile Include="Objects\Factory\Config\IVariableSource.cs" />
-    <Compile Include="Objects\Factory\Config\VariableAccessor.cs" />
-    <Compile Include="Objects\Factory\Config\VariablePlaceholderConfigurer.cs" />
-    <Compile Include="Objects\Factory\Parsing\FailFastProblemReporter.cs" />
-    <Compile Include="Objects\Factory\Parsing\IProblemReporter.cs" />
-    <Compile Include="Objects\Factory\Parsing\Location.cs" />
-    <Compile Include="Objects\Factory\Parsing\ObjectDefinitionParsingException.cs" />
-    <Compile Include="Objects\Factory\Parsing\Problem.cs" />
-    <Compile Include="Objects\Factory\Parsing\ReaderContext.cs" />
-    <Compile Include="Objects\Factory\Support\AutowireCandidateQualifier.cs" />	
-    <Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObject.cs" />
-    <Compile Include="Objects\Factory\Support\IObjectDefinitionRegistryPostProcessor.cs" />
-    <Compile Include="Objects\Factory\Support\ObjectScope.cs" />
-    <Compile Include="Objects\IObjectMetadataElement.cs" />
-    <Compile Include="Objects\ObjectMetadataAttribute.cs" />
-    <Compile Include="Objects\ObjectMetadataAttributeAccessor.cs" />	
-    <Compile Include="Util\ConstructorInstantiationInfo.cs" />
-    <Compile Include="Objects\Factory\Support\GenericObjectDefinition.cs" />
-    <Compile Include="Objects\Factory\Support\IAutowireCandidateResolver.cs" />
-    <Compile Include="Objects\Factory\Support\ConstructorResolver.cs" />
-    <Compile Include="Objects\Factory\Support\DefaultObjectNameGenerator.cs" />
-    <Compile Include="Objects\Factory\Support\IConfigurableObjectDefinition.cs" />
-    <Compile Include="Objects\Factory\Support\IObjectNameGenerator.cs" />
-    <Compile Include="Objects\Factory\Config\ManagedNameValueCollection.cs" />
-    <Compile Include="Objects\Factory\Support\ObjectDefinitionBuilder.cs" />
-    <Compile Include="Objects\Factory\Support\ObjectDefinitionValueResolver.cs" />
-    <Compile Include="Objects\Factory\Support\SimpleAutowireCandidateResolver.cs" />
-    <Compile Include="Objects\Factory\Xml\AbstractObjectDefinitionParser.cs" />
-    <Compile Include="Objects\Factory\Xml\AbstractSimpleObjectDefinitionParser.cs" />
-    <Compile Include="Objects\Factory\Xml\AbstractSingleObjectDefinitionParser.cs" />
-    <Compile Include="Objects\Factory\Xml\DefaultNamespaceHandlerResolver.cs" />
-    <Compile Include="Objects\Factory\Xml\INamespaceParserResolver.cs" />
-    <Compile Include="Objects\Factory\Xml\NamespaceParserAttribute.cs" />
-    <Compile Include="Objects\Factory\Xml\ObjectFactorySectionHandler.cs" />
-    <Compile Include="Objects\Factory\Xml\DocumentDefaultsDefinition.cs" />
-    <Compile Include="Objects\Factory\Xml\IObjectDefinitionDocumentReader.cs" />
-    <Compile Include="Objects\Factory\Xml\IObjectDefinitionParser.cs" />
-    <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\XmlReaderContext.cs" />
-    <Compile Include="Objects\FatalObjectException.cs" />
-    <Compile Include="Objects\IMergable.cs" />
-    <Compile Include="Objects\ISharedStateAware.cs" />
-    <Compile Include="Objects\ISharedStateFactory.cs" />
-    <Compile Include="Objects\MutablePropertyValues.cs" />
-    <Compile Include="Objects\ObjectWrapper.cs" />
-    <Compile Include="Objects\Events\IEventRegistry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Events\IEventRegistryAware.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Events\Support\EventManipulationUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Events\Support\EventRegistry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\AbstractFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\AutoWiringMode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ConfigurationReader.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ConstructorArgumentValues.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\CustomConverterConfigurer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\DelegateFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\DictionaryFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\EnvironmentVariableMode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\EventValues.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\FieldRetrievingFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\IAutowireCapableObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\IConfigurableListableObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\IConfigurableObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\IDestructionAwareObjectPostProcessor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\IInstantiationAwareObjectPostProcessor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\IObjectDefinition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\IObjectFactoryPostProcessor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\IObjectPostProcessor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ListFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\LogFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\MethodInvokingFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ObjectFactoryCreatingFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ObjectReferenceFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\PropertyOverrideConfigurer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\PropertyPathFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\PropertyPlaceholderConfigurer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\PropertyResourceConfigurer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\PropertyRetrievingFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ResourceManagerFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\RuntimeObjectReference.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\SetFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\TypedStringValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\FactoryObjectNotInitializedException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\IFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\IGenericObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\IHierarchicalObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\IInitializingObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\IListableObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\IObjectDefinitionFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\IObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\IObjectFactoryAware.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\IObjectNameAware.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\NoSuchObjectDefinitionException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ObjectCreationException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ObjectCurrentlyInCreationException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ObjectDefinitionException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ObjectDefinitionStoreException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ObjectFactoryUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ObjectInitializationException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ObjectIsNotAFactoryException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ObjectNotOfRequiredTypeException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\AbstractAutowireCapableObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\AbstractMethodReplacer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\AbstractObjectDefinition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\AbstractObjectDefinitionReader.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\AbstractObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\AutowireUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\ChildObjectDefinition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\DefaultListableObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\DefaultObjectDefinitionFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\DelegatingMethodReplacer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\DependencyCheckingMode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-	<Compile Include="Objects\Factory\Support\DisposableObjectAdapter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\IInstantiationStrategy.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\IManagedCollection.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\IMethodReplacer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\IObjectDefinitionReader.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\IObjectDefinitionRegistry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\LookupMethodOverride.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\LookupMethodReplacer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ManagedDictionary.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ManagedList.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ManagedSet.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\MethodInjectingInstantiationStrategy.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\MethodOverride.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\MethodOverrides.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\ObjectDefinitionReaderUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\ObjectDefinitionValidationException.cs">
-      <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>
-    <Compile Include="Objects\Factory\Support\SimpleInstantiationStrategy.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\StaticListableObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\UnsatisfiedDependencyException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\ObjectsNamespaceParser.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\INamespaceParser.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\ObjectDefinitionConstants.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\XmlObjectDefinitionReader.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\XmlObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\NamespaceParserRegistry.cs" />
-    <Compile Include="Objects\Factory\Xml\DefaultObjectDefinitionDocumentReader.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\IEventHandlerValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\IObjectWrapper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\IPropertyValues.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\ObjectsException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\PropertyAccessExceptionsException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\PropertyValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\AbstractEventHandlerValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\AbstractSharedStateFactory.cs" />
-    <Compile Include="Objects\Support\AbstractWiringEventHandlerValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\ArgumentConvertingMethodInvoker.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\AutoWiringEventHandlerValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\ByTypeSharedStateFactory.cs" />
-    <Compile Include="Objects\Support\InstanceEventHandlerValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\ISortDefinition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\MethodInvoker.cs" />
-    <Compile Include="Objects\Support\MutableSortDefinition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\PropertyComparator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\StaticEventHandlerValue.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Pool\IObjectPool.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Pool\IPoolableObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Pool\PoolException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Pool\Support\SimplePool.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\AbstractProxyMethodBuilder.cs" />
-    <Compile Include="Proxy\AbstractProxyTypeBuilder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\BaseProxyMethodBuilder.cs" />
-    <Compile Include="Proxy\ProxyIgnoreAttribute.cs" />
-    <Compile Include="Proxy\CompositionProxyTypeBuilder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\DynamicProxyManager.cs" />
-    <Compile Include="Proxy\InheritanceProxyTypeBuilder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\IProxyMethodBuilder.cs" />
-    <Compile Include="Proxy\IProxyTypeBuilder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\IProxyTypeGenerator.cs" />
-    <Compile Include="Proxy\TargetProxyMethodBuilder.cs" />
-    <Compile Include="Reflection\Dynamic\BaseDynamicMember.cs" />
-    <Compile Include="Reflection\Dynamic\DynamicConstructor.cs" />
-    <Compile Include="Reflection\Dynamic\DynamicField.cs" />
-    <Compile Include="Reflection\Dynamic\DynamicIndexer.cs" />
-    <Compile Include="Reflection\Dynamic\DynamicMethod.cs" />
-    <Compile Include="Reflection\Dynamic\DynamicProperty.cs" />
-    <Compile Include="Reflection\Dynamic\DynamicReflectionManager.cs" />
-    <Compile Include="Stereotype\ComponentAttribute.cs" />
-    <Compile Include="Stereotype\RepositoryAttribute.cs" />
-    <Compile Include="Stereotype\ControllerAttribute.cs" />
-    <Compile Include="Stereotype\ServiceAttribute.cs" />
-    <Compile Include="Threading\CallContextStorage.cs" />
-    <Compile Include="Threading\ISync.cs" />
-    <Compile Include="Threading\IThreadStorage.cs" />
-    <Compile Include="Threading\Latch.cs" />
-    <Compile Include="Threading\LogicalThreadContext.cs" />
-    <Compile Include="Threading\Semaphore.cs" />
-    <Compile Include="Threading\SyncHolder.cs" />
-    <Compile Include="Threading\ThreadStaticStorage.cs" />
-    <Compile Include="Threading\TimeoutException.cs" />
-    <Compile Include="Threading\TimeoutSync.cs" />
-    <Compile Include="Threading\Utils.cs" />
-    <Compile Include="Util\ArrayUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\AssertUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\AttributeUtils.cs" />
-    <Compile Include="Util\CollectionUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\CompareUtils.cs" />
-    <Compile Include="Util\ConfigurationUtils.cs" />
-    <Compile Include="Util\ConfigXmlAttribute.cs" />
-    <Compile Include="Util\ConfigXmlDocument.cs" />
-    <Compile Include="Util\ConfigXmlElement.cs" />
-    <Compile Include="Util\FatalReflectionException.cs" />
-    <Compile Include="Util\IChainableConfigSystem.cs" />
-    <Compile Include="Util\IErrorHandler.cs" />
-    <Compile Include="Util\IEventExceptionsCollector.cs" />
-    <Compile Include="Util\IoUtils.cs" />
-    <Compile Include="Util\IStringValueResolver.cs" />	
-    <Compile Include="Util\ITextPosition.cs" />
-    <Compile Include="Util\ObjectUtils.cs" />
-    <Compile Include="Util\ReflectionException.cs" />
-    <Compile Include="Util\SecurityCritical.cs" />
-    <Compile Include="Util\SystemUtils.cs" />
-    <Compile Include="Util\DynamicCodeManager.cs" />
-    <Compile Include="Util\Generic\CollectionUtils.cs" />
-    <Compile Include="Util\PatternMatchUtils.cs" />
-    <Compile Include="Util\TextPositionInfo.cs" />
-    <Compile Include="Util\UniqueKey.cs" />
-    <Compile Include="Core\TypeConversion\UniqueKeyConverter.cs" />
-    <Compile Include="Util\XmlUtils.cs" />
-    <Compile Include="Util\DelegateInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\EventUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\NumberUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\PathMatcher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\Properties.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\ReflectionUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <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\BaseValidationAction.cs" />
-    <Compile Include="Validation\BaseValidator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\Config\ValidationNamespaceParser.cs" />
-    <Compile Include="Validation\ErrorMessage.cs" />
-    <Compile Include="Validation\ExclusiveValidatorGroup.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\ValidatedAttribute.cs" />
-    <Compile Include="Validation\ValidationException.cs" />
-    <Compile Include="Validation\IValidationAction.cs" />
-    <Compile Include="Validation\IValidationErrors.cs" />
-    <Compile Include="Validation\IValidator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\ValidationErrors.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\ValidatorGroup.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\ValidatorReference.cs" />
-    <Compile Include="Validation\CollectionValidator.cs" />
-    <Compile Include="Validation\Validators\ConditionValidator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\Validators\CreditCardValidator.cs" />
-    <Compile Include="Validation\Validators\ISBNValidator.cs" />
-    <Compile Include="Validation\Validators\EmailValidator.cs" />
-    <Compile Include="Validation\Validators\RegularExpressionValidator.cs" />
-    <Compile Include="Validation\Validators\RequiredValidator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\Validators\UrlValidator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <None Include="Expressions\Expression.g" />
-    <EmbeddedResource Include="Objects\Factory\Xml\spring-tool-1.1.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.1.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.3.xsd" />
-    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-2.0.xsd" />	
-    <None Include="Spring.Core.build" />
-    <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>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>rem $(ProjectDir)..\..\..\build-support\tools\antlr-2.7.6\antlr-2.7.6.exe -o $(ProjectDir)Expressions\Parser $(ProjectDir)Expressions\Expression.g
-</PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Spring.Core.build b/src/Spring/Spring.Core/Spring.Core.build
index aaa91517..9c7b7b33 100644
--- a/src/Spring/Spring.Core/Spring.Core.build
+++ b/src/Spring/Spring.Core/Spring.Core.build
@@ -15,6 +15,8 @@
              debug="${current.build.debug}"
              output="${current.bin.dir}/${project::get-name()}.dll"
              doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
             >
             <arg line="${compiler.args}"/>
             <nowarn>
@@ -47,13 +49,16 @@
                 <include name="Validation/Config/spring-validation-1.1.xsd" />
                 <include name="Validation/Config/spring-validation-1.3.xsd" />
             </resources>
-            <references basedir="${current.bin.dir}">
-                <include name="Common.Logging.dll"/>
+            <references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
                 <include name="System.Drawing.dll"/>
                 <include name="System.Configuration.dll"/>
                 <include name="System.Xml.dll"/>
-				<include name="System.Core.dll"/>
                 <include name="Microsoft.VisualBasic.dll"/>
+		        <include name="${current.bin.dir}/Common.Logging.dll"/>
             </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Data.NHibernate/AssemblyInfo.cs b/src/Spring/Spring.Data.NHibernate/AssemblyInfo.cs
deleted file mode 100644
index 5d721b48..00000000
--- a/src/Spring/Spring.Data.NHibernate/AssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System;
-using System.Reflection;
-
-[assembly: AssemblyTitle("Spring.Net NHibernate 1.0 support")]
-[assembly: AssemblyDescription("Interfaces and classes that provide NHibernate 1.0 support in Spring.Net")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2008.csproj b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2008.csproj
deleted file mode 100644
index d9983f28..00000000
--- a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2008.csproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{130E1609-45A7-4F65-B112-105F2DD3E2CE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Data.NHibernate</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Spring.Data.NHibernate.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\Castle.DynamicProxy.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Data\NHibernate\HibernateAccessor.cs" />
-    <Compile Include="Data\NHibernate\HibernateAdoException.cs" />
-    <Compile Include="Data\NHibernate\HibernateDelegate.cs" />
-    <Compile Include="Data\NHibernate\HibernateObjectRetrievalFailureException.cs" />
-    <Compile Include="Data\NHibernate\HibernateOptimisticLockingFailureException.cs" />
-    <Compile Include="Data\NHibernate\HibernateQueryException.cs" />
-    <Compile Include="Data\NHibernate\HibernateSystemException.cs" />
-    <Compile Include="Data\NHibernate\HibernateTemplate.cs" />
-    <Compile Include="Data\NHibernate\HibernateTransactionManager.cs" />
-    <Compile Include="Data\NHibernate\ICommonHibernateOperations.cs" />
-    <Compile Include="Data\NHibernate\IHibernateCallback.cs" />
-    <Compile Include="Data\NHibernate\IHibernateOperations.cs" />
-    <Compile Include="Data\NHibernate\LocalSessionFactoryObject.cs" />
-    <Compile Include="Data\NHibernate\SessionFactoryUtils.cs" />
-    <Compile Include="Data\NHibernate\SessionHolder.cs" />
-    <Compile Include="Data\NHibernate\SpringSessionSynchronization.cs" />
-    <Compile Include="Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs" />
-    <Compile Include="Data\NHibernate\Support\HibernateDaoSupport.cs" />
-    <Compile Include="Data\NHibernate\Support\OpenSessionInViewModule.cs" />
-    <Compile Include="Data\NHibernate\Support\SessionScope.cs" />
-    <Compile Include="Data\NHibernate\Support\SessionScopeSettings.cs" />
-    <Compile Include="Data\NHibernate\TemplateFlushMode.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build
deleted file mode 100644
index 9406b6f6..00000000
--- a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Data.NHibernate" 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">
-
-        <!-- copy nh libs -->
-        <echo message="NH Libs: ${nh.lib.dir}" />
-        <copy todir="${current.bin.dir}" overwrite="true">
-          <fileset basedir="${nh.lib.dir}">
-            <include name="**/*.dll" />
-          </fileset>
-        </copy>
-
-		<!-- build Spring.Data.NHibernate -->
-		<csc target="library" define="${current.build.defines.csc}"
-				warnaserror="true"
-		                optimize="${build.optimize}"
-				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="${nowarn.numbers}" />
-				<warning number="0169" />
-				<warning number="0219,0414" if="${nant.settings.currentframework=='mono-2.0'}"/>
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../GenCommonAssemblyInfo.cs" />
-			</sources>
-			<references basedir="${current.bin.dir}">
-				<include name="System.Data.dll" />
-				<include name="System.Web.dll" />
-				<include name="System.EnterpriseServices.dll" />
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate*.dll" />
-				<exclude name="Spring.Data.NHibernate*.*.dll" />
-			</references>
-		</csc>
-	</target>
-</project>
diff --git a/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2008.csproj b/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2008.csproj
deleted file mode 100644
index 4c923973..00000000
--- a/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.2008.csproj
+++ /dev/null
@@ -1,203 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Data.NHibernate32</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Spring.Data.NHibernate32.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>0618</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Spring.Data.NHibernate32.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>0618</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=2.0.0.1001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\BytecodeProvider.cs">
-      <Link>Data\NHibernate\Bytecode\BytecodeProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\LazyInitializer.cs">
-      <Link>Data\NHibernate\Bytecode\LazyInitializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\ObjectsFactory.cs">
-      <Link>Data\NHibernate\Bytecode\ObjectsFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\ProxyFactory.cs">
-      <Link>Data\NHibernate\Bytecode\ProxyFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\ProxyFactoryFactory.cs">
-      <Link>Data\NHibernate\Bytecode\ProxyFactoryFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\ReflectionOptimizer.cs">
-      <Link>Data\NHibernate\Bytecode\ReflectionOptimizer.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\DelegatingLocalSessionFactoryObject.cs">
-      <Link>Data\NHibernate\DelegatingLocalSessionFactoryObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\DelegatingSessionFactory.cs">
-      <Link>Data\NHibernate\DelegatingSessionFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\FilterDefinitionFactoryObject.cs">
-      <Link>Data\NHibernate\FilterDefinitionFactoryObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\FindHibernateDelegate.cs">
-      <Link>Data\NHibernate\Generic\FindHibernateDelegate.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\HibernateDaoSupport.cs">
-      <Link>Data\NHibernate\Generic\HibernateDaoSupport.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\HibernateDelegate.cs">
-      <Link>Data\NHibernate\Generic\HibernateDelegate.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\HibernateTemplate.cs">
-      <Link>Data\NHibernate\Generic\HibernateTemplate.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\IFindHibernateCallback.cs">
-      <Link>Data\NHibernate\Generic\IFindHibernateCallback.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\IHibernateCallback.cs">
-      <Link>Data\NHibernate\Generic\IHibernateCallback.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\IHibernateOperations.cs">
-      <Link>Data\NHibernate\Generic\IHibernateOperations.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateAccessor.cs">
-      <Link>Data\NHibernate\HibernateAccessor.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateAdoException.cs">
-      <Link>Data\NHibernate\HibernateAdoException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateDelegate.cs">
-      <Link>Data\NHibernate\HibernateDelegate.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateObjectRetrievalFailureException.cs">
-      <Link>Data\NHibernate\HibernateObjectRetrievalFailureException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateOptimisticLockingFailureException.cs">
-      <Link>Data\NHibernate\HibernateOptimisticLockingFailureException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateQueryException.cs">
-      <Link>Data\NHibernate\HibernateQueryException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateSystemException.cs">
-      <Link>Data\NHibernate\HibernateSystemException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTemplate.cs">
-      <Link>Data\NHibernate\HibernateTemplate.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTransactionManager.cs">
-      <Link>Data\NHibernate\HibernateTransactionManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTxScopeTransactionManager.cs">
-      <Link>Data\NHibernate\HibernateTxScopeTransactionManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\ICommonHibernateOperations.cs">
-      <Link>Data\NHibernate\ICommonHibernateOperations.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\IHibernateCallback.cs">
-      <Link>Data\NHibernate\IHibernateCallback.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\IHibernateOperations.cs">
-      <Link>Data\NHibernate\IHibernateOperations.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\LocalSessionFactoryObject.cs">
-      <Link>Data\NHibernate\LocalSessionFactoryObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SessionFactoryUtils.cs">
-      <Link>Data\NHibernate\SessionFactoryUtils.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SessionHolder.cs">
-      <Link>Data\NHibernate\SessionHolder.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SimpleDelegatingSessionFactory.cs">
-      <Link>Data\NHibernate\SimpleDelegatingSessionFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SpringSessionContext.cs">
-      <Link>Data\NHibernate\SpringSessionContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SpringSessionSynchronization.cs">
-      <Link>Data\NHibernate\SpringSessionSynchronization.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs">
-      <Link>Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\HibernateDaoSupport.cs">
-      <Link>Data\NHibernate\Support\HibernateDaoSupport.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\OpenSessionInViewModule.cs">
-      <Link>Data\NHibernate\Support\OpenSessionInViewModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScope.cs">
-      <Link>Data\NHibernate\Support\SessionScope.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScopeSettings.cs">
-      <Link>Data\NHibernate\Support\SessionScopeSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\TemplateFlushMode.cs">
-      <Link>Data\NHibernate\TemplateFlushMode.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.build b/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.build
index ea069976..888aba0a 100644
--- a/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.build
+++ b/src/Spring/Spring.Data.NHibernate32/Spring.Data.NHibernate32.build
@@ -17,11 +17,14 @@
 
 		<!-- build Spring.Data.NHibernate32 -->
 		<csc target="library" define="${current.build.defines.csc}"
-                     warnaserror="true"
+             warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-                     doc="${current.bin.dir}/${project::get-name()}.xml">
+             output="${current.bin.dir}/${project::get-name()}.dll"
+             doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
 			<arg line="${compiler.args}"/>
 			<nowarn>
 				<warning number="${nowarn.numbers.test},0169,0618" />
@@ -32,15 +35,22 @@
 				<include name="../Spring.Data.NHibernate/Data/**/*.cs" />
 				<include name="../GenCommonAssemblyInfo.cs" />
 			</sources>
-			<references basedir="${current.bin.dir}">
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+                <include name="System.Configuration.dll"/>
 				<include name="System.Data.dll" />
+				<include name="System.Transactions.dll" />
 				<include name="System.Web.dll" />
+				<include name="System.Xml.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="*NHibernate.dll" />
-				<include name="*.dll" />
-				<exclude name="Spring.Data.NHibernate*.dll" />
-				<exclude name="Spring.Data.NHibernate*.*.dll" />
-				<exclude name="CloverRuntime.dll" />
+				<include name="${current.bin.dir}/*NHibernate.dll" />
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*.*.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 		</csc>
 	</target>
diff --git a/src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.2008.csproj b/src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.2008.csproj
deleted file mode 100644
index 20864d46..00000000
--- a/src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.2008.csproj
+++ /dev/null
@@ -1,203 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{67EA5988-C54E-4348-BFFB-E4A61F26143C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Data.NHibernate33</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate33\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Spring.Data.NHibernate33.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>0618</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate33\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Spring.Data.NHibernate33.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>0618</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=2.0.0.1001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate33\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\BytecodeProvider.cs">
-      <Link>Data\NHibernate\Bytecode\BytecodeProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\LazyInitializer.cs">
-      <Link>Data\NHibernate\Bytecode\LazyInitializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\ObjectsFactory.cs">
-      <Link>Data\NHibernate\Bytecode\ObjectsFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\ProxyFactory.cs">
-      <Link>Data\NHibernate\Bytecode\ProxyFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\ProxyFactoryFactory.cs">
-      <Link>Data\NHibernate\Bytecode\ProxyFactoryFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Bytecode\ReflectionOptimizer.cs">
-      <Link>Data\NHibernate\Bytecode\ReflectionOptimizer.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\DelegatingLocalSessionFactoryObject.cs">
-      <Link>Data\NHibernate\DelegatingLocalSessionFactoryObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\DelegatingSessionFactory.cs">
-      <Link>Data\NHibernate\DelegatingSessionFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\FilterDefinitionFactoryObject.cs">
-      <Link>Data\NHibernate\FilterDefinitionFactoryObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\FindHibernateDelegate.cs">
-      <Link>Data\NHibernate\Generic\FindHibernateDelegate.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\HibernateDaoSupport.cs">
-      <Link>Data\NHibernate\Generic\HibernateDaoSupport.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\HibernateDelegate.cs">
-      <Link>Data\NHibernate\Generic\HibernateDelegate.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\HibernateTemplate.cs">
-      <Link>Data\NHibernate\Generic\HibernateTemplate.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\IFindHibernateCallback.cs">
-      <Link>Data\NHibernate\Generic\IFindHibernateCallback.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\IHibernateCallback.cs">
-      <Link>Data\NHibernate\Generic\IHibernateCallback.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Generic\IHibernateOperations.cs">
-      <Link>Data\NHibernate\Generic\IHibernateOperations.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateAccessor.cs">
-      <Link>Data\NHibernate\HibernateAccessor.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateAdoException.cs">
-      <Link>Data\NHibernate\HibernateAdoException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateDelegate.cs">
-      <Link>Data\NHibernate\HibernateDelegate.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateObjectRetrievalFailureException.cs">
-      <Link>Data\NHibernate\HibernateObjectRetrievalFailureException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateOptimisticLockingFailureException.cs">
-      <Link>Data\NHibernate\HibernateOptimisticLockingFailureException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateQueryException.cs">
-      <Link>Data\NHibernate\HibernateQueryException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateSystemException.cs">
-      <Link>Data\NHibernate\HibernateSystemException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTemplate.cs">
-      <Link>Data\NHibernate\HibernateTemplate.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTransactionManager.cs">
-      <Link>Data\NHibernate\HibernateTransactionManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTxScopeTransactionManager.cs">
-      <Link>Data\NHibernate\HibernateTxScopeTransactionManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\ICommonHibernateOperations.cs">
-      <Link>Data\NHibernate\ICommonHibernateOperations.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\IHibernateCallback.cs">
-      <Link>Data\NHibernate\IHibernateCallback.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\IHibernateOperations.cs">
-      <Link>Data\NHibernate\IHibernateOperations.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\LocalSessionFactoryObject.cs">
-      <Link>Data\NHibernate\LocalSessionFactoryObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SessionFactoryUtils.cs">
-      <Link>Data\NHibernate\SessionFactoryUtils.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SessionHolder.cs">
-      <Link>Data\NHibernate\SessionHolder.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SimpleDelegatingSessionFactory.cs">
-      <Link>Data\NHibernate\SimpleDelegatingSessionFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SpringSessionContext.cs">
-      <Link>Data\NHibernate\SpringSessionContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SpringSessionSynchronization.cs">
-      <Link>Data\NHibernate\SpringSessionSynchronization.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs">
-      <Link>Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\HibernateDaoSupport.cs">
-      <Link>Data\NHibernate\Support\HibernateDaoSupport.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\OpenSessionInViewModule.cs">
-      <Link>Data\NHibernate\Support\OpenSessionInViewModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScope.cs">
-      <Link>Data\NHibernate\Support\SessionScope.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScopeSettings.cs">
-      <Link>Data\NHibernate\Support\SessionScopeSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\TemplateFlushMode.cs">
-      <Link>Data\NHibernate\TemplateFlushMode.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.build b/src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.build
index f84d3f20..9121ebc4 100644
--- a/src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.build
+++ b/src/Spring/Spring.Data.NHibernate33/Spring.Data.NHibernate33.build
@@ -17,11 +17,14 @@
 
 		<!-- build Spring.Data.NHibernate33 -->
 		<csc target="library" define="${current.build.defines.csc}"
-                     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-                     doc="${current.bin.dir}/${project::get-name()}.xml">
+			 warnaserror="true"
+			 optimize="${build.optimize}"
+			 debug="${current.build.debug}"
+			 output="${current.bin.dir}/${project::get-name()}.dll"
+			 doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
 			<arg line="${compiler.args}"/>
 			<nowarn>
 				<warning number="${nowarn.numbers},0169,0618" />
@@ -32,15 +35,22 @@
 				<include name="../Spring.Data.NHibernate/Data/**/*.cs" />
 				<include name="../GenCommonAssemblyInfo.cs" />
 			</sources>
-			<references basedir="${current.bin.dir}">
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+                <include name="System.Configuration.dll"/>
 				<include name="System.Data.dll" />
+				<include name="System.Transactions.dll" />
 				<include name="System.Web.dll" />
+				<include name="System.Xml.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="*NHibernate.dll" />
-				<include name="*.dll" />
-				<exclude name="Spring.Data.NHibernate*.dll" />
-				<exclude name="Spring.Data.NHibernate*.*.dll" />
-				<exclude name="CloverRuntime.dll" />
+				<include name="${current.bin.dir}/*NHibernate.dll" />
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*.*.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 		</csc>
 	</target>
diff --git a/src/Spring/Spring.Data/Spring.Data.2008.csproj b/src/Spring/Spring.Data/Spring.Data.2008.csproj
deleted file mode 100644
index 89f145d4..00000000
--- a/src/Spring/Spring.Data/Spring.Data.2008.csproj
+++ /dev/null
@@ -1,329 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Data</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>Spring.Data.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>1587, 1591, 219, 162, 618</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web">
-      <Name>System.Web</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Dao\Attributes\PersistenceExceptionTranslationAdvisor.cs" />
-    <Compile Include="Dao\Attributes\PersistenceExceptionTranslationPostProcessor.cs" />
-    <Compile Include="Dao\CannotAcquireLockException.cs" />
-    <Compile Include="Dao\CannotSerializeTransactionException.cs" />
-    <Compile Include="Dao\CleanupFailureDataAccessException.cs" />
-    <Compile Include="Dao\ConcurrencyFailureException.cs" />
-    <Compile Include="Dao\NonTransientDataAccessResourceException.cs" />
-    <Compile Include="Dao\NonTransientDataAccessException.cs" />
-    <Compile Include="Dao\TransientDataAccessResourceException.cs" />
-    <Compile Include="Dao\TransientDataAccessException.cs" />
-    <Compile Include="Dao\PessimisticLockingFailureException.cs" />
-    <Compile Include="Dao\DataAccessException.cs" />
-    <Compile Include="Dao\DataAccessResourceFailureException.cs" />
-    <Compile Include="Dao\DataIntegrityViolationException.cs" />
-    <Compile Include="Dao\DataRetrievalFailureException.cs" />
-    <Compile Include="Dao\DeadlockLoserDataAccessException.cs" />
-    <Compile Include="Dao\EmptyResultDataAccessException.cs" />
-    <Compile Include="Dao\IncorrectResultSizeDataAccessException.cs" />
-    <Compile Include="Dao\IncorrectUpdateSemanticsDataAccessException.cs" />
-    <Compile Include="Dao\InvalidDataAccessApiUsageException.cs" />
-    <Compile Include="Dao\InvalidDataAccessResourceUsageException.cs" />
-    <Compile Include="Dao\ObjectOptimisticLockingFailureException.cs" />
-    <Compile Include="Dao\ObjectRetrievalFailureException.cs" />
-    <Compile Include="Dao\OptimisticLockingFailureException.cs" />
-    <Compile Include="Dao\PermissionDeniedDataAccessException.cs" />
-    <Compile Include="Dao\Support\ChainedPersistenceExceptionTranslator.cs" />
-    <Compile Include="Dao\Support\DaoSupport.cs" />
-    <Compile Include="Dao\Support\DataAccessUtils.cs" />
-    <Compile Include="Dao\Support\Generic\DataAccessUtils.cs" />
-    <Compile Include="Dao\Support\IPersistenceExceptionTranslator.cs" />
-    <Compile Include="Dao\Support\PersistenceExceptionTranslationInterceptor.cs" />
-    <Compile Include="Dao\TypeMismatchDataAccessException.cs" />
-    <Compile Include="Dao\UncategorizedDataAccessException.cs" />
-    <Compile Include="Data\BadSqlGrammarException.cs" />
-    <Compile Include="Data\CommandDelegate.cs" />
-    <Compile Include="Data\Common\DbMetadata.cs" />
-    <Compile Include="Data\Common\DbParameter.cs" />
-    <Compile Include="Data\Common\DbParameters.cs" />
-    <Compile Include="Data\Common\DbProvider.cs" />
-    <Compile Include="Data\Common\DbProviderConfigurer.cs" />
-    <Compile Include="Data\Common\DbProviderFactory.cs" />
-    <Compile Include="Data\Common\DbProviderFactoryObject.cs" />
-    <Compile Include="Data\Common\DbParametersBuilder.cs" />
-    <Compile Include="Data\Common\DelegatingDbProvider.cs" />
-    <Compile Include="Data\Common\ErrorCodes.cs" />
-    <Compile Include="Data\Common\IDbMetadata.cs" />
-    <Compile Include="Data\Common\IDbParameter.cs" />
-    <Compile Include="Data\Common\IDbParametersBuilder.cs" />
-    <Compile Include="Data\Common\IDbParameters.cs" />
-    <Compile Include="Data\Common\IDbProvider.cs" />
-    <Compile Include="Data\CannotGetAdoConnectionException.cs" />
-    <Compile Include="Data\CommandSetterDelegate.cs" />
-    <Compile Include="Data\Common\MultiDelegatingDbProvider.cs" />
-    <Compile Include="Data\Common\UserCredentialsDbProvider.cs" />
-    <Compile Include="Data\Config\DatabaseNamespaceParser.cs" />
-    <Compile Include="Data\Core\AdoAccessor.cs" />
-    <Compile Include="Data\Core\AdoDaoSupport.cs" />
-    <Compile Include="Data\Core\AdoPlatformTransactionManager.cs" />
-    <Compile Include="Data\Core\AdoTemplate.cs" />
-    <Compile Include="Data\Core\RowMapperResultSetExtractor.cs" />
-    <Compile Include="Data\Core\ServiceDomainPlatformTransactionManager.cs" />
-    <Compile Include="Data\Core\TxScopeTransactionManager.cs" />
-    <Compile Include="Data\DuplicateKeyException.cs" />
-    <Compile Include="Data\Generic\AdoDaoSupport.cs" />
-    <Compile Include="Data\Generic\IDataAdapterCallback.cs" />
-    <Compile Include="Data\Generic\DataAdapterDelegate.cs" />
-    <Compile Include="Data\Generic\IDbCommandDelegate.cs" />
-    <Compile Include="Data\Generic\IDbCommandCallback.cs" />
-    <Compile Include="Data\Generic\IResultSetExtractor.cs" />
-    <Compile Include="Data\Generic\NamedResultSetProcessor.cs" />
-    <Compile Include="Data\Generic\ResultSetExtractorDelegate.cs" />
-    <Compile Include="Data\Generic\RowMapperDelegate.cs" />
-    <Compile Include="Data\Generic\RowMapperResultSetExtractor.cs" />
-    <Compile Include="Data\ICommonAdoOperations.cs" />
-    <Compile Include="Data\IDataReaderWrapper.cs" />
-    <Compile Include="Data\Objects\AbstractAdoOperation.cs" />
-    <Compile Include="Data\Objects\Generic\AdoOperation.cs" />
-    <Compile Include="Data\Objects\Generic\AdoQuery.cs" />
-    <Compile Include="Data\Objects\Generic\MappingAdoQuery.cs" />
-    <Compile Include="Data\Objects\Generic\MappingAdoQueryWithContext.cs" />
-    <Compile Include="Data\Objects\Generic\StoredProcedure.cs" />
-    <Compile Include="Data\ResultSetExtractorDelegate.cs" />
-    <Compile Include="Data\RowCallbackDelegate.cs" />
-    <Compile Include="Data\Generic\AdoTemplate.cs" />
-    <Compile Include="Data\Generic\CommandDelegate.cs" />
-    <Compile Include="Data\Generic\IAdoOperations.cs" />
-    <Compile Include="Data\Generic\ICommandCallback.cs" />
-    <Compile Include="Data\Generic\IRowMapper.cs" />
-    <Compile Include="Data\IAdoOperations.cs" />
-    <Compile Include="Data\ICommandCallback.cs" />
-    <Compile Include="Data\ICommandSetter.cs" />
-    <Compile Include="Data\ICommandTextProvider.cs" />
-    <Compile Include="Data\IDataAdapterCallback.cs" />
-    <Compile Include="Data\IDataAdapterSetter.cs" />
-    <Compile Include="Data\IDataSetFillLifecycleProcessor.cs" />
-    <Compile Include="Data\IDbCommandCreator.cs" />
-    <Compile Include="Data\IDbCommandCreatorFactory.cs" />
-    <Compile Include="Data\IDbDataAdapterCreator.cs" />
-    <Compile Include="Data\InvalidResultSetAccessException.cs" />
-    <Compile Include="Data\IResultSetExtractor.cs" />
-    <Compile Include="Data\IRowCallback.cs" />
-    <Compile Include="Data\IRowMapper.cs" />
-    <Compile Include="Data\Objects\AdoNonQuery.cs" />
-    <Compile Include="Data\Objects\AdoOperation.cs" />
-    <Compile Include="Data\Objects\AdoQuery.cs" />
-    <Compile Include="Data\Objects\AdoScalar.cs" />
-    <Compile Include="Data\Objects\MappingAdoQuery.cs" />
-    <Compile Include="Data\Objects\MappingAdoQueryWithContext.cs" />
-    <Compile Include="Data\Objects\StoredProcedure.cs" />
-    <Compile Include="Data\RowMapperDelegate.cs" />
-    <Compile Include="Data\Support\AdoTransactionObjectSupport.cs" />
-    <Compile Include="Data\Support\AdoUtils.cs" />
-    <Compile Include="Data\Support\ConnectionHolder.cs" />
-    <Compile Include="Data\Support\ConnectionSynchronization.cs" />
-    <Compile Include="Data\Support\ConnectionTxPair.cs" />
-    <Compile Include="Data\Support\ConnectionUtils.cs" />
-    <Compile Include="Data\Support\DefaultServiceDomainAdapter.cs" />
-    <Compile Include="Data\Support\DefaultTransactionScopeAdapter.cs" />
-    <Compile Include="Data\Support\ErrorCodeExceptionTranslator.cs" />
-    <Compile Include="Data\Support\FallbackExceptionTranslator.cs" />
-    <Compile Include="Data\Support\IAdoExceptionTranslator.cs" />
-    <Compile Include="Data\Support\IServiceDomainAdapter.cs" />
-    <Compile Include="Data\Support\ITransactionScopeAdapter.cs" />
-    <Compile Include="Data\Support\NamedResultSetProcessor.cs" />
-    <Compile Include="Data\Support\NullMappingDataReader.cs" />
-    <Compile Include="Data\Support\ParameterUtils.cs" />
-    <Compile Include="Data\Support\RowCallbackResultSetExtractor.cs" />
-    <Compile Include="Data\Support\SimpleServiceConfig.cs" />
-    <Compile Include="Data\Support\TypedDataSetUtils.cs" />
-    <Compile Include="Data\UncategorizedAdoException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Transaction\CannotCreateTransactionException.cs" />
-    <Compile Include="Transaction\Config\AttributeDrivenObjectDefinitionParser.cs" />
-    <Compile Include="Transaction\Config\TxNamespaceUtils.cs" />
-    <Compile Include="Transaction\Config\TxAdviceObjectDefinitionParser.cs" />
-    <Compile Include="Transaction\Config\TxNamespaceParser.cs" />
-    <Compile Include="Transaction\HeuristicCompletionException.cs" />
-    <Compile Include="Transaction\IllegalTransactionStateException.cs" />
-    <Compile Include="Transaction\Interceptor\AbstractFallbackTransactionAttributeSource.cs" />
-    <Compile Include="Transaction\Interceptor\AttributesTransactionAttributeSource.cs" />
-    <Compile Include="Transaction\Interceptor\DefaultTransactionAttribute.cs" />
-    <Compile Include="Transaction\Interceptor\DefaultTransactionAttributeSourceAdvisor.cs" />
-    <Compile Include="Transaction\Interceptor\DelegatingTransactionAttributeWithName.cs" />
-    <Compile Include="Transaction\Interceptor\ITransactionAttribute.cs" />
-    <Compile Include="Transaction\Interceptor\ITransactionAttributeSource.cs" />
-    <Compile Include="Transaction\Interceptor\MatchAlwaysTransactionAttributeSource.cs" />
-    <Compile Include="Transaction\Interceptor\MethodMapTransactionAttributeSource.cs" />
-    <Compile Include="Transaction\Interceptor\NameMatchTransactionAttributeSource.cs" />
-    <Compile Include="Transaction\Interceptor\NoRollbackRuleAttribute.cs" />
-    <Compile Include="Transaction\Interceptor\ObjectFactoryTransactionAttributeSourceAdvisor.cs" />
-    <Compile Include="Transaction\Interceptor\RollbackRuleAttribute.cs" />
-    <Compile Include="Transaction\Interceptor\RuleBasedTransactionAttribute.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionAspectSupport.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionAttribute.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionAttributeConverter.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionAttributeEditor.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionAttributeSourceAdvisor.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionAttributeSourceEditor.cs" />
-    <Compile Include="Transaction\Interceptor\AbstractTransactionAttributeSourcePointcut.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionInterceptor.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionProxyFactoryObject.cs" />
-    <Compile Include="Transaction\InvalidIsolationLevelException.cs" />
-    <Compile Include="Transaction\InvalidTimeoutException.cs" />
-    <Compile Include="Transaction\IPlatformTransactionManager.cs" />
-    <Compile Include="Transaction\ISavepointManager.cs" />
-    <Compile Include="Transaction\ITransactionDefinition.cs" />
-    <Compile Include="Transaction\ITransactionStatus.cs" />
-    <Compile Include="Transaction\NestedTransactionNotSupportedException.cs" />
-    <Compile Include="Transaction\NoTransactionException.cs" />
-    <Compile Include="Transaction\Support\AbstractPlatformTransactionManager.cs" />
-    <Compile Include="Transaction\Support\DefaultTransactionDefinition.cs" />
-    <Compile Include="Transaction\Support\DefaultTransactionStatus.cs" />
-    <Compile Include="Transaction\Support\IResourceTransactionManager.cs" />
-    <Compile Include="Transaction\Support\ISmartTransactionObject.cs" />
-    <Compile Include="Transaction\Support\ITransactionCallback.cs" />
-    <Compile Include="Transaction\Support\ITransactionOperations.cs" />
-    <Compile Include="Transaction\Support\ITransactionSynchronization.cs" />
-    <Compile Include="Transaction\Support\ResourceHolderSupport.cs" />
-    <Compile Include="Transaction\Support\TransactionCallbackWithoutResult.cs" />
-    <Compile Include="Transaction\Support\TransactionDelegate.cs" />
-    <Compile Include="Transaction\Support\TransactionSynchronizationAdapter.cs" />
-    <Compile Include="Transaction\Support\TransactionSynchronizationManager.cs" />
-    <Compile Include="Transaction\Support\TransactionSynchronizationState.cs" />
-    <Compile Include="Transaction\Support\TransactionSynchronizationStatus.cs" />
-    <Compile Include="Transaction\Support\TransactionTemplate.cs" />
-    <Compile Include="Transaction\TransactionException.cs" />
-    <Compile Include="Transaction\TransactionOutcomeState.cs" />
-    <Compile Include="Transaction\TransactionPropagation.cs" />
-    <Compile Include="Transaction\TransactionSuspensionNotSupportedException.cs" />
-    <Compile Include="Transaction\TransactionSystemException.cs" />
-    <Compile Include="Transaction\TransactionTimedOutException.cs" />
-    <Compile Include="Transaction\TransactionUsageException.cs" />
-    <Compile Include="Transaction\UnexpectedRollbackException.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Common\dbproviders.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Config\spring-database-1.1.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Transaction\Config\spring-tx-1.1.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Config\spring-database-1.3.xsd" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Spring.Data.build b/src/Spring/Spring.Data/Spring.Data.build
index 8b796b52..f63a9cad 100644
--- a/src/Spring/Spring.Data/Spring.Data.build
+++ b/src/Spring/Spring.Data/Spring.Data.build
@@ -9,11 +9,14 @@
 	<target name="build">
 		<!-- build Spring.Data -->
 		<csc target="library" define="${current.build.defines.csc}"
-                     warnaserror="true"
+             warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-                     doc="${current.bin.dir}/${project::get-name()}.xml">
+             output="${current.bin.dir}/${project::get-name()}.dll"
+             doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
 			<arg line="${compiler.args}"/>
 			<nowarn>
 				<warning number="${nowarn.numbers}" />
@@ -37,13 +40,19 @@
 			<resources basedir="Resources">
 				<include name="**/*" />
 			</resources>
-			<references basedir="${current.bin.dir}">
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+                <include name="System.Configuration.dll"/>			
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
 				<include name="System.Transactions.dll" />
-				<include name="Common.Logging.dll"/>
-				<include name="Spring.Core.dll" />
-				<include name="Spring.Aop.dll" />
+				<include name="System.Xml.dll" />
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/Spring.Core.dll" />
+				<include name="${current.bin.dir}/Spring.Aop.dll" />
 			</references>
 		</csc>
 	</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
deleted file mode 100644
index e30ba582..00000000
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2008.csproj
+++ /dev/null
@@ -1,176 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{900E3839-301E-48B1-BAEB-B6645620ACFF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Messaging.Ems</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Ems\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Spring.Messaging.Ems.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>1591,0618</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Ems\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <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>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.XML" />
-    <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Messaging\Ems\Common\EmsConnection.cs" />
-    <Compile Include="Messaging\Ems\Common\EmsConnectionFactory.cs" />
-    <Compile Include="Messaging\Ems\Common\EmsMessageConsumer.cs" />
-    <Compile Include="Messaging\Ems\Common\EmsMessageProducer.cs" />
-    <Compile Include="Messaging\Ems\Common\EmsSession.cs" />
-    <Compile Include="Messaging\Ems\Common\EmsSSLFileStoreInfo.cs" />
-    <Compile Include="Messaging\Ems\Common\EmsSSLSystemStoreInfo.cs" />
-    <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\ITopicSubscriber.cs" />
-    <Compile Include="Messaging\Ems\Config\MessageListenerContainerObjectDefinitionParser.cs" />
-    <Compile Include="Messaging\Ems\Config\EmsNamespaceParser.cs" />
-    <Compile Include="Messaging\Ems\Connections\CachedMessageConsumer .cs" />
-    <Compile Include="Messaging\Ems\Connections\CachedMessageProducer.cs" />
-    <Compile Include="Messaging\Ems\Connections\CachedSession.cs" />
-    <Compile Include="Messaging\Ems\Connections\CachingConnectionFactory.cs" />
-    <Compile Include="Messaging\Ems\Connections\ChainedExceptionListener.cs" />
-    <Compile Include="Messaging\Ems\Connections\ConnectionFactoryUtils.cs" />
-    <Compile Include="Messaging\Ems\Connections\EmsResourceHolder.cs" />
-    <Compile Include="Messaging\Ems\Connections\EmsTransactionManager.cs" />
-    <Compile Include="Messaging\Ems\Connections\IDecoratorSession.cs" />
-    <Compile Include="Messaging\Ems\Connections\ISmartConnectionFactory.cs" />
-    <Compile Include="Messaging\Ems\Connections\SingleConnectionFactory.cs" />
-    <Compile Include="Messaging\Ems\Connections\SynchedLocalTransactionFailedException.cs" />
-    <Compile Include="Messaging\Ems\Core\BrowserDelegate.cs" />
-    <Compile Include="Messaging\Ems\Core\EmsGatewaySupport.cs" />
-    <Compile Include="Messaging\Ems\Core\EmsTemplate.cs" />
-    <Compile Include="Messaging\Ems\Core\IBrowserCallback.cs" />
-    <Compile Include="Messaging\Ems\Core\IEmsOperations.cs" />
-    <Compile Include="Messaging\Ems\Core\IMessageCreator.cs" />
-    <Compile Include="Messaging\Ems\Core\IMessagePostProcessor.cs" />
-    <Compile Include="Messaging\Ems\Core\IProducerCallback.cs" />
-    <Compile Include="Messaging\Ems\Core\ISessionCallback.cs" />
-    <Compile Include="Messaging\Ems\Core\MessageCreatorDelegate.cs" />
-    <Compile Include="Messaging\Ems\Core\MessagePostProcessorDelegate.cs" />
-    <Compile Include="Messaging\Ems\Core\ProducerDelegate.cs" />
-    <Compile Include="Messaging\Ems\Core\SessionDelegate.cs" />
-    <Compile Include="Messaging\Ems\Jndi\JndiContextType.cs" />
-    <Compile Include="Messaging\Ems\Jndi\JndiAccessor.cs" />
-    <Compile Include="Messaging\Ems\Jndi\JndiLocatorSupport.cs" />
-    <Compile Include="Messaging\Ems\Jndi\JndiLookupFactoryObject.cs" />
-    <Compile Include="Messaging\Ems\Jndi\JndiObjectLocator.cs" />
-    <Compile Include="Messaging\Ems\Jndi\LookupContextFactoryObject.cs" />
-    <Compile Include="Messaging\Ems\Jndi\TypeMismatchNamingException.cs" />
-    <Compile Include="Messaging\Ems\Listener\AbstractListenerContainer.cs" />
-    <Compile Include="Messaging\Ems\Listener\AbstractMessageListenerContainer.cs" />
-    <Compile Include="Messaging\Ems\Listener\Adapter\ListenerExecutionFailedException.cs" />
-    <Compile Include="Messaging\Ems\Listener\Adapter\MessageListenerAdapter.cs" />
-    <Compile Include="Messaging\Ems\Listener\ISessionAwareMessageListener.cs" />
-    <Compile Include="Messaging\Ems\Listener\LocallyExposedEmsResourceHolder.cs" />
-    <Compile Include="Messaging\Ems\Listener\RecoveryTimeExceededException.cs" />
-    <Compile Include="Messaging\Ems\Listener\SimpleMessageListenerContainer.cs" />
-    <Compile Include="Messaging\Ems\Support\Converter\IMessageConverter.cs" />
-    <Compile Include="Messaging\Ems\Support\Converter\ITypeMapper.cs" />
-    <Compile Include="Messaging\Ems\Support\Converter\MessageConversionException.cs" />
-    <Compile Include="Messaging\Ems\Support\Converter\SimpleMessageConverter.cs" />
-    <Compile Include="Messaging\Ems\Support\Converter\TypeMapper.cs" />
-    <Compile Include="Messaging\Ems\Support\Converter\XmlMessageConverter.cs" />
-    <Compile Include="Messaging\Ems\Support\Destinations\DynamicDestinationResolver.cs" />
-    <Compile Include="Messaging\Ems\Support\Destinations\IDestinationResolver.cs" />
-    <Compile Include="Messaging\Ems\Support\Destinations\EmsDestinationAccessor.cs" />
-    <Compile Include="Messaging\Ems\Support\EmsAccessor.cs" />
-    <Compile Include="Messaging\Ems\Support\EmsUtils.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Messaging\Ems\Config\spring-ems-1.3.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build
index 4ff7e1c9..9f26c626 100644
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build
+++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build
@@ -13,6 +13,8 @@
             debug="${current.build.debug}"
             output="${current.bin.dir}/${project::get-name()}.dll"
             doc="${current.bin.dir}/${project::get-name()}.xml"
+           	nostdlib="true"
+			noconfig="true"
             >
             <arg line="${compiler.args}"/>
             <nowarn>
@@ -28,11 +30,16 @@
 	        <include name="**/*.xsd" />
         	<exclude name="**/obj/**" />
 	    </resources>
-	    <references basedir="${current.bin.dir}">
-		<include name="*.dll" />
-		<include name="System.Data.Dll" />
-		<exclude name="${project::get-name()}.dll" />
-		<exclude name="CloverRuntime.dll" />
+	    <references>
+			<include name="mscorlib.dll"/>
+			<include name="Microsoft.CSharp.dll"/>
+			<include name="System.dll"/>
+			<include name="System.Core.dll"/>
+			<include name="System.Configuration.dll"/>
+			<include name="System.Data.d ll" />
+			<include name="${current.bin.dir}/*.dll" />
+			<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+			<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 	    </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj
deleted file mode 100644
index 0e44b804..00000000
--- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2008.csproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AEB1578C-9018-4D49-B440-789F38DD2F29}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Messaging.Nms</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Nms\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Spring.Messaging.Nms.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>
-    </NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Nms\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Apache.NMS, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Apache.NMS.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Messaging\Nms\Config\MessageListenerContainerObjectDefinitionParser.cs" />
-    <Compile Include="Messaging\Nms\Config\NmsNamespaceParser.cs" />
-    <Compile Include="Messaging\Nms\Connections\CachedMessageConsumer .cs" />
-    <Compile Include="Messaging\Nms\Connections\CachedMessageProducer.cs" />
-    <Compile Include="Messaging\Nms\Connections\CachedSession.cs" />
-    <Compile Include="Messaging\Nms\Connections\CachingConnectionFactory.cs" />
-    <Compile Include="Messaging\Nms\Connections\ChainedExceptionListener.cs" />
-    <Compile Include="Messaging\Nms\Connections\ConnectionFactoryUtils.cs" />
-    <Compile Include="Messaging\Nms\Connections\IDecoratorSession.cs" />
-    <Compile Include="Messaging\Nms\Connections\ISmartConnectionFactory.cs" />
-    <Compile Include="Messaging\Nms\Connections\NmsResourceHolder.cs" />
-    <Compile Include="Messaging\Nms\Connections\NmsTransactionManager.cs" />
-    <Compile Include="Messaging\Nms\Connections\SingleConnectionFactory.cs" />
-    <Compile Include="Messaging\Nms\Connections\SynchedLocalTransactionFailedException.cs" />
-    <Compile Include="Messaging\Nms\Core\IExceptionListener.cs" />
-    <Compile Include="Messaging\Nms\Core\IMessageCreator.cs" />
-    <Compile Include="Messaging\Nms\Core\IMessageListener.cs" />
-    <Compile Include="Messaging\Nms\Core\IMessagePostProcessor.cs" />
-    <Compile Include="Messaging\Nms\Core\INmsOperations.cs" />
-    <Compile Include="Messaging\Nms\Core\IProducerCallback.cs" />
-    <Compile Include="Messaging\Nms\Core\ISessionCallback.cs" />
-    <Compile Include="Messaging\Nms\Core\MessageCreatorDelegate.cs" />
-    <Compile Include="Messaging\Nms\Core\MessagePostProcessorDelegate.cs" />
-    <Compile Include="Messaging\Nms\Core\NmsGatewaySupport.cs" />
-    <Compile Include="Messaging\Nms\Core\NmsTemplate.cs" />
-    <Compile Include="Messaging\Nms\Core\NmsTrace.cs" />
-    <Compile Include="Messaging\Nms\Core\ProducerDelegate.cs" />
-    <Compile Include="Messaging\Nms\Core\SessionDelegate.cs" />
-    <Compile Include="Messaging\Nms\Listener\AbstractListenerContainer.cs" />
-    <Compile Include="Messaging\Nms\Listener\AbstractMessageListenerContainer.cs" />
-    <Compile Include="Messaging\Nms\Listener\Adapter\ListenerExecutionFailedException.cs" />
-    <Compile Include="Messaging\Nms\Listener\Adapter\MessageListenerAdapter.cs" />
-    <Compile Include="Messaging\Nms\Listener\ISessionAwareMessageListener.cs" />
-    <Compile Include="Messaging\Nms\Listener\LocallyExposedNmsResourceHolder.cs" />
-    <Compile Include="Messaging\Nms\Listener\RecoveryTimeExceededException.cs" />
-    <Compile Include="Messaging\Nms\Listener\SimpleMessageListenerContainer.cs" />
-    <Compile Include="Messaging\Nms\Support\Converter\IMessageConverter.cs" />
-    <Compile Include="Messaging\Nms\Support\Converter\ITypeMapper.cs" />
-    <Compile Include="Messaging\Nms\Support\Converter\MessageConversionException.cs" />
-    <Compile Include="Messaging\Nms\Support\Converter\SimpleMessageConverter.cs" />
-    <Compile Include="Messaging\Nms\Support\Converter\TypeMapper.cs" />
-    <Compile Include="Messaging\Nms\Support\Converter\XmlMessageConverter.cs" />
-    <Compile Include="Messaging\Nms\Support\Destinations\DynamicDestinationResolver.cs" />
-    <Compile Include="Messaging\Nms\Support\Destinations\IDestinationResolver.cs" />
-    <Compile Include="Messaging\Nms\Support\Destinations\NmsDestinationAccessor.cs" />
-    <Compile Include="Messaging\Nms\Support\MessageUtils.cs" />
-    <Compile Include="Messaging\Nms\Support\NmsAccessor.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Messaging\Nms\Config\spring-nms-1.2.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Messaging\Nms\Config\spring-nms-1.3.xsd" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
index 8c91d16f..7c200e10 100644
--- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
@@ -13,6 +13,8 @@
             debug="${current.build.debug}"
             output="${current.bin.dir}/${project::get-name()}.dll"
             doc="${current.bin.dir}/${project::get-name()}.xml"
+           	nostdlib="true"
+			noconfig="true"
             >
             <arg line="${compiler.args}"/>
             <nowarn>
@@ -28,12 +30,17 @@
 	        <include name="**/*.xsd" />
         	<exclude name="**/obj/**" />
 	    </resources>
-	    <references basedir="${current.bin.dir}">
-		<include name="*.dll" />
-		<include name="System.Data.Dll" />
-		<exclude name="${project::get-name()}.dll" />
-		<exclude name="CloverRuntime.dll" />
-		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+	    <references>
+			<include name="mscorlib.dll"/>
+			<include name="Microsoft.CSharp.dll"/>
+			<include name="System.dll"/>
+			<include name="System.Core.dll"/>
+			<include name="System.Configuration.dll"/>
+			<include name="System.Data.dll" />
+			<include name="System.Xml.dll" />
+			<include name="${current.bin.dir}/*.dll" />
+			<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+			<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 	    </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Messaging/Spring.Messaging.2008.csproj b/src/Spring/Spring.Messaging/Spring.Messaging.2008.csproj
deleted file mode 100644
index d0593d1d..00000000
--- a/src/Spring/Spring.Messaging/Spring.Messaging.2008.csproj
+++ /dev/null
@@ -1,113 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0E23AE41-D8D8-41C2-84A2-D35564049F0D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Messaging</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Messaging\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Spring.Messaging.xml</DocumentationFile>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Messaging\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Messaging\Core\MessageQueueMetadata.cs" />
-    <Compile Include="Messaging\Core\MessageQueueMetadataCache.cs" />
-    <Compile Include="Messaging\Listener\ListenerExecutionFailedException.cs" />
-    <Compile Include="Messaging\Support\Converters\MessageConverterCreatorDelegate.cs" />
-    <Compile Include="Messaging\Core\DefaultMessageQueueFactory.cs" />
-    <Compile Include="Messaging\Support\MessageQueueCreatorDelegate.cs" />
-    <Compile Include="Messaging\Core\IMessageQueueFactory.cs" />
-    <Compile Include="Messaging\Core\MessagePostProcessorDelegate.cs" />
-    <Compile Include="Messaging\Listener\AbstractSendToQueueExceptionHandler.cs" />
-    <Compile Include="Messaging\Listener\AbstractTransactionalMessageListenerContainer.cs" />
-    <Compile Include="Messaging\Listener\DistributedTxMessageListenerContainer.cs" />
-    <Compile Include="Messaging\Listener\MessageListenerAdapter.cs" />
-    <Compile Include="Messaging\Listener\SendToQueueDistributedTransactionExceptionHandler.cs" />
-    <Compile Include="Messaging\Listener\TransactionalMessageListenerContainer.cs" />
-    <Compile Include="Messaging\Listener\NonTransactionalMessageListenerContainer.cs" />
-    <Compile Include="Messaging\Core\IMessageQueueOperations.cs" />
-    <Compile Include="Messaging\Core\LocallyExposedMessageQueueResourceHolder.cs" />
-    <Compile Include="Messaging\Core\MessageQueueResourceHolder.cs" />
-    <Compile Include="Messaging\Core\MessageQueueTransactionManager.cs" />
-    <Compile Include="Messaging\Core\MessageQueueTemplate.cs" />
-    <Compile Include="Messaging\Listener\AbstractListenerContainer.cs" />
-    <Compile Include="Messaging\Listener\AbstractMessageListenerContainer.cs" />
-    <Compile Include="Messaging\Listener\IDistributedTransactionExceptionHandler.cs" />
-    <Compile Include="Messaging\Listener\IMessageTransactionExceptionHandler.cs" />
-    <Compile Include="Messaging\Listener\AbstractPeekingMessageListenerContainer.cs" />
-    <Compile Include="Messaging\Listener\SendToQueueExceptionHandler.cs" />
-    <Compile Include="Messaging\Listener\TransactionAction.cs" />
-    <Compile Include="Messaging\Listener\IExceptionHandler.cs" />
-    <Compile Include="Messaging\Listener\IMessageListener.cs" />
-    <Compile Include="Messaging\MessagingException.cs" />
-    <Compile Include="Messaging\Support\Converters\ActiveXMessageConverter.cs" />
-    <Compile Include="Messaging\Support\Converters\BinaryMessageConverter.cs" />
-    <Compile Include="Messaging\Support\Converters\IMessageConverter.cs" />
-    <Compile Include="Messaging\Support\Converters\MessageConverterFactoryObject.cs" />
-    <Compile Include="Messaging\Support\Converters\XmlDocumentConverter.cs" />
-    <Compile Include="Messaging\Support\Converters\XmlMessageConverter.cs" />
-    <Compile Include="Messaging\Support\MessageQueueFactoryObject.cs" />
-    <Compile Include="Messaging\Core\QueueUtils.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Messaging\Listener\ListenerClassDiagram.cd" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Messaging/Spring.Messaging.build b/src/Spring/Spring.Messaging/Spring.Messaging.build
index 25cf3090..ba450a92 100644
--- a/src/Spring/Spring.Messaging/Spring.Messaging.build
+++ b/src/Spring/Spring.Messaging/Spring.Messaging.build
@@ -13,6 +13,8 @@
             debug="${current.build.debug}"
             output="${current.bin.dir}/${project::get-name()}.dll"
             doc="${current.bin.dir}/${project::get-name()}.xml"
+           	nostdlib="true"
+			noconfig="true"
             >
             <arg line="${compiler.args}"/>
             <nowarn>
@@ -23,12 +25,19 @@
                 <include name="**/*.cs" />
                 <include name="../GenCommonAssemblyInfo.cs" />
             </sources>
-		        <references basedir="${current.bin.dir}">
-			        <include name="*.dll" />
-			        <exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
-		        </references>
+	        <references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Configuration.dll"/>
+				<include name="System.Messaging.dll"/>
+				<include name="System.Transactions.dll"/>
+				<include name="System.Xml.dll"/>
+		        <include name="${current.bin.dir}/*.dll" />
+		        <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
+	        </references>
         </csc>
     </target>
 
diff --git a/src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.2008.csproj b/src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.2008.csproj
deleted file mode 100644
index 50e5952a..00000000
--- a/src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.2008.csproj
+++ /dev/null
@@ -1,98 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Scheduling.Quartz21</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz21\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz\Debug\Spring.Scheduling.Quartz21.XML</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz21\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="C5, Version=1.1.0.0, Culture=neutral, PublicKeyToken=06a1b38866503b69, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Quartz21\net\3.5\C5.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Quartz, Version=2.0.0.100, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Quartz21\net\3.5\Quartz.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="JobMethodInvocationFailedException.cs" />
-    <Compile Include="Scheduling\Quartz\AdaptableJobFactory.cs" />
-    <Compile Include="Scheduling\Quartz\CronTriggerObject.cs" />
-    <Compile Include="Scheduling\Quartz\DelegatingJob.cs" />
-    <Compile Include="Scheduling\Quartz\IJobDetailAwareTrigger.cs" />
-    <Compile Include="Scheduling\Quartz\ISchedulerContextAware.cs" />
-    <Compile Include="Scheduling\Quartz\ISchedulingTaskExecutor.cs" />
-    <Compile Include="Scheduling\Quartz\ITaskExecutor.cs" />
-    <Compile Include="Scheduling\Quartz\JobDetailObject.cs" />
-    <Compile Include="Scheduling\Quartz\LocalDataSourceJobStore.cs" />
-    <Compile Include="Scheduling\Quartz\LocalTaskExecutorThreadPool.cs" />
-    <Compile Include="Scheduling\Quartz\MethodInvokingJob.cs" />
-    <Compile Include="Scheduling\Quartz\MethodInvokingJobDetailFactoryObject.cs" />
-    <Compile Include="Scheduling\Quartz\MethodInvokingRunnable.cs" />
-    <Compile Include="Scheduling\Quartz\QuartzJobObject.cs" />
-    <Compile Include="Scheduling\Quartz\SchedulerAccessor.cs" />
-    <Compile Include="Scheduling\Quartz\SchedulerAccessorObject.cs" />
-    <Compile Include="Scheduling\Quartz\SchedulerFactoryObject.cs" />
-    <Compile Include="Scheduling\Quartz\SchedulingException.cs" />
-    <Compile Include="Scheduling\Quartz\SimpleThreadPoolTaskExecutor.cs" />
-    <Compile Include="Scheduling\Quartz\SimpleTriggerObject.cs" />
-    <Compile Include="Scheduling\Quartz\SpringDbProviderAdapter.cs" />
-    <Compile Include="Scheduling\Quartz\SpringObjectJobFactory.cs" />
-    <Compile Include="Scheduling\Quartz\StatefulMethodInvokingJob.cs" />
-    <Compile Include="Scheduling\Quartz\TaskRejectedException.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.build b/src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.build
index a4487c23..b05435a4 100644
--- a/src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.build
+++ b/src/Spring/Spring.Scheduling.Quartz21/Spring.Scheduling.Quartz21.build
@@ -21,6 +21,8 @@
             debug="${current.build.debug}"
             output="${current.bin.dir}/${project::get-name()}.dll"
             doc="${current.bin.dir}/${project::get-name()}.xml"
+			nostdlib="true"
+			noconfig="true"
             >
             <arg line="${compiler.args}"/>
             <nowarn>
@@ -32,15 +34,19 @@
                 <include name="**/*.cs" />
                 <include name="../GenCommonAssemblyInfo.cs" />
             </sources>
-	    <references basedir="${current.bin.dir}">
-		<include name="Spring.Core.dll" />
-		<include name="Spring.Data.dll" />
-		<include name="Common.Logging.dll" />
-		<include name="System.Data.dll" />
-		<include name="Quartz.dll" />
-		<include name="C5.dll" />
-		<exclude name="${project::get-name()}.dll" />
-		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+	    <references>
+			<include name="mscorlib.dll"/>
+			<include name="Microsoft.CSharp.dll"/>
+			<include name="System.dll"/>
+			<include name="System.Core.dll"/>
+			<include name="System.Configuration.dll"/>
+			<include name="System.Data.dll" />
+			<include name="${current.bin.dir}/Spring.Core.dll" />
+			<include name="${current.bin.dir}/Spring.Data.dll" />
+			<include name="${current.bin.dir}/Common.Logging.dll" />
+			<include name="${current.bin.dir}/Quartz.dll" />
+			<include name="${current.bin.dir}/C5.dll" />
+			<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
 	    </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Services/Spring.Services.2008.csproj b/src/Spring/Spring.Services/Spring.Services.2008.csproj
deleted file mode 100644
index 82d0be19..00000000
--- a/src/Spring/Spring.Services/Spring.Services.2008.csproj
+++ /dev/null
@@ -1,164 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Services</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <SignAssembly>false</SignAssembly>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Services\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;NET_3_0</DefineConstants>
-    <DocumentationFile>Spring.Services.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Services\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0;NET_3_0;NET_3_5</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.EnterpriseServices">
-      <Name>system.enterpriseservices</Name>
-    </Reference>
-    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-    <Reference Include="System.Web.Services">
-      <Name>system.web.services</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="EnterpriseServices\ExeConfigurationSystem.cs" />
-    <Compile Include="EnterpriseServices\EnterpriseServicesExporter.cs" />
-    <Compile Include="EnterpriseServices\ServicedComponentContextHandler.cs" />
-    <Compile Include="EnterpriseServices\ServicedComponentExporter.cs" />
-    <Compile Include="EnterpriseServices\ServicedComponentFactory.cs" />
-    <Compile Include="EnterpriseServices\ServicedComponentHelper.cs" />
-    <Compile Include="Remoting\CaoExporter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting\CaoFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting\Config\RemotingNamespaceParser.cs" />
-    <Compile Include="Remoting\RemotingConfigurer.cs" />
-    <Compile Include="Remoting\RemoteObjectFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting\Support\BaseRemoteObject.cs" />
-    <Compile Include="Remoting\Support\ConfigurableLifetime.cs" />
-    <Compile Include="Remoting\Support\ICaoRemoteFactory.cs" />
-    <Compile Include="Remoting\Support\ILifetime.cs" />
-    <Compile Include="Remoting\Support\RemoteObjectProxyTypeBuilder.cs" />
-    <Compile Include="Remoting\SaoExporter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting\SaoFactoryObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ServiceModel\Activation\ServiceHostFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ServiceModel\Activation\ServiceHostFactoryObject.cs" />
-    <Compile Include="ServiceModel\ChannelFactoryObject.cs" />
-    <Compile Include="ServiceModel\Config\ChannelFactoryObjectDefinitionParser.cs" />
-    <Compile Include="ServiceModel\Config\WcfNamespaceParser.cs" />
-    <Compile Include="ServiceModel\ServiceExporter.cs" />
-    <Compile Include="ServiceModel\SpringServiceHost.cs" />
-    <Compile Include="ServiceModel\Support\ServiceProxyTypeBuilder.cs" />
-    <Compile Include="Web\Services\WebServiceProxyFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="EnterpriseServices\EnterpriseServices.keys" />
-    <EmbeddedResource Include="Remoting\Config\spring-remoting-1.1.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ServiceModel\Config\spring-wcf-1.3.xsd" />
-    <None Include="Spring.Services.build" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.build b/src/Spring/Spring.Services/Spring.Services.build
index 15f24516..7a2b8820 100644
--- a/src/Spring/Spring.Services/Spring.Services.build
+++ b/src/Spring/Spring.Services/Spring.Services.build
@@ -11,11 +11,13 @@
 	<!-- build Spring.Services -->
     <csc target="library" define="${current.build.defines.csc}"
 		     warnaserror="true"
-                     optimize="${build.optimize}"
+			 optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-                     doc="${current.bin.dir}/${project::get-name()}.xml"
-		     >
+			 output="${current.bin.dir}/${project::get-name()}.dll"
+			 doc="${current.bin.dir}/${project::get-name()}.xml"
+		     nostdlib="true"
+			 noconfig="true"
+			 >
       <arg line="${compiler.args}"/>
       <nowarn>
         <warning number="${nowarn.numbers}" />
@@ -34,13 +36,24 @@
         <include name="**/*.keys" />
         <exclude name="**/obj/**" />
       </resources>
-      <references basedir="${current.bin.dir}">
-        <include name="Common.Logging.dll"/>
-        <include name="Spring.Core.dll" />
-        <include name="Spring.Aop.dll" />
-        <include name="Spring.Web.dll" />
+      <references>
+		<include name="mscorlib.dll"/>
+		<include name="Microsoft.CSharp.dll"/>
+		<include name="System.dll"/>
+		<include name="System.Core.dll"/>
+		<include name="System.Configuration.dll"/>
+		<include name="System.EnterpriseServices.dll"/>
         <include name="System.Web.Services.dll" />
+		<include name="System.ServiceModel.dll" />        
 		<include name="System.ServiceModel.Activation.dll" />        
+		<include name="System.ServiceModel.Web.dll" />        
+		<include name="System.Web.dll" />
+		<include name="System.Web.Services.dll" />
+		<include name="System.Xml.dll"/>
+        <include name="${current.bin.dir}/Common.Logging.dll"/>
+        <include name="${current.bin.dir}/Spring.Core.dll" />
+        <include name="${current.bin.dir}/Spring.Aop.dll" />
+        <include name="${current.bin.dir}/Spring.Web.dll" />
       </references>
     </csc>
   </target>
diff --git a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2008.csproj b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2008.csproj
deleted file mode 100644
index 36bb504e..00000000
--- a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2008.csproj
+++ /dev/null
@@ -1,118 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BF3AB954-8375-407C-9E98-4C51D8072784}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Template.Velocity</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>http://localhost/Spring.Template.Velocity/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Template.Velocity\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\build\VS.NET.2008\Spring.Template.Velocity\Debug\Spring.Template.Velocity.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Template.Velocity\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DocumentationFile>..\..\..\build\VS.NET.2005\Spring.Template.Velocity\Release\Spring.Template.Velocity.XML</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="NVelocity, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\NVelocity.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Template\Velocity\Config\TemplateNamespaceParser.cs" />
-    <Compile Include="Template\Velocity\CommonsLoggingLogSystem.cs" />
-    <Compile Include="Template\Velocity\SpringResourceLoader.cs" />
-    <Compile Include="Template\Velocity\VelocityConstants.cs" />
-    <Compile Include="Template\Velocity\VelocityEngineFactory.cs" />
-    <Compile Include="Template\Velocity\VelocityEngineFactoryObject.cs" />
-    <Compile Include="Template\Velocity\VelocityEngineUtils.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Template\Velocity\Config\spring-nvelocity-1.3.xsd" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build
index b8bdfd67..7f96efa3 100644
--- a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build
+++ b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build
@@ -13,6 +13,8 @@
             debug="${current.build.debug}"
             output="${current.bin.dir}/${project::get-name()}.dll"
             doc="${current.bin.dir}/${project::get-name()}.xml"
+           	nostdlib="true"
+			noconfig="true"
             >
             <arg line="${compiler.args}"/>
             <nowarn>
@@ -26,11 +28,16 @@
             <resources basedir="." prefix="Spring.Template.Velocity.Config">
 	            <include name="Template/Velocity/Config/spring-nvelocity-1.3.xsd" />
       	    </resources>
-	    <references basedir="${current.bin.dir}">
-		<include name="*.dll" />
-		<exclude name="${project::get-name()}.dll" />
-		<exclude name="CloverRuntime.dll" />
-		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+	    <references>
+			<include name="mscorlib.dll"/>
+			<include name="Microsoft.CSharp.dll"/>
+			<include name="System.dll"/>
+			<include name="System.Core.dll"/>
+			<include name="System.Configuration.dll"/>
+			<include name="System.Xml.dll" />
+			<include name="${current.bin.dir}/*.dll" />
+			<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+			<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 	    </references>
         </csc>
     </target>
diff --git a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.2008.csproj b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.2008.csproj
deleted file mode 100644
index cadd8e0c..00000000
--- a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.2008.csproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2E10A8D3-B8FF-4699-90B8-E621659C58DD}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Testing.Microsoft</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>http://localhost/Spring.Testing.Microsoft/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <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.2008\Spring.Testing.Microsoft\Debug\Spring.Testing.Microsoft.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <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.2.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Testing\Microsoft\AbstractDependencyInjectionSpringContextTests.cs" />
-    <Compile Include="Testing\Microsoft\AbstractSpringContextTests.cs" />
-    <Compile Include="Testing\Microsoft\AbstractTransactionalDbProviderSpringContextTests.cs" />
-    <Compile Include="Testing\Microsoft\AbstractTransactionalSpringContextTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
index a83d742c..f732002f 100644
--- a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
+++ b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
@@ -13,7 +13,9 @@
             debug="${current.build.debug}"
             output="${current.bin.dir}/${project::get-name()}.dll"
             doc="${current.bin.dir}/${project::get-name()}.xml"
-            >
+           	nostdlib="true"
+			noconfig="true"
+			>
             <arg line="${compiler.args}"/>
             <nowarn>
 				<warning number="${nowarn.numbers}" />
@@ -25,12 +27,17 @@
                 <include name="**/*.cs" />
                 <include name="../GenCommonAssemblyInfo.cs" />
             </sources>
-		        <references basedir="${current.bin.dir}">
-			        <include name="System.Data.dll" />
+		    <references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Configuration.dll"/>
+				<include name="System.Data.dll" />
 				<include name="${vs-net.mstest.bin.dir.current}\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
-			        <include name="*.dll" />
-			        <exclude name="${project::get-name()}.dll" />
-		        </references>
+			    <include name="${current.bin.dir}/*.dll" />
+			    <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+		    </references>
         </csc>
     </target>
 
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2008.csproj b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2008.csproj
deleted file mode 100644
index a54bd721..00000000
--- a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2008.csproj
+++ /dev/null
@@ -1,77 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Testing.NUnit</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Testing.NUnit\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Spring.Testing.NUnit.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Testing.NUnit\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>1587, 1591, 219, 162, 618</NoWarn>
-    <DocumentationFile>Spring.Testing.NUnit.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <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" />
-    <Compile Include="Testing\NUnit\AbstractTransactionalSpringContextTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
index 2964cb1d..2b517b3b 100644
--- a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
@@ -13,6 +13,8 @@
             debug="${current.build.debug}"
             output="${current.bin.dir}/${project::get-name()}.dll"
             doc="${current.bin.dir}/${project::get-name()}.xml"
+			nostdlib="true"
+			noconfig="true"
             >
             <arg line="${compiler.args}"/>
             <nowarn>
@@ -25,15 +27,20 @@
                 <include name="**/*.cs" />
                 <include name="../GenCommonAssemblyInfo.cs" />
             </sources>
-		        <references basedir="${current.bin.dir}">
-			        <include name="Common.Logging.dll"/>
-			        <include name="nunit.framework.dll"/>
-				<include name="Spring.Core.dll" />
-				<include name="Spring.Data.dll" />
-			        <include name="System.Data.dll" />
-			        <exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
-		        </references>
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Configuration.dll"/>
+				<include name="System.Data.dll" />
+			    <include name="${current.bin.dir}/Common.Logging.dll"/>
+			    <include name="${current.bin.dir}/nunit.framework.dll"/>
+				<include name="${current.bin.dir}/Spring.Core.dll" />
+				<include name="${current.bin.dir}/Spring.Data.dll" />
+			    <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
+			</references>
         </csc>
     </target>
 
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2008.csproj b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2008.csproj
deleted file mode 100644
index 643584fd..00000000
--- a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2008.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Web.Conversation.NHibernate32</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Conversation.NHibernate32\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Spring.Web.Conversation.NHibernate32.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate32\net\3.5\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=3.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Data\NHibernate\Support\SessionPerConversationScope.cs" />
-    <Compile Include="Data\NHibernate\Support\SessionPerConversationSettings.cs" />
-    <Compile Include="Web\Conversation\HttpModule\ConversationModule.cs" />
-    <Compile Include="Web\Conversation\IConversationManager.cs" />
-    <Compile Include="Web\Conversation\IConversationState.cs" />
-    <Compile Include="Web\Conversation\InnerConversationList.cs" />
-    <Compile Include="Web\Conversation\WebConversationManager.cs" />
-    <Compile Include="Web\Conversation\WebConversationSpringState.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\build-support\tools\nant\schema\nant.xsd">
-      <Link>nant.xsd</Link>
-    </None>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data.NHibernate32\Spring.Data.NHibernate32.2008.csproj">
-      <Project>{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}</Project>
-      <Name>Spring.Data.NHibernate32.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.build b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.build
index 6ec4f73d..7c67daad 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.build
+++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.build
@@ -19,10 +19,13 @@
 		<!-- build Spring.Data.NHibernate -->
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
-		                optimize="${build.optimize}"
+                optimize="${build.optimize}"
 				debug="${current.build.debug}"
 				output="${current.bin.dir}/${project::get-name()}.dll"
-				doc="${current.bin.dir}/${project::get-name()}.xml">
+				doc="${current.bin.dir}/${project::get-name()}.xml"
+				nostdlib="true"
+				noconfig="true"
+			>
 			<arg line="${compiler.args}"/>
 			<nowarn>
 				<warning number="${nowarn.numbers}" />
@@ -31,14 +34,19 @@
 				<include name="**/*.cs" />
 				<include name="../GenCommonAssemblyInfo.cs" />
 			</sources>
-			<references basedir="${current.bin.dir}">
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Configuration.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.Web.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="*.dll" />
+				<include name="${current.bin.dir}/*.dll" />
 				<exclude name="${project::get-name()}.dll" />
-        <exclude name="Spring.Web.Conversation.NHibernate*.dll" />
-        <exclude name="Spring.Data.NHibernate33.dll" />
+				<exclude name="${current.bin.dir}/Spring.Web.Conversation.NHibernate*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate33.dll" />
 			</references>
 		</csc>
 	</target>
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2008.csproj b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2008.csproj
deleted file mode 100644
index 29d3a5e9..00000000
--- a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2008.csproj
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Web.Conversation.NHibernate33</AssemblyName>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Conversation.NHibernate33\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Spring.Web.Conversation.NHibernate33.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate33\net\3.5\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=3.3.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate33\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationScope.cs">
-      <Link>Data\NHibernate\Support\SessionPerConversationScope.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationSettings.cs">
-      <Link>Data\NHibernate\Support\SessionPerConversationSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\HttpModule\ConversationModule.cs">
-      <Link>Web\Conversation\HttpModule\ConversationModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\IConversationManager.cs">
-      <Link>Web\Conversation\IConversationManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\IConversationState.cs">
-      <Link>Web\Conversation\IConversationState.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\InnerConversationList.cs">
-      <Link>Web\Conversation\InnerConversationList.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\WebConversationManager.cs">
-      <Link>Web\Conversation\WebConversationManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\WebConversationSpringState.cs">
-      <Link>Web\Conversation\WebConversationSpringState.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data.NHibernate33\Spring.Data.NHibernate33.2008.csproj">
-      <Project>{67EA5988-C54E-4348-BFFB-E4A61F26143C}</Project>
-      <Name>Spring.Data.NHibernate33.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.build b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.build
index ed14dc3e..7f572a3e 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.build
+++ b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.build
@@ -19,10 +19,13 @@
 		<!-- build Spring.Data.NHibernate -->
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
-		                optimize="${build.optimize}"
+                optimize="${build.optimize}"
 				debug="${current.build.debug}"
 				output="${current.bin.dir}/${project::get-name()}.dll"
-				doc="${current.bin.dir}/${project::get-name()}.xml">
+				doc="${current.bin.dir}/${project::get-name()}.xml"
+				nostdlib="true"
+				noconfig="true"
+				>
 			<arg line="${compiler.args}"/>
 			<nowarn>
 				<warning number="${nowarn.numbers}" />
@@ -33,14 +36,19 @@
 				<include name="../GenCommonAssemblyInfo.cs" />
         <exclude name="../Spring.Web.Conversation.NHibernate32/AssemblyInfo.cs"/>
 			</sources>
-			<references basedir="${current.bin.dir}">
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Configuration.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.Web.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-        <exclude name="Spring.Web.Conversation.NHibernate*.dll" />
-        <exclude name="Spring.Data.NHibernate32.dll" />
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/Spring.Web.Conversation.NHibernate*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate32.dll" />
 			</references>
 		</csc>
 	</target>
diff --git a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2008.csproj b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2008.csproj
deleted file mode 100644
index cfd39a2c..00000000
--- a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2008.csproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<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>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Web.Extensions</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Extensions\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;NET_3_5</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Spring.Web.Extensions.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Extensions\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0;NET_3_5</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web.Services" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Web\Script\Services\ScriptHandlerFactory.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Web\Spring.Web.2008.csproj">
-      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
-      <Name>Spring.Web.2008</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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
index 69edb759..39f1ca6a 100644
--- a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
+++ b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
@@ -14,6 +14,8 @@
 		     debug="${current.build.debug}" 
 		     output="${current.bin.dir}/${project::get-name()}.dll" 
 		     doc="${current.bin.dir}/${project::get-name()}.xml"
+   			 nostdlib="true"
+			 noconfig="true"
 		     >
 			<arg line="${compiler.args}"/>	
 			<nowarn>
@@ -26,12 +28,17 @@
 			<resources basedir="Resources">
 				<include name="**/*" />
 			</resources>
-			<references basedir="${current.bin.dir}">
-				<include name="Spring.Core.dll" />
-				<include name="Spring.Web.dll" />
-				<include name="System.Web.Extensions.dll" />
-				<include name="System.Web.dll" />
-				<include name="System.Web.Services.dll" />
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Configuration.dll" />
+ 				<include name="System.Xml.dll" />
+ 				<include name="System.Web.dll" />
+ 				<include name="System.Web.Extensions.dll" />
+ 				<include name="System.Web.Services.dll" />
+				<include name="${current.bin.dir}/Spring.Core.dll" />
+				<include name="${current.bin.dir}/Spring.Web.dll" />
 			</references>
 		</csc>
 	</target>
diff --git a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj
deleted file mode 100644
index 7627c599..00000000
--- a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5166CE3A-14BE-478A-88DA-729A39DE1E29}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.Web.Mvc</RootNamespace>
-    <AssemblyName>Spring.Web.Mvc</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Mvc\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DocumentationFile>Spring.Web.Mvc.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging">
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Context\Support\MvcApplicationContext.cs" />
-    <Compile Include="Context\Support\MvcApplicationContextArgs.cs" />
-    <Compile Include="Context\Support\MvcContextHandler.cs" />
-    <Compile Include="SpringActionInvoker.cs" />
-    <Compile Include="SpringControllerFactory.cs" />
-    <Compile Include="SpringMvcApplication.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2010</Name>
-      <Private>True</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Web\Spring.Web.2010.csproj">
-      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
-      <Name>Spring.Web.2010</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
deleted file mode 100644
index 41d37d18..00000000
--- a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Mvc" 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">
-		<!-- build Spring.Web.Mvc -->
-		<csc target="library" define="${current.build.defines.csc}" 
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     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="${nowarn.numbers},0108,0114,0612,0109" />
-				<warning number="${nowarn.numbers},1591" if="${nant.settings.currentframework=='mono-2.0'}"/>
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../GenCommonAssemblyInfo.cs" />
-			</sources>
-			<resources basedir="Resources">
-				<include name="**/*" />
-			</resources>
-			<references basedir="${current.bin.dir}">
-				<include name="Common.Logging.dll"/>
-				<include name="antlr.runtime.dll" />
-				<include name="Spring.Core.dll" />
-				<include name="Spring.Aop.dll" />
-				<include name="Spring.Web.dll" />
-				<include name="System.Configuration.dll" />
- 				<include name="System.Web.dll" />
-				<include name="System.Web.Routing.dll" if="${nant.settings.currentframework=='net-4.0'}" />
-				<include name="System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-4.0'}" />
- 				<include name="System.Web.Services.dll" />
-			
-				<include name="${programfiles}\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
-				<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
-				<include name="${programfiles}\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
-				<include name="${programfiles}\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-3.5'}" />
-				
-				<include if="${net-4.0.installed and net-4.0}" name="System.Web.ApplicationServices.dll" />        
-			</references>
-		</csc>
-	</target>
-</project>
diff --git a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.nuspec b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.nuspec
deleted file mode 100644
index ac085b33..00000000
--- a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.nuspec
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Spring.Web.Mvc</id>
-    <projectUrl>http://www.springframework.net/</projectUrl>
-    <licenseUrl>http://www.springframework.net/license.html</licenseUrl>
-    <iconUrl>http://springframework.net/images/SpringSource_Leaves32x32.png</iconUrl>
-    <version>0.0.0</version>
-    <!-- this value is a placeholder replaced by build script -->
-    <authors>SpringSource</authors>
-    <description>Interfaces and classes that provide ASP.NET MVC application support in Spring.Net</description>
-    <summary>Interfaces and classes that provide ASP.NET MVC application support in Spring.Net</summary>
-    <language>en-US</language>
-    <dependencies>
-      <dependency id="Common.Logging" version="1.2.0" />
-      <dependency id="Spring.Core" version="2.0.0" />
-      <dependency id="Spring.Web" version="2.0.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="build\net\3.5\release\Spring.Web.Mvc.dll" target="lib\net35" />
-    <file src="build\net\3.5\release\Spring.Web.Mvc.pdb" target="lib\net35" />
-    <file src="build\net\3.5\release\Spring.Web.Mvc.xml" target="lib\net35" />
-    <file src="build\net\4.0\release\Spring.Web.Mvc.dll" target="lib\net40" />
-    <file src="build\net\4.0\release\Spring.Web.Mvc.pdb" target="lib\net40" />
-    <file src="build\net\4.0\release\Spring.Web.Mvc.xml" target="lib\net40" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build b/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build
index dc48ef0e..7025ad3c 100644
--- a/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build
+++ b/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build
@@ -14,6 +14,8 @@
 		     debug="${current.build.debug}" 
 		     output="${current.bin.dir}/${project::get-name()}.dll" 
 		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
 		     >
 			<arg line="${compiler.args}"/>	
 			<nowarn>
@@ -27,22 +29,27 @@
 			<resources basedir="Resources">
 				<include name="**/*" />
 			</resources>
-			<references basedir="${current.bin.dir}">
-			        <include name="Common.Logging.dll"/>
-				<include name="antlr.runtime.dll" />
-				<include name="Spring.Core.dll" />
-				<include name="Spring.Aop.dll" />
-				<include name="Spring.Web.dll" />
+			<references>
+			    <include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
 				<include name="System.Configuration.dll" />
+				<include name="System.Core.dll"/>
+ 				<include name="System.Xml.dll" />
  				<include name="System.Web.dll" />
-				<include name="System.Web.Routing.dll"/>
 				<include name="System.Web.Abstractions.dll"/>
+				<include name="System.Web.ApplicationServices.dll" />        
+				<include name="System.Web.Routing.dll"/>
  				<include name="System.Web.Services.dll" />
+
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/antlr.runtime.dll" />
+				<include name="${current.bin.dir}/Spring.Core.dll" />
+				<include name="${current.bin.dir}/Spring.Aop.dll" />
+				<include name="${current.bin.dir}/Spring.Web.dll" />
 			
 				<include name="${programfiles}\Microsoft ASP.NET\ASP.NET MVC 3\Assemblies\System.Web.Mvc.dll" />
-				<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 3\Assemblies\System.Web.Mvc.dll" />
-				
-				<include name="System.Web.ApplicationServices.dll" />        
+				<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 3\Assemblies\System.Web.Mvc.dll" />				
 			</references>
 		</csc>
 	</target>
diff --git a/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build b/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build
index f7db7f55..c92579e8 100644
--- a/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build
+++ b/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build
@@ -14,6 +14,8 @@
 		     debug="${current.build.debug}" 
 		     output="${current.bin.dir}/${project::get-name()}.dll" 
 		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
 		     >
 			<arg line="${compiler.args}"/>	
 			<nowarn>
@@ -27,17 +29,24 @@
 			<resources basedir="Resources">
 				<include name="**/*" />
 			</resources>
-			<references basedir="${current.bin.dir}">
-			        <include name="Common.Logging.dll"/>
-				<include name="antlr.runtime.dll" />
-				<include name="Spring.Core.dll" />
-				<include name="Spring.Aop.dll" />
-				<include name="Spring.Web.dll" />
+			<references>
+			    <include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
 				<include name="System.Configuration.dll" />
+				<include name="System.Core.dll"/>
+ 				<include name="System.Xml.dll" />
  				<include name="System.Web.dll" />
-				<include name="System.Web.Routing.dll"/>
 				<include name="System.Web.Abstractions.dll"/>
+				<include name="System.Web.ApplicationServices.dll" />        
+				<include name="System.Web.Routing.dll"/>
  				<include name="System.Web.Services.dll" />
+
+				<include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/antlr.runtime.dll" />
+				<include name="${current.bin.dir}/Spring.Core.dll" />
+				<include name="${current.bin.dir}/Spring.Aop.dll" />
+				<include name="${current.bin.dir}/Spring.Web.dll" />
 			
 				<include name="${programfiles}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Mvc.dll" />
 				<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Mvc.dll" />
@@ -46,7 +55,6 @@
 				<include name="${programfiles}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Http.WebHost.dll" />
 				<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Http.WebHost.dll" />
 				
-				<include name="System.Web.ApplicationServices.dll" />        
 			</references>
 		</csc>
 	</target>
diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs
index 41a72240..211d61ed 100644
--- a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs
+++ b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs
@@ -446,12 +446,13 @@ namespace Spring.Objects.Factory.Support
         private ObjectScope GetObjectScope(IObjectDefinition objectDefinition)
         {
             if (objectDefinition is IWebObjectDefinition)
+            {
                 return ((IWebObjectDefinition) objectDefinition).Scope;
+            }
 
-            ObjectScope scope;
-            Enum.TryParse<ObjectScope>(objectDefinition.Scope, true, out scope);
+            ObjectScope scope = (ObjectScope) Enum.Parse(typeof (ObjectScope), objectDefinition.Scope, true);
 
-            return scope == null ? ObjectScope.Singleton : scope;            
+            return scope;            
         }
 
         /// <summary>
diff --git a/src/Spring/Spring.Web/Spring.Web.2008.csproj b/src/Spring/Spring.Web/Spring.Web.2008.csproj
deleted file mode 100644
index 3a8f9ace..00000000
--- a/src/Spring/Spring.Web/Spring.Web.2008.csproj
+++ /dev/null
@@ -1,304 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BA4789EB-281A-48EA-8763-28B9F0596A18}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Web</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\..\Spring.Net.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>Spring.Web.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.DirectoryServices" />
-    <Reference Include="System.EnterpriseServices">
-      <Name>system.enterpriseservices</Name>
-    </Reference>
-    <Reference Include="System.Web">
-      <Name>system.web</Name>
-    </Reference>
-    <Reference Include="System.Web.Services">
-      <Name>system.web.services</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Caching\AspNetCache.cs" />
-    <Compile Include="Context\Support\HttpApplicationConfigurer.cs" />
-    <Compile Include="Context\Support\WebApplicationContext.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\WebApplicationContextArgs.cs" />
-    <Compile Include="Context\Support\WebContextHandler.cs" />
-    <Compile Include="Context\Support\WebSupportModule.cs" />
-    <Compile Include="Core\IO\WebResource.cs" />
-    <Compile Include="DataBinding\DataSourceItemFormatter.cs" />
-    <Compile Include="DataBinding\HttpRequestBindingContainer.cs" />
-    <Compile Include="DataBinding\IBindingAwareFormatter.cs" />
-    <Compile Include="DataBinding\IWebDataBound.cs" />
-    <Compile Include="DataBinding\MultipleSelectionListControlBinding.cs" />
-    <Compile Include="Globalization\AspNetResourceCache.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\IWebObjectNameGenerator.cs" />
-    <Compile Include="Objects\Factory\Xml\WebObjectDefinitionDocumentReader.cs" />
-    <Compile Include="Objects\Factory\Xml\WebObjectDefinitionParserHelper.cs" />
-    <Compile Include="Objects\Factory\Xml\WebObjectDefinitionReader.cs" />
-    <Compile Include="Util\ISessionState.cs" />
-    <Compile Include="Util\SecurityCritical.cs" />
-    <Compile Include="Web\Support\DefaultHandlerFactory.cs" />
-    <Compile Include="Web\Support\DefaultResultFactory.cs" />
-    <Compile Include="Web\Support\HandlerMap.cs" />
-    <Compile Include="Web\Support\HandlerMapEntry.cs" />
-    <Compile Include="Web\UI\IModelPersistenceMedium.cs" />
-    <Compile Include="Web\Support\IResult.cs" />
-    <Compile Include="Web\Support\IResultFactory.cs" />
-    <Compile Include="Web\Support\LocalResourceManager.cs" />
-    <Compile Include="Web\Support\MappingHandlerFactory.cs" />
-    <Compile Include="Web\Support\MappingHandlerFactoryConfigurer.cs" />
-    <Compile Include="Web\Support\ResultFactoryRegistry.cs" />
-    <Compile Include="Web\Support\WebFormsResultWebNavigator.cs" />
-    <Compile Include="Web\Support\IHierarchicalWebNavigator.cs" />
-    <Compile Include="Web\Support\IResultWebNavigator.cs" />
-    <Compile Include="Web\Support\IWebNavigable.cs" />
-    <Compile Include="Web\Support\IWebNavigator.cs" />
-    <Compile Include="Web\Support\WebNavigableWebNavigatorAdapter.cs" />
-    <Compile Include="Web\UI\IValidationContainer.cs" />
-    <Compile Include="Web\Support\MimeMediaType.cs" />
-    <Compile Include="Web\Support\SharedStateResourceCache.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\Resolvers\CookieCultureResolver.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\Resolvers\DefaultWebCultureResolver.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\Resolvers\RequestCultureResolver.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\Resolvers\SessionCultureResolver.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\ChildWebObjectDefinition.cs" />
-    <Compile Include="Objects\Factory\Support\IWebObjectDefinition.cs" />
-    <Compile Include="Objects\Factory\Support\RootWebObjectDefinition.cs" />
-    <Compile Include="Objects\Factory\Support\WebInstantiationStrategy.cs" />
-    <Compile Include="Objects\Factory\Support\WebObjectDefinitionFactory.cs" />
-    <Compile Include="Objects\Factory\Support\WebObjectFactory.cs" />
-    <Compile Include="Objects\Factory\Support\WebObjectUtils.cs" />
-    <Compile Include="Objects\Factory\Xml\WebObjectsNamespaceParser.cs" />
-    <Compile Include="Threading\HttpContextStorage.cs" />
-    <Compile Include="Threading\HybridContextStorage.cs" />
-    <Compile Include="Web\Support\ControlAccessor.cs" />
-    <Compile Include="Web\Support\ControlCollectionAccessor.cs" />
-    <Compile Include="Util\HttpContextSwitch.cs" />
-    <Compile Include="Util\IVirtualEnvironment.cs" />
-    <Compile Include="Util\VirtualEnvironment.cs" />
-    <Compile Include="Util\WebUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\Providers\ConfigurableActiveDirectoryMembershipProvider.cs" />
-    <Compile Include="Web\Providers\ConfigurableSqlMembershipProvider.cs" />
-    <Compile Include="Web\Providers\ConfigurableSqlProfileProvider.cs" />
-    <Compile Include="Web\Providers\ConfigurableSqlRoleProvider.cs" />
-    <Compile Include="Web\Providers\ConfigurableXmlSiteMapProvider.cs" />
-    <Compile Include="Web\Providers\IMembershipProvider.cs" />
-    <Compile Include="Web\Providers\IProfileProvider.cs" />
-    <Compile Include="Web\Providers\IRoleProvider.cs" />
-    <Compile Include="Web\Providers\ISiteMapProvider.cs" />
-    <Compile Include="Web\Providers\MembershipProviderAdapter.cs" />
-    <Compile Include="Web\Providers\ProfileProviderAdapter.cs" />
-    <Compile Include="Web\Providers\RoleProviderAdapter.cs" />
-    <Compile Include="Web\Providers\SiteMapProviderAdapter.cs" />
-    <Compile Include="Web\Services\WebServiceExporter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\Services\WebServiceHandlerFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\Support\AbstractHandlerFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\Support\ContextMonitor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\Support\ControlInterceptor.cs" />
-    <Compile Include="Web\Support\IInterceptionStrategy.cs" />
-    <Compile Include="Web\Support\InterceptControlCollectionOwnerStrategy.cs" />
-    <Compile Include="Web\Support\InterceptControlCollectionStrategy.cs" />
-    <Compile Include="Web\Support\ISupportsWebDependencyInjection.cs" />
-    <Compile Include="Web\Support\PageHandlerFactory.cs">
-    </Compile>
-    <Compile Include="Web\Support\Result.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\Support\ResultMode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\Support\Script.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\Support\SupportsWebDependencyInjectionMethodBuilder.cs" />
-    <Compile Include="Web\Support\SupportsWebDependencyInjectionOwnerProxy.cs" />
-    <Compile Include="Web\Support\SupportsWebDependencyInjectionTypeBuilder.cs" />
-    <Compile Include="Web\Support\WebDependencyInjectionUtils.cs" />
-    <Compile Include="Web\UI\AbstractWizard.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Controls\AbstractBaseValidator.cs" />
-    <Compile Include="Web\UI\Controls\AbstractValidationControl.cs" />
-    <Compile Include="Web\UI\Controls\Calendar.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Controls\CheckBoxList.cs" />
-    <Compile Include="Web\UI\Controls\CheckBoxValidator.cs" />
-    <Compile Include="Web\UI\Controls\Content.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Controls\ContentPlaceholder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Controls\ContentReplacer.cs" />
-    <Compile Include="Web\UI\Controls\DataBindingAdapter.cs" />
-    <Compile Include="Web\UI\Controls\DataBindingPanel.cs" />
-    <Compile Include="Web\UI\Controls\Form.cs" />
-    <Compile Include="Web\UI\Controls\Head.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Controls\LocalizedImage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Controls\Panel.cs" />
-    <Compile Include="Web\UI\Controls\RadioButtonGroup.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Controls\TabCommandEventArgs.cs" />
-    <Compile Include="Web\UI\Controls\TabCommandEventHandler.cs" />
-    <Compile Include="Web\UI\Controls\TabContainer.cs" />
-    <Compile Include="Web\UI\Controls\TabularMultiView.cs" />
-    <Compile Include="Web\UI\Controls\TabularView.cs" />
-    <Compile Include="Web\UI\Controls\TabularViewCollection.cs" />
-    <Compile Include="Web\UI\Controls\ValidationError.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Controls\ValidationSummary.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\UI\DialogAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\UI\MasterPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Page.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Web\Support\DefaultResultWebNavigator.cs" />
-    <Compile Include="Web\UI\SessionModelPersistenceMedium.cs" />
-    <Compile Include="Web\UI\UserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Validation\AbstractValidationErrorsRenderer.cs" />
-    <Compile Include="Web\UI\Validation\DivValidationErrorsRenderer.cs" />
-    <Compile Include="Web\UI\Validation\IconValidationErrorsRenderer.cs" />
-    <Compile Include="Web\UI\Validation\IValidationErrorsRenderer.cs" />
-    <Compile Include="Web\UI\Validation\SpanValidationErrorsRenderer.cs" />
-    <None Include="Spring.Web.build" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Spring.Web.build b/src/Spring/Spring.Web/Spring.Web.build
index 75fd5375..a744d354 100644
--- a/src/Spring/Spring.Web/Spring.Web.build
+++ b/src/Spring/Spring.Web/Spring.Web.build
@@ -14,6 +14,8 @@
 		     debug="${current.build.debug}" 
 		     output="${current.bin.dir}/${project::get-name()}.dll" 
 		     doc="${current.bin.dir}/${project::get-name()}.xml"
+   			 nostdlib="true"
+			 noconfig="true"
 		     >
 			<arg line="${compiler.args}"/>	
 			<nowarn>
@@ -27,15 +29,20 @@
 			<resources basedir="Resources">
 				<include name="**/*" />
 			</resources>
-			<references basedir="${current.bin.dir}">
-			        <include name="Common.Logging.dll"/>
-				<include name="antlr.runtime.dll" />
-				<include name="Spring.Core.dll" />
-				<include name="Spring.Aop.dll" />
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
 				<include name="System.Configuration.dll" />
+ 				<include name="System.DirectoryServices.dll" />
+ 				<include name="System.Xml.dll" />
  				<include name="System.Web.dll" />
  				<include name="System.Web.Services.dll" />
 				<include if="${net-4.0.installed and net-4.0}" name="System.Web.ApplicationServices.dll" />        
+			    <include name="${current.bin.dir}/Common.Logging.dll"/>
+				<include name="${current.bin.dir}/antlr.runtime.dll" />
+				<include name="${current.bin.dir}/Spring.Core.dll" />
+				<include name="${current.bin.dir}/Spring.Aop.dll" />
 			</references>
 		</csc>
 	</target>
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2008.csproj b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2008.csproj
deleted file mode 100644
index b49911e7..00000000
--- a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2008.csproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2111596A-0327-4C9D-8919-294FBD988A23}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Aop.Tests</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Aop.Tests\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;DEBUG_DYNAMIC</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>0618</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>3</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <WarningsAsErrors>0612</WarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Aop.Tests\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>618</NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Web">
-      <Name>System.Web</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AopExceptionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AopSerializationTests.cs" />
-    <Compile Include="Aop\Advice\DebugAdvice.cs" />
-    <Compile Include="Aop\Config\AopNamespaceParserTests.cs" />
-    <Compile Include="Aop\Framework\Adapter\AdvisorAdapterRegistrationTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\AfterReturningAdviceInterceptorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\ThrowsAdviceInterceptorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\Adapter\UnknownAdviceTypeExceptionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\AopContextTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\AutoProxy\AbstractAdvisorAutoProxyCreatorTests.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\AbstractAutoProxyCreatorTests.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\AdvisorAutoProxyCreatorCircularReferencesTests.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\AdvisorAutoProxyCreatorTests.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\AttributeAutoProxyCreatorTests.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\DefaultAdvisorAutoProxyCreatorTests.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\InfrastructureAdvisorAutoProxyCreator.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\LogicalThreadContextAdvice.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\NoSetterProperties.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\ObjectNameAutoProxyCreatorTests.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\OrderedLogicalThreadContextCheckAdvisor.cs" />
-    <Compile Include="Aop\Framework\AbstractMethodInvocationTests.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\CreatesTestObject.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\PointcutFilteringAutoProxyCreatorTests.cs" />
-    <Compile Include="Aop\Framework\AutoProxy\TypeNameAutoProxyCreatorTests.cs" />
-    <Compile Include="Aop\Framework\DynamicMethodInvocationTests.cs" />
-    <Compile Include="Aop\Framework\CountingAfterReturningAdvice.cs" />
-    <Compile Include="Aop\Framework\CountingBeforeAdvice.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\CountingMultiAdvice.cs" />
-    <Compile Include="Aop\Framework\CountingThrowsAdvice.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\AbstractAopProxyTests.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\AopUtilsTests.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\CachedAopProxyFactoryTests.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\CompositionAopProxyTests.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\InheritanceAopProxyTests.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\DecoratorAopProxyTests.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\DefaultAopProxyFactoryTests.cs" />
-    <Compile Include="Aop\Framework\DynamicProxy\MockTargetSource.cs" />
-    <Compile Include="Aop\Framework\HashtableCachingAdvisorChainFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\IIsModified.cs" />
-    <Compile Include="Aop\Framework\IsModifiedMixin.cs" />
-    <Compile Include="Aop\Framework\ITimeStamped.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\MethodCounter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\PrototypeTargetTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\ProxyConfigTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\ProxyFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\ProxyFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\ReflectiveMethodInvocationTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\TimestampIntroductionInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Framework\UnsupportedInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Interceptor\NopInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Interceptor\SerializableNopInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\ISimpleBeforeAdvice.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\SimpleBeforeAdviceAdapter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\SimpleBeforeAdviceImpl.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\SimpleBeforeAdviceInterceptor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\AbstractRegularExpressionMethodPointcutTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\AttributeMatchMethodPointcutTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\ControlFlowPointcutTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\DefaultIntroductionAdvisorTests.cs" />
-    <Compile Include="Aop\Support\DelegatingIntroductionInterceptorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\RegularExpressionMethodPointcutAdvisorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\RootTypeFilterTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\SdkRegularExpressionMethodPointcutTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Support\TypeFiltersTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\EmptyTargetSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\HotSwappableTargetSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\PrototypeTargetSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\SimplePoolTargetSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\SingletonTargetSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\Target\ThreadLocalTargetSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\TrueMethodMatcherTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\TruePointcutTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aop\TrueTypeFilterTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Aspects\Cache\CacheResultAdviceTests.cs" />
-    <Compile Include="Aspects\Cache\CacheParameterAdviceTests.cs" />
-    <Compile Include="Aspects\Cache\CacheAspectIntegrationTests.cs" />
-    <Compile Include="Aspects\Cache\InvalidateCacheAdviceTests.cs" />
-    <Compile Include="Aspects\Exception\CaptureOutputLogger.cs" />
-    <Compile Include="Aspects\Exception\CaptureOutputLoggerFactoryAdapter.cs" />
-    <Compile Include="Aspects\Exception\ExceptionHandlerAspectIntegrationTests.cs" />
-    <Compile Include="Aspects\Logging\SimpleLoggingAdviceTests.cs" />
-    <Compile Include="Aspects\Logging\TestableSimpleLoggingAdvice.cs" />
-    <Compile Include="Aspects\RetryAdviceTests.cs" />
-    <Compile Include="Aspects\Validation\ParameterValidationAdviceTests.cs" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="AopCompilerOptionsTests.cs" />
-    <None Include="Spring.Aop.Tests.build" />
-    <None Include="Spring.Aop.Tests.dll.config" />
-    <EmbeddedResource Include="Aop\Config\AopNamespaceParserTests.xml" />
-    <EmbeddedResource Include="Data\Spring\Aop\Framework\adapter\withBPPContext.xml" />
-    <EmbeddedResource Include="Data\Spring\Aop\Framework\adapter\withoutBPPContext.xml" />
-    <EmbeddedResource Include="Aop\Framework\AutoProxy\advisorAutoProxyCreatorCircularReferencesTests.xml" />
-    <Content Include="Data\Spring\Aop\Framework\AutoProxy\advisorAutoProxyCreator.xml" />
-    <Content Include="Data\Spring\Aop\Framework\AutoProxy\objectNameAutoProxyCreatorTests.xml" />
-    <Content Include="Data\Spring\Aop\Framework\innerBeanTarget.xml" />
-    <Content Include="Data\Spring\Aop\Framework\prototypeTarget.xml" />
-    <Content Include="Data\Spring\Aop\Framework\prototypeTests.xml" />
-    <Content Include="Data\Spring\Aop\Framework\proxyFactoryDoubleTargetSourceTests.xml" />
-    <Content Include="Data\Spring\Aop\Framework\proxyFactoryTargetSourceTests.xml" />
-    <Content Include="Data\Spring\Aop\Framework\proxyFactoryTests.xml" />
-    <Content Include="Data\Spring\Aop\Framework\serializationTests.xml" />
-    <Content Include="Data\Spring\Aop\Framework\throwsAdvice.xml" />
-    <Content Include="Data\Spring\Aop\Support\RegularExpressionSetterTests.xml" />
-    <Content Include="Data\Spring\Aop\Target\commonsPoolTests.xml" />
-    <Content Include="Data\Spring\Aop\Target\hotSwapTests.xml" />
-    <Content Include="Data\Spring\Aop\Target\prototypeTargetSourceTests.xml" />
-    <Content Include="Data\Spring\Aop\Target\simplePoolTests.xml" />
-    <Content Include="Data\Spring\Aop\Target\threadLocalTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>echo "Copying .xml files for tests"
-xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Aop.Tests\$(ConfigurationName)\ /y /s /q /d
-xcopy "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Aop.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
index d3de9a16..02877f7b 100644
--- a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
@@ -15,8 +15,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+             output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			 >
 			<nowarn>
 				<warning number="${nowarn.numbers.test},0219" />
 			</nowarn>
@@ -35,15 +38,17 @@
 					<exclude name="Data/**/*" />
 					<exclude name="obj/**/*" />
 			</resources>
-			<references basedir="${current.bin.dir}">
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.Web.dll" />
 				<include name="System.Xml.dll" />
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
-				
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
deleted file mode 100644
index fee21a0a..00000000
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
+++ /dev/null
@@ -1,961 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Core.Tests</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Core.Tests\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;DEBUG_DYNAMIC</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>67, 618</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Core.Tests\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>618</NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Caching\AbstractCacheTests.cs" />
-    <Compile Include="Caching\BaseCacheAttributeTests.cs" />
-    <Compile Include="Collections\AbstractQueueTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\CaseInsensitiveHashtableTests.cs" />
-    <Compile Include="Collections\Generic\ReadOnlyDictionaryTests.cs" />
-    <Compile Include="Collections\HashedSetTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\HybridSetTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\ImmutableSetTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\LinkedListTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\ListSetTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\PriorityQueueTests.cs" />
-    <Compile Include="Collections\SetTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\SortedSetTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\StaticSetTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Collections\SynchronizedHashtableTests.cs" />
-    <Compile Include="CommonTypes.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\ApplicationEventArgsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\CommonTypes.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\ContextExceptionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\ContextListenerObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\EventListenerAttributeTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Events\ConsoleListenerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\AbstractApplicationContextTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\AbstractMessageSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\ApplicationContextAwareProcessorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\ApplicationContextExtensionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\ApplicationObjectSupportTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\Assembler.cs" />
-    <Compile Include="Context\Support\ContextLocatorHandlerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\ContextRegistryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\NamespaceParsersSectionHandlerTests.cs" />
-    <Compile Include="Context\Support\DefaultMessageSourceResolvableTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\DelegatingMessageSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\Logic.cs" />
-    <Compile Include="Context\Support\MessageSourceAccessorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\NullMessageSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\ResourceSetMessageSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\Service.cs" />
-    <Compile Include="Context\Support\StaticApplicationContextTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\StaticMessageSourceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\TestObjectConfigParser.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\TypeAliasesSectionHandlerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Context\Support\XmlApplicationContentArgsTests.cs" />
-    <Compile Include="Context\Support\XmlApplicationContextTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="CoreCompilerOptionsTests.cs" />
-    <Compile Include="CoreExceptionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\ComposedCriteriaTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\ControlFlowFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\IO\EncodedResourceTests.cs" />
-    <Compile Include="Core\MethodArgumentsCriteriaTests.cs" />
-    <Compile Include="Core\IO\AssemblyResourceTest.cs" />
-    <Compile Include="Core\IO\ConfigSectionResourceTests.cs" />
-    <Compile Include="Core\IO\ConfigurableResourceLoaderTests.cs" />
-    <Compile Include="Core\IO\FileSystemResourceCommonTests.cs" />
-    <Compile Include="Core\IO\FileSystemResourceTests.cs" />
-    <Compile Include="Core\IO\InputStreamResourceTests.cs" />
-    <Compile Include="Core\IO\ResourceConverterTests.cs" />
-    <Compile Include="Core\IO\ResourceHandlerRegistryTests.cs" />
-    <Compile Include="Core\IO\StringResourceTests.cs" />
-    <Compile Include="Core\IO\UrlResourceTest.cs" />
-    <Compile Include="Core\MethodGenericArgumentsCountCriteriaTests.cs" />
-    <Compile Include="Core\MethodParametersCountCriteriaTests.cs" />
-    <Compile Include="Core\MethodParametersCriteriaTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\MethodReturnTypeCriteriaTests.cs" />
-    <Compile Include="Core\OrderComparatorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\RegularExpressionEventNameCriteriaTests.cs" />
-    <Compile Include="Core\RegularExpressionMethodNameCriteriaTests.cs" />
-    <Compile Include="Core\TypeConversion\CredentialConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\CustomNumberConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\FileInfoConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\NameValueConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\RegexConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\RegistryKeyConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\ResourceManagerTests.cs" />
-    <Compile Include="Core\TypeConversion\RGBColorConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\RuntimeTypeConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\StreamConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\StringArrayConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\TimeSpanConverterTests.cs" />
-    <Compile Include="Core\TypeConversion\TypeConversionUtilsTests.cs" />
-    <Compile Include="Core\TypeConversion\TypeConverterRegistryTests.cs" />
-    <Compile Include="Core\TypeConversion\UriConverterTests.cs" />
-    <Compile Include="Core\TypeResolution\CachedTypeResolverTests.cs" />
-    <Compile Include="Core\TypeResolution\GenericTypeResolverTests.cs" />
-    <Compile Include="Core\TypeResolution\TypeAssemblyHolderTests.cs" />
-    <Compile Include="Core\TypeResolution\TypeRegistryTests.cs" />
-    <Compile Include="Core\TypeResolution\TypeResolutionUtilsTests.cs" />
-    <Compile Include="Core\TypeResolution\TypeResolverTests.cs" />
-    <Compile Include="DataBinding\SimpleExpressionBindingTests.cs" />
-    <Compile Include="DataBinding\BaseBindingManagerTests.cs" />
-    <Compile Include="CompilerOptionsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ExceptionsTest.cs" />
-    <Compile Include="Expressions\ConstructorNodeTests.cs" />
-    <Compile Include="Expressions\ExpressionEvaluatorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Expressions\FunctionNodeTests.cs" />
-    <Compile Include="Expressions\MethodNodeTests.cs" />
-    <Compile Include="Expressions\OpADDTests.cs" />
-    <Compile Include="Expressions\OpANDTests.cs" />
-    <Compile Include="Expressions\OpORTests.cs" />
-    <Compile Include="Expressions\OpXORTests.cs" />
-    <Compile Include="Expressions\Processors\ConversionProcessorTests.cs" />
-    <Compile Include="Expressions\Processors\OrderByProcessorTests.cs" />
-    <Compile Include="Expressions\PropertyOrFieldNodeTests.cs" />
-    <Compile Include="Expressions\ReferenceNodeTests.cs" />
-    <Compile Include="Expressions\SelectionNodeTests.cs" />
-    <Compile Include="Globalization\AbstractLocalizerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\CultureInfoUtils.cs" />
-    <Compile Include="Globalization\CultureTestScope.cs" />
-    <Compile Include="Globalization\Formatters\BooleanFormatterTests.cs" />
-    <Compile Include="Globalization\Formatters\CurrencyFormatterTests.cs" />
-    <Compile Include="Globalization\Formatters\DateTimeFormatterTests.cs" />
-    <Compile Include="Globalization\Formatters\FilteringFormatterTests.cs" />
-    <Compile Include="Globalization\Formatters\FloatFormatterTests.cs" />
-    <Compile Include="Globalization\Formatters\HasTextFilteringFormatterTests.cs" />
-    <Compile Include="Globalization\Formatters\IntegerFormatterTests.cs" />
-    <Compile Include="Globalization\Formatters\NumberFormatterTests.cs" />
-    <Compile Include="Globalization\Formatters\PercentFormatterTests.cs" />
-    <Compile Include="Globalization\Localizers\ResourceSetLocalizerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Globalization\Resolvers\DefaultCultureResolverTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="HookableContextHandler.cs" />
-    <Compile Include="Objects\ExpressionTestObject.cs" />
-    <Compile Include="Objects\Factory\Attributes\PostConstructAttributeTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowireByTypeNormalTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowireByTypeFailTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowireTestObjects.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowireByTypePrimaryTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowireByTypeNotRequiredTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowireByQualifierTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowireByQualifierAttributeTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowireByValueTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\AutowireCollectionTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\MyRequiredAttribute.cs" />
-    <Compile Include="Objects\Factory\Attributes\PreDestroyAttributeTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\RequiredAttributeObjectPostProcessorTests.cs" />
-    <Compile Include="Objects\Factory\Attributes\RequiredTestObject.cs" />
-    <Compile Include="Objects\Factory\ConcurrentObjectFactoryTests.cs" />
-    <Compile Include="Objects\Factory\Config\CommandLineArgsVariableSourceTests.cs" />
-    <Compile Include="Objects\Factory\Config\ConfigSectionVariableSourceTests.cs" />
-    <Compile Include="Objects\Factory\Config\ConnectionStringsVariableSourceTests.cs" />
-    <Compile Include="Objects\Factory\Config\ConfigurableVariableSourceTests.cs" />
-    <Compile Include="Objects\Factory\Config\DelegateObjectFactoryConfigurerTests.cs" />
-    <Compile Include="Objects\Factory\Config\DestructionAwareObjectPostProcessorTest.cs" />	
-    <Compile Include="Objects\Factory\Config\DictionaryVariableSourceTests.cs" />
-    <Compile Include="Objects\Factory\Config\ObjectDefinitionVisitorTests.cs" />
-    <Compile Include="Objects\Factory\Config\ResourceHandlerConfigurerTests.cs" />
-    <Compile Include="Objects\Factory\Config\PropertyFileVariableSourceTests.cs" />
-    <Compile Include="Objects\Factory\Config\SharedStateAwareProcessorTests.cs" />
-    <Compile Include="Objects\Factory\Config\SpecialFolderVariableSourceTests.cs" />
-    <Compile Include="Objects\Factory\Config\EnvironmentVariableSourceTests.cs" />
-    <Compile Include="Objects\Factory\Config\RegistryVariableSourceTests.cs" />
-    <Compile Include="Objects\Factory\Config\TypeAliasConfigurerTests.cs" />
-    <Compile Include="Objects\Factory\Config\VariableAccessorTests.cs" />
-    <Compile Include="Objects\Factory\Config\VariablePlaceholderConfigurerTests.cs" />
-    <Compile Include="Objects\Factory\DefaultListableObjectFactoryPerfTests.cs" />
-    <Compile Include="Objects\Factory\DummyConfigurableFactory.cs" />
-    <Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObjectTests.cs" />
-    <Compile Include="Objects\Factory\Support\ManagedNameValueCollectionTests.cs" />
-    <Compile Include="Objects\Factory\Support\ManagedListTests.cs" />
-    <Compile Include="Objects\Factory\Support\ManagedDictionaryTests.cs" />
-    <Compile Include="Objects\Factory\Support\ManagedSetTests.cs" />
-    <Compile Include="Objects\Factory\Support\ObjectDefinitionBuilderTests.cs" />
-    <Compile Include="Objects\Factory\Xml\ArrayCtorDependencyObject.cs" />
-    <Compile Include="Objects\Factory\Xml\CollectionMergingTests.cs" />
-    <Compile Include="Objects\Factory\Xml\CollectionMergingGenericTests.cs" />
-    <Compile Include="Objects\Factory\Xml\CollectionConversionGenericTests.cs" />
-    <Compile Include="Objects\Factory\Xml\LocaleTests.cs" />
-    <Compile Include="Objects\Factory\Xml\NamespaceParserRegistryTests.cs" />
-    <Compile Include="Objects\Factory\Xml\ObjectFactorySectionHandlerTests.cs" />
-    <Compile Include="Objects\Factory\Xml\ObjectNameGenerationTests.cs" />
-    <Compile Include="Objects\Factory\Xml\SiimpleCtorWiringTests.cs" />
-    <Compile Include="Objects\LazyTestObject.cs" />
-    <Compile Include="Objects\Support\AbstractSharedStateFactoryTests.cs" />
-    <Compile Include="Objects\Support\ByTypeSharedStateProviderTests.cs" />
-    <Compile Include="Objects\Support\MethodInvokerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\TestGenericObject.cs" />
-    <Compile Include="Objects\ObjectWrapperTests.cs" />
-    <Compile Include="Objects\DerivedTestObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Events\Support\EventManipulationUtilsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Events\Support\EventRegistryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\AbstractListableObjectFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\AbstractObjectFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\AbstractFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ConfigurationReaderTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ConstructorArgumentValuesTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\CustomConverterConfigurerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\DelegateFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\DictionaryFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\EventValuesTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\FieldRetrievingFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ListFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\LogFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\MethodInvokingFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ObjectFactoryCreatingFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ObjectReferenceFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\PropertyOverrideConfigurerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\PropertyPathFactoryObjectTests.cs" />
-    <Compile Include="Objects\Factory\Config\PropertyPlaceholderConfigurerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\PropertyRetrievingFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\ResourceManagerFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\RuntimeObjectReferenceTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\SetFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Config\TypedStringValueTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\DefaultListableObjectFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\DummyFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\HasMap.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ISideEffectObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\KnowsIfInstantiated.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\LifecycleObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\MethodReplacerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\MustBeInitialized.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\NoSuchObjectDefinitionExceptionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ObjectDefinitionStoreExceptionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\ObjectFactoryUtilsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\SideEffectObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\AutowireUtilsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\ChildObjectDefinitionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\DefaultObjectDefinitionFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\DelegatingMethodReplacerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\LookupMethodOverrideTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\LookupMethodReplacerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\ObjectDefinitionReaderUtilsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\ReplacedMethodOverrideTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\RootObjectDefinitionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\SimpleInstantiationStrategyTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\UnsupportedObjectDefinitionImplementation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\ConstructorDependenciesObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\DependenciesObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\DerivedConstructorDependenciesObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\DoubleBooleanConstructorObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\DummyBo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\DummyDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\DummyReferencer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\EventWiringTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\FactoryMethods.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\IDummyBo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\InstanceFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\MixedCollectionObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\NullAppender.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\ReadOnlyXmlTestResource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\SingleSimpleTypeConstructorObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\TestObjectCreator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\XmlListableObjectFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\XmlObjectCollectionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\XmlObjectDefinitionReaderTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\XmlObjectFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Xml\XmlParserResolverTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\IndexedTestObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\INestedTestObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\IOther.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\IPerson.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\ITestObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\MutablePropertyValuesTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\NestedTestObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\NotWritablePropertyExceptionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\NumberTestObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\PropertyAccessExceptionsExceptionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\PropertyValueTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\ResourceTestObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\SerializablePerson.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\StaticTestEventHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\ArgumentConvertingMethodInvokerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\AutoWiringEventHandlerValueTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\InstanceEventHandlerValueTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\MutableSortDefinitionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\PropertyComparatorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Support\StaticEventHandlerValueTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\TestEventHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\TestObject.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\TestObjectDAO.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\TestObjectList.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\TestTransparentProxyFactory.cs" />
-    <Compile Include="Objects\TypeMismatchExceptionTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\ValidatorTestObject.cs">
-    </Compile>
-    <Compile Include="Pool\Support\SimplePoolTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\AbstractProxyTypeBuilderTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\CompositionProxyTypeBuilderTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\DynamicProxyManagerTests.cs" />
-    <Compile Include="Proxy\ExplicitCompositionProxyTypeBuilderTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Proxy\InheritanceProxyTypeBuilderTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Reflection\Dynamic\BasePropertyTests.cs" />
-    <EmbeddedResource Include="Reflection\Dynamic\SafePropertyTests_TestObject.vb" />
-    <Compile Include="Reflection\Dynamic\DynamicConstructorTests.cs" />
-    <Compile Include="Reflection\Dynamic\DynamicFieldTests.cs" />
-    <Compile Include="Reflection\Dynamic\DynamicIndexerTests.cs" />
-    <Compile Include="Reflection\Dynamic\DynamicMethodTests.cs" />
-    <Compile Include="Reflection\Dynamic\DynamicPropertyTests.cs" />
-    <Compile Include="Reflection\Dynamic\SafeFieldTests.cs" />
-    <Compile Include="Reflection\Dynamic\SafePropertyTests.cs" />
-    <Compile Include="SecurityTemplate.cs" />
-    <Compile Include="StandardsComplianceTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="StopWatch.cs" />
-    <Compile Include="StreamHelperDecorator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="TestResourceLoader.cs" />
-    <Compile Include="Threading\AsyncTestMethod.cs" />
-    <Compile Include="Threading\AsyncTestTask.cs" />
-    <Compile Include="Threading\CallContextStorageTests.cs" />
-    <Compile Include="Threading\LatchTest.cs" />
-    <Compile Include="Threading\LogicalThreadContextTest.cs" />
-    <Compile Include="Threading\SemaphoreTest.cs" />
-    <Compile Include="Threading\SyncHolderTest.cs" />
-    <Compile Include="Threading\CommonThreadStorageTests.cs" />
-    <Compile Include="Threading\ThreadStaticStorageTests.cs" />
-    <Compile Include="Util\ArrayUtilsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\AssertUtilsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\CollectionUtilsTests.cs" />
-    <Compile Include="Util\ConfigXmlDocumentTests.cs" />
-    <Compile Include="Util\ObjectUtilsTests.cs" />
-    <Compile Include="Util\PatternMatchUtilsTests.cs" />
-    <Compile Include="Util\DefensiveEventRaiserTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\DelegateInfoTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\EventRaiserTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\NumberUtilsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\PathMatcherTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\PropertiesTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\ReflectionUtilsMemberwiseCopyTests.cs" />
-    <Compile Include="Util\ReflectionUtilsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\SerializationTestUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Util\StringUtilsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\TypeConversion\UniqueKeyConverterTests.cs" />
-    <Compile Include="Util\SystemUtilsTests.cs" />
-    <Compile Include="Util\UniqueKeyTests.cs" />
-    <Compile Include="Validation\Actions\ExceptionActionTests.cs" />
-    <Compile Include="Validation\Actions\ErrorMessageActionTests.cs" />
-    <Compile Include="Validation\Actions\ExpressionActionTests.cs" />
-    <Compile Include="Validation\AnyValidatorGroupTests.cs" />
-    <Compile Include="Validation\ExclusiveValidatorGroupTests.cs" />
-    <Compile Include="Validation\HelperClasses.cs" />
-    <Compile Include="Validation\ValidationExceptionTests.cs" />
-    <Compile Include="Validation\ValidationNamespaceParserTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\ValidationErrorsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\ValidatorGroupTests.cs" />
-    <Compile Include="Validation\ValidatorReferenceTests.cs" />
-    <Compile Include="Validation\CollectionValidatorTests.cs" />
-    <Compile Include="Validation\Validators\ConditionValidatorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\Validators\CreditCardValidatorTests.cs" />
-    <Compile Include="Validation\Validators\Integration\UrlValidatorIntegrationTests.cs" />
-    <Compile Include="Validation\Validators\Integration\EmailValidatorIntegrationTests.cs" />
-    <Compile Include="Validation\Validators\Integration\CreditCardValidatorIntegrationTests.cs" />
-    <Compile Include="Validation\Validators\Integration\ISBNValidatorIntegrationTests.cs" />
-    <Compile Include="Validation\Validators\ISBNValidatorTests.cs" />
-    <Compile Include="Validation\Validators\EmailValidatorTests.cs" />
-    <Compile Include="Validation\Validators\UrlValidatorTests.cs" />
-    <Compile Include="Validation\Validators\RegularExpressionValidatorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Validation\Validators\RequiredValidatorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="Context\Support\testobject.xsd">
-      <SubType>
-      </SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Data\Spring\Objects\Factory\Config\two.properties" />
-    <EmbeddedResource Include="Data\Spring\Objects\Factory\Config\one.properties" />
-    <None Include="Context\Support\testobject.xsx">
-      <DependentUpon>testobject.xsd</DependentUpon>
-    </None>
-    <EmbeddedResource Include="Objects\Factory\Xml\NamespaceParserRegistryTests_TestSchema.xsd" />
-    <EmbeddedResource Include="Objects\Factory\Xml\NamespaceParserRegistryTests_TestSchema_2.xsd" />
-    <None Include="Spring.Core.Tests.build" />
-    <EmbeddedResource Include="Context\Support\contextB.xml" />
-    <EmbeddedResource Include="Context\Support\contextC.xml" />
-    <EmbeddedResource Include="Context\Support\import1.xml" />
-    <EmbeddedResource Include="Context\Support\contextA.xml" />
-    <EmbeddedResource Include="Context\Support\simpleContext.xml" />
-    <EmbeddedResource Include="Context\Support\invalidValueType.xml" />
-    <EmbeddedResource Include="Context\Support\invalidType.xml" />
-    <EmbeddedResource Include="Core\TypeResolution\aliasedObjects.xml" />
-    <EmbeddedResource Include="Core\IO\TestResource.txt" />
-    <EmbeddedResource Include="Context\Support\innerObjectsWithPostProcessor.xml" />
-    <EmbeddedResource Include="Core\IO\ConfigSectionResourceTests_config1.xml" />
-    <EmbeddedResource Include="Context\Support\XmlApplicationContextTests-SPRNET1231.xml" />
-    <Content Include="Data\PathMatcher\EmptyPattern.test" />
-    <Content Include="Data\PathMatcher\Examples.test" />
-    <Content Include="Data\PathMatcher\InBetween.test" />
-    <Content Include="Data\PathMatcher\MatchAll.test" />
-    <Content Include="Data\PathMatcher\PatternsAreCaseSensitive.test" />
-    <Content Include="Data\PathMatcher\SingleCaracters.test" />
-    <Content Include="Data\PathMatcher\SlurpPrependedDirectories.test" />
-    <Content Include="Data\PathMatcher\SpringAssembliesPrefix.test" />
-    <Content Include="Data\PathMatcher\ThisDirectory.test" />
-    <Content Include="Data\Spring\Context\Support\SPRNET-192.xml" />
-    <Content Include="Data\Spring\Objects\Factory\concurrent.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Config\AnotherDaoConfig.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Config\PPCWithTypesTests.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Config\TypeAliases.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Config\DaoConfig.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Config\DatabaseConfig.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Config\PPC-SPRNET-55.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Config\PPCTwoLocationsOneSectionTests.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Config\PPCTwoLocationsTwoSectionsTests.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Config\PropertyPlaceholderConfigurerTests.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Config\PropertyResourceConfigurerTests.xml" />
-    <Content Include="Data\Spring\Objects\Factory\leaf.xml" />
-    <Content Include="Data\Spring\Objects\Factory\middle.xml" />
-    <Content Include="Data\Spring\Objects\Factory\root.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\abstract.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\autowire.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\bad-external-resources.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\bad-named-constructor-arg.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\child.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\classnotfound.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\collections.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\constructor-arg.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\array-autowire.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\collectionMergingGeneric.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\collectionMerging.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\collectionConversionGeneric.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\ctor-args.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\objectNameGeneration.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\simple-constructor-arg.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\expressions.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\default-autowire.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\default-lazy-init.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\dependenciesmaterializethis.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\enums.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\event-wiring-prototypes.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\event-wiring.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\external-resources.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\factory-methods.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\factorycircle.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\field-props-factory.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\initializers.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\invalid-factory.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\invalid.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\invoke-factory.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\lazy-init-multithreaded.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\locale.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\no-objects.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\notfullyspecified.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\parent.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\reftypes.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\resource.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\Resources\resource-imports.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\satisfiedalldependencycheck.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\satisfiedobjectdependencycheck.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\satisfiedsimpledependencycheck.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\schema-validation.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\test.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\unsatisfiedalldependencycheckmissingobjects.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\unsatisfiedAllDependencyCheckMissingSimple.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\unsatisfiedobjectdependencycheck.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\unsatisfiedsimpledependencycheck.xml" />
-    <Content Include="Data\Spring\Objects\Factory\Xml\wellformed-but-bad.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithOneRequiredPropertyOmitted.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithThreeRequiredPropertiesOmitted.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithAllRequiredPropertiesProvided.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithCustomAttribute.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\ByTypeNormalObjects.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\ByTypeFailObjects.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\ByTypePrimaryObjects.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\ByTypeNotRequiredObjects.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\ByQualifierObjects.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\ByQualifierAttributeObjects.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\ByValueObjects.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\ByValueObjects.config" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\CollectionObjects.xml" />
-    <Content Include="Spring.Core.Tests.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <EmbeddedResource Include="Resources\Spring.Context.Tests.de-AT.resx" />
-    <EmbeddedResource Include="Resources\Spring.Context.Tests.de.resx" />
-    <EmbeddedResource Include="Validation\ValidationNamespaceParserTests_WhenConfigFileIsNotValid.xml" />
-    <EmbeddedResource Include="Validation\ValidationNamespaceParserTests_WhenConfigFileIsValid.xml" />
-    <EmbeddedResource Include="Util\ConfigXmlDocumentTests_SampleConfig.xml" />
-    <EmbeddedResource Include="Context\contextlifecycle.xml" />
-    <EmbeddedResource Include="Context\Support\objects.xml" />
-    <EmbeddedResource Include="Objects\Factory\TestResource.txt" />
-    <EmbeddedResource Include="Objects\TestObject.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Tesla.sr-Cyrl-CS.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Spring.Context.Tests.sr-Cyrl-CS.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Images.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\SampleResources.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\SimpleAppContext.xml" />
-    <EmbeddedResource Include="Resources\Spring.Context.Tests.pt-BR.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Spring.Context.Tests.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Spring.Context.Tests.sr-SP-Cyrl.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Spring.Context.Tests.sr.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Tesla.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Tesla.sr-SP-Cyrl.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Tesla.sr.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TestResource.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>echo "Copying .xml files for tests"
-xcopy "$(ProjectDir)Data" "$(ProjectDir)..\..\..\build\VS.Net.2008\Spring.Core.Tests\$(ConfigurationName)\" /y /s /q /d
-xcopy "$(ProjectDir)$(TargetFileName).config" "$(ProjectDir)..\..\..\build\VS.Net.2008\Spring.Core.Tests\$(ConfigurationName)\" /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
index 310cbad3..bdaa6399 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
@@ -18,10 +18,13 @@
 
 		<csc target="library" define="${current.build.defines.csc}"
 			warnaserror="true"
-		        optimize="${build.optimize}"
+		    optimize="${build.optimize}"
 			debug="${current.build.debug}"
 			output="${current.bin.dir}/${project::get-name()}.dll"
-			doc="${current.bin.dir}/${project::get-name()}.xml">
+			doc="${current.bin.dir}/${project::get-name()}.xml"
+			nostdlib="true"
+			noconfig="true"
+			>
 			<nowarn>
 				<warning number="${nowarn.numbers.test},0219,0169,0612" /> <!-- add 0414 for mono 2.0 -->
 				<warning number="${nowarn.numbers},1574" if="${nant.settings.currentframework=='mono-2.0'}"/>
@@ -49,7 +52,11 @@
 				<include name="**/contextlifecycle.xml" />
 -->
 			</resources>
-			<references basedir="${current.bin.dir}">
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
 				<include name="System.EnterpriseServices.dll" />
 				<include name="System.Drawing.dll" />
 				<include name="System.Data.dll" />
@@ -58,11 +65,11 @@
 				<include name="System.Web.dll" />
 				<include name="System.Runtime.Serialization.Formatters.Soap.dll" />
 				<include name="System.Windows.Forms.dll" />
-				<include name="Rhino.Mocks.dll" />
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+                <include name="System.Xml.dll"/>
+				<include name="${current.bin.dir}/Rhino.Mocks.dll" />
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj
deleted file mode 100644
index ae2ca028..00000000
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2008.csproj
+++ /dev/null
@@ -1,202 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{91766D21-C568-459F-9BEA-759B011F23CF}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Data.Integration.Tests</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.Integration.Tests\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>67, 618</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.Integration.Tests\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj">
-      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
-      <Name>Spring.Testing.NUnit.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Data\AccountCreditDao.cs" />
-    <Compile Include="Data\AccountDebitDao.cs" />
-    <Compile Include="Data\AccountManager.cs" />
-    <Compile Include="Data\AdoDaoTests.cs" />
-    <Compile Include="Data\AdoTemplatePerformanceTests.cs" />
-    <Compile Include="Data\AdoTemplateTests.cs" />
-    <Compile Include="Data\AutoDeclarativeTxTests.cs" />
-    <Compile Include="Data\CallCreateTestObject.cs" />
-    <Compile Include="Data\ConsoleLoggingAroundAdvice.cs" />
-    <Compile Include="Data\OracleAdoTemplateTests.cs" />
-    <Compile Include="Data\TestTxIsolationLevelTests.cs" />
-    <Compile Include="Data\Generic\GenericAdoTemplateTests.cs" />
-    <Compile Include="Data\Generic\ITestObjectDao.cs" />
-    <Compile Include="Data\Objects\Generic\VacationRowMapper.cs" />
-    <Compile Include="Data\Objects\Generic\StoredProcedureTests.cs" />
-    <Compile Include="Data\Generic\TestObjectDao.cs" />
-    <Compile Include="Data\Generic\TestObjectRowMapper.cs" />
-    <Compile Include="Data\ITestCoordinator.cs" />
-    <Compile Include="Data\Objects\Generic\Vacation.cs" />
-    <Compile Include="Data\SimpleAccountManager.cs" />
-    <Compile Include="Data\SimpleAccountDebitDao.cs" />
-    <Compile Include="Data\SimpleAccountCreditDao.cs" />
-    <Compile Include="Data\DTCTestsNoInterfaces.cs" />
-    <Compile Include="Data\CreateTestObjectNonQuery.cs" />
-    <Compile Include="Data\DeclarativeTxTests.cs" />
-    <Compile Include="Data\DTCTests.cs" />
-    <Compile Include="Data\IAccountCreditDao.cs" />
-    <Compile Include="Data\IAccountDebitDao.cs" />
-    <Compile Include="Data\IAccountManager.cs" />
-    <Compile Include="Data\ITestObjectDao.cs" />
-    <Compile Include="Data\ITestObjectManager.cs" />
-    <Compile Include="Data\MappingAdoQueryTests.cs" />
-    <Compile Include="Data\NativeAdoTestObjectDao.cs" />
-    <Compile Include="Data\NativeAdoTests.cs" />
-    <Compile Include="Data\Northwind\AdoTemplateShipperDao.cs" />
-    <Compile Include="Data\Northwind\IShipperDao.cs" />
-    <Compile Include="Data\Northwind\NativeAdoShipperDao.cs" />
-    <Compile Include="Data\Northwind\Shipper.cs" />
-    <Compile Include="Data\SQLiteTests.cs" />
-    <Compile Include="Data\StoredProcedureTests.cs" />
-    <Compile Include="Data\Support\SimpleExceptionTranslationTests.cs" />
-    <Compile Include="Data\TestCoordinator.cs" />
-    <Compile Include="Data\TestObjectDao.cs" />
-    <Compile Include="Data\TestObjectManager.cs" />
-    <Compile Include="Data\TestObjectQuery.cs" />
-    <Compile Include="Data\TestObjectStoredProcedure.cs" />
-    <Compile Include="Data\TransactionTemplateTests.cs" />
-    <Compile Include="Data\NestedTxScopeTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\adoTemplateTests.xml" />
-    <EmbeddedResource Include="Data\declarativeServices.xml" />
-    <EmbeddedResource Include="Data\DTCAppContext.xml" />
-    <EmbeddedResource Include="Data\autoDeclarativeServices.xml" />
-    <EmbeddedResource Include="Data\DTCAppContextNoInterfaces.xml" />
-    <EmbeddedResource Include="Data\Generic\GenericAdoTemplateTests.xml" />
-    <EmbeddedResource Include="Data\nativeAdoTests.xml" />
-    <EmbeddedResource Include="Data\oracleAdoTemplateTests.xml" />
-    <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>
-  </ItemGroup>
-  <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>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
index 122e2e4b..2a7718de 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
@@ -16,7 +16,10 @@
          optimize="${build.optimize}"
          debug="${current.build.debug}"
          output="${current.bin.dir}/${project::get-name()}.dll"
-         doc="${current.bin.dir}/${project::get-name()}.xml">
+         doc="${current.bin.dir}/${project::get-name()}.xml"
+		 nostdlib="true"
+		 noconfig="true"
+		 >
       <nowarn>
         <warning number="${nowarn.numbers.test}" />
         <warning number="${nowarn.numbers.test},219" if="${nant.settings.currentframework=='mono-2.0'}" />
@@ -27,18 +30,21 @@
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
 		<include name="**/*.xml" />
 	  </resources>
-      <references basedir="${current.bin.dir}">
-        <include name="*.dll" />
-        <include name="System.Data.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-        <include name="System.Data.Common.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-        <include name="System.Data.OracleClient.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-        <include name="System.Drawing.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-        <include name="System.EnterpriseServices.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-        <include name="System.Transactions.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-        <include name="System.Logging.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
+      <references>
+		<include name="mscorlib.dll"/>
+		<include name="Microsoft.CSharp.dll"/>
+		<include name="System.dll"/>
+		<include name="System.Core.dll"/>
+        <include name="System.Data.dll" />
+        <include name="System.Data.Common.dll" />
+        <include name="System.Drawing.dll" />
+        <include name="System.EnterpriseServices.dll" />
+        <include name="System.Transactions.dll" />
+        <include name="System.Logging.dll" />
         <include name="System.Data.OracleClient.dll" />
-        <exclude name="${project::get-name()}.dll" />
-		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+        <include name="System.Xml.dll" />
+        <include name="${current.bin.dir}/*.dll" />
+        <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
       </references>
     </csc>
   </target>
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2008.csproj
deleted file mode 100644
index 8a61c091..00000000
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2008.csproj
+++ /dev/null
@@ -1,131 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4A07E150-ED90-407C-8CAD-4760444DDFD9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Data.NHibernate.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate.Integration.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>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate.Integration.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\Castle.DynamicProxy.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Data\NHibernate\AccountCreditDao.cs" />
-    <Compile Include="Data\NHibernate\AccountDebitDao.cs" />
-    <Compile Include="Data\NHibernate\AccountManager.cs" />
-    <Compile Include="Data\NHibernate\AuditDao.cs" />
-    <Compile Include="Data\NHibernate\Credit.cs" />
-    <Compile Include="Data\NHibernate\DbProviderTemplateTests.cs" />
-    <Compile Include="Data\NHibernate\Debit.cs" />
-    <Compile Include="Data\NHibernate\IAccountCreditDao.cs" />
-    <Compile Include="Data\NHibernate\IAccountDebitDao.cs" />
-    <Compile Include="Data\NHibernate\IAccountManager.cs" />
-    <Compile Include="Data\NHibernate\IAuditDao.cs" />
-    <Compile Include="Data\NHibernate\ITestObjectDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\NHibernate\MultipleDbTests.cs" />
-    <Compile Include="Data\NHibernate\NativeNHTestObjectDao.cs" />
-    <Compile Include="Data\NHibernate\NativeNHTests.cs" />
-    <Compile Include="Data\NHibernate\NHDAOTests.cs" />
-    <Compile Include="Data\NHibernate\NHTestObjectDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Data\NHibernate\TemplateTests.cs" />
-    <Compile Include="Data\NHibernate\TestObject.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\dbProviderTemplateTests.xml" />
-    <EmbeddedResource Include="Data\NHibernate\Credit.hbm.xml" />
-    <Content Include="Data\NHibernate\creditdebit.sql" />
-    <EmbeddedResource Include="Data\NHibernate\Debit.hbm.xml" />
-    <EmbeddedResource Include="Data\NHibernate\MultipleDbTests.xml" />
-    <EmbeddedResource Include="Data\NHibernate\NHDAOTests.xml" />
-    <EmbeddedResource Include="Data\NHibernate\templateTests.xml" />
-    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate\Spring.Data.NHibernate.2008.csproj">
-      <Project>{130E1609-45A7-4F65-B112-105F2DD3E2CE}</Project>
-      <Name>Spring.Data.NHibernate.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Data\NHibernate\testObject.sql" />
-    <None Include="Spring.Data.NHibernate.Integration.Tests.dll.config" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>echo "Copying .xml files for tests"
-rem xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate.Integration.Tests\$(ConfigurationName)\ /y /s /q /d
-xcopy "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate.Integration.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2008.csproj
deleted file mode 100644
index 1c774c2c..00000000
--- a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2008.csproj
+++ /dev/null
@@ -1,121 +0,0 @@
-<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>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Data.NHibernate.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate.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>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\Castle.DynamicProxy.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate10\net\2.0\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, 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>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2008.csproj">
-      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
-      <Name>Spring.Data.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Data\NHibernate\Config\AopConfiguration.cs" />
-    <Compile Include="Data\NHibernate\SessionFactoryUtilsTests.cs" />
-    <Compile Include="Data\NHibernate\HibernateTransactionManagerTests.cs" />
-    <Compile Include="Data\NHibernate\ISimpleService.cs" />
-    <Compile Include="Data\NHibernate\ITestObjectDao.cs" />
-    <Compile Include="Data\NHibernate\LocalSessionFactoryObjectTests.cs" />
-    <Compile Include="Data\NHibernate\NHTestObjectDao.cs" />
-    <Compile Include="Data\NHibernate\SimpleService.cs" />
-    <Compile Include="Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs" />
-    <Compile Include="Data\NHibernate\Support\SessionScopeSettingsTests.cs" />
-    <Compile Include="Data\NHibernate\Support\SessionScopeTests.cs" />
-    <Compile Include="Data\NHibernate\TestObject.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\Config\AopConfiguration.xml" />
-    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Data.NHibernate.Tests.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\Config\AopConfigurationTxPointcut.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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>echo "Copying .xml files for tests"
-xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate.Tests\$(ConfigurationName)\ /y /s /q /d
-xcopy "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.2008.csproj
deleted file mode 100644
index 183c7522..00000000
--- a/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.2008.csproj
+++ /dev/null
@@ -1,209 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CD6A49DE-745C-4360-AADF-3539CFEC6639}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Data.NHibernate32.Integration.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32.Integration.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32.Integration.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate32\net\3.5\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountController.cs">
-      <Link>Data\NHibernate\AccountController.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountCreditDao.cs">
-      <Link>Data\NHibernate\AccountCreditDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountDebitDao.cs">
-      <Link>Data\NHibernate\AccountDebitDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountManager.cs">
-      <Link>Data\NHibernate\AccountManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AuditDao.cs">
-      <Link>Data\NHibernate\AuditDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\AbstractInjectableUserTypeFixture.cs">
-      <Link>Data\Bytecode\AbstractInjectableUserTypeFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\Foo.cs">
-      <Link>Data\Bytecode\Foo.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\IDelimiter.cs">
-      <Link>Data\Bytecode\IDelimiter.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\InjectableStringUserType.cs">
-      <Link>Data\Bytecode\InjectableStringUserType.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\InjectableUserTypeFixture.cs">
-      <Link>Data\Bytecode\InjectableUserTypeFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\Product.cs">
-      <Link>Data\Bytecode\Product.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Credit.cs">
-      <Link>Data\NHibernate\Credit.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\DbProviderTemplateTests.cs">
-      <Link>Data\NHibernate\DbProviderTemplateTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Debit.cs">
-      <Link>Data\NHibernate\Debit.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\HibernateTxScopeTransactionManagerTests.cs">
-      <Link>Data\NHibernate\HibernateTxScopeTransactionManagerTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountController.cs">
-      <Link>Data\NHibernate\IAccountController.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountCreditDao.cs">
-      <Link>Data\NHibernate\IAccountCreditDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountDebitDao.cs">
-      <Link>Data\NHibernate\IAccountDebitDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountManager.cs">
-      <Link>Data\NHibernate\IAccountManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAuditDao.cs">
-      <Link>Data\NHibernate\IAuditDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\ITestObjectDao.cs">
-      <Link>Data\NHibernate\ITestObjectDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\MultipleDbTests.cs">
-      <Link>Data\NHibernate\MultipleDbTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NativeNHTestObjectDao.cs">
-      <Link>Data\NHibernate\NativeNHTestObjectDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NativeNHTests.cs">
-      <Link>Data\NHibernate\NativeNHTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NHDAOTests.cs">
-      <Link>Data\NHibernate\NHDAOTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NHTestObjectDao.cs">
-      <Link>Data\NHibernate\NHTestObjectDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\SimpleTestDao.cs">
-      <Link>Data\NHibernate\SimpleTestDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\TemplateTests.cs">
-      <Link>Data\NHibernate\TemplateTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\TestObject.cs">
-      <Link>Data\NHibernate\TestObject.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\creditdebit.sql">
-      <Link>Data\NHibernate\creditdebit.sql</Link>
-    </None>
-    <None Include="Spring.Data.NHibernate32.Integration.Tests.dll.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate32\Spring.Data.NHibernate32.2008.csproj">
-      <Project>{71368632-B8B7-4A6A-8C65-8DA848120C82}</Project>
-      <Name>Spring.Data.NHibernate32.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\Credit.hbm.xml" />
-    <EmbeddedResource Include="Data\NHibernate\Debit.hbm.xml" />
-    <EmbeddedResource Include="Data\NHibernate\MultipleDbTests.xml" />
-    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\NHDAOTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\dbProviderTemplateTests.xml" />
-    <EmbeddedResource Include="Data\NHibernate\templateTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Controllers.xml">
-      <Link>Data\NHibernate\Controllers.xml</Link>
-    </EmbeddedResource>
-    <Content Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\HibernateTxScopeTransactionManagerTests.xml">
-      <Link>Data\NHibernate\HibernateTxScopeTransactionManagerTests.xml</Link>
-    </Content>
-    <EmbeddedResource Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Services.xml">
-      <Link>Data\NHibernate\Services.xml</Link>
-    </EmbeddedResource>
-    <Content Include="Data\NHibernate\Bytecode\Foo.Spechbm.xml" />
-    <EmbeddedResource Include="Data\NHibernate\Dao.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>echo "Copying .xml files for tests"
-xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32.Integration.Tests\$(ConfigurationName)\ /y /s /q /d
-xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32.Integration.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build
index fc352ee0..d3bc19b1 100644
--- a/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate32.Integration.Tests/Spring.Data.NHibernate32.Integration.Tests.build
@@ -11,10 +11,13 @@
 		<!-- build Spring.Data.NHibernate32.Integration.Tests -->
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
-		                optimize="${build.optimize}"
+		        optimize="${build.optimize}"
 				debug="${current.build.debug}"
 				output="${current.bin.dir}/${project::get-name()}.dll"
-				doc="${current.bin.dir}/${project::get-name()}.xml">
+				doc="${current.bin.dir}/${project::get-name()}.xml"
+				nostdlib="true"
+				noconfig="true"
+			>
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -22,20 +25,21 @@
 				<include name="**/*.cs" />
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
-			<references basedir="${current.bin.dir}">
+			<references>
 				<lib>
 					<include name="${nh32.lib.dir}"/>
 				</lib>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="log4net.dll" />
-				<include name="NHibernate.dll" />
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate31*.dll" />
-				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate31*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
diff --git a/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2008.csproj
deleted file mode 100644
index afb185af..00000000
--- a/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.2008.csproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{231512F3-4F1D-45E1-BADE-D01F68DB9A80}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Data.NHibernate32.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate32\net\3.5\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, 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="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Config\AopConfiguration.cs">
-      <Link>Data\NHibernate\Config\AopConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\HibernateTransactionManagerTests.cs">
-      <Link>Data\NHibernate\HibernateTransactionManagerTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\ISimpleService.cs">
-      <Link>Data\NHibernate\ISimpleService.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\ITestObjectDao.cs">
-      <Link>Data\NHibernate\ITestObjectDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\LocalSessionFactoryObjectTests.cs">
-      <Link>Data\NHibernate\LocalSessionFactoryObjectTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\NHTestObjectDao.cs">
-      <Link>Data\NHibernate\NHTestObjectDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\SimpleService.cs">
-      <Link>Data\NHibernate\SimpleService.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs">
-      <Link>Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\SessionScopeSettingsTests.cs">
-      <Link>Data\NHibernate\Support\SessionScopeSettingsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\SessionScopeTests.cs">
-      <Link>Data\NHibernate\Support\SessionScopeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\TestObject.cs">
-      <Link>Data\NHibernate\TestObject.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Data.NHibernate32.Tests.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate32\Spring.Data.NHibernate32.2008.csproj">
-      <Project>{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}</Project>
-      <Name>Spring.Data.NHibernate32.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2008.csproj">
-      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
-      <Name>Spring.Data.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\Config\AopConfiguration.xml" />
-    <EmbeddedResource Include="Data\NHibernate\Config\AopConfigurationTxPointcut.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>echo "Copying .xml files for tests"
-xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32.Tests\$(ConfigurationName)\ /y /s /q /d
-xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate32.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build b/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build
index a8e80684..3f431d21 100644
--- a/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate32.Tests/Spring.Data.NHibernate32.Tests.build
@@ -14,8 +14,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-      		     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+      		 output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -23,22 +26,20 @@
 				<include name="**/*.cs" />
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
-			<references basedir="${current.bin.dir}">
+			<references>
 				<lib>
 					<include name="${nh32.lib.dir}"/>
 				</lib>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="NHibernate.dll" />
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate1*.dll" />
-				<exclude name="Spring.Data.NHibernate2*.dll" />
-				<exclude name="Spring.Data.NHibernate30*.dll" />
-				<exclude name="Spring.Data.NHibernate31*.dll" />
-				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
diff --git a/test/Spring/Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.2008.csproj
deleted file mode 100644
index 77c11db5..00000000
--- a/test/Spring/Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.2008.csproj
+++ /dev/null
@@ -1,208 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CD6A49DE-745C-4360-AADF-3539CFEC6639}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Data.NHibernate33.Integration.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate33.Integration.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate33.Integration.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate33\net\3.5\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\..\..\lib\Net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate33\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountController.cs">
-      <Link>Data\NHibernate\AccountController.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountCreditDao.cs">
-      <Link>Data\NHibernate\AccountCreditDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountDebitDao.cs">
-      <Link>Data\NHibernate\AccountDebitDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AccountManager.cs">
-      <Link>Data\NHibernate\AccountManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\AuditDao.cs">
-      <Link>Data\NHibernate\AuditDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\AbstractInjectableUserTypeFixture.cs">
-      <Link>Data\Bytecode\AbstractInjectableUserTypeFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\Foo.cs">
-      <Link>Data\Bytecode\Foo.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\IDelimiter.cs">
-      <Link>Data\Bytecode\IDelimiter.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\InjectableStringUserType.cs">
-      <Link>Data\Bytecode\InjectableStringUserType.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\InjectableUserTypeFixture.cs">
-      <Link>Data\Bytecode\InjectableUserTypeFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Bytecode\Product.cs">
-      <Link>Data\Bytecode\Product.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Credit.cs">
-      <Link>Data\NHibernate\Credit.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\DbProviderTemplateTests.cs">
-      <Link>Data\NHibernate\DbProviderTemplateTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Debit.cs">
-      <Link>Data\NHibernate\Debit.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\HibernateTxScopeTransactionManagerTests.cs">
-      <Link>Data\NHibernate\HibernateTxScopeTransactionManagerTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountController.cs">
-      <Link>Data\NHibernate\IAccountController.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountCreditDao.cs">
-      <Link>Data\NHibernate\IAccountCreditDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountDebitDao.cs">
-      <Link>Data\NHibernate\IAccountDebitDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAccountManager.cs">
-      <Link>Data\NHibernate\IAccountManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\IAuditDao.cs">
-      <Link>Data\NHibernate\IAuditDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\ITestObjectDao.cs">
-      <Link>Data\NHibernate\ITestObjectDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\MultipleDbTests.cs">
-      <Link>Data\NHibernate\MultipleDbTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NativeNHTestObjectDao.cs">
-      <Link>Data\NHibernate\NativeNHTestObjectDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NativeNHTests.cs">
-      <Link>Data\NHibernate\NativeNHTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NHDAOTests.cs">
-      <Link>Data\NHibernate\NHDAOTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\NHTestObjectDao.cs">
-      <Link>Data\NHibernate\NHTestObjectDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\SimpleTestDao.cs">
-      <Link>Data\NHibernate\SimpleTestDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\TemplateTests.cs">
-      <Link>Data\NHibernate\TemplateTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\TestObject.cs">
-      <Link>Data\NHibernate\TestObject.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\creditdebit.sql">
-      <Link>Data\NHibernate\creditdebit.sql</Link>
-    </None>
-    <None Include="Spring.Data.NHibernate33.Integration.Tests.dll.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate33\Spring.Data.NHibernate33.2008.csproj">
-      <Project>{71368632-B8B7-4A6A-8C65-8DA848120C82}</Project>
-      <Name>Spring.Data.NHibernate33.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\Credit.hbm.xml" />
-    <EmbeddedResource Include="Data\NHibernate\Debit.hbm.xml" />
-    <EmbeddedResource Include="Data\NHibernate\MultipleDbTests.xml" />
-    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\NHDAOTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\dbProviderTemplateTests.xml" />
-    <EmbeddedResource Include="Data\NHibernate\templateTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Controllers.xml">
-      <Link>Data\NHibernate\Controllers.xml</Link>
-    </EmbeddedResource>
-    <Content Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\HibernateTxScopeTransactionManagerTests.xml">
-      <Link>Data\NHibernate\HibernateTxScopeTransactionManagerTests.xml</Link>
-    </Content>
-    <EmbeddedResource Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\Services.xml">
-      <Link>Data\NHibernate\Services.xml</Link>
-    </EmbeddedResource>
-    <Content Include="Data\NHibernate\Bytecode\Foo.Spechbm.xml" />
-    <EmbeddedResource Include="Data\NHibernate\Dao.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>echo "Copying .xml files for tests"
-xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate33.Integration.Tests\$(ConfigurationName)\ /y /s /q /d
-xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate33.Integration.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.build
index 36ca2de9..8317e038 100644
--- a/test/Spring/Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate33.Integration.Tests/Spring.Data.NHibernate33.Integration.Tests.build
@@ -11,10 +11,13 @@
 		<!-- build Spring.Data.NHibernate33.Integration.Tests -->
 		<csc target="library" define="${current.build.defines.csc}"
 				warnaserror="true"
-		                optimize="${build.optimize}"
+		        optimize="${build.optimize}"
 				debug="${current.build.debug}"
 				output="${current.bin.dir}/${project::get-name()}.dll"
-				doc="${current.bin.dir}/${project::get-name()}.xml">
+				doc="${current.bin.dir}/${project::get-name()}.xml"
+				nostdlib="true"
+				noconfig="true"
+				>
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -22,20 +25,21 @@
 				<include name="**/*.cs" />
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
-			<references basedir="${current.bin.dir}">
+			<references>
 				<lib>
 					<include name="${nh33.lib.dir}"/>
 				</lib>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="log4net.dll" />
-				<include name="NHibernate.dll" />
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate31*.dll" />
-				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate32*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
diff --git a/test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.2008.csproj
deleted file mode 100644
index 54e72db5..00000000
--- a/test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.2008.csproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B48B00A6-8E4C-4953-9B82-7121A08AC57C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Data.NHibernate33.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate33.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.NHibernate33.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate33\net\3.5\Iesi.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate33\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, 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="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Config\AopConfiguration.cs">
-      <Link>Data\NHibernate\Config\AopConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\HibernateTransactionManagerTests.cs">
-      <Link>Data\NHibernate\HibernateTransactionManagerTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\ISimpleService.cs">
-      <Link>Data\NHibernate\ISimpleService.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\ITestObjectDao.cs">
-      <Link>Data\NHibernate\ITestObjectDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\LocalSessionFactoryObjectTests.cs">
-      <Link>Data\NHibernate\LocalSessionFactoryObjectTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\NHTestObjectDao.cs">
-      <Link>Data\NHibernate\NHTestObjectDao.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\SimpleService.cs">
-      <Link>Data\NHibernate\SimpleService.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs">
-      <Link>Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\SessionScopeSettingsTests.cs">
-      <Link>Data\NHibernate\Support\SessionScopeSettingsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\Support\SessionScopeTests.cs">
-      <Link>Data\NHibernate\Support\SessionScopeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Data.NHibernate.Tests\Data\NHibernate\TestObject.cs">
-      <Link>Data\NHibernate\TestObject.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Data.NHibernate33.Tests.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate33\Spring.Data.NHibernate33.2008.csproj">
-      <Project>{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}</Project>
-      <Name>Spring.Data.NHibernate33.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2008.csproj">
-      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
-      <Name>Spring.Data.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\Config\AopConfiguration.xml" />
-    <EmbeddedResource Include="Data\NHibernate\Config\AopConfigurationTxPointcut.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>echo "Copying .xml files for tests"
-xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate33.Tests\$(ConfigurationName)\ /y /s /q /d
-xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Data.NHibernate33.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.build b/test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.build
index 3476c8d2..a4a3e349 100644
--- a/test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.build
+++ b/test/Spring/Spring.Data.NHibernate33.Tests/Spring.Data.NHibernate33.Tests.build
@@ -14,8 +14,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-      		     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+      		 output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			 >
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -23,22 +26,22 @@
 				<include name="**/*.cs" />
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
-			<references basedir="${current.bin.dir}">
+			<references>
 				<lib>
 					<include name="${nh32.lib.dir}"/>
 				</lib>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
 				<include name="System.Data.dll" />
 				<include name="System.EnterpriseServices.dll" />
-				<include name="NHibernate.dll" />
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="Spring.Data.NHibernate1*.dll" />
-				<exclude name="Spring.Data.NHibernate2*.dll" />
-				<exclude name="Spring.Data.NHibernate30*.dll" />
-				<exclude name="Spring.Data.NHibernate31*.dll" />
-				<exclude name="Spring.Data.NHibernate*Tests*.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate1*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate31*.dll" />
+				<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj
deleted file mode 100644
index 69e23466..00000000
--- a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj
+++ /dev/null
@@ -1,203 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Data.Tests</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.Tests\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>67, 618</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-    <WarningsAsErrors>219</WarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Data.Tests\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>618</NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Dao\IncorrectResultSizeDataAccessExceptionTests.cs" />
-    <Compile Include="Dao\IncorrectUpdateSemanticsDataAccessExceptionTests.cs" />
-    <Compile Include="Dao\UncategorizedDataAccessExceptionTests.cs" />
-    <Compile Include="DataExceptionTests.cs" />
-    <Compile Include="Data\AdoPlatformTransactionManagerTests.cs" />
-    <Compile Include="Data\AutoDeclarativeTxTests.cs" />
-    <Compile Include="Data\Common\DbProviderFactoryTests.cs" />
-    <Compile Include="Data\LoggingAroundAdvice.cs" />
-    <Compile Include="Data\ITestCoord.cs" />
-    <Compile Include="Data\ITestObjectMgr.cs" />
-    <Compile Include="Data\Objects\AdoQueryTests.cs" />
-    <Compile Include="Data\TestCoord.cs" />
-    <Compile Include="Data\TestObjectMgr.cs" />
-    <Compile Include="Support\ErrorCodeExceptionTranslatorTests.cs" />
-    <Compile Include="Support\TestDbProvider.cs" />
-    <Compile Include="Support\TestSqlException.cs" />
-    <Compile Include="Transaction\CallCountingTransactionManager.cs" />
-    <Compile Include="Transaction\CommonTypes.cs" />
-    <Compile Include="Transaction\Config\TxNamespaceParserTests.cs" />
-    <Compile Include="Transaction\HeuristicCompletionExceptionTests.cs" />
-    <Compile Include="Transaction\Interceptor\DefaultTransactionAttributeTests.cs" />
-    <Compile Include="Transaction\Interceptor\MatchAlwaysTransactionAttributeSourceTests.cs" />
-    <Compile Include="Transaction\Interceptor\NoRollbackRuleAttributeTests.cs" />
-    <Compile Include="Transaction\Interceptor\RollbackRuleAttributeTests.cs" />
-    <Compile Include="Transaction\Interceptor\RuleBasedTransactionAttributeTests.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionAttributeEditorTests.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionAttributeSourceAdvisorTests.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionAttributeSourceEditorTests.cs" />
-    <Compile Include="Transaction\InvalidTimeoutExceptionTests.cs" />
-    <Compile Include="Transaction\Support\AbstractPlatformTransactionManagerTests.cs" />
-    <Compile Include="Transaction\Support\DefaultTransactionDefinitionTests.cs" />
-    <Compile Include="Transaction\Support\DefaultTransactionStatusTests.cs" />
-    <Compile Include="Transaction\Support\ResourceHolderSupportTests.cs" />
-    <Compile Include="Transaction\Support\TransactionSynchronizationAdapterTests.cs" />
-    <Compile Include="Transaction\Support\TransactionSynchronizationManagerTests.cs" />
-    <Compile Include="Transaction\Support\TransactionTemplateTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\AutoDeclarativeTxTests.xml" />
-    <EmbeddedResource Include="Data\Common\AdditionalProviders.xml" />
-    <EmbeddedResource Include="Data\Common\DbProviderFactoryTests.xml" />
-    <Content Include="Spring.Data.Tests.dll.config" />
-    <Content Include="Transaction\Config\TxNamespaceParserTests_TxAttributeDriven.xml" />
-    <EmbeddedResource Include="Transaction\Interceptor\MatchAlwaysTransactionAttributeSourceTests.xml" />
-    <EmbeddedResource Include="Transaction\Config\TxNamespaceParserTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DataCompilerOptionsTests.cs" />
-    <Compile Include="Dao\Attributes\PersistenceExceptionTranslationAdvisorTests.cs" />
-    <Compile Include="Dao\Attributes\PersistenceExceptionTranslationInterceptorTests.cs" />
-    <Compile Include="Dao\Attributes\PersistenceExceptionTranslationPostProcessorTests.cs" />
-    <Compile Include="Dao\Support\DataAccessUtilsTests.cs" />
-    <Compile Include="Data\Common\DbParametersTests.cs" />
-    <Compile Include="Data\Common\MultiDelegatingDbProviderTests.cs" />
-    <Compile Include="Data\Common\UserCredentialsDbProviderTests.cs" />
-    <Compile Include="Data\Core\ServiceDomainTransactionManagerTests.cs" />
-    <Compile Include="Data\Core\TxScopeTransactionManagerIntegrationTests.cs" />
-    <Compile Include="Data\Core\TxScopeTransactionManagerTests.cs" />
-    <Compile Include="Data\Objects\AbstractAdoQueryTests.cs" />
-    <Compile Include="Data\Objects\AdoOperationTests.cs" />
-    <Compile Include="Data\Objects\StoredProcedureTests.cs" />
-    <Compile Include="Transaction\Interceptor\AbstractTransactionAspectTests.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionAttributeSourceTests.cs" />
-    <Compile Include="Transaction\Interceptor\TransactionInterceptorTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Data.Tests.build" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>echo "Copying .xml files for tests"
-xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Data.Tests\$(ConfigurationName)\ /y /s /q /d
-xcopy "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Data.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
index 3a69050d..22265b5a 100644
--- a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
+++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
@@ -15,8 +15,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+             output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			 >
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -27,18 +30,20 @@
 		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
 			        <include name="**/*.xml" />
 			</resources>
-			<references basedir="${current.bin.dir}">
-				<include name="*.dll" />
-				<include name="System.Data.dll" if="${nant.settings.currentframework == 'mono-2.0'}"/>
-				<include name="System.Data.Common.dll" if="${nant.settings.currentframework == 'mono-2.0'}"/>
-				<include name="System.Data.OracleClient.dll" if="${nant.settings.currentframework == 'mono-2.0'}"/>
-				<include name="System.Drawing.dll" if="${nant.settings.currentframework == 'mono-2.0'}"/>
-				<include name="System.EnterpriseServices.dll" if="${nant.settings.currentframework == 'mono-2.0'}"/>
-				<include name="System.Transactions.dll" if="${nant.settings.currentframework == 'mono-2.0'}"/>
-				<include name="Common.Logging.dll" if="${nant.settings.currentframework == 'mono-2.0'}"/>
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Data.dll" />
+				<include name="System.Data.Common.dll" />
+				<include name="System.Data.OracleClient.dll" />
+				<include name="System.Drawing.dll" />
+				<include name="System.EnterpriseServices.dll" />
+				<include name="System.Transactions.dll" />
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2008.csproj b/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2008.csproj
deleted file mode 100644
index a08d7f7c..00000000
--- a/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2008.csproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Messaging.Ems.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>http://localhost/Spring.Messaging.Ems.Tests/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Ems.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>1591,0618,0067</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Ems.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.5.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
-    </Reference>
-    <Reference Include="TIBCO.EMS.ADMIN, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.ADMIN.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Ems\Spring.Messaging.Ems.2008.csproj">
-      <Project>{900E3839-301E-48B1-BAEB-B6645620ACFF}</Project>
-      <Name>Spring.Messaging.Ems.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj">
-      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
-      <Name>Spring.Testing.NUnit.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Messaging\Ems\Connections\CachingConnectionFactoryTests.cs" />
-    <Compile Include="Messaging\Ems\Connections\MessageTransactionManagerTests.cs" />
-    <Compile Include="Messaging\Ems\Connections\SingleConnectionFactoryTests.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestConnection.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestExceptionListener.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestMessageConsumer.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestMessageListener.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestMessageProducer.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestSession.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestTopicSubscriber.cs" />
-    <Compile Include="Messaging\Ems\Core\MessageTemplateTests.cs" />
-    <Compile Include="Messaging\Ems\Core\SimpleMessageConverterTests.cs" />
-    <Compile Include="Messaging\Ems\Core\SimpleMessageListenerContainerTests.cs" />
-    <Compile Include="Messaging\Ems\Integration\LoggingExceptionHandler.cs" />
-    <Compile Include="Messaging\Ems\Integration\SimpleMessageListener.cs" />
-    <Compile Include="Messaging\Ems\Integration\SimpleMessageListenerContainerTests.cs" />
-    <Compile Include="Messaging\Ems\Jndi\ExpectedLookupContext.cs" />
-    <Compile Include="Messaging\Ems\Jndi\JndiLookupFactoryObjectTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Messaging\Ems\Integration\SimpleMessageListenerContainerTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build
index f4004260..0fa0d1a5 100644
--- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build
+++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build
@@ -17,7 +17,10 @@
         optimize="${build.optimize}"
         debug="${current.build.debug}"
         output="${current.bin.dir}/${project::get-name()}.dll"
-        doc="${current.bin.dir}/${project::get-name()}.xml">
+        doc="${current.bin.dir}/${project::get-name()}.xml"
+		nostdlib="true"
+		noconfig="true"
+	  >
       <nowarn>
         <warning number="${nowarn.numbers.test}" />
       </nowarn>
@@ -26,13 +29,15 @@
         <include name="**/*.cs" />
         <exclude name="AssemblyInfo.cs" />
       </sources>
-      <references basedir="${current.bin.dir}">
+      <references>
+		<include name="mscorlib.dll"/>
+		<include name="Microsoft.CSharp.dll"/>
+		<include name="System.dll"/>
+		<include name="System.Core.dll"/>
         <include name="System.Data.dll" />
         <include name="System.EnterpriseServices.dll" />
-        <include name="*.dll" />
-        <include name="Spring.Messaging.Nms.dll" />
-		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
-		<exclude if="${net-4.0}" name="Spring.Messaging.Nms.Integration.Tests.dll" />
+        <include name="${current.bin.dir}/*.dll" />
+		<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
       </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
         <include name="**/*.xml" />
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj
deleted file mode 100644
index 3bafbba3..00000000
--- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj
+++ /dev/null
@@ -1,127 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{FA7A6931-7DBE-4A32-A312-51FAD2E80332}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Messaging.Nms.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Nms.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>..\..\..\build\VS.NET.2008\Spring.Messaging.Nms.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Accessibility" />
-    <Reference Include="Apache.NMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Apache.NMS.dll</HintPath>
-    </Reference>
-    <Reference Include="Apache.NMS.ActiveMQ, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Apache.NMS.ActiveMQ.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, 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>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2008.csproj">
-      <Project>{AEB1578C-9018-4D49-B440-789F38DD2F29}</Project>
-      <Name>Spring.Messaging.Nms.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj">
-      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
-      <Name>Spring.Testing.NUnit.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="NmsExceptionTests.cs" />
-    <Compile Include="NmsCompilerOptionsTests.cs" />
-    <Compile Include="Messaging\Nms\Config\NmsNamespaceHandlerTests.cs" />
-    <Compile Include="Messaging\Nms\Connections\CachingConnectionFactoryTests.cs" />
-    <Compile Include="Messaging\Nms\Connections\MessageTransactionManagerTests.cs" />
-    <Compile Include="Messaging\Nms\Connections\SingleConnectionFactoryTests.cs" />
-    <Compile Include="Messaging\Nms\Connections\TestConnection.cs" />
-    <Compile Include="Messaging\Nms\Connections\TestExceptionListener.cs" />
-    <Compile Include="Messaging\Nms\Connections\TestMessageConsumer.cs" />
-    <Compile Include="Messaging\Nms\Connections\TestMessageListener.cs" />
-    <Compile Include="Messaging\Nms\Connections\TestMessageProducer.cs" />
-    <Compile Include="Messaging\Nms\Connections\TestSession.cs" />
-    <Compile Include="Messaging\Nms\Core\MessageTemplateTests.cs" />
-    <Compile Include="Messaging\Nms\Core\SimpleMessageConverterTests.cs" />
-    <Compile Include="Messaging\Nms\Core\SimpleMessageListenerContainerTests.cs" />
-    <Compile Include="Messaging\Nms\Integration\LoggingExceptionHandler.cs" />
-    <Compile Include="Messaging\Nms\Integration\SimpleMessageListener.cs" />
-    <Compile Include="Messaging\Nms\Integration\SimpleMessageListenerContainerTests.cs" />
-    <Compile Include="Messaging\Nms\Connections\TestConnectionFactory.cs" />
-    <Compile Include="Messaging\Nms\Listener\Adapter\IMessageContentsHandler.cs" />
-    <Compile Include="Messaging\Nms\Listener\Adapter\MessageContentsHandler.cs" />
-    <Compile Include="Messaging\Nms\Listener\Adapter\MessageListenerAdapterTests.cs" />
-    <Compile Include="Messaging\Nms\StubQueue.cs" />
-    <Compile Include="Messaging\Nms\Support\Converter\TypeMapperTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Messaging\Nms\Integration\SimpleMessageListenerContainerTests.xml" />
-    <EmbeddedResource Include="Messaging\Nms\Config\NmsNamespaceHandlerTests.xml" />
-    <Content Include="Spring.Messaging.Nms.Tests.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
index ba6764ce..5f35fe8f 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
@@ -15,8 +15,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+             output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -27,11 +30,14 @@
 		        <resources prefix="Spring" dynamicprefix="true" failonempty="false">
 			        <include name="**/*.xml" />
 			</resources>
-			<references basedir="${current.bin.dir}">
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj
deleted file mode 100644
index a7fb0b1d..00000000
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj
+++ /dev/null
@@ -1,128 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Messaging.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, 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.Messaging" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Messaging\Core\MessageQueueTemplateTests.cs" />
-    <Compile Include="Messaging\Support\MessageQueueFactoryObjectTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging\Spring.Messaging.2008.csproj">
-      <Project>{0E23AE41-D8D8-41C2-84A2-D35564049F0D}</Project>
-      <Name>Spring.Messaging.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj">
-      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
-      <Name>Spring.Testing.NUnit.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Messaging\Listener\NonTransactionalMessageListenerContainerTests.xml" />
-    <EmbeddedResource Include="Messaging\Listener\MultiThreadedNonTransactionalMessageListenerContainerTests.xml" />
-    <EmbeddedResource Include="Messaging\Listener\TransactionalMessageListenerContainerTests.xml" />
-    <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="MessagingCompilerOptionsTests.cs" />
-    <Compile Include="MessagingExceptionTests.cs" />
-    <Compile Include="Messaging\Listener\Adapter\StandardReflectionMessageListenerAdapter.cs" />
-    <Compile Include="Messaging\Listener\WaitingHandler.cs" />
-    <Compile Include="Messaging\Core\MessageQueueMetadataCacheTests.cs" />
-    <Compile Include="Messaging\Core\MessageQueueUtils.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" />
-    <Compile Include="Messaging\Listener\MultiThreadedNonTransactionalMessageListenerContainerTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Messaging\Listener\SimpleExceptionHandler.cs" />
-    <Compile Include="Messaging\Listener\SimpleHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Messaging\Listener\SimpleMessageListener.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Messaging\Listener\TransactionalMessageListenerContainerTests.cs">
-      <SubType>Code</SubType>
-    </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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build
index 29a3cec4..ad8f05cf 100644
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build
+++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build
@@ -15,8 +15,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+             output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -27,11 +30,16 @@
 		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
 			        <include name="**/*.xml" />
 			</resources>
-			<references basedir="${current.bin.dir}">
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Messaging.dll"/>
+				<include name="System.Transactions.dll"/>
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.2008.csproj b/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.2008.csproj
deleted file mode 100644
index 1f8479c1..00000000
--- a/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.2008.csproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E4328F68-C3FC-43E2-9D63-30CEC55215B0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Scheduling.Quartz.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz.Integration.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;NET_3_5</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz.Integration.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0;NET_3_5</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Quartz, Version=1.0.3.2, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Quartz10\net\2.0\Quartz.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, 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.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz\Spring.Scheduling.Quartz.2008.csproj">
-      <Project>{E823D54C-CE82-4868-929F-5F95A999F61E}</Project>
-      <Name>Spring.Scheduling.Quartz.2005</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Scheduling.Quartz.Integration.Tests.dll.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Scheduling\Quartz\LocalDataSourceJobStoreTest.cs" />
-    <Compile Include="Scheduling\Quartz\TestJob.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Scheduling\Quartz\LocalDataSourceJobStoreTest.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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.2008.csproj b/test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.2008.csproj
deleted file mode 100644
index 486a8343..00000000
--- a/test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.2008.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Scheduling.Quartz21.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz21.Integration.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz21.Integration.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="C5, Version=1.1.0.0, Culture=neutral, PublicKeyToken=06a1b38866503b69, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Quartz21\net\3.5\C5.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Quartz, Version=2.0.0.100, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Quartz21\net\3.5\Quartz.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, 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.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Scheduling.Quartz21.Integration.Tests.dll.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Scheduling\Quartz\LocalDataSourceJobStoreTest.cs" />
-    <Compile Include="Scheduling\Quartz\TestJob.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Scheduling\Quartz\LocalDataSourceJobStoreTest.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz21\Spring.Scheduling.Quartz21.2008.csproj">
-      <Project>{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}</Project>
-      <Name>Spring.Scheduling.Quartz21.2008</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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.build b/test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.build
index 203797b9..09f9e6a6 100644
--- a/test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.build
+++ b/test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.build
@@ -15,8 +15,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-      		     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+      		 output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -24,9 +27,13 @@
 				<include name="**/*.cs" />
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
-			<references basedir="${current.bin.dir}">
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
 			</references>
 		</csc>
 		<copy todir="${current.bin.dir}">
diff --git a/test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.2008.csproj b/test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.2008.csproj
deleted file mode 100644
index 15cc3249..00000000
--- a/test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.2008.csproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Scheduling.Quartz21.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz21.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz21.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="C5, Version=1.1.0.0, Culture=neutral, PublicKeyToken=06a1b38866503b69, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Quartz21\net\3.5\C5.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Quartz, Version=2.0.0.100, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Quartz21\net\3.5\Quartz.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, 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.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="QuartzCompilerOptionsTests.cs" />
-    <Compile Include="Scheduling\Quartz\AdaptableJobFactoryTest.cs" />
-    <Compile Include="Scheduling\Quartz\CronTriggerObjectTest.cs" />
-    <Compile Include="Scheduling\Quartz\JobDetailObjectTest.cs" />
-    <Compile Include="Scheduling\Quartz\MethodInvokingJobDetailFactoryObjectTest.cs" />
-    <Compile Include="Scheduling\Quartz\MethodInvokingJobTest.cs" />
-    <Compile Include="Scheduling\Quartz\QuartzSupportTests.cs" />
-    <Compile Include="Scheduling\Quartz\QuartzTestObject.cs" />
-    <Compile Include="Scheduling\Quartz\SchedulerFactoryObjectTest.cs" />
-    <Compile Include="Scheduling\Quartz\SimpleTriggerObjectTest.cs" />
-    <Compile Include="Scheduling\Quartz\SpringObjectJobFactoryTest.cs" />
-    <Compile Include="Scheduling\Quartz\TestMethodInvokingTask.cs" />
-    <Compile Include="Scheduling\Quartz\TestUtil.cs" />
-    <Compile Include="Scheduling\Quartz\TriggerObjectTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="job-scheduling-data.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="multipleAnonymousMethodInvokingJobDetailFB.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="multipleSchedulers.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="schedulerAccessorObject.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="schedulerRepositoryExposure.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz21\Spring.Scheduling.Quartz21.2008.csproj">
-      <Project>{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}</Project>
-      <Name>Spring.Scheduling.Quartz21.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Scheduling.Quartz21.Tests.build" />
-    <None Include="Spring.Scheduling.Quartz21.Tests.dll.config" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.build b/test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.build
index 042ce17f..bc5b597f 100644
--- a/test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.build
+++ b/test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.build
@@ -22,8 +22,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-      		     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+      		 output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			 >
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -31,9 +34,13 @@
 				<include name="**/*.cs" />
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
-			<references basedir="${current.bin.dir}">
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2008.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2008.csproj
deleted file mode 100644
index bf07699d..00000000
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2008.csproj
+++ /dev/null
@@ -1,223 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4374F018-9738-46BF-A399-4594CEE75B21}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Services.Tests</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Services.Tests\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;NET_3_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Services.Tests\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0;NET_3_0;NET_3_5</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <Name>nunit.framework</Name>
-      <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">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.Runtime.Serialization, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="EnterpriseServices\ExeConfigurationSystemTests.cs" />
-    <Compile Include="EnterpriseServices\ExportedServicedComponentSample.cs" />
-    <Compile Include="EnterpriseServices\ServicedComponentExporterTests.cs" />
-    <Compile Include="ServiceModel\Config\ChannelFactoryObjectDefinitionParserTests.cs" />
-    <Compile Include="ServiceModel\Config\WcfNamespaceParserTests.cs" />
-    <Compile Include="ServiceModel\SpringServiceHostTests.cs" />
-    <Compile Include="ServicesCompilerOptionsTests.cs" />
-    <Compile Include="Remoting\BaseRemotingTestFixture.cs" />
-    <Compile Include="Remoting\CaoExporterTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting\CaoFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting\RemotingConfigParserTests.cs" />
-    <Compile Include="Remoting\RemotingConfigurerTests.cs" />
-    <Compile Include="Remoting\ISimpleCounter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting\RemoteObjectFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting\SaoExporterTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting\SaoFactoryObjectTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Remoting\SimpleCounter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ServiceModel\ServiceExporterTests.cs" />
-    <Compile Include="Web\Services\WebServiceProxyFactoryTests.cs" />
-    <EmbeddedResource Include="Data\Spring\Web\Services\rpc-literal.wsdl" />
-    <EmbeddedResource Include="Data\Spring\Web\Services\document-literal.wsdl" />
-    <None Include="Data\Spring\Web\Services\nestedSchema.wsdl" />
-    <None Include="Data\Spring\Web\Services\nestedSchema.xsd">
-      <SubType>
-      </SubType>
-    </None>
-    <None Include="Data\Spring\Web\Services\Service.cs.fyi" />
-    <EmbeddedResource Include="EnterpriseServices\ExeConfigurationSystemTests.config" />
-    <None Include="Spring.Services.Tests.build" />
-    <None Include="Spring.Services.Tests.dll.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <EmbeddedResource Include="Data\Spring\Remoting\autowire.xml">
-    </EmbeddedResource>
-    <EmbeddedResource Include="Data\Spring\Remoting\cao.xml">
-    </EmbeddedResource>
-    <EmbeddedResource Include="Data\Spring\Remoting\caoLifetimeService.xml">
-    </EmbeddedResource>
-    <EmbeddedResource Include="Data\Spring\Remoting\saoLifetimeService.xml">
-    </EmbeddedResource>
-    <EmbeddedResource Include="Data\Spring\Remoting\saoSingleCall.xml">
-    </EmbeddedResource>
-    <EmbeddedResource Include="Data\Spring\Remoting\saoSingleton.xml">
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Spring\Remoting\remotingConfigurer.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Services\Spring.Services.2008.csproj">
-      <Project>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Project>
-      <Name>Spring.Services.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Aop.Tests\Spring.Aop.Tests.2008.csproj">
-      <Project>{2111596A-0327-4C9D-8919-294FBD988A23}</Project>
-      <Name>Spring.Aop.Tests.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Spring\Web\Services\configurableFactory.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Spring\Remoting\saoSingleton-aop.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Spring\Remoting\saoSingleton-autowired.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ServiceComponentExporterTests.TestServicedComponents.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="ServiceComponentExporterTests.TestServicedComponents.exe.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <Content Include="ServiceComponentExporterTests.TestServicedComponents.Services.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <EmbeddedResource Include="ServiceModel\Config\ChannelFactoryObjectDefinitionParserTests.WithTypeAlias.xml" />
-    <EmbeddedResource Include="ServiceModel\Config\ChannelFactoryObjectDefinitionParserTests.WithoutId.xml" />
-    <EmbeddedResource Include="ServiceModel\Config\ChannelFactoryObjectDefinitionParserTests.CustomProperties.xml" />
-    <EmbeddedResource Include="ServiceModel\Config\ChannelFactoryObjectDefinitionParserTests.BasicConfig.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>echo "Copying .xml files for Spring.Services tests"
-xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q /d
-xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
index 9bc8da0e..d1ea5ac3 100644
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
@@ -17,7 +17,10 @@
          optimize="${build.optimize}"
          debug="${current.build.debug}"
          output="${current.bin.dir}/${project::get-name()}.dll"
-         doc="${current.bin.dir}/${project::get-name()}.xml">
+         doc="${current.bin.dir}/${project::get-name()}.xml"
+		 nostdlib="true"
+		 noconfig="true"
+		 >
       <nowarn>
         <warning number="${nowarn.numbers.test}" />
       </nowarn>
@@ -31,12 +34,22 @@
         <include name="**/*.wsdl" />
         <include name="**/*.config" />
       </resources>
-      <references basedir="${current.bin.dir}">
-        <include name="*.dll" />
+      <references>
+		<include name="mscorlib.dll"/>
+		<include name="Microsoft.CSharp.dll"/>
+		<include name="System.dll"/>
+		<include name="System.Configuration.dll"/>
+		<include name="System.Core.dll"/>
+        <include name="System.EnterpriseServices.dll" />
         <include name="System.ServiceModel.dll" />
-        <exclude name="${project::get-name()}.dll" />
-        <exclude name="CloverRuntime.dll" />
-		<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+        <include name="System.Runtime.Remoting.dll" />
+        <include name="System.Runtime.Serialization.dll" />
+		<include name="System.Web.dll"/>
+		<include name="System.Web.Services.dll"/>
+		<include name="System.Xml.dll"/>
+        <include name="${current.bin.dir}/*.dll" />
+        <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+        <exclude name="${current.bin.dir}/CloverRuntime.dll" />
       </references>
     </csc>
     <copy todir="${current.bin.dir}" verbose="${copy-verbose}" >
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
index c66fb244..210f83ac 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
+++ b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
@@ -15,8 +15,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-      		     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+      		 output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			 >
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -24,11 +27,14 @@
 				<include name="**/*.cs" />
 				<include name="../CommonAssemblyInfo.cs" />
 			</sources>
-			<references basedir="${current.bin.dir}">
-				<include name="*.dll" />
-				<include name="Nvelocity.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Configuration.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
 			</references>
 			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2008.csproj b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2008.csproj
deleted file mode 100644
index f627c577..00000000
--- a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2008.csproj
+++ /dev/null
@@ -1,87 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7321149A-47C6-4FBA-9D1A-26FD6815381B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Testing.Microsoft.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</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>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Testing\Microsoft\AbstractDependencyInjectionSpringContextTestsTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="Spring.Testing.Microsoft.Tests.dll.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Testing\Microsoft\TestApplicationContext.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.Microsoft\Spring.Testing.Microsoft.2008.csproj">
-      <Project>{2E10A8D3-B8FF-4699-90B8-E621659C58DD}</Project>
-      <Name>Spring.Testing.Microsoft.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2008.csproj">
-      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
-      <Name>Spring.Data.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
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
index 63912298..85048fbc 100644
--- a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
+++ b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
@@ -15,8 +15,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+             output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			 >
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -27,16 +30,15 @@
 		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
 			        <include name="**/*.xml" />
 			</resources>
-			<references basedir="${current.bin.dir}">
-				<include name="Spring.Core.dll" />
-				<include name="Spring.Data.dll" />
-				<include name="Spring.Core.Tests.dll" />
-				<include name="Spring.Data.Tests.dll" />
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
 				<include name="${vs-net.mstest.bin.dir.current}\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
 				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2008.csproj b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2008.csproj
deleted file mode 100644
index 546695f1..00000000
--- a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2008.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Testing.NUnit.Tests</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Testing.NUnit.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>..\..\..\build\VS.Net.2008\Spring.Testing.NUnit.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <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" />
-    <Compile Include="NUnitCompilerOptionsTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj">
-      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
-      <Name>Spring.Testing.NUnit.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2008.csproj">
-      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
-      <Name>Spring.Data.Tests.2008</Name>
-    </ProjectReference>
-  </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.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
index c34cebd0..d636ac16 100644
--- a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
@@ -15,8 +15,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+             output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
 			<nowarn>
 				<warning number="${nowarn.numbers.test}" />
 			</nowarn>
@@ -27,11 +30,15 @@
 		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
 			        <include name="**/*.xml" />
 			</resources>
-			<references basedir="${current.bin.dir}">
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />				
+			<references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Data.dll"/>
+				<include name="${current.bin.dir}/*.dll" />
+				<exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+				<exclude name="${current.bin.dir}/CloverRuntime.dll" />
 			</references>
 		</csc>
 
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs
index 497f2df0..913f6608 100644
Binary files a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs and b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs differ
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj
deleted file mode 100644
index cef0c663..00000000
--- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj
+++ /dev/null
@@ -1,149 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2FB16852-22AD-4A5B-885A-97136265CC46}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Web.Conversation.NHibernate32.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Conversation.NHibernate32.Tests\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\build\VS.Net.2008\Spring.Web.Conversation.NHibernate32.Tests\Debug\Spring.Web.Conversation.NHibernate32.Tests.XML</DocumentationFile>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(MSBuildProjectDirectory)\..\..\dependencies\tools\NUnit-2.6.0.12051\bin\nunit-x86.exe</StartProgram>
-    <StartArguments>"$(MSBuildProjectDirectory)\$(OutputPath)\$(AssemblyName).dll"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=3.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate32\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="NUnitAspEx, Version=2.0.3482.27831, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\NUnitAspEx.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.80.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>lib\net\2.0\System.Data.SQLite.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\src\Spring\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Bsn\ConversationEvidenceBsnImpl.cs" />
-    <Compile Include="Bsn\IConversationEvidenceBsn.cs" />
-    <Compile Include="Bsn\INoDeferedErrorBsn.cs" />
-    <Compile Include="Bsn\NoDeferedErrorBsnImpl.cs" />
-    <Compile Include="Conversation\PatialEndConvBeginBasePage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Conversation\PatialEndConvEndBasePage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Conversation\SerializeConversationTestModule.cs" />
-    <Compile Include="Conversation\SimpleTest.cs" />
-    <Compile Include="Conversation\WebConversationStateTest.cs" />
-    <Compile Include="Entities\SPCDetailEnt.cs" />
-    <Compile Include="Entities\SPCMasterEnt.cs" />
-    <Compile Include="Spring\Data\Common\ConnectionCreationTrackingDbProvider.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Conversation.NHibernate32\Spring.Web.Conversation.NHibernate32.2008.csproj">
-      <Project>{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}</Project>
-      <Name>Spring.Web.Conversation.NHibernate32.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate32\Spring.Data.NHibernate32.2008.csproj">
-      <Project>{1C8E0481-A70D-445E-AB4D-4A963CF7DC83}</Project>
-      <Name>Spring.Data.NHibernate32.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web\Spring.Web.2008.csproj">
-      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
-      <Name>Spring.Web.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Data\Spring\Conversation\WebConversationStateTest\log4net.config" />
-    <None Include="Data\Spring\Conversation\WebConversationStateTest\services.xml.config" />
-    <None Include="Data\Spring\Conversation\WebConversationStateTest\web.config.net-2.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Entities\SPCDetailEnt.hbm.xml" />
-    <EmbeddedResource Include="Entities\SPCMasterEnt.hbm.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="Data\Spring\Conversation\WebConversationStateTest\Web.Config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>echo "Copying TestWebs to output directory"
-rd /S /Q "$(TargetDir)Data"
-xcopy "$(ProjectDir)Data" "$(TargetDir)Data\" /y /s
-rd /S /Q "$(TargetDir)Data\Spring\Conversation\WebConversationStateTest\Bin"
-</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj
index 6172345b..0f61d1af 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj
@@ -37,7 +37,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Conversation.NHibernate32.Tests\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET_40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\..\..\build\VS.Net.2010\Spring.Web.Conversation.NHibernate32.Tests\Debug\Spring.Web.Conversation.NHibernate32.Tests.XML</DocumentationFile>
@@ -48,8 +48,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Conversation.NHibernate32.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.build b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.build
index 3b66f442..340884da 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.build
+++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.build
@@ -21,8 +21,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-      		     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+      		 output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
       <nowarn>
         <warning number="${nowarn.numbers.test}" />
       </nowarn>
@@ -32,22 +35,24 @@
         <exclude name="Data/**/*.*" />
         <exclude name="bin/**/*" />
       </sources>
-      <references basedir="${current.bin.dir}">
+      <references>
         <lib>
           <include name="${nh32.lib.dir}"/>
         </lib>
+		<include name="mscorlib.dll"/>
+		<include name="Microsoft.CSharp.dll"/>
+		<include name="System.dll"/>
+		<include name="System.Configuration.dll"/>
+		<include name="System.Core.dll"/>
         <include name="System.Data.dll" />
         <include name="System.EnterpriseServices.dll" />
-        <include name="*.dll" />
-        <exclude name="${project::get-name()}.dll" />
-        <exclude name="Spring.Data.NHibernate1*.dll" />
-        <exclude name="Spring.Data.NHibernate2*.dll" />
-        <exclude name="Spring.Data.NHibernate30*.dll" />
-        <exclude name="Spring.Data.NHibernate33*.dll" />
-        <exclude name="Spring.Web.Conversation.NHibernate33*.dll" />
-        <exclude name="Spring.Data.NHibernate*Tests*.dll" />
-        <exclude name="CloverRuntime.dll" />
-        <exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+        <include name="System.Web.dll" />
+        <include name="${current.bin.dir}/*.dll" />
+        <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+        <exclude name="${current.bin.dir}/Spring.Data.NHibernate33*.dll" />
+        <exclude name="${current.bin.dir}/Spring.Web.Conversation.NHibernate33*.dll" />
+        <exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
+        <exclude name="${current.bin.dir}/CloverRuntime.dll" />
       </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
         <include name="**/*.xml" />
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj
deleted file mode 100644
index b8a46346..00000000
--- a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj
+++ /dev/null
@@ -1,176 +0,0 @@
-<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>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Web.Conversation.NHibernate33.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Conversation.NHibernate33.Tests\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(MSBuildProjectDirectory)\..\..\dependencies\tools\NUnit-2.6.0.12051\bin\nunit-x86.exe</StartProgram>
-    <StartArguments>"$(MSBuildProjectDirectory)\$(OutputPath)\$(AssemblyName).dll"</StartArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="NHibernate, Version=3.3.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\NHibernate33\net\3.5\NHibernate.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="NUnitAspEx, Version=2.0.3482.27831, Culture=neutral">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\NUnitAspEx.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.80.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Spring.Web.Conversation.NHibernate32.Tests\lib\net\2.0\System.Data.SQLite.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\src\Spring\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\ConversationEvidenceBsnImpl.cs">
-      <Link>Bsn\ConversationEvidenceBsnImpl.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\IConversationEvidenceBsn.cs">
-      <Link>Bsn\IConversationEvidenceBsn.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\INoDeferedErrorBsn.cs">
-      <Link>Bsn\INoDeferedErrorBsn.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\NoDeferedErrorBsnImpl.cs">
-      <Link>Bsn\NoDeferedErrorBsnImpl.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Conversation\PatialEndConvBeginBasePage.cs">
-      <Link>Conversation\PatialEndConvBeginBasePage.cs</Link>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Conversation\PatialEndConvEndBasePage.cs">
-      <Link>Conversation\PatialEndConvEndBasePage.cs</Link>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Conversation\SerializeConversationTestModule.cs">
-      <Link>Conversation\SerializeConversationTestModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Conversation\WebConversationStateTest.cs">
-      <Link>Conversation\WebConversationStateTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Entities\SPCDetailEnt.cs">
-      <Link>Entities\SPCDetailEnt.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Entities\SPCMasterEnt.cs">
-      <Link>Entities\SPCMasterEnt.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Spring\Data\Common\ConnectionCreationTrackingDbProvider.cs">
-      <Link>Spring\Data\Common\ConnectionCreationTrackingDbProvider.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Conversation.NHibernate33\Spring.Web.Conversation.NHibernate33.2008.csproj">
-      <Project>{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}</Project>
-      <Name>Spring.Web.Conversation.NHibernate33.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate33\Spring.Data.NHibernate33.2008.csproj">
-      <Project>{67EA5988-C54E-4348-BFFB-E4A61F26143C}</Project>
-      <Name>Spring.Data.NHibernate33.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web\Spring.Web.2008.csproj">
-      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
-      <Name>Spring.Web.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Data\Spring\Conversation\WebConversationStateTest\services.xml.config" />
-    <None Include="Data\Spring\Conversation\WebConversationStateTest\web.config.net-2.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Entities\SPCDetailEnt.hbm.xml" />
-    <EmbeddedResource Include="Entities\SPCMasterEnt.hbm.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Spring.Web.Conversation.NHibernate32.Tests\Data\Spring\Conversation\WebConversationStateTest\log4net.config">
-      <Link>Data\Spring\Conversation\WebConversationStateTest\log4net.config</Link>
-    </None>
-    <None Include="app.config" />
-    <None Include="Data\Spring\Conversation\WebConversationStateTest\Web.Config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>echo "Copying TestWebs to output directory"
-rd /S /Q "$(TargetDir)Data"
-xcopy "$(ProjectDir)..\Spring.Web.Conversation.NHibernate32.Tests\Data" "$(TargetDir)Data\" /y /s
-xcopy "$(ProjectDir)Data" "$(TargetDir)Data\" /y /s
-rd /S /Q "$(TargetDir)Data\Spring\Conversation\WebConversationStateTest\Bin"
-</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj
index 760580ae..0dc6abe6 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj
@@ -37,7 +37,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Conversation.NHibernate33.Tests\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET_40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>
@@ -49,8 +49,8 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Conversation.NHibernate33.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -154,7 +154,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Data\Spring\Conversation\WebConversationStateTest\services.xml.config" />
-    <None Include="Data\Spring\Conversation\WebConversationStateTest\web.config.net-1.1" />
     <None Include="Data\Spring\Conversation\WebConversationStateTest\web.config.net-2.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.build b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.build
index 46a1a774..076e249b 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.build
+++ b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.build
@@ -21,8 +21,11 @@
 		     warnaserror="true"
 		     optimize="${build.optimize}"
 		     debug="${current.build.debug}"
-      		     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
+      		 output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
       <nowarn>
         <warning number="${nowarn.numbers.test}" />
       </nowarn>
@@ -36,22 +39,24 @@
         <exclude name="../Spring.Web.Conversation.NHibernate32.Tests/Data/**/*.*" />
         <exclude name="../Spring.Web.Conversation.NHibernate32.Tests/bin/**/*" />
       </sources>
-      <references basedir="${current.bin.dir}">
+      <references>
         <lib>
           <include name="${nh33.lib.dir}"/>
         </lib>
+		<include name="mscorlib.dll"/>
+		<include name="Microsoft.CSharp.dll"/>
+		<include name="System.dll"/>
+		<include name="System.Configuration.dll"/>
+		<include name="System.Core.dll"/>
         <include name="System.Data.dll" />
         <include name="System.EnterpriseServices.dll" />
-        <include name="*.dll" />
-        <exclude name="${project::get-name()}.dll" />
-        <exclude name="Spring.Data.NHibernate1*.dll" />
-        <exclude name="Spring.Data.NHibernate2*.dll" />
-        <exclude name="Spring.Data.NHibernate30*.dll" />
-        <exclude name="Spring.Data.NHibernate32*.dll" />
-        <exclude name="Spring.Web.Conversation.NHibernate32*.dll" />
-        <exclude name="Spring.Data.NHibernate*Tests*.dll" />
-        <exclude name="CloverRuntime.dll" />
-        <exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
+        <include name="System.Web.dll" />
+		<include name="${current.bin.dir}/*.dll" />
+        <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+        <exclude name="${current.bin.dir}/Spring.Data.NHibernate32*.dll" />
+        <exclude name="${current.bin.dir}/Spring.Web.Conversation.NHibernate32*.dll" />
+        <exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
+        <exclude name="${current.bin.dir}/CloverRuntime.dll" />
       </references>
       <resources prefix="Spring" dynamicprefix="true" failonempty="true">
         <include name="**/*.xml" />
diff --git a/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build b/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build
index 354eea63..06e16d67 100644
--- a/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build
+++ b/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build
@@ -12,11 +12,14 @@
     <target name="build">
         <!-- build Spring.Web.Mvc -->
         <csc target="library" define="${current.build.defines.csc}" 
-	     warnaserror="true" 
+			 warnaserror="true" 
              optimize="${build.optimize}"
-	     debug="${current.build.debug}"
+			 debug="${current.build.debug}"
              output="${current.bin.dir}/${project::get-name()}.dll" 
-	     doc="${current.bin.dir}/${project::get-name()}.xml">
+			 doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			 >
             <nowarn>
                 <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
                 <warning number="${nowarn.numbers.test},1587" if="${nant.settings.currentframework=='mono-2.0'}"/>
@@ -33,14 +36,17 @@
                 <exclude name="Data/**/*" />
                 <exclude name="obj/**/*" />
             </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'}" />
+            <references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Configuration.dll" />
+				<include name="System.Drawing.dll" />
+				<include name="System.Xml.dll" />
+				<include name="System.Web.dll" />
+				<include name="System.Web.Services.dll" />
+				<include name="System.Data.dll" />
 				
 				<include name="System.Web.Abstractions.dll"/>
 				<include name="System.Web.Routing.dll"/>
@@ -49,14 +55,14 @@
 				<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 3\Assemblies\System.Web.Mvc.dll" />
 
 				
-                <exclude name="${project::get-name()}.dll" />
+                <include name="${current.bin.dir}/*.dll" />
+                <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
             
                 <include name="${lib.dir}/nunit.core.interfaces.dll" />
-				<exclude name="System.Web.Extensions.dll" />
-				<exclude name="Spring.Web.Mvc.dll" />
-				<exclude name="Spring.Web.Mvc.Tests.dll" />
-				<exclude name="Spring.Web.Mvc4.dll" />
-				<exclude name="Spring.Web.Mvc4.Tests.dll" />
+				<exclude name="${current.bin.dir}/Spring.Web.Mvc.dll" />
+				<exclude name="${current.bin.dir}/Spring.Web.Mvc.Tests.dll" />
+				<exclude name="${current.bin.dir}/Spring.Web.Mvc4.dll" />
+				<exclude name="${current.bin.dir}/Spring.Web.Mvc4.Tests.dll" />
             </references>
         </csc>
         <copy todir="${current.bin.dir}">
diff --git a/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build b/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build
index 78cf1375..2ef08c6a 100644
--- a/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build
+++ b/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build
@@ -12,14 +12,17 @@
     <target name="build">
         <!-- build Spring.Web.Mvc -->
         <csc target="library" define="${current.build.defines.csc}" 
-	     warnaserror="true" 
+			 warnaserror="true" 
              optimize="${build.optimize}"
-	     debug="${current.build.debug}"
+			 debug="${current.build.debug}"
              output="${current.bin.dir}/${project::get-name()}.dll" 
-	     doc="${current.bin.dir}/${project::get-name()}.xml">
+			 doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
             <nowarn>
                 <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
-                <warning number="${nowarn.numbers.test},1587" if="${nant.settings.currentframework=='mono-2.0'}"/>
+                <warning number="${nowarn.numbers.test},1587"/>
             </nowarn>
             <sources failonempty="true">
                 <include name="**/*.cs" />
@@ -37,14 +40,17 @@
                 <exclude name="../Spring.Web.Mvc3.Tests/obj/**/*" />
                 <exclude name="../Spring.Web.Mvc3.Tests/bin/**/*" />
             </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'}" />
+            <references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Configuration.dll" />
+				<include name="System.Drawing.dll" />
+				<include name="System.Xml.dll" />
+				<include name="System.Web.dll" />
+				<include name="System.Web.Services.dll" />
+				<include name="System.Data.dll" />
 				
 				<include name="System.Web.Abstractions.dll"/>
 				<include name="System.Web.Routing.dll"/>
@@ -56,15 +62,15 @@
 				<include name="${programfiles}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Http.WebHost.dll" />
 				<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 4\Assemblies\System.Web.Http.WebHost.dll" />
 
-				
-                <exclude name="${project::get-name()}.dll" />
+                <include name="${current.bin.dir}/*.dll" />
+                <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
             
                 <include name="${lib.dir}/nunit.core.interfaces.dll" />
-				<exclude name="System.Web.Extensions.dll" />
-				<exclude name="Spring.Web.Mvc.dll" />
-				<exclude name="Spring.Web.Mvc.Tests.dll" />
-				<exclude name="Spring.Web.Mvc3.dll" />
-				<exclude name="Spring.Web.Mvc3.Tests.dll" />
+				<exclude name="${current.bin.dir}/System.Web.Extensions.dll" />
+				<exclude name="${current.bin.dir}/Spring.Web.Mvc.dll" />
+				<exclude name="${current.bin.dir}/Spring.Web.Mvc.Tests.dll" />
+				<exclude name="${current.bin.dir}/Spring.Web.Mvc3.dll" />
+				<exclude name="${current.bin.dir}/Spring.Web.Mvc3.Tests.dll" />
             </references>
         </csc>
         <copy todir="${current.bin.dir}">
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2008.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2008.csproj
deleted file mode 100644
index 0df5423b..00000000
--- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2008.csproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C67E47AA-1ACD-41B4-A465-4D336A2319CA}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>Spring.Web.Tests</AssemblyName>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Spring</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <PublishUrl>http://localhost/Spring.Web.Tests/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Tests\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>0618</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Tests\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Caching\AspNetCacheTests.cs" />
-    <Compile Include="Context\Support\HttpApplicationConfigurerTests.cs" />
-    <Compile Include="Context\Support\WebApplicationContextArgsTests.cs" />
-    <Compile Include="Context\Support\WebApplicationContextTests.cs" />
-    <Compile Include="Core\IO\WebResourceTests.cs" />
-    <Compile Include="Data\Spring\Objects\Factory\Support\TestForm.aspx.cs">
-      <DependentUpon>TestForm.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Globalization\Resolvers\DefaultWebCultureResolverTests.cs" />
-    <Compile Include="WebCompilerOptionsTests.cs" />
-    <Compile Include="Objects\Factory\Support\WebObjectDefinitionFactoryTests.cs" />
-    <Compile Include="Objects\Factory\Support\WebObjectDefinitionTests.cs" />
-    <Compile Include="Objects\Factory\Support\WebObjectFactoryTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Objects\Factory\Support\WebObjectUtilsTests.cs" />
-    <Compile Include="Objects\Factory\Xml\WebObjectDefinitionReaderTests.cs" />
-    <Compile Include="TestSupport\NUnitAdapter.cs" />
-    <Compile Include="TestSupport\SessionMock.cs" />
-    <Compile Include="TestSupport\TestPage.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TestSupport\TestWebContext.cs" />
-    <Compile Include="TestSupport\TestWebContextTests.cs" />
-    <Compile Include="TestSupport\VirtualEnvironmentMock.cs" />
-    <Compile Include="TestSupport\VoidDelegate.cs" />
-    <Compile Include="TestSupport\WebApplicationTests.cs" />
-    <Compile Include="Threading\HttpContextStorageTests.cs" />
-    <Compile Include="Threading\HybridContextStorageTests.cs" />
-    <Compile Include="Util\WebDIPerformanceTests.cs" />
-    <Compile Include="Util\WebUtilsTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\Services\WebServiceExporterTests.cs" />
-    <Compile Include="Web\Support\AbstractHandlerFactoryTests.cs" />
-    <Compile Include="Web\Support\ControlInterceptionTests.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Web\Support\HandlerMapTests.cs" />
-    <Compile Include="Web\Support\LocalResourceManagerTests.cs" />
-    <Compile Include="Web\Support\MimeMediaTypeTests.cs" />
-    <Compile Include="Web\Support\PageHandlerFactoryTests.cs" />
-    <Compile Include="Web\Support\ResultFactoryRegistryTests.cs" />
-    <Compile Include="Web\Support\ResultTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Web\UI\Controls\AbstractValidationControlTests.cs" />
-    <Compile Include="Web\UI\Controls\HeadTests.cs" />
-    <Compile Include="Web\UI\Controls\ValidationErrorsTests.cs" />
-    <Compile Include="Web\UI\Controls\ValidationSummaryTests.cs" />
-    <Compile Include="TestSupport\DictionaryModelPersistenceMedium.cs" />
-    <Compile Include="Web\UI\PageTests.cs">
-    </Compile>
-    <Compile Include="TestSupport\TestUserControl.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Web\UI\SessionModelPersistenceMediumTests.cs" />
-    <Compile Include="Web\UI\UserControlTests.cs">
-    </Compile>
-    <None Include="Data\Spring\Context\Support\WebApplicationContextTests\Web.Config" />
-    <None Include="Data\Spring\Web\Support\LocalResourceManagerTests\Web.Config" />
-    <None Include="Data\Spring\Web\Support\PageHandlerFactoryTests\Web.Config.net-1.1" />
-    <None Include="Data\Spring\Web\Support\PageHandlerFactoryTests\Web.Config.net-2.0" />
-    <None Include="Spring.Web.Tests.build" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Context\Support\HttpApplicationConfigurerTests.xml" />
-    <EmbeddedResource Include="Context\Support\HttpApplicationConfigurerMergablePropertiesTests.xml" />
-    <Content Include="Data\Spring\Context\Support\WebApplicationContextTests\Dummy.aspx" />
-    <Content Include="Data\Spring\Objects\Factory\Support\TestForm.aspx" />
-    <Content Include="Data\Spring\Web\Support\LocalResourceManagerTests\WithoutResources.aspx" />
-    <Content Include="Data\Spring\Web\Support\LocalResourceManagerTests\WithResources.aspx" />
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\ReadOnlySession.aspx" />
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResult.aspx" />
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\MaintainsSession1.aspx" />
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\MaintainsSession2.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\DisablesSession.aspx" />
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResultSave.aspx" />
-    <EmbeddedResource Include="Data\Spring\Web\Support\LocalResourceManagerTests\App_LocalResources\WithResources.aspx.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Web\Support\ControlInterceptionTests.objects.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="NUnitAsp, Version=1.5.1.27647, Culture=neutral, PublicKeyToken=f9bdb8e9d00f2b23">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\NUnitAsp.dll</HintPath>
-    </Reference>
-    <Reference Include="NUnitAspEx, Version=1.0.2892.39670, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\NUnitAspEx.dll</HintPath>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, 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.configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web\Spring.Web.2008.csproj">
-      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
-      <Name>Spring.Web.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>echo "Copying .xml files for tests"
-%25SystemRoot%25\system32\xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Web.Tests\$(ConfigurationName)\ /y /s /q /d
-</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
index ee59118e..4c10ab86 100644
--- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
@@ -12,14 +12,17 @@
     <target name="build">
         <!-- build Spring.Web -->
         <csc target="library" define="${current.build.defines.csc}" 
-	     warnaserror="true" 
+			 warnaserror="true" 
              optimize="${build.optimize}"
-	     debug="${current.build.debug}"
+			 debug="${current.build.debug}"
              output="${current.bin.dir}/${project::get-name()}.dll" 
-	     doc="${current.bin.dir}/${project::get-name()}.xml">
+			 doc="${current.bin.dir}/${project::get-name()}.xml"
+			 nostdlib="true"
+			 noconfig="true"
+			>
             <nowarn>
                 <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
-                <warning number="${nowarn.numbers.test},1587" if="${nant.settings.currentframework=='mono-2.0'}"/>
+                <warning number="${nowarn.numbers.test},1587"/>
             </nowarn>
             <sources failonempty="true">
                 <include name="**/*.cs" />
@@ -33,18 +36,21 @@
                 <exclude name="Data/**/*" />
                 <exclude name="obj/**/*" />
             </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" />
+            <references>
+				<include name="mscorlib.dll"/>
+				<include name="Microsoft.CSharp.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Configuration.dll" />
+				<include name="System.Drawing.dll" />
+				<include name="System.Xml.dll" />
+				<include name="System.Web.dll" />
+				<include name="System.Web.Services.dll" />
+				<include name="System.Data.dll" />
+                <include name="${current.bin.dir}/*.dll" />
+                <exclude name="${current.bin.dir}/${project::get-name()}.dll" />
+                <exclude name="${current.bin.dir}/CloverRuntime.dll" />
                 <include name="${lib.dir}/nunit.core.interfaces.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
             </references>
         </csc>
         <copy todir="${current.bin.dir}">
diff --git a/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs
index 118a9f81..d78f4955 100644
--- a/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs
+++ b/test/Spring/Spring.Web.Tests/Web/Support/LocalResourceManagerTests.cs
@@ -30,6 +30,9 @@ namespace Spring.Web.Support
     /// </summary>
     /// <author>Erich Eichinger</author>
     [TestFixture]
+#if NET_4_0
+    [Ignore("Trouble with running under .NET 4.5")]
+#endif
     public class LocalResourceManagerTests : WebApplicationTests
     {
         public LocalResourceManagerTests()