diff --git a/Spring.Net.2010.sln b/Spring.Net.2010.sln
new file mode 100644
index 00000000..717a1217
--- /dev/null
+++ b/Spring.Net.2010.sln
@@ -0,0 +1,420 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+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.2010", "src\Spring\Spring.Core\Spring.Core.2010.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2010", "test\Spring\Spring.Core.Tests\Spring.Core.Tests.2010.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2010", "src\Spring\Spring.Aop\Spring.Aop.2010.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.Tests.2010", "test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.2010.csproj", "{2111596A-0327-4C9D-8919-294FBD988A23}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.2010", "src\Spring\Spring.Services\Spring.Services.2010.csproj", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.Tests.2010", "test\Spring\Spring.Services.Tests\Spring.Services.Tests.2010.csproj", "{4374F018-9738-46BF-A399-4594CEE75B21}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.2010", "src\Spring\Spring.Web\Spring.Web.2010.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Tests.2010", "test\Spring\Spring.Web.Tests\Spring.Web.Tests.2010.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2010", "src\Spring\Spring.Data\Spring.Data.2010.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2010", "test\Spring\Spring.Data.Tests\Spring.Data.Tests.2010.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Integration.Tests.2010", "test\Spring\Spring.Data.Integration.Tests\Spring.Data.Integration.Tests.2010.csproj", "{91766D21-C568-459F-9BEA-759B011F23CF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Extensions.2010", "src\Spring\Spring.Web.Extensions\Spring.Web.Extensions.2010.csproj", "{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2010", "src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj", "{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate12.2010", "src\Spring\Spring.Data.NHibernate12\Spring.Data.NHibernate12.2010.csproj", "{90F2D070-6F98-4926-A626-BD7A6071D6D9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.Tests.2010", "test\Spring\Spring.Testing.NUnit.Tests\Spring.Testing.NUnit.Tests.2010.csproj", "{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz.2010", "src\Spring\Spring.Scheduling.Quartz\Spring.Scheduling.Quartz.2010.csproj", "{E823D54C-CE82-4868-929F-5F95A999F61E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz.Tests.2010", "test\Spring\Spring.Scheduling.Quartz.Tests\Spring.Scheduling.Quartz.Tests.2010.csproj", "{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.2010", "src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2010.csproj", "{AEB1578C-9018-4D49-B440-789F38DD2F29}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.Tests.2010", "test\Spring\Spring.Messaging.Nms.Tests\Spring.Messaging.Nms.Tests.2010.csproj", "{FA7A6931-7DBE-4A32-A312-51FAD2E80332}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate20.2010", "src\Spring\Spring.Data.NHibernate20\Spring.Data.NHibernate20.2010.csproj", "{71368632-B8B7-4A6A-8C65-8DA848120C82}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.2010", "src\Spring\Spring.Messaging\Spring.Messaging.2010.csproj", "{0E23AE41-D8D8-41C2-84A2-D35564049F0D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Tests.2010", "test\Spring\Spring.Messaging.Tests\Spring.Messaging.Tests.2010.csproj", "{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate20.Tests.2010", "test\Spring\Spring.Data.NHibernate20.Tests\Spring.Data.NHibernate20.Tests.2010.csproj", "{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate21.Tests.2010", "test\Spring\Spring.Data.NHibernate21.Tests\Spring.Data.NHibernate21.Tests.2010.csproj", "{90FEE979-7367-4542-BCCB-BF634E04A9D3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate21.2010", "src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.2010.csproj", "{E57B4652-0231-49CB-B058-87E10EFE540D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Template.Velocity.2010", "src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2010.csproj", "{BF3AB954-8375-407C-9E98-4C51D8072784}"
+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.Data.NHibernate30.2010", "src\Spring\Spring.Data.NHibernate30\Spring.Data.NHibernate30.2010.csproj", "{009247FE-CBAD-40FF-ADC3-D7F28B270071}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate30.Tests.2010", "test\Spring\Spring.Data.NHibernate30.Tests\Spring.Data.NHibernate30.Tests.2010.csproj", "{E4CCB8A2-2381-41D1-B44C-E20E13703056}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate21.Integration.Tests.2010", "test\Spring\Spring.Data.NHibernate21.Integration.Tests\Spring.Data.NHibernate21.Integration.Tests.2010.csproj", "{4A07E150-ED90-407C-8CAD-4760444DDFD9}"
+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
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|.NET.Build.0 = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|.NET.ActiveCfg = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|.NET.Build.0 = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.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
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|.NET.ActiveCfg = Release|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.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
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|.NET.ActiveCfg = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{71368632-B8B7-4A6A-8C65-8DA848120C82}.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
+		{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}.Release|.NET.ActiveCfg = Release|Any CPU
+		{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{90FEE979-7367-4542-BCCB-BF634E04A9D3}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{90FEE979-7367-4542-BCCB-BF634E04A9D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90FEE979-7367-4542-BCCB-BF634E04A9D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90FEE979-7367-4542-BCCB-BF634E04A9D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{90FEE979-7367-4542-BCCB-BF634E04A9D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{90FEE979-7367-4542-BCCB-BF634E04A9D3}.Release|.NET.ActiveCfg = Release|Any CPU
+		{90FEE979-7367-4542-BCCB-BF634E04A9D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90FEE979-7367-4542-BCCB-BF634E04A9D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90FEE979-7367-4542-BCCB-BF634E04A9D3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{90FEE979-7367-4542-BCCB-BF634E04A9D3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E57B4652-0231-49CB-B058-87E10EFE540D}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E57B4652-0231-49CB-B058-87E10EFE540D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E57B4652-0231-49CB-B058-87E10EFE540D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E57B4652-0231-49CB-B058-87E10EFE540D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E57B4652-0231-49CB-B058-87E10EFE540D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E57B4652-0231-49CB-B058-87E10EFE540D}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E57B4652-0231-49CB-B058-87E10EFE540D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E57B4652-0231-49CB-B058-87E10EFE540D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E57B4652-0231-49CB-B058-87E10EFE540D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E57B4652-0231-49CB-B058-87E10EFE540D}.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
+		{009247FE-CBAD-40FF-ADC3-D7F28B270071}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{009247FE-CBAD-40FF-ADC3-D7F28B270071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{009247FE-CBAD-40FF-ADC3-D7F28B270071}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{009247FE-CBAD-40FF-ADC3-D7F28B270071}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{009247FE-CBAD-40FF-ADC3-D7F28B270071}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{009247FE-CBAD-40FF-ADC3-D7F28B270071}.Release|.NET.ActiveCfg = Release|Any CPU
+		{009247FE-CBAD-40FF-ADC3-D7F28B270071}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{009247FE-CBAD-40FF-ADC3-D7F28B270071}.Release|Any CPU.Build.0 = Release|Any CPU
+		{009247FE-CBAD-40FF-ADC3-D7F28B270071}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{009247FE-CBAD-40FF-ADC3-D7F28B270071}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E4CCB8A2-2381-41D1-B44C-E20E13703056}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E4CCB8A2-2381-41D1-B44C-E20E13703056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4CCB8A2-2381-41D1-B44C-E20E13703056}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4CCB8A2-2381-41D1-B44C-E20E13703056}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E4CCB8A2-2381-41D1-B44C-E20E13703056}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E4CCB8A2-2381-41D1-B44C-E20E13703056}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E4CCB8A2-2381-41D1-B44C-E20E13703056}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4CCB8A2-2381-41D1-B44C-E20E13703056}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4CCB8A2-2381-41D1-B44C-E20E13703056}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E4CCB8A2-2381-41D1-B44C-E20E13703056}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|.NET.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.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/src/Spring/Spring.Aop/Spring.Aop.2010.csproj b/src/Spring/Spring.Aop/Spring.Aop.2010.csproj
new file mode 100644
index 00000000..50c74b1f
--- /dev/null
+++ b/src/Spring/Spring.Aop/Spring.Aop.2010.csproj
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v2.0</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>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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.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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</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.Core/Spring.Core.2010.csproj b/src/Spring/Spring.Core/Spring.Core.2010.csproj
new file mode 100644
index 00000000..7d2bf10c
--- /dev/null
+++ b/src/Spring/Spring.Core/Spring.Core.2010.csproj
@@ -0,0 +1,1252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v2.0</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>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Core\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;DEBUG_DYNAMICX</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.2010\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.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\ReadOnlyDictionary.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\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="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\IO\EncodedResource.cs" />
+    <Compile Include="Core\MethodArgumentsCriteria.cs" />
+    <Compile Include="Core\IO\AbstractResource.cs" />
+    <Compile Include="Core\IO\AssemblyResource.cs" />
+    <Compile Include="Core\IO\ConfigSectionResource.cs" />
+    <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\RequiredAttribute.cs" />
+    <Compile Include="Objects\Factory\Attributes\RequiredAttributeObjectPostProcessor.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\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\ReaderContext.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\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\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\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" />
+    <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.Data.NHibernate12/Spring.Data.NHibernate12.2010.csproj b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2010.csproj
new file mode 100644
index 00000000..449472ad
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2010.csproj
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{90F2D070-6F98-4926-A626-BD7A6071D6D9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate12</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate12\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Data.NHibernate12.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate12\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</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="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate12\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate12\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="..\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\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\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\SessionHolder.cs">
+      <Link>Data\NHibernate\SessionHolder.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" />
+    <Compile Include="Data\NHibernate\Generic\FindHibernateDelegate.cs" />
+    <Compile Include="Data\NHibernate\Generic\HibernateDaoSupport.cs" />
+    <Compile Include="Data\NHibernate\Generic\HibernateDelegate.cs" />
+    <Compile Include="Data\NHibernate\Generic\HibernateTemplate.cs" />
+    <Compile Include="Data\NHibernate\Generic\IFindHibernateCallback.cs" />
+    <Compile Include="Data\NHibernate\Generic\IHibernateCallback.cs" />
+    <Compile Include="Data\NHibernate\Generic\IHibernateOperations.cs" />
+    <Compile Include="Data\NHibernate\HibernateAccessor.cs" />
+    <Compile Include="Data\NHibernate\HibernateOptimisticLockingFailureException.cs" />
+    <Compile Include="Data\NHibernate\LocalSessionFactoryObject.cs" />
+    <Compile Include="Data\NHibernate\SessionFactoryUtils.cs" />
+    <Compile Include="Data\NHibernate\SpringSessionContext.cs" />
+    <Compile Include="Data\NHibernate\SpringSessionSynchronization.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</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.NHibernate20/Spring.Data.NHibernate20.2010.csproj b/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2010.csproj
new file mode 100644
index 00000000..138bf3ac
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.2010.csproj
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{71368632-B8B7-4A6A-8C65-8DA848120C82}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate20</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate20\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Data.NHibernate20.xml</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate20\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</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="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate20\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=2.0.0.1001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate20\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="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\FindHibernateDelegate.cs">
+      <Link>Data\NHibernate\Generic\FindHibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateDaoSupport.cs">
+      <Link>Data\NHibernate\Generic\HibernateDaoSupport.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateDelegate.cs">
+      <Link>Data\NHibernate\Generic\HibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateTemplate.cs">
+      <Link>Data\NHibernate\Generic\HibernateTemplate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IFindHibernateCallback.cs">
+      <Link>Data\NHibernate\Generic\IFindHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IHibernateCallback.cs">
+      <Link>Data\NHibernate\Generic\IHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IHibernateOperations.cs">
+      <Link>Data\NHibernate\Generic\IHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\HibernateAccessor.cs">
+      <Link>Data\NHibernate\HibernateAccessor.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SpringSessionContext.cs">
+      <Link>Data\NHibernate\SpringSessionContext.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SpringSessionSynchronization.cs">
+      <Link>Data\NHibernate\SpringSessionSynchronization.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\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\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.NHibernate12\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\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" />
+    <Compile Include="Data\NHibernate\FilterDefiniitionFactoryObject.cs" />
+    <Compile Include="Data\NHibernate\HibernateObjectRetrievalFailureException.cs" />
+    <Compile Include="Data\NHibernate\HibernateOptimisticLockingFailureException.cs" />
+    <Compile Include="Data\NHibernate\LocalSessionFactoryObject.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Data.NHibernate20.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/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2010.csproj b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2010.csproj
new file mode 100644
index 00000000..024ca17f
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.2010.csproj
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E57B4652-0231-49CB-B058-87E10EFE540D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate21</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate21\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Data.NHibernate21.xml</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>
+    </NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate21\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Antlr3.Runtime, Version=3.1.0.39271, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\Antlr3.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.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.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=2.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\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="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\FindHibernateDelegate.cs">
+      <Link>Data\NHibernate\Generic\FindHibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateDaoSupport.cs">
+      <Link>Data\NHibernate\Generic\HibernateDaoSupport.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateDelegate.cs">
+      <Link>Data\NHibernate\Generic\HibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateTemplate.cs">
+      <Link>Data\NHibernate\Generic\HibernateTemplate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IFindHibernateCallback.cs">
+      <Link>Data\NHibernate\Generic\IFindHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IHibernateCallback.cs">
+      <Link>Data\NHibernate\Generic\IHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IHibernateOperations.cs">
+      <Link>Data\NHibernate\Generic\IHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\HibernateAccessor.cs">
+      <Link>Data\NHibernate\HibernateAccessor.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SpringSessionContext.cs">
+      <Link>Data\NHibernate\SpringSessionContext.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SpringSessionSynchronization.cs">
+      <Link>Data\NHibernate\SpringSessionSynchronization.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\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\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.NHibernate12\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\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="..\Spring.Data.NHibernate20\Data\NHibernate\FilterDefiniitionFactoryObject.cs">
+      <Link>Data\NHibernate\FilterDefiniitionFactoryObject.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\HibernateObjectRetrievalFailureException.cs">
+      <Link>Data\NHibernate\HibernateObjectRetrievalFailureException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\HibernateOptimisticLockingFailureException.cs">
+      <Link>Data\NHibernate\HibernateOptimisticLockingFailureException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\LocalSessionFactoryObject.cs">
+      <Link>Data\NHibernate\LocalSessionFactoryObject.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\LazyInitializer.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\ProxyFactory.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\ProxyFactoryFactory.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\ReflectionOptimizer.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\BytecodeProvider.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\ObjectsFactory.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Data.NHibernate21.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/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2010.csproj b/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2010.csproj
new file mode 100644
index 00000000..afaace11
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate30/Spring.Data.NHibernate30.2010.csproj
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{009247FE-CBAD-40FF-ADC3-D7F28B270071}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate30</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate30\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_1,NH_3_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Data.NHibernate30.xml</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>
+    </NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate30\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NH_2_1</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="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate30\net\3.5\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate">
+      <HintPath>..\..\..\lib\NHibernate30\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.Data.NHibernate12\Data\NHibernate\Generic\FindHibernateDelegate.cs">
+      <Link>Data\NHibernate\Generic\FindHibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateDaoSupport.cs">
+      <Link>Data\NHibernate\Generic\HibernateDaoSupport.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateDelegate.cs">
+      <Link>Data\NHibernate\Generic\HibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\HibernateTemplate.cs">
+      <Link>Data\NHibernate\Generic\HibernateTemplate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IFindHibernateCallback.cs">
+      <Link>Data\NHibernate\Generic\IFindHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IHibernateCallback.cs">
+      <Link>Data\NHibernate\Generic\IHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\Generic\IHibernateOperations.cs">
+      <Link>Data\NHibernate\Generic\IHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\HibernateAccessor.cs">
+      <Link>Data\NHibernate\HibernateAccessor.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SpringSessionContext.cs">
+      <Link>Data\NHibernate\SpringSessionContext.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate12\Data\NHibernate\SpringSessionSynchronization.cs">
+      <Link>Data\NHibernate\SpringSessionSynchronization.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate21\Data\NHibernate\Bytecode\BytecodeProvider.cs">
+      <Link>Data\NHibernate\Bytecode\BytecodeProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate21\Data\NHibernate\Bytecode\LazyInitializer.cs">
+      <Link>Data\NHibernate\Bytecode\LazyInitializer.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate21\Data\NHibernate\Bytecode\ObjectsFactory.cs">
+      <Link>Data\NHibernate\Bytecode\ObjectsFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate21\Data\NHibernate\Bytecode\ProxyFactory.cs">
+      <Link>Data\NHibernate\Bytecode\ProxyFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate21\Data\NHibernate\Bytecode\ProxyFactoryFactory.cs">
+      <Link>Data\NHibernate\Bytecode\ProxyFactoryFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate21\Data\NHibernate\Bytecode\ReflectionOptimizer.cs">
+      <Link>Data\NHibernate\Bytecode\ReflectionOptimizer.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\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\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.NHibernate12\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\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="..\Spring.Data.NHibernate20\Data\NHibernate\FilterDefiniitionFactoryObject.cs">
+      <Link>Data\NHibernate\FilterDefiniitionFactoryObject.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\HibernateObjectRetrievalFailureException.cs">
+      <Link>Data\NHibernate\HibernateObjectRetrievalFailureException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\HibernateOptimisticLockingFailureException.cs">
+      <Link>Data\NHibernate\HibernateOptimisticLockingFailureException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate20\Data\NHibernate\LocalSessionFactoryObject.cs">
+      <Link>Data\NHibernate\LocalSessionFactoryObject.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</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/Spring.Data.2010.csproj b/src/Spring/Spring.Data/Spring.Data.2010.csproj
new file mode 100644
index 00000000..46c4465f
--- /dev/null
+++ b/src/Spring/Spring.Data/Spring.Data.2010.csproj
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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\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.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</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.Messaging.Nms/Spring.Messaging.Nms.2010.csproj b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2010.csproj
new file mode 100644
index 00000000..425040a6
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2010.csproj
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\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.2010\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.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</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/Spring.Messaging.2010.csproj b/src/Spring/Spring.Messaging/Spring.Messaging.2010.csproj
new file mode 100644
index 00000000..585ba0a5
--- /dev/null
+++ b/src/Spring/Spring.Messaging/Spring.Messaging.2010.csproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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\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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</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.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj
new file mode 100644
index 00000000..595bddb2
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E823D54C-CE82-4868-929F-5F95A999F61E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Scheduling.Quartz</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz\Debug\Spring.Scheduling.Quartz.XML</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz\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="Quartz, Version=0.6.0.21049, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\Quartz.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <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\ResourceJobSchedulingDataProcessor.cs" />
+    <Compile Include="Scheduling\Quartz\SchedulerAccessorObject.cs" />
+    <Compile Include="Scheduling\Quartz\SchedulerAccessor.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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</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.Services/Spring.Services.2010.csproj b/src/Spring/Spring.Services/Spring.Services.2010.csproj
new file mode 100644
index 00000000..65930c08
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.2010.csproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</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.Template.Velocity/Spring.Template.Velocity.2010.csproj b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2010.csproj
new file mode 100644
index 00000000..0af80fc1
--- /dev/null
+++ b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2010.csproj
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Template.Velocity\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\build\VS.NET.2010\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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</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.Testing.NUnit/Spring.Testing.NUnit.2010.csproj b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2010.csproj
new file mode 100644
index 00000000..6f070b0f
--- /dev/null
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2010.csproj
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</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.2010.csproj b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2010.csproj
new file mode 100644
index 00000000..b5833cf4
--- /dev/null
+++ b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2010.csproj
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Web\Spring.Web.2010.csproj">
+      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
+      <Name>Spring.Web.2010</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/Spring.Web.2010.csproj b/src/Spring/Spring.Web/Spring.Web.2010.csproj
new file mode 100644
index 00000000..764f0c92
--- /dev/null
+++ b/src/Spring/Spring.Web/Spring.Web.2010.csproj
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v2.0</TargetFrameworkVersion>
+    <SignAssembly>false</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\Spring.Net.snk</AssemblyOriginatorKeyFile>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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\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\ObjectScope.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\ControlState.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\MultiView.cs" />
+    <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\Controls\View.cs" />
+    <Compile Include="Web\UI\Controls\ViewCollection.cs" />
+    <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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</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/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj
new file mode 100644
index 00000000..e697c97d
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.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.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.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</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.2010\Spring.Aop.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2010\Spring.Aop.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.2010.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
new file mode 100644
index 00000000..f769fedf
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
@@ -0,0 +1,937 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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="DotNetMock, Version=0.7.5.0, Culture=neutral, PublicKeyToken=65e474d141e25e07">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.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.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\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\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\MyRequiredAttribute.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\DelegateObjectFactoryConfigurerTests.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\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\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\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" />
+    <Content Include="Spring.Core.Tests.dll.config" />
+    <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.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</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.2010\Spring.Core.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2010\Spring.Core.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2010.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2010.csproj
new file mode 100644
index 00000000..4adea1cc
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2010.csproj
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.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.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj">
+      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
+      <Name>Spring.Testing.NUnit.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</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.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2010.csproj
new file mode 100644
index 00000000..d52b0498
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2010.csproj
@@ -0,0 +1,131 @@
+<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>v2.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate\Spring.Data.NHibernate.2010.csproj">
+      <Project>{130E1609-45A7-4F65-B112-105F2DD3E2CE}</Project>
+      <Name>Spring.Data.NHibernate.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</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.2010\Spring.Data.NHibernate.Integration.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2010\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.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2010.csproj
new file mode 100644
index 00000000..590b9fe5
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.2010.csproj
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EACD4B0B-06F9-4A0C-B8E8-EBE6BB0A167F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate20.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate20.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_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.2010\Spring.Data.NHibernate20.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NH_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.DynamicProxy2, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate20\net\2.0\Castle.DynamicProxy2.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\NHibernate20\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\NHibernate20\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate20\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>
+    <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>
+    <Compile Include="HibernateCompilerOptionsTests.cs" />
+    <Compile Include="HibernateExceptionTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Data.NHibernate20.Tests.build" />
+    <None Include="Spring.Data.NHibernate20.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate20\Spring.Data.NHibernate20.2010.csproj">
+      <Project>{71368632-B8B7-4A6A-8C65-8DA848120C82}</Project>
+      <Name>Spring.Data.NHibernate20.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2010.csproj">
+      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
+      <Name>Spring.Data.Tests.2010</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.2010\Spring.Data.NHibernate20.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2010\Spring.Data.NHibernate20.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2010.csproj
new file mode 100644
index 00000000..83f0d337
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2010.csproj
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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.NHibernate21.Integration.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate21.Integration.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate21.Integration.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Antlr3.Runtime, Version=3.1.0.39271, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\Antlr3.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DotNetMock, Version=0.8.1.0, Culture=neutral, PublicKeyToken=65e474d141e25e07">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate.DomainModel, Version=2.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.DomainModel.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate.Test, Version=2.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\net\2.0\NHibernate.Test.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.configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.OracleClient" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <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\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\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\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="Data\NHibernate\Bytecode\AbstractInjectableUserTypeFixture.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\Foo.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\IDelimiter.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\InjectableStringUserType.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\InjectableUserTypeFixture.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\NHibernateTestImports.cs" />
+    <Compile Include="Data\NHibernate\Bytecode\Product.cs" />
+    <Compile Include="Data\NHibernate\AccountController.cs" />
+    <Compile Include="Data\NHibernate\IAccountController.cs" />
+    <Compile Include="Setup.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\creditdebit.sql">
+      <Link>Data\NHibernate\creditdebit.sql</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="RecreateDatabases.sql" />
+    <EmbeddedResource Include="..\Spring.Data.NHibernate.Integration.Tests\Data\NHibernate\testObject.sql">
+      <Link>Data\NHibernate\testObject.sql</Link>
+    </EmbeddedResource>
+    <None Include="NHibernate.Test.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Spring.Data.NHibernate21.Integration.Tests.build" />
+    <None Include="Spring.Data.NHibernate21.Integration.Tests.dll.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.2010.csproj">
+      <Project>{E57B4652-0231-49CB-B058-87E10EFE540D}</Project>
+      <Name>Spring.Data.NHibernate21.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj">
+      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
+      <Name>Spring.Testing.NUnit.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</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>
+    <Content Include="Data\NHibernate\Bytecode\Foo.Spechbm.xml" />
+    <Content Include="TestEnbeddedConfig.cfg.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Config\Log4Net.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <EmbeddedResource Include="Data\NHibernate\Dao.xml" />
+    <EmbeddedResource Include="Data\NHibernate\Services.xml" />
+    <EmbeddedResource Include="Data\NHibernate\Controllers.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Data\NHibernate\Bytecode\Foo.Spechbm.xml" />
+    <Content Include="TestEnbeddedConfig.cfg.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>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2010\Spring.Data.NHibernate21.Integration.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2010\Spring.Data.NHibernate21.Integration.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.2010.csproj
new file mode 100644
index 00000000..92105186
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate21.Tests.2010.csproj
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{90FEE979-7367-4542-BCCB-BF634E04A9D3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate21.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate21.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate21.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NH_2_1</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\NHibernate21\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\NHibernate21\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=2.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate21\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>
+    <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>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="HibernateCompilerOptionsTests.cs" />
+    <Compile Include="HibernateExceptionTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Data.NHibernate21.Tests.build" />
+    <None Include="Spring.Data.NHibernate21.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate21\Spring.Data.NHibernate21.2010.csproj">
+      <Project>{E57B4652-0231-49CB-B058-87E10EFE540D}</Project>
+      <Name>Spring.Data.NHibernate21.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2010.csproj">
+      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
+      <Name>Spring.Data.Tests.2010</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.2010\Spring.Data.NHibernate21.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2010\Spring.Data.NHibernate21.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2010.csproj
new file mode 100644
index 00000000..758ecdcf
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate30.Tests/Spring.Data.NHibernate30.Tests.2010.csproj
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E4CCB8A2-2381-41D1-B44C-E20E13703056}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate30.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate30.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NH_2_0,NH_2_1</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.NHibernate30.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0,NET_2_1</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\NHibernate30\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\NHibernate30\net\3.5\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate30\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.NHibernate30.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate30\Spring.Data.NHibernate30.2010.csproj">
+      <Project>{71368632-B8B7-4A6A-8C65-8DA848120C82}</Project>
+      <Name>Spring.Data.NHibernate30.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2010.csproj">
+      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
+      <Name>Spring.Data.Tests.2010</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.2010\Spring.Data.NHibernate30.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2010\Spring.Data.NHibernate30.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.2010.csproj b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2010.csproj
new file mode 100644
index 00000000..83be25b4
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2010.csproj
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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="DotNetMock, Version=0.7.5.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.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.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.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</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" />
+    <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.2010\Spring.Data.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2010\Spring.Data.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2010.csproj b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2010.csproj
new file mode 100644
index 00000000..7b610760
--- /dev/null
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2010.csproj
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\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.2010\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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2010.csproj">
+      <Project>{AEB1578C-9018-4D49-B440-789F38DD2F29}</Project>
+      <Name>Spring.Messaging.Nms.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj">
+      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
+      <Name>Spring.Testing.NUnit.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</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.Tests/Spring.Messaging.Tests.2010.csproj b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2010.csproj
new file mode 100644
index 00000000..8780aa47
--- /dev/null
+++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2010.csproj
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Messaging.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging\Spring.Messaging.2010.csproj">
+      <Project>{0E23AE41-D8D8-41C2-84A2-D35564049F0D}</Project>
+      <Name>Spring.Messaging.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj">
+      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
+      <Name>Spring.Testing.NUnit.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Messaging\Listener\NonTransactionalMessageListenerContainerTests.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\Core\MessageQueueMetadataCacheTests.cs" />
+    <Compile Include="Messaging\Core\ThreadingTests.cs" />
+    <Compile Include="Messaging\Listener\Adapter\MessageListenerAdapterTests.cs" />
+    <Compile Include="Messaging\Listener\DistributedTxMessageListenerContainerTests.cs" />
+    <Compile Include="Messaging\Listener\LoggingExceptionHandler.cs" />
+    <Compile Include="Messaging\Listener\NonTransactionalMessageListenerContainerTests.cs">
+      <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.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj
new file mode 100644
index 00000000..09d9d0eb
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Scheduling.Quartz.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</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.2010\Spring.Scheduling.Quartz.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</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=0.7.0.15571, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\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.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz\Spring.Scheduling.Quartz.2010.csproj">
+      <Project>{E823D54C-CE82-4868-929F-5F95A999F61E}</Project>
+      <Name>Spring.Scheduling.Quartz.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="QuartzCompilerOptionsTests.cs" />
+    <Compile Include="Scheduling\Quartz\AdaptableJobFactoryTest.cs" />
+    <Compile Include="Scheduling\Quartz\QuartzSupportTests.cs" />
+    <Compile Include="Scheduling\Quartz\QuartzTestObject.cs" />
+    <Compile Include="Scheduling\Quartz\SchedulerFactoryObjectTest.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" />
+    <Compile Include="Scheduling\Quartz\SimpleTriggerObjectTest.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" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Scheduling.Quartz.Tests.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </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>
+  <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.Services.Tests/Spring.Services.Tests.2010.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2010.csproj
new file mode 100644
index 00000000..148df31b
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2010.csproj
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.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" />
+    <Reference Include="System.ServiceModel" />
+    <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.2010.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Services\Spring.Services.2010.csproj">
+      <Project>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Project>
+      <Name>Spring.Services.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Aop.Tests\Spring.Aop.Tests.2010.csproj">
+      <Project>{2111596A-0327-4C9D-8919-294FBD988A23}</Project>
+      <Name>Spring.Aop.Tests.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</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.2010\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2010\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj
new file mode 100644
index 00000000..cbf24960
--- /dev/null
+++ b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj
@@ -0,0 +1,100 @@
+<?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>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{10405837-CB67-40D8-9326-84C9383983E2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Template.Velocity.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Template.Velocity.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <DocumentationFile>
+    </DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Template.Velocity.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <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="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.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Template\Velocity\Config\TemplateNamespaceParserTests.cs" />
+    <Compile Include="Template\Velocity\VelocityEngineFactoryObjectTests.cs" />
+    <Compile Include="Template\Velocity\VelocityEngineTestBase.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2010.csproj">
+      <Project>{BF3AB954-8375-407C-9E98-4C51D8072784}</Project>
+      <Name>Spring.Template.Velocity.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Template\Velocity\VelocityEngineFactoryObjectTests.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Template\Velocity\SimpleTemplate.vm">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Template\Velocity\config.properties">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <EmbeddedResource Include="Template\Velocity\EmbeddedTemplate.vm">
+    </EmbeddedResource>
+  </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/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2010.csproj b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2010.csproj
new file mode 100644
index 00000000..3cff9ec9
--- /dev/null
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2010.csproj
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj">
+      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
+      <Name>Spring.Testing.NUnit.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2010.csproj">
+      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
+      <Name>Spring.Data.Tests.2010</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.Web.Tests/Spring.Web.Tests.2010.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj
new file mode 100644
index 00000000..4142d31d
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <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>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2010\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.2010\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\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\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" />
+    <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.2010.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web\Spring.Web.2010.csproj">
+      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
+      <Name>Spring.Web.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2010</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.2010\Spring.Web.Tests\$(ConfigurationName)\ /y /s /q /d
+</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file