From d7da8399480ff47dd0fdbc303d066c2f5646f3c2 Mon Sep 17 00:00:00 2001
From: Marko Lahma <marko.lahma@gmail.com>
Date: Sun, 30 Sep 2018 21:12:07 +0300
Subject: [PATCH] remove 2010 from sln and csproj names

---
 Spring.Net.2010.sln => Spring.Net.sln         | 1290 ++++++++---------
 ...hostDoc.xml => Spring.Net.sln.GhostDoc.xml |    0
 Spring.build                                  |   16 +-
 ...tart.2010.sln => Spring.AopQuickStart.sln} |  132 +-
 ...roj => Spring.AopQuickStart.Common.csproj} |   26 +-
 .../Spring.AopQuickStart.Step1.csproj}        |   36 +-
 .../Spring.AopQuickStart.Step2.csproj}        |   36 +-
 .../Spring.AopQuickStart.Step3.csproj}        |   36 +-
 .../Spring.AopQuickStart.Step4.csproj}        |   36 +-
 .../Spring.AopQuickStart.Step5.2010.csproj    |   19 -
 .../Spring.AopQuickStart.Step5.csproj         |   19 +
 ...proj => Spring.AopQuickStart.Step6.csproj} |   30 +-
 .../Spring.AopQuickStart.Step7.2010.csproj    |   19 -
 .../Spring.AopQuickStart.Step7.csproj         |   19 +
 ....2010.sln => Spring.CachingQuickStart.sln} |   44 +-
 ...oj => Spring.CachingQuickStart.Web.csproj} |  206 +--
 ...culator.2010.sln => Spring.Calculator.sln} |  218 +--
 ...ects.2010.csproj => Spring.Aspects.csproj} |   30 +-
 .../src/Spring.Aspects/project.json           |  Bin 414 -> 0 bytes
 ...roj => Spring.Calculator.ClientApp.csproj} |   50 +-
 ...proj => Spring.Calculator.Contract.csproj} |   16 +-
 ...lculator.RegisterComponentServices.csproj} |   52 +-
 ...roj => Spring.Calculator.RemoteApp.csproj} |   42 +-
 ...proj => Spring.Calculator.Services.csproj} |   22 +-
 ...10.csproj => Spring.Calculator.Web.csproj} |    6 +-
 ...10.sln => Spring.CodeConfig.Migration.sln} |    6 +-
 .../{Primes.2010.csproj => Primes.csproj}     |    0
 ...SpringApp.2010.csproj => SpringApp.csproj} |    2 +-
 ....Tests.2010.csproj => Primes.Tests.csproj} |    2 +-
 .../test/Primes.Tests/project.json            |  Bin 332 -> 0 bytes
 ...orthwind.2010.sln => Spring.Northwind.sln} |  192 +--
 ...pring.Northwind.Dao.NHibernate.2010.csproj |   29 -
 .../Spring.Northwind.Dao.NHibernate.csproj    |  114 +-
 .../project.json                              |  Bin 420 -> 0 bytes
 .../Spring.Northwind.Dao.2010.csproj          |    6 -
 .../Spring.Northwind.Dao.csproj               |   56 +-
 .../Spring.Northwind.Service.2010.csproj      |   19 -
 .../Spring.Northwind.Service.2010.csproj.user |   13 -
 .../Spring.Northwind.Service.csproj           |   70 +-
 .../src/Spring.Northwind.Service/project.json |  Bin 414 -> 0 bytes
 ... Spring.Northwind.Web.Conversation.csproj} |    6 +-
 .../project.json                              |  Bin 656 -> 0 bytes
 ...010.csproj => Spring.Northwind.Web.csproj} |  414 +++---
 .../src/Spring.Northwind.Web/project.json     |  Bin 656 -> 0 bytes
 ...ing.Northwind.IntegrationTests.2010.csproj |   37 -
 .../Spring.Northwind.IntegrationTests.csproj  |  134 +-
 .../project.json                              |  Bin 574 -> 0 bytes
 ...art.2010.sln => Spring.DataQuickStart.sln} |   58 +-
 ...10.csproj => Spring.DataQuickStart.csproj} |   32 +-
 ...roj => Spring.DataQuickStart.Tests.csproj} |   52 +-
 .../Spring.DataQuickStart.Tests/project.json  |  Bin 332 -> 0 bytes
 ...tart.2010.sln => Spring.EmsQuickStart.sln} |   70 +-
 .../Spring.EmsQuickStart.Client.2010.csproj   |   56 -
 .../Spring.EmsQuickStart.Client.csproj        |  181 +--
 .../Spring.EmsQuickStart.Client.csproj.user   |   19 -
 .../Spring.EmsQuickStart.Client/project.json  |  Bin 414 -> 0 bytes
 .../Spring.EmsQuickStart.Common.2010.csproj   |   41 -
 .../Spring.EmsQuickStart.Common.csproj        |  131 +-
 .../Spring.EmsQuickStart.Server.2010.csproj   |   28 -
 .../Spring.EmsQuickStart.Server.csproj        |  161 +-
 .../Spring.EmsQuickStart.Server/project.json  |  Bin 414 -> 0 bytes
 ...ng.EmsQuickStart.Integration.Tests.csproj} |   86 +-
 ...proj => Spring.EmsQuickStart.Tests.csproj} |   86 +-
 ...010.csproj => Spring.Examples.Pool.csproj} |   32 +-
 ...Pool.2010.sln => Spring.Examples.Pool.sln} |   38 +-
 ...ln => Spring.IocQuickStart.AppContext.sln} |   38 +-
 ...=> Spring.IocQuickStart.AppContext.csproj} |   34 +-
 ...=> Spring.IocQuickStart.EventRegistry.sln} |   38 +-
 ...Spring.IocQuickStart.EventRegistry.csproj} |   22 +-
 ...n => Spring.IocQuickStart.MovieFinder.sln} |   38 +-
 ...> Spring.IocQuickStart.MovieFinder.csproj} |   46 +-
 .../src/project.json                          |  Bin 532 -> 0 bytes
 ...art.2010.sln => Spring.MsmqQuickStart.sln} |   64 +-
 .../Spring.MsmqQuickStart.Client.2010.csproj  |   46 -
 .../Spring.MsmqQuickStart.Client.csproj       |  122 +-
 .../Spring.MsmqQuickStart.Client/project.json |  Bin 414 -> 0 bytes
 .../Spring.MsmqQuickStart.Common.2010.csproj  |   45 -
 .../Spring.MsmqQuickStart.Common.csproj       |   83 +-
 .../Spring.MsmqQuickStart.Common/project.json |  Bin 414 -> 0 bytes
 .../Spring.MsmqQuickStart.Server.2010.csproj  |   25 -
 .../Spring.MsmqQuickStart.Server.csproj       |   99 +-
 .../Spring.MsmqQuickStart.Server/project.json |  Bin 414 -> 0 bytes
 ...g.MsmqQuickStart.Integration.Tests.csproj} |   76 +-
 ...roj => Spring.MsmqQuickStart.Tests.csproj} |   76 +-
 .../src/Spring.Mvc3QuickStart/project.json    |  Bin 1166 -> 0 bytes
 .../Spring.Mvc4QuickStart/project.json        |  Bin 1590 -> 0 bytes
 .../Spring.Mvc5QuickStart/project.json        |   28 -
 ...tart.2010.sln => Spring.NmsQuickStart.sln} |   88 +-
 .../Spring.NmsQuickStart.Client.2010.csproj   |   52 -
 .../Spring.NmsQuickStart.Client.csproj        |  139 +-
 .../Spring.NmsQuickStart.Client/project.json  |  Bin 414 -> 0 bytes
 .../Spring.NmsQuickStart.Common.2010.csproj   |   39 -
 .../Spring.NmsQuickStart.Common.csproj        |   88 +-
 .../Spring.NmsQuickStart.Server.2010.csproj   |   28 -
 .../Spring.NmsQuickStart.Server.csproj        |  112 +-
 .../Spring.NmsQuickStart.Server/project.json  |  Bin 414 -> 0 bytes
 ...ng.NmsQuickStart.Integration.Tests.csproj} |   10 +-
 ...proj => Spring.NmsQuickStart.Tests.csproj} |  122 +-
 ...n => Spring.Scheduling.Quartz.Example.sln} |   46 +-
 ...> Spring.Scheduling.Quartz.Example.csproj} |   40 +-
 ...Start.2010.sln => Spring.TxQuickStart.sln} |   56 +-
 ...2010.csproj => Spring.TxQuickStart.csproj} |   40 +-
 .../Spring/Spring.TxQuickStart/project.json   |  Bin 414 -> 0 bytes
 ...sproj => Spring.TxQuickStart.Tests.csproj} |   58 +-
 .../Spring.TxQuickStart.Tests/project.json    |  Bin 568 -> 0 bytes
 ...tart.2010.sln => Spring.WcfQuickStart.sln} |  166 +--
 ...oj => Spring.WcfQuickStart.Aspects.csproj} |   28 +-
 ... => Spring.WcfQuickStart.ClientApp.csproj} |   52 +-
 ... => Spring.WcfQuickStart.Contracts.csproj} |   18 +-
 ... => Spring.WcfQuickStart.ServerApp.csproj} |   46 +-
 ... => Spring.WcfQuickStart.ServerWeb.csproj} |  226 +--
 ....sln => Spring.Web.Extensions.Example.sln} |  110 +-
 .../Spring.WebQuickStart/.nuget/project.json  |  Bin 386 -> 0 bytes
 ...tart.2010.sln => Spring.WebQuickStart.sln} |  406 +++---
 .../{SpringAir.2010.sln => SpringAir.sln}     |  344 ++---
 ...Core.2010.csproj => SpringAir.Core.csproj} |   16 +-
 ....2010.csproj => SpringAir.Data.Ado.csproj} |   26 +-
 ...csproj => SpringAir.Web.References.csproj} |   36 +-
 .../project.json                              |  Bin 414 -> 0 bytes
 ...010.csproj => SpringAir.Core.Tests.csproj} |   32 +-
 .../test/SpringAir.Core.Tests/project.json    |  Bin 332 -> 0 bytes
 ...csproj => SpringAir.Data.Ado.Tests.csproj} |   34 +-
 .../SpringAir.Data.Ado.Tests/project.json     |  Bin 332 -> 0 bytes
 src/Directory.Build.props                     |    7 +-
 src/Spring/Spring.Aop/Spring.Aop.build        |   55 -
 ...ring.Aop.2010.csproj => Spring.Aop.csproj} |   42 +-
 ...ng.Core.2010.csproj => Spring.Core.csproj} |   88 +-
 ....csproj => Spring.Data.NHibernate3.csproj} |    6 +-
 ....csproj => Spring.Data.NHibernate4.csproj} |    6 +-
 ....csproj => Spring.Data.NHibernate5.csproj} |    6 +-
 ...ng.Data.2010.csproj => Spring.Data.csproj} |   78 +-
 .../Spring.Messaging.Ems.build                |   57 -
 ...010.csproj => Spring.Messaging.Ems.csproj} |   58 +-
 .../Spring.Messaging.Nms.build                |   56 -
 ...010.csproj => Spring.Messaging.Nms.csproj} |   44 +-
 .../Spring.Messaging/Spring.Messaging.build   |   52 -
 ...ng.2010.csproj => Spring.Messaging.csproj} |   42 +-
 .../Spring.Scheduling.Quartz2.build           |   55 -
 ...sproj => Spring.Scheduling.Quartz2.csproj} |    4 +-
 .../Spring.Services/Spring.Services.build     |   68 -
 ...ces.2010.csproj => Spring.Services.csproj} |   52 +-
 .../Spring.Template.Velocity.Castle.build     |   63 -
 ...=> Spring.Template.Velocity.Castle.csproj} |   68 +-
 .../Spring.Template.Velocity.build            |   55 -
 ...csproj => Spring.Template.Velocity.csproj} |   40 +-
 .../Spring.Testing.Microsoft.build            |   52 -
 ...csproj => Spring.Testing.Microsoft.csproj} |   34 +-
 .../Spring.Testing.NUnit.build                |   53 -
 ...010.csproj => Spring.Testing.NUnit.csproj} |   38 +-
 .../Spring.Web.Conversation.NHibernate3.build |   58 -
 ...pring.Web.Conversation.NHibernate3.csproj} |    6 +-
 .../Spring.Web.Extensions.build               |   53 -
 ...10.csproj => Spring.Web.Extensions.csproj} |   38 +-
 .../Spring.Web.Mvc3/Spring.Web.Mvc3.build     |   62 -
 ...vc3.2010.csproj => Spring.Web.Mvc3.csproj} |   46 +-
 .../Spring.Web.Mvc4/Spring.Web.Mvc4.build     |   67 -
 ...vc4.2010.csproj => Spring.Web.Mvc4.csproj} |    4 +-
 .../Spring.Web.Mvc5/Spring.Web.Mvc5.build     |   68 -
 ...vc5.2010.csproj => Spring.Web.Mvc5.csproj} |    4 +-
 src/Spring/Spring.Web/Spring.Web.build        |   55 -
 ...ring.Web.2010.csproj => Spring.Web.csproj} |   44 +-
 test/Directory.Build.props                    |    5 +-
 .../Spring.Aop.Tests/Spring.Aop.Tests.build   |   98 --
 ...ts.2010.csproj => Spring.Aop.Tests.csproj} |   66 +-
 .../Spring.Core.Tests/Spring.Core.Tests.build |  197 ---
 ...s.2010.csproj => Spring.Core.Tests.csproj} |  148 +-
 .../Spring.Data.Integration.Tests.build       |   65 -
 ...j => Spring.Data.Integration.Tests.csproj} |   64 +-
 ...Data.NHibernate3.Integration.Tests.csproj} |    8 +-
 ...j => Spring.Data.NHibernate3.Tests.csproj} |   10 +-
 ...Data.NHibernate4.Integration.Tests.csproj} |    8 +-
 ...estedTxSuspension.Integration.Tests.csproj |   10 +-
 ...j => Spring.Data.NHibernate4.Tests.csproj} |   10 +-
 ...Data.NHibernate5.Integration.Tests.csproj} |    8 +-
 ...j => Spring.Data.NHibernate5.Tests.csproj} |   10 +-
 .../Spring.Data.Tests/Spring.Data.Tests.build |   80 -
 ...s.2010.csproj => Spring.Data.Tests.csproj} |   78 +-
 ...essaging.Ems.Integration.Tests.2010.csproj |   36 -
 ...ring.Messaging.Ems.Integration.Tests.build |   79 -
 ...ing.Messaging.Ems.Integration.Tests.csproj |  121 +-
 .../Spring.Messaging.Ems.Tests.build          |   58 -
 ...proj => Spring.Messaging.Ems.Tests.csproj} |  302 ++--
 ...essaging.Nms.Integration.Tests.2010.csproj |   23 -
 ...ring.Messaging.Nms.Integration.Tests.build |   80 -
 ...ing.Messaging.Nms.Integration.Tests.csproj |  100 +-
 .../Spring.Messaging.Nms.Tests.build          |   79 -
 ...proj => Spring.Messaging.Nms.Tests.csproj} |   60 +-
 .../Spring.Messaging.Tests.build              |   76 -
 ...0.csproj => Spring.Messaging.Tests.csproj} |   60 +-
 ....Scheduling.Quartz.Integration.Tests.build |   74 -
 ...cheduling.Quartz.Integration.Tests.csproj} |    6 +-
 ...Scheduling.Quartz2.Integration.Tests.build |   92 --
 ...heduling.Quartz2.Integration.Tests.csproj} |    6 +-
 .../Spring.Scheduling.Quartz2.Tests.build     |   93 --
 ...=> Spring.Scheduling.Quartz2.Tests.csproj} |    6 +-
 .../Spring.Services.Tests.build               |  102 --
 ...10.csproj => Spring.Services.Tests.csproj} |  100 +-
 ...Spring.Services.WindowsService.Tests.build |   78 -
 ...Template.Velocity.Castle.Tests.2010.csproj |   49 -
 ...pring.Template.Velocity.Castle.Tests.build |  115 --
 ...ring.Template.Velocity.Castle.Tests.csproj |  122 +-
 ...Spring.Template.Velocity.Tests.2010.csproj |   26 -
 .../Spring.Template.Velocity.Tests.build      |   98 --
 .../Spring.Template.Velocity.Tests.csproj     |   95 +-
 .../Spring.Testing.Microsoft.Tests.build      |   63 -
 ... => Spring.Testing.Microsoft.Tests.csproj} |   40 +-
 .../Spring.Testing.NUnit.Tests.build          |   74 -
 ...proj => Spring.Testing.NUnit.Tests.csproj} |   48 +-
 ...g.Web.Conversation.NHibernate3.Tests.build |  122 --
 ...Web.Conversation.NHibernate3.Tests.csproj} |   12 +-
 .../Spring.Web.Mvc.Tests.build                |   87 --
 ...010.csproj => Spring.Web.Mvc.Tests.csproj} |  196 +--
 .../Spring.Web.Mvc3.Tests.build               |  111 --
 ...10.csproj => Spring.Web.Mvc3.Tests.csproj} |   46 +-
 .../Spring.Web.Mvc4.Tests.build               |  116 --
 ...10.csproj => Spring.Web.Mvc4.Tests.csproj} |    4 +-
 .../Spring.Web.Mvc5.Tests.build               |  115 --
 ...10.csproj => Spring.Web.Mvc5.Tests.csproj} |    4 +-
 .../Spring.Web.Tests/Spring.Web.Tests.build   |   89 --
 ...ts.2010.csproj => Spring.Web.Tests.csproj} |   98 +-
 220 files changed, 4352 insertions(+), 9467 deletions(-)
 rename Spring.Net.2010.sln => Spring.Net.sln (86%)
 rename Spring.Net.2010.sln.GhostDoc.xml => Spring.Net.sln.GhostDoc.xml (100%)
 rename examples/Spring/Spring.AopQuickStart/{Spring.AopQuickStart.2010.sln => Spring.AopQuickStart.sln} (87%)
 rename examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/{Spring.AopQuickStart.Common.2010.csproj => Spring.AopQuickStart.Common.csproj} (97%)
 rename examples/Spring/Spring.AopQuickStart/src/{Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2010.csproj => Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.csproj} (92%)
 rename examples/Spring/Spring.AopQuickStart/src/{Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2010.csproj => Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.csproj} (92%)
 rename examples/Spring/Spring.AopQuickStart/src/{Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2010.csproj => Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.csproj} (92%)
 rename examples/Spring/Spring.AopQuickStart/src/{Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2010.csproj => Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.csproj} (92%)
 delete mode 100644 examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2010.csproj
 create mode 100644 examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.csproj
 rename examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/{Spring.AopQuickStart.Step6.2010.csproj => Spring.AopQuickStart.Step6.csproj} (97%)
 delete mode 100644 examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2010.csproj
 create mode 100644 examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.csproj
 rename examples/Spring/Spring.CachingQuickStart/{Spring.CachingQuickStart.2010.sln => Spring.CachingQuickStart.sln} (90%)
 rename examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/{Spring.CachingQuickStart.Web.2010.csproj => Spring.CachingQuickStart.Web.csproj} (97%)
 rename examples/Spring/Spring.Calculator/{Spring.Calculator.2010.sln => Spring.Calculator.sln} (92%)
 rename examples/Spring/Spring.Calculator/src/Spring.Aspects/{Spring.Aspects.2010.csproj => Spring.Aspects.csproj} (97%)
 delete mode 100644 examples/Spring/Spring.Calculator/src/Spring.Aspects/project.json
 rename examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/{Spring.Calculator.ClientApp.2010.csproj => Spring.Calculator.ClientApp.csproj} (90%)
 rename examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/{Spring.Calculator.Contract.2010.csproj => Spring.Calculator.Contract.csproj} (97%)
 rename examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/{Spring.Calculator.RegisterComponentServices.2010.csproj => Spring.Calculator.RegisterComponentServices.csproj} (90%)
 rename examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/{Spring.Calculator.RemoteApp.2010.csproj => Spring.Calculator.RemoteApp.csproj} (87%)
 rename examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/{Spring.Calculator.Services.2010.csproj => Spring.Calculator.Services.csproj} (89%)
 rename examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/{Spring.Calculator.Web.2010.csproj => Spring.Calculator.Web.csproj} (98%)
 rename examples/Spring/Spring.CodeConfig.Migration/{Spring.CodeConfig.Migration.2010.sln => Spring.CodeConfig.Migration.sln} (86%)
 rename examples/Spring/Spring.CodeConfig.Migration/src/Primes/{Primes.2010.csproj => Primes.csproj} (100%)
 rename examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/{SpringApp.2010.csproj => SpringApp.csproj} (91%)
 rename examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/{Primes.Tests.2010.csproj => Primes.Tests.csproj} (85%)
 delete mode 100644 examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/project.json
 rename examples/Spring/Spring.Data.NHibernate.Northwind/{Spring.Northwind.2010.sln => Spring.Northwind.sln} (92%)
 delete mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2010.csproj
 delete mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/project.json
 delete mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2010.csproj
 delete mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj
 delete mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj.user
 delete mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/project.json
 rename examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/{Spring.Northwind.Web.Conversation.2010.csproj => Spring.Northwind.Web.Conversation.csproj} (98%)
 delete mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/project.json
 rename examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/{Spring.Northwind.Web.2010.csproj => Spring.Northwind.Web.csproj} (96%)
 delete mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/project.json
 delete mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2010.csproj
 delete mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/project.json
 rename examples/Spring/Spring.DataQuickStart/{Spring.DataQuickStart.2010.sln => Spring.DataQuickStart.sln} (88%)
 rename examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/{Spring.DataQuickStart.2010.csproj => Spring.DataQuickStart.csproj} (97%)
 rename examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/{Spring.DataQuickStart.Tests.2010.csproj => Spring.DataQuickStart.Tests.csproj} (93%)
 delete mode 100644 examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/project.json
 rename examples/Spring/Spring.EmsQuickStart/{Spring.EmsQuickStart.2010.sln => Spring.EmsQuickStart.sln} (87%)
 delete mode 100644 examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.2010.csproj
 delete mode 100644 examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj.user
 delete mode 100644 examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/project.json
 delete mode 100644 examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.2010.csproj
 delete mode 100644 examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.2010.csproj
 delete mode 100644 examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/project.json
 rename examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Integration.Tests/{Spring.EmsQuickStart.Integration.Tests.2010.csproj => Spring.EmsQuickStart.Integration.Tests.csproj} (98%)
 rename examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Tests/{Spring.EmsQuickStart.Tests.2010.csproj => Spring.EmsQuickStart.Tests.csproj} (97%)
 rename examples/Spring/Spring.Examples.Pool/{Spring.Examples.Pool.2010.csproj => Spring.Examples.Pool.csproj} (97%)
 rename examples/Spring/Spring.Examples.Pool/{Spring.Examples.Pool.2010.sln => Spring.Examples.Pool.sln} (87%)
 rename examples/Spring/Spring.IoCQuickStart.AppContext/{Spring.IocQuickStart.AppContext.2010.sln => Spring.IocQuickStart.AppContext.sln} (92%)
 rename examples/Spring/Spring.IoCQuickStart.AppContext/src/{Spring.IocQuickStart.AppContext.2010.csproj => Spring.IocQuickStart.AppContext.csproj} (97%)
 rename examples/Spring/Spring.IoCQuickStart.EventRegistry/{Spring.IocQuickStart.EventRegistry.2010.sln => Spring.IocQuickStart.EventRegistry.sln} (91%)
 rename examples/Spring/Spring.IoCQuickStart.EventRegistry/src/{Spring.IocQuickStart.EventRegistry.2010.csproj => Spring.IocQuickStart.EventRegistry.csproj} (97%)
 rename examples/Spring/Spring.IoCQuickStart.MovieFinder/{Spring.IocQuickStart.MovieFinder.2010.sln => Spring.IocQuickStart.MovieFinder.sln} (91%)
 rename examples/Spring/Spring.IoCQuickStart.MovieFinder/src/{Spring.IocQuickStart.MovieFinder.2010.csproj => Spring.IocQuickStart.MovieFinder.csproj} (97%)
 delete mode 100644 examples/Spring/Spring.IoCQuickStart.MovieFinder/src/project.json
 rename examples/Spring/Spring.MsmqQuickStart/{Spring.MsmqQuickStart.2010.sln => Spring.MsmqQuickStart.sln} (86%)
 delete mode 100644 examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2010.csproj
 delete mode 100644 examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/project.json
 delete mode 100644 examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2010.csproj
 delete mode 100644 examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/project.json
 delete mode 100644 examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2010.csproj
 delete mode 100644 examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/project.json
 rename examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Integration.Tests/{Spring.MsmqQuickStart.Integration.Tests.2010.csproj => Spring.MsmqQuickStart.Integration.Tests.csproj} (98%)
 rename examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Tests/{Spring.MsmqQuickStart.Tests.2010.csproj => Spring.MsmqQuickStart.Tests.csproj} (98%)
 delete mode 100644 examples/Spring/Spring.Mvc3QuickStart/src/Spring.Mvc3QuickStart/project.json
 delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/project.json
 delete mode 100644 examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/project.json
 rename examples/Spring/Spring.NmsQuickStart/{Spring.NmsQuickStart.2010.sln => Spring.NmsQuickStart.sln} (84%)
 delete mode 100644 examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2010.csproj
 delete mode 100644 examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/project.json
 delete mode 100644 examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2010.csproj
 delete mode 100644 examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2010.csproj
 delete mode 100644 examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/project.json
 rename examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/{Spring.NmsQuickStart.Integration.Tests.2010.csproj => Spring.NmsQuickStart.Integration.Tests.csproj} (97%)
 rename examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/{Spring.NmsQuickStart.Tests.2010.csproj => Spring.NmsQuickStart.Tests.csproj} (97%)
 rename examples/Spring/Spring.Scheduling.Quartz.Example/{Spring.Scheduling.Quartz.Example.2010.sln => Spring.Scheduling.Quartz.Example.sln} (92%)
 rename examples/Spring/Spring.Scheduling.Quartz.Example/src/{Spring.Scheduling.Quartz.Example.2010.csproj => Spring.Scheduling.Quartz.Example.csproj} (97%)
 rename examples/Spring/Spring.TxQuickStart/{Spring.TxQuickStart.2010.sln => Spring.TxQuickStart.sln} (89%)
 rename examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/{Spring.TxQuickStart.2010.csproj => Spring.TxQuickStart.csproj} (97%)
 delete mode 100644 examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/project.json
 rename examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/{Spring.TxQuickStart.Tests.2010.csproj => Spring.TxQuickStart.Tests.csproj} (94%)
 delete mode 100644 examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/project.json
 rename examples/Spring/Spring.WcfQuickStart/{Spring.WcfQuickStart.2010.sln => Spring.WcfQuickStart.sln} (91%)
 rename examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/{Spring.WcfQuickStart.Aspects.2010.csproj => Spring.WcfQuickStart.Aspects.csproj} (97%)
 rename examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/{Spring.WcfQuickStart.ClientApp.2010.csproj => Spring.WcfQuickStart.ClientApp.csproj} (89%)
 rename examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/{Spring.WcfQuickStart.Contracts.2010.csproj => Spring.WcfQuickStart.Contracts.csproj} (96%)
 rename examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/{Spring.WcfQuickStart.ServerApp.2010.csproj => Spring.WcfQuickStart.ServerApp.csproj} (89%)
 rename examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/{Spring.WcfQuickStart.ServerWeb.2010.csproj => Spring.WcfQuickStart.ServerWeb.csproj} (96%)
 rename examples/Spring/Spring.Web.Extensions.Example/{Spring.Web.Extensions.Example.2010.sln => Spring.Web.Extensions.Example.sln} (98%)
 delete mode 100644 examples/Spring/Spring.WebQuickStart/.nuget/project.json
 rename examples/Spring/Spring.WebQuickStart/{Spring.WebQuickStart.2010.sln => Spring.WebQuickStart.sln} (93%)
 rename examples/Spring/SpringAir/{SpringAir.2010.sln => SpringAir.sln} (92%)
 rename examples/Spring/SpringAir/src/SpringAir.Core/{SpringAir.Core.2010.csproj => SpringAir.Core.csproj} (86%)
 rename examples/Spring/SpringAir/src/SpringAir.Data.Ado/{SpringAir.Data.Ado.2010.csproj => SpringAir.Data.Ado.csproj} (83%)
 rename examples/Spring/SpringAir/src/SpringAir.Web.2005.References/{SpringAir.Web.2010.References.csproj => SpringAir.Web.References.csproj} (79%)
 delete mode 100644 examples/Spring/SpringAir/src/SpringAir.Web.2005.References/project.json
 rename examples/Spring/SpringAir/test/SpringAir.Core.Tests/{SpringAir.Core.Tests.2010.csproj => SpringAir.Core.Tests.csproj} (93%)
 delete mode 100644 examples/Spring/SpringAir/test/SpringAir.Core.Tests/project.json
 rename examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/{SpringAir.Data.Ado.Tests.2010.csproj => SpringAir.Data.Ado.Tests.csproj} (90%)
 delete mode 100644 examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/project.json
 delete mode 100644 src/Spring/Spring.Aop/Spring.Aop.build
 rename src/Spring/Spring.Aop/{Spring.Aop.2010.csproj => Spring.Aop.csproj} (88%)
 rename src/Spring/Spring.Core/{Spring.Core.2010.csproj => Spring.Core.csproj} (98%)
 rename src/Spring/Spring.Data.NHibernate3/{Spring.Data.NHibernate3.2010.csproj => Spring.Data.NHibernate3.csproj} (96%)
 rename src/Spring/Spring.Data.NHibernate4/{Spring.Data.NHibernate4.2010.csproj => Spring.Data.NHibernate4.csproj} (97%)
 rename src/Spring/Spring.Data.NHibernate5/{Spring.Data.NHibernate5.2010.csproj => Spring.Data.NHibernate5.csproj} (97%)
 rename src/Spring/Spring.Data/{Spring.Data.2010.csproj => Spring.Data.csproj} (91%)
 delete mode 100644 src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build
 rename src/Spring/Spring.Messaging.Ems/{Spring.Messaging.Ems.2010.csproj => Spring.Messaging.Ems.csproj} (79%)
 delete mode 100644 src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
 rename src/Spring/Spring.Messaging.Nms/{Spring.Messaging.Nms.2010.csproj => Spring.Messaging.Nms.csproj} (72%)
 delete mode 100644 src/Spring/Spring.Messaging/Spring.Messaging.build
 rename src/Spring/Spring.Messaging/{Spring.Messaging.2010.csproj => Spring.Messaging.csproj} (82%)
 delete mode 100644 src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build
 rename src/Spring/Spring.Scheduling.Quartz2/{Spring.Scheduling.Quartz2.2010.csproj => Spring.Scheduling.Quartz2.csproj} (76%)
 delete mode 100644 src/Spring/Spring.Services/Spring.Services.build
 rename src/Spring/Spring.Services/{Spring.Services.2010.csproj => Spring.Services.csproj} (91%)
 delete mode 100644 src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.build
 rename src/Spring/Spring.Template.Velocity.Castle/{Spring.Template.Velocity.Castle.2010.csproj => Spring.Template.Velocity.Castle.csproj} (93%)
 delete mode 100644 src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build
 rename src/Spring/Spring.Template.Velocity/{Spring.Template.Velocity.2010.csproj => Spring.Template.Velocity.csproj} (87%)
 delete mode 100644 src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
 rename src/Spring/Spring.Testing.Microsoft/{Spring.Testing.Microsoft.2010.csproj => Spring.Testing.Microsoft.csproj} (75%)
 delete mode 100644 src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
 rename src/Spring/Spring.Testing.NUnit/{Spring.Testing.NUnit.2010.csproj => Spring.Testing.NUnit.csproj} (78%)
 delete mode 100644 src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.build
 rename src/Spring/Spring.Web.Conversation.NHibernate3/{Spring.Web.Conversation.NHibernate3.2010.csproj => Spring.Web.Conversation.NHibernate3.csproj} (75%)
 delete mode 100644 src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
 rename src/Spring/Spring.Web.Extensions/{Spring.Web.Extensions.2010.csproj => Spring.Web.Extensions.csproj} (77%)
 delete mode 100644 src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build
 rename src/Spring/Spring.Web.Mvc3/{Spring.Web.Mvc3.2010.csproj => Spring.Web.Mvc3.csproj} (81%)
 delete mode 100644 src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build
 rename src/Spring/Spring.Web.Mvc4/{Spring.Web.Mvc4.2010.csproj => Spring.Web.Mvc4.csproj} (90%)
 delete mode 100644 src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build
 rename src/Spring/Spring.Web.Mvc5/{Spring.Web.Mvc5.2010.csproj => Spring.Web.Mvc5.csproj} (92%)
 delete mode 100644 src/Spring/Spring.Web/Spring.Web.build
 rename src/Spring/Spring.Web/{Spring.Web.2010.csproj => Spring.Web.csproj} (88%)
 delete mode 100644 test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
 rename test/Spring/Spring.Aop.Tests/{Spring.Aop.Tests.2010.csproj => Spring.Aop.Tests.csproj} (96%)
 delete mode 100644 test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
 rename test/Spring/Spring.Core.Tests/{Spring.Core.Tests.2010.csproj => Spring.Core.Tests.csproj} (93%)
 delete mode 100644 test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
 rename test/Spring/Spring.Data.Integration.Tests/{Spring.Data.Integration.Tests.2010.csproj => Spring.Data.Integration.Tests.csproj} (90%)
 rename test/Spring/Spring.Data.NHibernate3.Integration.Tests/{Spring.Data.NHibernate3.Integration.Tests.2010.csproj => Spring.Data.NHibernate3.Integration.Tests.csproj} (98%)
 rename test/Spring/Spring.Data.NHibernate3.Tests/{Spring.Data.NHibernate3.Tests.2010.csproj => Spring.Data.NHibernate3.Tests.csproj} (95%)
 rename test/Spring/Spring.Data.NHibernate4.Integration.Tests/{Spring.Data.NHibernate4.Integration.Tests.2010.csproj => Spring.Data.NHibernate4.Integration.Tests.csproj} (98%)
 rename test/Spring/Spring.Data.NHibernate4.Tests/{Spring.Data.NHibernate4.Tests.2010.csproj => Spring.Data.NHibernate4.Tests.csproj} (96%)
 rename test/Spring/Spring.Data.NHibernate5.Integration.Tests/{Spring.Data.NHibernate5.Integration.Tests.2010.csproj => Spring.Data.NHibernate5.Integration.Tests.csproj} (98%)
 rename test/Spring/Spring.Data.NHibernate5.Tests/{Spring.Data.NHibernate5.Tests.2010.csproj => Spring.Data.NHibernate5.Tests.csproj} (96%)
 delete mode 100644 test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
 rename test/Spring/Spring.Data.Tests/{Spring.Data.Tests.2010.csproj => Spring.Data.Tests.csproj} (94%)
 delete mode 100644 test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.2010.csproj
 delete mode 100644 test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build
 delete mode 100644 test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build
 rename test/Spring/Spring.Messaging.Ems.Tests/{Spring.Messaging.Ems.Tests.2010.csproj => Spring.Messaging.Ems.Tests.csproj} (95%)
 delete mode 100644 test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.2010.csproj
 delete mode 100644 test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build
 delete mode 100644 test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
 rename test/Spring/Spring.Messaging.Nms.Tests/{Spring.Messaging.Nms.Tests.2010.csproj => Spring.Messaging.Nms.Tests.csproj} (88%)
 delete mode 100644 test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build
 rename test/Spring/Spring.Messaging.Tests/{Spring.Messaging.Tests.2010.csproj => Spring.Messaging.Tests.csproj} (88%)
 delete mode 100644 test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.build
 rename test/Spring/Spring.Scheduling.Quartz.Integration.Tests/{Spring.Scheduling.Quartz.Integration.Tests.2010.csproj => Spring.Scheduling.Quartz.Integration.Tests.csproj} (97%)
 delete mode 100644 test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.build
 rename test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/{Spring.Scheduling.Quartz2.Integration.Tests.2010.csproj => Spring.Scheduling.Quartz2.Integration.Tests.csproj} (89%)
 delete mode 100644 test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build
 rename test/Spring/Spring.Scheduling.Quartz2.Tests/{Spring.Scheduling.Quartz2.Tests.2010.csproj => Spring.Scheduling.Quartz2.Tests.csproj} (91%)
 delete mode 100644 test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
 rename test/Spring/Spring.Services.Tests/{Spring.Services.Tests.2010.csproj => Spring.Services.Tests.csproj} (93%)
 delete mode 100644 test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Tests.build
 delete mode 100644 test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.2010.csproj
 delete mode 100644 test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.build
 delete mode 100644 test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj
 delete mode 100644 test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
 delete mode 100644 test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
 rename test/Spring/Spring.Testing.Microsoft.Tests/{Spring.Testing.Microsoft.Tests.2010.csproj => Spring.Testing.Microsoft.Tests.csproj} (83%)
 delete mode 100644 test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
 rename test/Spring/Spring.Testing.NUnit.Tests/{Spring.Testing.NUnit.Tests.2010.csproj => Spring.Testing.NUnit.Tests.csproj} (87%)
 delete mode 100644 test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build
 rename test/Spring/Spring.Web.Conversation.NHibernate3.Tests/{Spring.Web.Conversation.NHibernate3.Tests.2010.csproj => Spring.Web.Conversation.NHibernate3.Tests.csproj} (94%)
 delete mode 100644 test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
 rename test/Spring/Spring.Web.Mvc.Tests/{Spring.Web.Mvc.Tests.2010.csproj => Spring.Web.Mvc.Tests.csproj} (95%)
 delete mode 100644 test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build
 rename test/Spring/Spring.Web.Mvc3.Tests/{Spring.Web.Mvc3.Tests.2010.csproj => Spring.Web.Mvc3.Tests.csproj} (92%)
 delete mode 100644 test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build
 rename test/Spring/Spring.Web.Mvc4.Tests/{Spring.Web.Mvc4.Tests.2010.csproj => Spring.Web.Mvc4.Tests.csproj} (94%)
 delete mode 100644 test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build
 rename test/Spring/Spring.Web.Mvc5.Tests/{Spring.Web.Mvc5.Tests.2010.csproj => Spring.Web.Mvc5.Tests.csproj} (94%)
 delete mode 100644 test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
 rename test/Spring/Spring.Web.Tests/{Spring.Web.Tests.2010.csproj => Spring.Web.Tests.csproj} (95%)

diff --git a/Spring.Net.2010.sln b/Spring.Net.sln
similarity index 86%
rename from Spring.Net.2010.sln
rename to Spring.Net.sln
index ed16a982..5d92e8a3 100644
--- a/Spring.Net.2010.sln
+++ b/Spring.Net.sln
@@ -1,645 +1,645 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.25807.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
-	ProjectSection(SolutionItems) = preProject
-		BreakingChanges.txt = BreakingChanges.txt
-		changelog.txt = changelog.txt
-		common-project.include = common-project.include
-		Local.testsettings = Local.testsettings
-		readme.txt = readme.txt
-		Spring.build = Spring.build
-		Spring.include = Spring.include
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{79F495DF-83D6-435E-A20E-47800F6F8FE7}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\packages.config = .nuget\packages.config
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Core.2010", "src\Spring\Spring.Core\Spring.Core.2010.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Core.Tests.2010", "test\Spring\Spring.Core.Tests\Spring.Core.Tests.2010.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Aop.2010", "src\Spring\Spring.Aop\Spring.Aop.2010.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Aop.Tests.2010", "test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.2010.csproj", "{2111596A-0327-4C9D-8919-294FBD988A23}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Services.2010", "src\Spring\Spring.Services\Spring.Services.2010.csproj", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Services.Tests.2010", "test\Spring\Spring.Services.Tests\Spring.Services.Tests.2010.csproj", "{4374F018-9738-46BF-A399-4594CEE75B21}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.2010", "src\Spring\Spring.Web\Spring.Web.2010.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Tests.2010", "test\Spring\Spring.Web.Tests\Spring.Web.Tests.2010.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.2010", "src\Spring\Spring.Data\Spring.Data.2010.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.Tests.2010", "test\Spring\Spring.Data.Tests\Spring.Data.Tests.2010.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.Integration.Tests.2010", "test\Spring\Spring.Data.Integration.Tests\Spring.Data.Integration.Tests.2010.csproj", "{91766D21-C568-459F-9BEA-759B011F23CF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Extensions.2010", "src\Spring\Spring.Web.Extensions\Spring.Web.Extensions.2010.csproj", "{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Testing.NUnit.2010", "src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj", "{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Testing.NUnit.Tests.2010", "test\Spring\Spring.Testing.NUnit.Tests\Spring.Testing.NUnit.Tests.2010.csproj", "{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Nms.2010", "src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2010.csproj", "{AEB1578C-9018-4D49-B440-789F38DD2F29}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Nms.Tests.2010", "test\Spring\Spring.Messaging.Nms.Tests\Spring.Messaging.Nms.Tests.2010.csproj", "{FA7A6931-7DBE-4A32-A312-51FAD2E80332}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.2010", "src\Spring\Spring.Messaging\Spring.Messaging.2010.csproj", "{0E23AE41-D8D8-41C2-84A2-D35564049F0D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Tests.2010", "test\Spring\Spring.Messaging.Tests\Spring.Messaging.Tests.2010.csproj", "{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Template.Velocity.2010", "src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2010.csproj", "{BF3AB954-8375-407C-9E98-4C51D8072784}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Template.Velocity.Tests.2010", "test\Spring\Spring.Template.Velocity.Tests\Spring.Template.Velocity.Tests.2010.csproj", "{10405837-CB67-40D8-9326-84C9383983E2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc3.2010", "src\Spring\Spring.Web.Mvc3\Spring.Web.Mvc3.2010.csproj", "{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc3.Tests.2010", "test\Spring\Spring.Web.Mvc3.Tests\Spring.Web.Mvc3.Tests.2010.csproj", "{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Testing.Microsoft.2010", "src\Spring\Spring.Testing.Microsoft\Spring.Testing.Microsoft.2010.csproj", "{2E10A8D3-B8FF-4699-90B8-E621659C58DD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Testing.Microsoft.Tests.2010", "test\Spring\Spring.Testing.Microsoft.Tests\Spring.Testing.Microsoft.Tests.2010.csproj", "{7321149A-47C6-4FBA-9D1A-26FD6815381B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate3.2010", "src\Spring\Spring.Data.NHibernate3\Spring.Data.NHibernate3.2010.csproj", "{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate3.Tests.2010", "test\Spring\Spring.Data.NHibernate3.Tests\Spring.Data.NHibernate3.Tests.2010.csproj", "{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Ems.2010", "src\Spring\Spring.Messaging.Ems\Spring.Messaging.Ems.2010.csproj", "{900E3839-301E-48B1-BAEB-B6645620ACFF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc4.2010", "src\Spring\Spring.Web.Mvc4\Spring.Web.Mvc4.2010.csproj", "{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc4.Tests.2010", "test\Spring\Spring.Web.Mvc4.Tests\Spring.Web.Mvc4.Tests.2010.csproj", "{7B2FB412-047C-4A34-A0D9-3F3D2727F388}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Scheduling.Quartz2.2010", "src\Spring\Spring.Scheduling.Quartz2\Spring.Scheduling.Quartz2.2010.csproj", "{E823D54C-CE82-4868-929F-5F95A999F123}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Scheduling.Quartz2.Tests.2010", "test\Spring\Spring.Scheduling.Quartz2.Tests\Spring.Scheduling.Quartz2.Tests.2010.csproj", "{247787CF-ECE1-4675-8B42-7DF4329A4891}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Ems.Integration.Tests.2010", "test\Spring\Spring.Messaging.Ems.Integration.Tests\Spring.Messaging.Ems.Integration.Tests.2010.csproj", "{FA934E92-C8C2-428A-BE2A-26818F17A787}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate3.Integration.Tests.2010", "test\Spring\Spring.Data.NHibernate3.Integration.Tests\Spring.Data.NHibernate3.Integration.Tests.2010.csproj", "{6B7DA759-F46D-4860-AF03-E7AC7498E003}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Nms.Integration.Tests.2010", "test\Spring\Spring.Messaging.Nms.Integration.Tests\Spring.Messaging.Nms.Integration.Tests.2010.csproj", "{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Scheduling.Quartz2.Integration.Tests.2010", "test\Spring\Spring.Scheduling.Quartz2.Integration.Tests\Spring.Scheduling.Quartz2.Integration.Tests.2010.csproj", "{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Conversation.NHibernate3.2010", "src\Spring\Spring.Web.Conversation.NHibernate3\Spring.Web.Conversation.NHibernate3.2010.csproj", "{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Conversation.NHibernate3.Tests.2010", "test\Spring\Spring.Web.Conversation.NHibernate3.Tests\Spring.Web.Conversation.NHibernate3.Tests.2010.csproj", "{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc5.2010", "src\Spring\Spring.Web.Mvc5\Spring.Web.Mvc5.2010.csproj", "{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc5.Tests.2010", "test\Spring\Spring.Web.Mvc5.Tests\Spring.Web.Mvc5.Tests.2010.csproj", "{B9590252-6D58-4587-950C-475AB61FDBCF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate4.2010", "src\Spring\Spring.Data.NHibernate4\Spring.Data.NHibernate4.2010.csproj", "{D9C45177-0D80-4133-AB46-58F142DB92AA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate4.Tests.2010", "test\Spring\Spring.Data.NHibernate4.Tests\Spring.Data.NHibernate4.Tests.2010.csproj", "{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate4.Integration.Tests.2010", "test\Spring\Spring.Data.NHibernate4.Integration.Tests\Spring.Data.NHibernate4.Integration.Tests.2010.csproj", "{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Template.Velocity.Castle.2010", "src\Spring\Spring.Template.Velocity.Castle\Spring.Template.Velocity.Castle.2010.csproj", "{250601C0-A4AC-41FE-B484-51A9B0D5473D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Template.Velocity.Castle.Tests.2010", "test\Spring\Spring.Template.Velocity.Castle.Tests\Spring.Template.Velocity.Castle.Tests.2010.csproj", "{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests", "test\Spring\Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests\Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj", "{DE276F7C-4564-49EC-AABC-B964EC3D1626}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate5.2010", "src\Spring\Spring.Data.NHibernate5\Spring.Data.NHibernate5.2010.csproj", "{26604974-B6B8-45BA-A72A-66574ADC498B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate5.Integration.Tests.2010", "test\Spring\Spring.Data.NHibernate5.Integration.Tests\Spring.Data.NHibernate5.Integration.Tests.2010.csproj", "{740CDA28-39BC-455A-86C3-5323D14F5B2E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate5.Tests.2010", "test\Spring\Spring.Data.NHibernate5.Tests\Spring.Data.NHibernate5.Tests.2010.csproj", "{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|.NET.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|.NET.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|.NET.Build.0 = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|.NET.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|.NET.Build.0 = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|.NET.Build.0 = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|.NET.ActiveCfg = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|.NET.Build.0 = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|.NET.Build.0 = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|.NET.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|.NET.Build.0 = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|.NET.Build.0 = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|.NET.ActiveCfg = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|.NET.Build.0 = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|.NET.ActiveCfg = Release|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|.NET.ActiveCfg = Release|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|.NET.ActiveCfg = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Release|.NET.ActiveCfg = Release|Any CPU
-		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Release|.NET.ActiveCfg = Release|Any CPU
-		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|.NET.ActiveCfg = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Release|.NET.ActiveCfg = Release|Any CPU
-		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Release|.NET.ActiveCfg = Release|Any CPU
-		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|.NET.ActiveCfg = Release|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Release|.NET.ActiveCfg = Release|Any CPU
-		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Release|.NET.ActiveCfg = Release|Any CPU
-		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E823D54C-CE82-4868-929F-5F95A999F123}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{E823D54C-CE82-4868-929F-5F95A999F123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E823D54C-CE82-4868-929F-5F95A999F123}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E823D54C-CE82-4868-929F-5F95A999F123}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E823D54C-CE82-4868-929F-5F95A999F123}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E823D54C-CE82-4868-929F-5F95A999F123}.Release|.NET.ActiveCfg = Release|Any CPU
-		{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|.NET.ActiveCfg = Release|Any CPU
-		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Any CPU.Build.0 = Release|Any CPU
-		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|.NET.ActiveCfg = Release|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Release|.NET.ActiveCfg = Release|Any CPU
-		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|.NET.ActiveCfg = Release|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|.NET.ActiveCfg = Release|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|.NET.ActiveCfg = Release|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|.NET.ActiveCfg = Release|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Release|.NET.ActiveCfg = Release|Any CPU
-		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B9590252-6D58-4587-950C-475AB61FDBCF}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{B9590252-6D58-4587-950C-475AB61FDBCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9590252-6D58-4587-950C-475AB61FDBCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9590252-6D58-4587-950C-475AB61FDBCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B9590252-6D58-4587-950C-475AB61FDBCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B9590252-6D58-4587-950C-475AB61FDBCF}.Release|.NET.ActiveCfg = Release|Any CPU
-		{B9590252-6D58-4587-950C-475AB61FDBCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9590252-6D58-4587-950C-475AB61FDBCF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9590252-6D58-4587-950C-475AB61FDBCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B9590252-6D58-4587-950C-475AB61FDBCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Release|.NET.ActiveCfg = Release|Any CPU
-		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Release|.NET.ActiveCfg = Release|Any CPU
-		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Release|.NET.ActiveCfg = Release|Any CPU
-		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Release|Any CPU.Build.0 = Release|Any CPU
-		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Release|.NET.ActiveCfg = Release|Any CPU
-		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|.NET.ActiveCfg = Release|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Release|.NET.ActiveCfg = Release|Any CPU
-		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|.NET.Build.0 = Debug|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|.NET.ActiveCfg = Release|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|.NET.Build.0 = Release|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|.NET.Build.0 = Debug|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|.NET.ActiveCfg = Release|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|.NET.Build.0 = Release|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|.NET.Build.0 = Debug|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|.NET.Build.0 = Release|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {803E6B42-7DEE-4DCC-83D0-51925047BCB0}
-		NAntAddinLastFileName = Spring.build
-	EndGlobalSection
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = Spring.Net.2010.vsmdi
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.25807.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
+	ProjectSection(SolutionItems) = preProject
+		BreakingChanges.txt = BreakingChanges.txt
+		changelog.txt = changelog.txt
+		common-project.include = common-project.include
+		Local.testsettings = Local.testsettings
+		readme.txt = readme.txt
+		Spring.build = Spring.build
+		Spring.include = Spring.include
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{79F495DF-83D6-435E-A20E-47800F6F8FE7}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\packages.config = .nuget\packages.config
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Core", "src\Spring\Spring.Core\Spring.Core.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Core.Tests", "test\Spring\Spring.Core.Tests\Spring.Core.Tests.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Aop", "src\Spring\Spring.Aop\Spring.Aop.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Aop.Tests", "test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.csproj", "{2111596A-0327-4C9D-8919-294FBD988A23}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Services", "src\Spring\Spring.Services\Spring.Services.csproj", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Services.Tests", "test\Spring\Spring.Services.Tests\Spring.Services.Tests.csproj", "{4374F018-9738-46BF-A399-4594CEE75B21}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web", "src\Spring\Spring.Web\Spring.Web.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Tests", "test\Spring\Spring.Web.Tests\Spring.Web.Tests.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data", "src\Spring\Spring.Data\Spring.Data.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.Tests", "test\Spring\Spring.Data.Tests\Spring.Data.Tests.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.Integration.Tests", "test\Spring\Spring.Data.Integration.Tests\Spring.Data.Integration.Tests.csproj", "{91766D21-C568-459F-9BEA-759B011F23CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Extensions", "src\Spring\Spring.Web.Extensions\Spring.Web.Extensions.csproj", "{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Testing.NUnit", "src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.csproj", "{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Testing.NUnit.Tests", "test\Spring\Spring.Testing.NUnit.Tests\Spring.Testing.NUnit.Tests.csproj", "{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Nms", "src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.csproj", "{AEB1578C-9018-4D49-B440-789F38DD2F29}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Nms.Tests", "test\Spring\Spring.Messaging.Nms.Tests\Spring.Messaging.Nms.Tests.csproj", "{FA7A6931-7DBE-4A32-A312-51FAD2E80332}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging", "src\Spring\Spring.Messaging\Spring.Messaging.csproj", "{0E23AE41-D8D8-41C2-84A2-D35564049F0D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Tests", "test\Spring\Spring.Messaging.Tests\Spring.Messaging.Tests.csproj", "{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Template.Velocity", "src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.csproj", "{BF3AB954-8375-407C-9E98-4C51D8072784}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Template.Velocity.Tests", "test\Spring\Spring.Template.Velocity.Tests\Spring.Template.Velocity.Tests.csproj", "{10405837-CB67-40D8-9326-84C9383983E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc3", "src\Spring\Spring.Web.Mvc3\Spring.Web.Mvc3.csproj", "{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc3.Tests", "test\Spring\Spring.Web.Mvc3.Tests\Spring.Web.Mvc3.Tests.csproj", "{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Testing.Microsoft", "src\Spring\Spring.Testing.Microsoft\Spring.Testing.Microsoft.csproj", "{2E10A8D3-B8FF-4699-90B8-E621659C58DD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Testing.Microsoft.Tests", "test\Spring\Spring.Testing.Microsoft.Tests\Spring.Testing.Microsoft.Tests.csproj", "{7321149A-47C6-4FBA-9D1A-26FD6815381B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate3", "src\Spring\Spring.Data.NHibernate3\Spring.Data.NHibernate3.csproj", "{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate3.Tests", "test\Spring\Spring.Data.NHibernate3.Tests\Spring.Data.NHibernate3.Tests.csproj", "{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Ems", "src\Spring\Spring.Messaging.Ems\Spring.Messaging.Ems.csproj", "{900E3839-301E-48B1-BAEB-B6645620ACFF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc4", "src\Spring\Spring.Web.Mvc4\Spring.Web.Mvc4.csproj", "{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc4.Tests", "test\Spring\Spring.Web.Mvc4.Tests\Spring.Web.Mvc4.Tests.csproj", "{7B2FB412-047C-4A34-A0D9-3F3D2727F388}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Scheduling.Quartz2", "src\Spring\Spring.Scheduling.Quartz2\Spring.Scheduling.Quartz2.csproj", "{E823D54C-CE82-4868-929F-5F95A999F123}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Scheduling.Quartz2.Tests", "test\Spring\Spring.Scheduling.Quartz2.Tests\Spring.Scheduling.Quartz2.Tests.csproj", "{247787CF-ECE1-4675-8B42-7DF4329A4891}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Ems.Integration.Tests", "test\Spring\Spring.Messaging.Ems.Integration.Tests\Spring.Messaging.Ems.Integration.Tests.csproj", "{FA934E92-C8C2-428A-BE2A-26818F17A787}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate3.Integration.Tests", "test\Spring\Spring.Data.NHibernate3.Integration.Tests\Spring.Data.NHibernate3.Integration.Tests.csproj", "{6B7DA759-F46D-4860-AF03-E7AC7498E003}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Nms.Integration.Tests", "test\Spring\Spring.Messaging.Nms.Integration.Tests\Spring.Messaging.Nms.Integration.Tests.csproj", "{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Scheduling.Quartz2.Integration.Tests", "test\Spring\Spring.Scheduling.Quartz2.Integration.Tests\Spring.Scheduling.Quartz2.Integration.Tests.csproj", "{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Conversation.NHibernate3", "src\Spring\Spring.Web.Conversation.NHibernate3\Spring.Web.Conversation.NHibernate3.csproj", "{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Conversation.NHibernate3.Tests", "test\Spring\Spring.Web.Conversation.NHibernate3.Tests\Spring.Web.Conversation.NHibernate3.Tests.csproj", "{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc5", "src\Spring\Spring.Web.Mvc5\Spring.Web.Mvc5.csproj", "{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Mvc5.Tests", "test\Spring\Spring.Web.Mvc5.Tests\Spring.Web.Mvc5.Tests.csproj", "{B9590252-6D58-4587-950C-475AB61FDBCF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate4", "src\Spring\Spring.Data.NHibernate4\Spring.Data.NHibernate4.csproj", "{D9C45177-0D80-4133-AB46-58F142DB92AA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate4.Tests", "test\Spring\Spring.Data.NHibernate4.Tests\Spring.Data.NHibernate4.Tests.csproj", "{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate4.Integration.Tests", "test\Spring\Spring.Data.NHibernate4.Integration.Tests\Spring.Data.NHibernate4.Integration.Tests.csproj", "{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Template.Velocity.Castle", "src\Spring\Spring.Template.Velocity.Castle\Spring.Template.Velocity.Castle.csproj", "{250601C0-A4AC-41FE-B484-51A9B0D5473D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Template.Velocity.Castle.Tests", "test\Spring\Spring.Template.Velocity.Castle.Tests\Spring.Template.Velocity.Castle.Tests.csproj", "{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests", "test\Spring\Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests\Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj", "{DE276F7C-4564-49EC-AABC-B964EC3D1626}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate5", "src\Spring\Spring.Data.NHibernate5\Spring.Data.NHibernate5.csproj", "{26604974-B6B8-45BA-A72A-66574ADC498B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate5.Integration.Tests", "test\Spring\Spring.Data.NHibernate5.Integration.Tests\Spring.Data.NHibernate5.Integration.Tests.csproj", "{740CDA28-39BC-455A-86C3-5323D14F5B2E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate5.Tests", "test\Spring\Spring.Data.NHibernate5.Tests\Spring.Data.NHibernate5.Tests.csproj", "{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.Build.0 = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.Build.0 = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.ActiveCfg = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.Build.0 = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|.NET.Build.0 = Debug|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|.NET.ActiveCfg = Release|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|.NET.Build.0 = Release|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|.NET.Build.0 = Debug|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|.NET.ActiveCfg = Release|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|.NET.Build.0 = Release|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4374F018-9738-46BF-A399-4594CEE75B21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.Build.0 = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.Build.0 = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.Build.0 = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.Build.0 = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|.NET.Build.0 = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|.NET.ActiveCfg = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|.NET.Build.0 = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|.NET.Build.0 = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|.NET.Build.0 = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.Build.0 = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.ActiveCfg = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.Build.0 = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|.NET.Build.0 = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|.NET.ActiveCfg = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|.NET.Build.0 = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|.NET.ActiveCfg = Release|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|.NET.ActiveCfg = Release|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|.NET.ActiveCfg = Release|Any CPU
+		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0E23AE41-D8D8-41C2-84A2-D35564049F0D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|.NET.ActiveCfg = Release|Any CPU
+		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{41BC3AEA-7EB3-48BF-B1EC-84119376AC98}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BF3AB954-8375-407C-9E98-4C51D8072784}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BF3AB954-8375-407C-9E98-4C51D8072784}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{10405837-CB67-40D8-9326-84C9383983E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{10405837-CB67-40D8-9326-84C9383983E2}.Release|.NET.ActiveCfg = Release|Any CPU
+		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{10405837-CB67-40D8-9326-84C9383983E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Release|.NET.ActiveCfg = Release|Any CPU
+		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{904C97E0-3667-4D12-A55F-6CC2E6F68A0A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Release|.NET.ActiveCfg = Release|Any CPU
+		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1E8E7C0A-4474-44F6-AA67-FABB40FA9784}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|.NET.ActiveCfg = Release|Any CPU
+		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2E10A8D3-B8FF-4699-90B8-E621659C58DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|.NET.ActiveCfg = Release|Any CPU
+		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7321149A-47C6-4FBA-9D1A-26FD6815381B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Release|.NET.ActiveCfg = Release|Any CPU
+		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D546EFB7-9F6C-4C11-B2F8-B85FAD135399}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Release|.NET.ActiveCfg = Release|Any CPU
+		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9C86BC69-DD23-4DCC-B11F-8781BBC887CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|.NET.ActiveCfg = Release|Any CPU
+		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{900E3839-301E-48B1-BAEB-B6645620ACFF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Release|.NET.ActiveCfg = Release|Any CPU
+		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CB351EB2-049D-40BE-BB09-1CE4ED68FE67}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Release|.NET.ActiveCfg = Release|Any CPU
+		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7B2FB412-047C-4A34-A0D9-3F3D2727F388}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F123}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F123}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F123}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F123}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F123}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|.NET.ActiveCfg = Release|Any CPU
+		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Any CPU.Build.0 = Release|Any CPU
+		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|.NET.ActiveCfg = Release|Any CPU
+		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA934E92-C8C2-428A-BE2A-26818F17A787}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Release|.NET.ActiveCfg = Release|Any CPU
+		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6B7DA759-F46D-4860-AF03-E7AC7498E003}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|.NET.ActiveCfg = Release|Any CPU
+		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|.NET.ActiveCfg = Release|Any CPU
+		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|.NET.ActiveCfg = Release|Any CPU
+		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Release|.NET.ActiveCfg = Release|Any CPU
+		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{39AAD7EA-2ED0-4E50-8D4D-C666EA9CBFE4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B9590252-6D58-4587-950C-475AB61FDBCF}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B9590252-6D58-4587-950C-475AB61FDBCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9590252-6D58-4587-950C-475AB61FDBCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9590252-6D58-4587-950C-475AB61FDBCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B9590252-6D58-4587-950C-475AB61FDBCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B9590252-6D58-4587-950C-475AB61FDBCF}.Release|.NET.ActiveCfg = Release|Any CPU
+		{B9590252-6D58-4587-950C-475AB61FDBCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9590252-6D58-4587-950C-475AB61FDBCF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9590252-6D58-4587-950C-475AB61FDBCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B9590252-6D58-4587-950C-475AB61FDBCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Release|.NET.ActiveCfg = Release|Any CPU
+		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D9C45177-0D80-4133-AB46-58F142DB92AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Release|.NET.ActiveCfg = Release|Any CPU
+		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{86E9E4E0-792F-43F6-AAA0-599D3B1A0C4E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Release|.NET.ActiveCfg = Release|Any CPU
+		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Release|.NET.ActiveCfg = Release|Any CPU
+		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{250601C0-A4AC-41FE-B484-51A9B0D5473D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|.NET.ActiveCfg = Release|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Release|.NET.ActiveCfg = Release|Any CPU
+		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DE276F7C-4564-49EC-AABC-B964EC3D1626}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|.NET.Build.0 = Debug|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|.NET.ActiveCfg = Release|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|.NET.Build.0 = Release|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{26604974-B6B8-45BA-A72A-66574ADC498B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|.NET.Build.0 = Debug|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|.NET.ActiveCfg = Release|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|.NET.Build.0 = Release|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{740CDA28-39BC-455A-86C3-5323D14F5B2E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|.NET.Build.0 = Debug|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|.NET.Build.0 = Release|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BEEBC49B-4519-4C77-AE93-11E68F4CA7E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {803E6B42-7DEE-4DCC-83D0-51925047BCB0}
+		NAntAddinLastFileName = Spring.build
+	EndGlobalSection
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = Spring.Net.vsmdi
+	EndGlobalSection
+EndGlobal
diff --git a/Spring.Net.2010.sln.GhostDoc.xml b/Spring.Net.sln.GhostDoc.xml
similarity index 100%
rename from Spring.Net.2010.sln.GhostDoc.xml
rename to Spring.Net.sln.GhostDoc.xml
diff --git a/Spring.build b/Spring.build
index 2407381a..87a893c0 100644
--- a/Spring.build
+++ b/Spring.build
@@ -411,12 +411,12 @@ Commandline Examples:
     <foreach item="File" property="file">
 	  <in>
 	    <items>
-		   <include name="${spring.basedir}/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj" />
-		   <include name="${spring.basedir}/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj" />
-		   <include name="${spring.basedir}/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2010.csproj" />
-		   <include name="${spring.basedir}/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2010.csproj" />
-		   <include name="${spring.basedir}/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.2010.csproj" />
-		   <include name="${spring.basedir}/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.2010.csproj" />
+		   <include name="${spring.basedir}/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj" />
+		   <include name="${spring.basedir}/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj" />
+		   <include name="${spring.basedir}/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj" />
+		   <include name="${spring.basedir}/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj" />
+		   <include name="${spring.basedir}/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj" />
+		   <include name="${spring.basedir}/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj" />
 		</items>
 	  </in>
       <do>
@@ -463,7 +463,7 @@ Commandline Examples:
 	</if>
 
     <exec program="${msbuild.exe}" verbose="true">
-      <arg value="Spring.NET.2010.sln"/>
+      <arg value="Spring.NET.sln"/>
       <arg line="/nologo" />
       <arg line="/v:m" />
       <arg line="/m" />
@@ -1280,7 +1280,7 @@ Commandline Examples:
     <property name="build-quartz" value="true" />
     <property name="build-msmq" value="true" />
     <property name="build-velocity" value="true" />
-    <property name="solution.file.2010" value="Spring.Net.2010.sln"/>
+    <property name="solution.file.2010" value="Spring.Net.sln"/>
     <fileset id="src.to.copy">
       <include name="src/Spring/Spring.Core/**"/>
       <include name="src/Spring/Spring.Aop/**"/>
diff --git a/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2010.sln b/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.sln
similarity index 87%
rename from examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2010.sln
rename to examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.sln
index 930c2ab3..66eae5e6 100644
--- a/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2010.sln
+++ b/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.sln
@@ -1,66 +1,66 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{919AF8FE-423F-4A8C-BDA4-CB8B39D64780}"
-	ProjectSection(SolutionItems) = preProject
-		readme.txt = readme.txt
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Common.2010", "src\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2010.csproj", "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step1.2010", "src\Spring.AopQuickStart.Step1\Spring.AopQuickStart.Step1.2010.csproj", "{1B3559A0-5274-4968-A628-77F036984F02}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step2.2010", "src\Spring.AopQuickStart.Step2\Spring.AopQuickStart.Step2.2010.csproj", "{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step3.2010", "src\Spring.AopQuickStart.Step3\Spring.AopQuickStart.Step3.2010.csproj", "{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step4.2010", "src\Spring.AopQuickStart.Step4\Spring.AopQuickStart.Step4.2010.csproj", "{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step5.2010", "src\Spring.AopQuickStart.Step5\Spring.AopQuickStart.Step5.2010.csproj", "{61086108-3EB7-4ACE-B4B6-B4B60AB76108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step6.2010", "src\Spring.AopQuickStart.Step6\Spring.AopQuickStart.Step6.2010.csproj", "{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step7.2010", "src\Spring.AopQuickStart.Step7\Spring.AopQuickStart.Step7.2010.csproj", "{0077A8CA-4C09-42B1-B227-91095CE4CCA2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B3559A0-5274-4968-A628-77F036984F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B3559A0-5274-4968-A628-77F036984F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B3559A0-5274-4968-A628-77F036984F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B3559A0-5274-4968-A628-77F036984F02}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{919AF8FE-423F-4A8C-BDA4-CB8B39D64780}"
+	ProjectSection(SolutionItems) = preProject
+		readme.txt = readme.txt
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Common.2010", "src\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.csproj", "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step1.2010", "src\Spring.AopQuickStart.Step1\Spring.AopQuickStart.Step1.csproj", "{1B3559A0-5274-4968-A628-77F036984F02}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step2.2010", "src\Spring.AopQuickStart.Step2\Spring.AopQuickStart.Step2.csproj", "{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step3.2010", "src\Spring.AopQuickStart.Step3\Spring.AopQuickStart.Step3.csproj", "{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step4.2010", "src\Spring.AopQuickStart.Step4\Spring.AopQuickStart.Step4.csproj", "{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step5.2010", "src\Spring.AopQuickStart.Step5\Spring.AopQuickStart.Step5.csproj", "{61086108-3EB7-4ACE-B4B6-B4B60AB76108}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step6.2010", "src\Spring.AopQuickStart.Step6\Spring.AopQuickStart.Step6.csproj", "{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step7.2010", "src\Spring.AopQuickStart.Step7\Spring.AopQuickStart.Step7.csproj", "{0077A8CA-4C09-42B1-B227-91095CE4CCA2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B3559A0-5274-4968-A628-77F036984F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B3559A0-5274-4968-A628-77F036984F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B3559A0-5274-4968-A628-77F036984F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B3559A0-5274-4968-A628-77F036984F02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.csproj
similarity index 97%
rename from examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2010.csproj
rename to examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.csproj
index 38d05157..823c3cff 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.csproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.csproj
similarity index 92%
rename from examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2010.csproj
rename to examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.csproj
index 203cd85d..ea127b5c 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.csproj
@@ -1,19 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.csproj
similarity index 92%
rename from examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2010.csproj
rename to examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.csproj
index 203cd85d..ea127b5c 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.csproj
@@ -1,19 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.csproj
similarity index 92%
rename from examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2010.csproj
rename to examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.csproj
index 203cd85d..ea127b5c 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.csproj
@@ -1,19 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.csproj
similarity index 92%
rename from examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2010.csproj
rename to examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.csproj
index 203cd85d..ea127b5c 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.csproj
@@ -1,19 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2010.csproj
deleted file mode 100644
index 203cd85d..00000000
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2010.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.csproj
new file mode 100644
index 00000000..ea127b5c
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.csproj
similarity index 97%
rename from examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2010.csproj
rename to examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.csproj
index 7419c133..3c9efe6c 100644
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2010.csproj
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2010.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2010.csproj
deleted file mode 100644
index 203cd85d..00000000
--- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2010.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.AopQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.csproj
new file mode 100644
index 00000000..ea127b5c
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.CachingQuickStart/Spring.CachingQuickStart.2010.sln b/examples/Spring/Spring.CachingQuickStart/Spring.CachingQuickStart.sln
similarity index 90%
rename from examples/Spring/Spring.CachingQuickStart/Spring.CachingQuickStart.2010.sln
rename to examples/Spring/Spring.CachingQuickStart/Spring.CachingQuickStart.sln
index 30efd78f..941cf21a 100644
--- a/examples/Spring/Spring.CachingQuickStart/Spring.CachingQuickStart.2010.sln
+++ b/examples/Spring/Spring.CachingQuickStart/Spring.CachingQuickStart.sln
@@ -1,22 +1,22 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.CachingQuickStart.Web.2010", "src\Spring.CachingQuickStart.Web\Spring.CachingQuickStart.Web.2010.csproj", "{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.CachingQuickStart.Web.2010", "src\Spring.CachingQuickStart.Web\Spring.CachingQuickStart.Web.csproj", "{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.2010.csproj b/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.csproj
similarity index 97%
rename from examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.2010.csproj
rename to examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.csproj
index 2263732a..127f25bf 100644
--- a/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.2010.csproj
+++ b/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.csproj
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.CachingQuickStart</RootNamespace>
-    <AssemblyName>Spring.CachingQuickStart.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <UseIISExpress>false</UseIISExpress>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\net452\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\net452\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Web\net452\Spring.Web.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Default.aspx" />
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Services\IMovieService.cs" />
-    <Compile Include="Services\Movie.cs" />
-    <Compile Include="Services\MovieService.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Spring.config" />
-  </ItemGroup>
-  <ItemGroup />
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>31290</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F02A190A-C98A-434B-8203-D9E5EBCDE9DB}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.CachingQuickStart</RootNamespace>
+    <AssemblyName>Spring.CachingQuickStart.Web</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <UseIISExpress>false</UseIISExpress>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\net452\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\net452\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Web">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Web\net452\Spring.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Default.aspx" />
+    <Content Include="Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Default.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>Default.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Default.aspx.designer.cs">
+      <DependentUpon>Default.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Services\IMovieService.cs" />
+    <Compile Include="Services\Movie.cs" />
+    <Compile Include="Services\MovieService.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Spring.config" />
+  </ItemGroup>
+  <ItemGroup />
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>31290</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/Spring.Calculator.2010.sln b/examples/Spring/Spring.Calculator/Spring.Calculator.sln
similarity index 92%
rename from examples/Spring/Spring.Calculator/Spring.Calculator.2010.sln
rename to examples/Spring/Spring.Calculator/Spring.Calculator.sln
index 8a317e91..eb3278af 100644
--- a/examples/Spring/Spring.Calculator/Spring.Calculator.2010.sln
+++ b/examples/Spring/Spring.Calculator/Spring.Calculator.sln
@@ -1,109 +1,109 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B1FF7E1F-9BF9-4EB3-B38C-39A0E3EA4D0A}"
-	ProjectSection(SolutionItems) = preProject
-		readme.txt = readme.txt
-		SpringCalculator.snk = SpringCalculator.snk
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Services.2010", "src\Spring.Calculator.Services\Spring.Calculator.Services.2010.csproj", "{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Contract.2010", "src\Spring.Calculator.Contract\Spring.Calculator.Contract.2010.csproj", "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RemoteApp.2010", "src\Spring.Calculator.RemoteApp\Spring.Calculator.RemoteApp.2010.csproj", "{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.ClientApp.2010", "src\Spring.Calculator.ClientApp\Spring.Calculator.ClientApp.2010.csproj", "{F202BB75-CEFD-400B-9CD3-0914F466EBF5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aspects.2010", "src\Spring.Aspects\Spring.Aspects.2010.csproj", "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RegisterComponentServices.2010", "src\Spring.Calculator.RegisterComponentServices\Spring.Calculator.RegisterComponentServices.2010.csproj", "{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Web.2010", "src\Spring.Calculator.Web\Spring.Calculator.Web.2010.csproj", "{08E648D8-FD43-4459-B997-1095E50FFD24}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|.NET.ActiveCfg = Release|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|.NET.ActiveCfg = Release|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|.NET.ActiveCfg = Release|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|.NET.ActiveCfg = Release|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|.NET.ActiveCfg = Release|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|.NET.ActiveCfg = Release|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|.NET.ActiveCfg = Release|Any CPU
-		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B1FF7E1F-9BF9-4EB3-B38C-39A0E3EA4D0A}"
+	ProjectSection(SolutionItems) = preProject
+		readme.txt = readme.txt
+		SpringCalculator.snk = SpringCalculator.snk
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Services.2010", "src\Spring.Calculator.Services\Spring.Calculator.Services.csproj", "{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Contract.2010", "src\Spring.Calculator.Contract\Spring.Calculator.Contract.csproj", "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RemoteApp.2010", "src\Spring.Calculator.RemoteApp\Spring.Calculator.RemoteApp.csproj", "{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.ClientApp.2010", "src\Spring.Calculator.ClientApp\Spring.Calculator.ClientApp.csproj", "{F202BB75-CEFD-400B-9CD3-0914F466EBF5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aspects.2010", "src\Spring.Aspects\Spring.Aspects.csproj", "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RegisterComponentServices.2010", "src\Spring.Calculator.RegisterComponentServices\Spring.Calculator.RegisterComponentServices.csproj", "{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Web.2010", "src\Spring.Calculator.Web\Spring.Calculator.Web.csproj", "{08E648D8-FD43-4459-B997-1095E50FFD24}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|.NET.ActiveCfg = Release|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|.NET.ActiveCfg = Release|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|.NET.ActiveCfg = Release|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|.NET.ActiveCfg = Release|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|.NET.ActiveCfg = Release|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|.NET.ActiveCfg = Release|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|.NET.ActiveCfg = Release|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{08E648D8-FD43-4459-B997-1095E50FFD24}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.csproj
similarity index 97%
rename from examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj
rename to examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.csproj
index da4aad3d..a35dbc59 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/project.json b/examples/Spring/Spring.Calculator/src/Spring.Aspects/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.csproj
similarity index 90%
rename from examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2010.csproj
rename to examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.csproj
index 87804c94..14899ae8 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.csproj
@@ -1,26 +1,26 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2010.csproj" />
-    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2010.csproj" />
-    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\$(TargetFramework)\Spring.Services.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Config\EnterpriseServices\enterpriseServices.xml" />
-    <EmbeddedResource Include="Config\InProcess\inProcess.xml" />
-    <EmbeddedResource Include="Config\Remoting\*.xml" />
-    <EmbeddedResource Include="Config\WebServices\calculatorService.wsdl" />
-    <EmbeddedResource Include="Config\WebServices\*.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.csproj" />
+    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.csproj" />
+    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Services">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\$(TargetFramework)\Spring.Services.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Config\EnterpriseServices\enterpriseServices.xml" />
+    <EmbeddedResource Include="Config\InProcess\inProcess.xml" />
+    <EmbeddedResource Include="Config\Remoting\*.xml" />
+    <EmbeddedResource Include="Config\WebServices\calculatorService.wsdl" />
+    <EmbeddedResource Include="Config\WebServices\*.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.csproj
similarity index 97%
rename from examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2010.csproj
rename to examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.csproj
index e4b1f003..6ff13845 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.Calculator</RootNamespace>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>../../Spring.Calculator.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.Calculator</RootNamespace>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>../../Spring.Calculator.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.csproj
similarity index 90%
rename from examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2010.csproj
rename to examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.csproj
index b4ec959f..0c1a9d47 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.csproj
@@ -1,27 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2010.csproj" />
-    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\$(TargetFramework)\Spring.Services.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Calculator.EnterpriseServices.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Spring.Calculator.EnterpriseServices.exe.config" />
-    <Content Include="Config\services.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.csproj" />
+    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Services">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\$(TargetFramework)\Spring.Services.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Calculator.EnterpriseServices.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Spring.Calculator.EnterpriseServices.exe.config" />
+    <Content Include="Config\services.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.csproj
similarity index 87%
rename from examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2010.csproj
rename to examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.csproj
index e3ba0339..22698e76 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.csproj
@@ -1,22 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2010.csproj" />
-    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2010.csproj" />
-    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\$(TargetFramework)\Spring.Services.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Config\*.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.csproj" />
+    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.csproj" />
+    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Services">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\$(TargetFramework)\Spring.Services.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Config\*.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.csproj
similarity index 89%
rename from examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2010.csproj
rename to examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.csproj
index ce553f14..47c9ebc3 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.Calculator</RootNamespace>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>../../Spring.Calculator.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2010.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.Calculator</RootNamespace>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>../../Spring.Calculator.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.csproj
similarity index 98%
rename from examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2010.csproj
rename to examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.csproj
index eb463199..0b5fee0b 100644
--- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2010.csproj
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.csproj
@@ -85,15 +85,15 @@
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2010.csproj">
+    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.csproj">
       <Project>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</Project>
       <Name>Spring.Aspects.2010</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2010.csproj">
+    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.csproj">
       <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
       <Name>Spring.Calculator.Contract.2010</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2010.csproj">
+    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.csproj">
       <Project>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</Project>
       <Name>Spring.Calculator.Services.2010</Name>
     </ProjectReference>
diff --git a/examples/Spring/Spring.CodeConfig.Migration/Spring.CodeConfig.Migration.2010.sln b/examples/Spring/Spring.CodeConfig.Migration/Spring.CodeConfig.Migration.sln
similarity index 86%
rename from examples/Spring/Spring.CodeConfig.Migration/Spring.CodeConfig.Migration.2010.sln
rename to examples/Spring/Spring.CodeConfig.Migration/Spring.CodeConfig.Migration.sln
index 7cd8f408..b7a0e71f 100644
--- a/examples/Spring/Spring.CodeConfig.Migration/Spring.CodeConfig.Migration.2010.sln
+++ b/examples/Spring/Spring.CodeConfig.Migration/Spring.CodeConfig.Migration.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primes.2010", "src\Primes\Primes.2010.csproj", "{865E1A8E-88F3-48D8-869F-B584C5A36740}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primes.2010", "src\Primes\Primes.csproj", "{865E1A8E-88F3-48D8-869F-B584C5A36740}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primes.Tests.2010", "test\Primes.Tests\Primes.Tests.2010.csproj", "{32476935-0852-4A11-B938-4D202D8B4454}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primes.Tests.2010", "test\Primes.Tests\Primes.Tests.csproj", "{32476935-0852-4A11-B938-4D202D8B4454}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringApp.2010", "src\SpringApp\SpringApp.2010.csproj", "{08A8AC17-E5E1-48FC-9958-76ECA8C08D71}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringApp.2010", "src\SpringApp\SpringApp.csproj", "{08A8AC17-E5E1-48FC-9958-76ECA8C08D71}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.2010.csproj b/examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.csproj
similarity index 100%
rename from examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.2010.csproj
rename to examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.csproj
diff --git a/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.2010.csproj b/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj
similarity index 91%
rename from examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.2010.csproj
rename to examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj
index 7603cc89..d4452dfd 100644
--- a/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.2010.csproj
+++ b/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Primes\Primes.2010.csproj" />
+    <ProjectReference Include="..\Primes\Primes.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
diff --git a/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.2010.csproj b/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.csproj
similarity index 85%
rename from examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.2010.csproj
rename to examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.csproj
index 5fa280b0..638147da 100644
--- a/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.2010.csproj
+++ b/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>Primes</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Primes\Primes.2010.csproj" />
+    <ProjectReference Include="..\..\src\Primes\Primes.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
diff --git a/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/project.json b/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/project.json
deleted file mode 100644
index fcc734f03cc2db389e930ce4896ef5ee0fa21060..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 332
zcmZ9HO9}!p5JcZv@D7r-ilA;hggXx)ejtc(7$Y*sTwSdgJ4y&iI-Tm*)vxD+Ap=HQ
zjy(q&?eK{LJG@?3{jBt#m5wzVDLnC;cg&fx)SfA0w4QN^9Y<QWoJG5HQGBYXsekqm
zq=_s_&%RLpiCNonlanYfiEKX2sWI(#>g}bU$Vs5nbdBn5wwhj7{d6{AQe=1ed;^QO
BDd_+J

diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.2010.sln b/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.sln
similarity index 92%
rename from examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.2010.sln
rename to examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.sln
index 7be84ed0..2ff00404 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.2010.sln
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.sln
@@ -1,96 +1,96 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Service.2010", "src\Spring.Northwind.Service\Spring.Northwind.Service.2010.csproj", "{9E15876F-E9E0-43B7-9874-B54F163757D6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Dao.2010", "src\Spring.Northwind.Dao\Spring.Northwind.Dao.2010.csproj", "{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Dao.NHibernate.2010", "src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.2010.csproj", "{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.IntegrationTests.2010", "test\Spring.Northwind.IntegrationTests\Spring.Northwind.IntegrationTests.2010.csproj", "{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Web.2010", "src\Spring.Northwind.Web\Spring.Northwind.Web.2010.csproj", "{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Web.Conversation.2010", "src\Spring.Northwind.Web.Conversation\Spring.Northwind.Web.Conversation.2010.csproj", "{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|.NET.ActiveCfg = Release|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|.NET.ActiveCfg = Release|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|.NET.ActiveCfg = Release|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|.NET.ActiveCfg = Release|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Release|.NET.ActiveCfg = Release|Any CPU
-		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		NAntAddinLastFileName = 
-	EndGlobalSection
-EndGlobal
-
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Service.2010", "src\Spring.Northwind.Service\Spring.Northwind.Service.csproj", "{9E15876F-E9E0-43B7-9874-B54F163757D6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Dao.2010", "src\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj", "{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Dao.NHibernate.2010", "src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj", "{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.IntegrationTests.2010", "test\Spring.Northwind.IntegrationTests\Spring.Northwind.IntegrationTests.csproj", "{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Web.2010", "src\Spring.Northwind.Web\Spring.Northwind.Web.csproj", "{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Web.Conversation.2010", "src\Spring.Northwind.Web.Conversation\Spring.Northwind.Web.Conversation.csproj", "{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|.NET.ActiveCfg = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|.NET.ActiveCfg = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|.NET.ActiveCfg = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|.NET.ActiveCfg = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|.NET.ActiveCfg = Release|Any CPU
+		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Release|.NET.ActiveCfg = Release|Any CPU
+		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8EEAB62E-DBAF-4C5F-9906-77B2A817F945}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		NAntAddinLastFileName = 
+	EndGlobalSection
+EndGlobal
+
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2010.csproj
deleted file mode 100644
index d11d2a4e..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.2010.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.Northwind</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
-    <PackageReference Include="Iesi.Collections" Version="3.4.1.4000" />
-    <PackageReference Include="NHibernate" Version="3.4.1.4000" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data.NHibernate3">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data.NHibernate3\$(TargetFramework)\Spring.Data.NHibernate3.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Mappings\*.hbm.xml" />
-    <EmbeddedResource Include="Dao\*.xml" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj
index ecdbc004..642cd187 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj
@@ -1,109 +1,29 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net452</TargetFramework>
     <RootNamespace>Spring.Northwind</RootNamespace>
-    <AssemblyName>Spring.Northwind.Dao.NHibernate</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, 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="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data.NHibernate21, Version=1.1.1.20093, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate21.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\System.Data.SQLite.DLL</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Dao\NHibernate\CustomLocalSessionFactoryObject.cs" />
-    <Compile Include="Dao\NHibernate\HibernateCustomerDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Dao\NHibernate\HibernateDao.cs" />
-    <Compile Include="Dao\NHibernate\HibernateOrderDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Dao\NHibernate\HibernateProductDao.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
+    <PackageReference Include="Iesi.Collections" Version="3.4.1.4000" />
+    <PackageReference Include="NHibernate" Version="3.4.1.4000" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Mappings\Customer.hbm.xml" />
-    <EmbeddedResource Include="Mappings\Order.hbm.xml" />
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data.NHibernate3">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data.NHibernate3\$(TargetFramework)\Spring.Data.NHibernate3.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj">
-      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
-      <Name>Spring.Northwind.Dao</Name>
-    </ProjectReference>
+    <EmbeddedResource Include="Mappings\*.hbm.xml" />
+    <EmbeddedResource Include="Dao\*.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Mappings\OrderDetail.hbm.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Dao\Dao.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/project.json b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/project.json
deleted file mode 100644
index 1eea63bc177f0d23dbb2a6681ac778bdfc427fed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmZvY%L>9U5Jm4=@E;^=6<;g2Zgk^6RIO0dw6qlw>94CNjcK}&VM5wDckWC+@0W%e
zXhayDl&T<Yd$T$!<Ex^wrtV3jUHdQ7R2${G5-DU2o1+Z0(Gp@o&d3#~3!^b^Mtg1H
z4=77C3F`Fc;&o2z((C5b!jugi!rkbMKG6;J1NTyw&Oh$uce5}x{lYFy*QMXlv!(7#
o<u-Di!$#o+9McbjcLqOU600X~QJ{}Lao&Hb$c3#O<)`!K7ewkd0RR91

diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2010.csproj
deleted file mode 100644
index f265b87d..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.2010.csproj
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.Northwind</RootNamespace>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.csproj
index 2ff3a649..f265b87d 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.csproj
@@ -1,58 +1,6 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net452</TargetFramework>
     <RootNamespace>Spring.Northwind</RootNamespace>
-    <AssemblyName>Spring.Northwind.Dao</AssemblyName>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Dao\ICustomerDao.cs" />
-    <Compile Include="Dao\IDao.cs" />
-    <Compile Include="Dao\IOrderDao.cs" />
-    <Compile Include="Dao\IProductDao.cs" />
-    <Compile Include="Dao\ISupportsDeleteDao.cs" />
-    <Compile Include="Dao\ISupportsSave.cs" />
-    <Compile Include="Domain\Customer.cs" />
-    <Compile Include="Domain\DefaultCustomerClassificationCalculator.cs" />
-    <Compile Include="Domain\ICustomer.cs" />
-    <Compile Include="Domain\ICustomerClassificationCalculator.cs" />
-    <Compile Include="Domain\Order.cs" />
-    <Compile Include="Domain\OrderDetail.cs" />
-    <Compile Include="Domain\Product.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj
deleted file mode 100644
index 4e6a4e41..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.Northwind</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.2010.csproj" />
-    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Data">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Service\Services.xml" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj.user b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj.user
deleted file mode 100644
index e98b7a34..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.2010.csproj.user
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishUrlHistory />
-    <InstallUrlHistory />
-    <SupportUrlHistory />
-    <UpdateUrlHistory />
-    <BootstrapperUrlHistory />
-    <ErrorReportUrlHistory />
-    <FallbackCulture>en-US</FallbackCulture>
-    <VerifyUploadedFiles>false</VerifyUploadedFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj
index 69c4a223..c77245a6 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj
@@ -1,73 +1,19 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9E15876F-E9E0-43B7-9874-B54F163757D6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net452</TargetFramework>
     <RootNamespace>Spring.Northwind</RootNamespace>
-    <AssemblyName>Spring.Northwind.Service</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup />
   <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
+    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj" />
+    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Service\FedExShippingService.cs" />
-    <Compile Include="Service\IFulfillmentService.cs" />
-    <Compile Include="Service\IShippingService.cs" />
-    <Compile Include="Service\FulfillmentService.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj">
-      <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
-      <Name>Spring.Northwind.Dao.NHibernate</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj">
-      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
-      <Name>Spring.Northwind.Dao</Name>
-    </ProjectReference>
+    <Reference Include="Spring.Data">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Service\Services.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/project.json b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.csproj
similarity index 98%
rename from examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.2010.csproj
rename to examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.csproj
index 7a789d27..ea184dd9 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.2010.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.csproj
@@ -162,15 +162,15 @@
     <Content Include="Shared\MasterPage.master" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.2010.csproj">
+    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj">
       <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
       <Name>Spring.Northwind.Dao.NHibernate.2010</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.2010.csproj">
+    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj">
       <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
       <Name>Spring.Northwind.Dao.2010</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Spring.Northwind.Service\Spring.Northwind.Service.2010.csproj">
+    <ProjectReference Include="..\Spring.Northwind.Service\Spring.Northwind.Service.csproj">
       <Project>{9E15876F-E9E0-43B7-9874-B54F163757D6}</Project>
       <Name>Spring.Northwind.Service.2010</Name>
     </ProjectReference>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/project.json b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/project.json
deleted file mode 100644
index ef81daa679a1823d7365147793a6636d8e572fc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 656
zcmb7?K~KU^5QOJ!;(svjtVFOUuU;S_{0GoV8nGn>LJZ-ri{HNOQuIJ#Hru}D&Cbs3
z_Vj(wt!{KjB)zHBnymAw)~hPMHrzaO@5rPVHTonPa05+wFNun;Wrs|9;^r}D(mnjw
zs|J~~rI&a5f4!?HG=pQSp+@BJ3fm<6s!(WdRz!*0EiTMeICdSQ&P#zKi*U5c&I|C?
zGn5Cq$IUc`cLAyeI|uvQr_IXJ`Av0f<jCyeob*opoVl0U)4A2hS!cgP-=ixkI!y;1
y&n%aWj%~F=l{q)&a30$>%w;5c+om5-QtOMEt*MXy<1c$uMpcgsSB7wP{`>*#pjH|H

diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Spring.Northwind.Web.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Spring.Northwind.Web.csproj
similarity index 96%
rename from examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Spring.Northwind.Web.2010.csproj
rename to examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Spring.Northwind.Web.csproj
index 75892fe1..7a3a06e5 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Spring.Northwind.Web.2010.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Spring.Northwind.Web.csproj
@@ -1,208 +1,208 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.Northwind.Web</RootNamespace>
-    <AssemblyName>Spring.Northwind.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <UseIISExpress>false</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
-    <PackageReference Include="Iesi.Collections" Version="3.4.1.4000" />
-    <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="NHibernate" Version="3.4.1.4000" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\net452\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data\net452\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data.NHibernate3">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data.NHibernate3\net452\Spring.Data.NHibernate3.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Web\net452\Spring.Web.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\net\2.0\System.Data.SQLite.DLL</HintPath>
-    </Reference>
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Mobile" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="CSS\style.css" />
-    <Content Include="CustomerEditor.aspx" />
-    <Content Include="CustomerList.aspx" />
-    <Content Include="CustomerOrders.aspx" />
-    <Content Include="CustomerView.aspx" />
-    <Content Include="Default.aspx" />
-    <Content Include="FulfillmentResult.aspx" />
-    <Content Include="Global.asax" />
-    <Content Include="Img\bg-spring.png" />
-    <Content Include="Img\footern.gif" />
-    <Content Include="Img\header-spring.png" />
-    <Content Include="Img\logo.png" />
-    <Content Include="Img\springNet_release.png" />
-    <Content Include="Web.config" />
-    <Content Include="Web.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomerEditor.aspx.designer.cs">
-      <DependentUpon>CustomerEditor.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CustomerList.aspx.designer.cs">
-      <DependentUpon>CustomerList.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CustomerOrders.aspx.designer.cs">
-      <DependentUpon>CustomerOrders.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="CustomerView.aspx.designer.cs">
-      <DependentUpon>CustomerView.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Default.aspx.designer.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="FulfillmentResult.aspx.designer.cs">
-      <DependentUpon>FulfillmentResult.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Controller\ICustomerEditController.cs" />
-    <Compile Include="Controller\NHibernateCustomerEditController.cs" />
-    <Compile Include="CustomerEditor.aspx.cs">
-      <DependentUpon>CustomerEditor.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CustomerList.aspx.cs">
-      <DependentUpon>CustomerList.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CustomerOrders.aspx.cs">
-      <DependentUpon>CustomerOrders.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="CustomerView.aspx.cs">
-      <DependentUpon>CustomerView.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="FulfillmentResult.aspx.cs">
-      <DependentUpon>FulfillmentResult.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Shared\MasterPage.master.cs">
-      <DependentUpon>MasterPage.master</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Shared\MasterPage.master.designer.cs">
-      <DependentUpon>MasterPage.master</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_Themes\Spring\Spring.skin" />
-    <Content Include="Config\Aspects.xml" />
-    <Content Include="Config\Log4Net.xml" />
-    <Content Include="Shared\MasterPage.master" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.2010.csproj">
-      <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
-      <Name>Spring.Northwind.Dao.NHibernate.2010</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.2010.csproj">
-      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
-      <Name>Spring.Northwind.Dao.2010</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Northwind.Service\Spring.Northwind.Service.2010.csproj">
-      <Project>{9E15876F-E9E0-43B7-9874-B54F163757D6}</Project>
-      <Name>Spring.Northwind.Service.2010</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>2431</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2967CA64-7352-46E3-89C0-6BB3A0A13FC1}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.Northwind.Web</RootNamespace>
+    <AssemblyName>Spring.Northwind.Web</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <UseIISExpress>false</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
+    <PackageReference Include="Iesi.Collections" Version="3.4.1.4000" />
+    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="NHibernate" Version="3.4.1.4000" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\net452\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data\net452\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data.NHibernate3">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data.NHibernate3\net452\Spring.Data.NHibernate3.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Web">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Web\net452\Spring.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data.SQLite, Version=1.0.65.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\net\2.0\System.Data.SQLite.DLL</HintPath>
+    </Reference>
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Web.Mobile" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="CSS\style.css" />
+    <Content Include="CustomerEditor.aspx" />
+    <Content Include="CustomerList.aspx" />
+    <Content Include="CustomerOrders.aspx" />
+    <Content Include="CustomerView.aspx" />
+    <Content Include="Default.aspx" />
+    <Content Include="FulfillmentResult.aspx" />
+    <Content Include="Global.asax" />
+    <Content Include="Img\bg-spring.png" />
+    <Content Include="Img\footern.gif" />
+    <Content Include="Img\header-spring.png" />
+    <Content Include="Img\logo.png" />
+    <Content Include="Img\springNet_release.png" />
+    <Content Include="Web.config" />
+    <Content Include="Web.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CustomerEditor.aspx.designer.cs">
+      <DependentUpon>CustomerEditor.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CustomerList.aspx.designer.cs">
+      <DependentUpon>CustomerList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CustomerOrders.aspx.designer.cs">
+      <DependentUpon>CustomerOrders.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CustomerView.aspx.designer.cs">
+      <DependentUpon>CustomerView.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Default.aspx.designer.cs">
+      <DependentUpon>Default.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="FulfillmentResult.aspx.designer.cs">
+      <DependentUpon>FulfillmentResult.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Controller\ICustomerEditController.cs" />
+    <Compile Include="Controller\NHibernateCustomerEditController.cs" />
+    <Compile Include="CustomerEditor.aspx.cs">
+      <DependentUpon>CustomerEditor.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CustomerList.aspx.cs">
+      <DependentUpon>CustomerList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CustomerOrders.aspx.cs">
+      <DependentUpon>CustomerOrders.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CustomerView.aspx.cs">
+      <DependentUpon>CustomerView.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Default.aspx.cs">
+      <DependentUpon>Default.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="FulfillmentResult.aspx.cs">
+      <DependentUpon>FulfillmentResult.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Shared\MasterPage.master.cs">
+      <DependentUpon>MasterPage.master</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Shared\MasterPage.master.designer.cs">
+      <DependentUpon>MasterPage.master</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_Themes\Spring\Spring.skin" />
+    <Content Include="Config\Aspects.xml" />
+    <Content Include="Config\Log4Net.xml" />
+    <Content Include="Shared\MasterPage.master" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj">
+      <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
+      <Name>Spring.Northwind.Dao.NHibernate.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj">
+      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
+      <Name>Spring.Northwind.Dao.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Northwind.Service\Spring.Northwind.Service.csproj">
+      <Project>{9E15876F-E9E0-43B7-9874-B54F163757D6}</Project>
+      <Name>Spring.Northwind.Service.2010</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="App_Data\" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>2431</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/project.json b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/project.json
deleted file mode 100644
index ef81daa679a1823d7365147793a6636d8e572fc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 656
zcmb7?K~KU^5QOJ!;(svjtVFOUuU;S_{0GoV8nGn>LJZ-ri{HNOQuIJ#Hru}D&Cbs3
z_Vj(wt!{KjB)zHBnymAw)~hPMHrzaO@5rPVHTonPa05+wFNun;Wrs|9;^r}D(mnjw
zs|J~~rI&a5f4!?HG=pQSp+@BJ3fm<6s!(WdRz!*0EiTMeICdSQ&P#zKi*U5c&I|C?
zGn5Cq$IUc`cLAyeI|uvQr_IXJ`Av0f<jCyeob*opoVl0U)4A2hS!cgP-=ixkI!y;1
y&n%aWj%~F=l{q)&a30$>%w;5c+om5-QtOMEt*MXy<1c$uMpcgsSB7wP{`>*#pjH|H

diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2010.csproj
deleted file mode 100644
index f64a4811..00000000
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.2010.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.Northwind</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>rem echo "Copying .xml files for tests"
-rem xcopy  "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Northwind.IntegrationTests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.2010.csproj" />
-    <ProjectReference Include="..\..\src\Spring.Northwind.Dao\Spring.Northwind.Dao.2010.csproj" />
-    <ProjectReference Include="..\..\src\Spring.Northwind.Service\Spring.Northwind.Service.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data.NHibernate3">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data.NHibernate3\$(TargetFramework)\Spring.Data.NHibernate3.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Testing.NUnit">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Testing.NUnit\$(TargetFramework)\Spring.Testing.NUnit.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Web\$(TargetFramework)\Spring.Web.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
index 67f5bf42..6e4b4686 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
@@ -1,111 +1,37 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net452</TargetFramework>
     <RootNamespace>Spring.Northwind</RootNamespace>
-    <AssemblyName>Spring.Northwind.IntegrationTests</AssemblyName>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\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="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data.NHibernate21, Version=1.1.2.20153, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Data.NHibernate21.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Testing.NUnit, Version=1.1.2.20153, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Testing.NUnit.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="IntegrationTests\AbstractDaoIntegrationTests.cs" />
-    <Compile Include="IntegrationTests\FulfillmentServiceTests.cs" />
-    <Compile Include="IntegrationTests\NorthwindIntegrationTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj">
-      <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
-      <Name>Spring.Northwind.Dao.NHibernate</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj">
-      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
-      <Name>Spring.Northwind.Dao</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Spring.Northwind.Service\Spring.Northwind.Service.csproj">
-      <Project>{9E15876F-E9E0-43B7-9874-B54F163757D6}</Project>
-      <Name>Spring.Northwind.Service</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
   <PropertyGroup>
-    <PostBuildEvent>rem echo "Copying .xml files for tests"
+    <PostBuildEvent>rem echo "Copying .xml files for tests"
 rem xcopy  "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Northwind.IntegrationTests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
   </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj" />
+    <ProjectReference Include="..\..\src\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj" />
+    <ProjectReference Include="..\..\src\Spring.Northwind.Service\Spring.Northwind.Service.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data.NHibernate3">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Data.NHibernate3\$(TargetFramework)\Spring.Data.NHibernate3.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Testing.NUnit">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Testing.NUnit\$(TargetFramework)\Spring.Testing.NUnit.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Web">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Web\$(TargetFramework)\Spring.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/project.json b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/project.json
deleted file mode 100644
index dec199566a4c5cceca8de4bc366d39847d272020..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 574
zcmaKpL2JT56olt2_#euiHMD9kz4p?Ac<T?a8YQ$QA&rzG{&ns5cHL|Qk;i7U?97{a
zv**)6Lk;vmIjxneW|jW0)Jg@XA8uZ_4@jq1RoYP%xJ+~QEmd&ZUXV^xZXW$|8qxng
zEAu@Yw1Uzt{=0Wl(9`t4sT_YTy5=K#49v+zeTE0C=wYEZ@SiXnI7`^qissr@;63$t
zAK(k{eSgnh#dY}|nKWg&L1Rfuxqflj=&SRX5)Y}DU|KX|%Ezutzhl5Q+T+Bgw$5?t
i_%?>=mqXj$WsH+jf8<rePddr(Emp$CsSFj|h3`LL1WJ4W

diff --git a/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2010.sln b/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.sln
similarity index 88%
rename from examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2010.sln
rename to examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.sln
index 5884c4ae..28d56eac 100644
--- a/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2010.sln
+++ b/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.sln
@@ -1,29 +1,29 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.DataQuickStart.2010", "src\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2010.csproj", "{92B2A60E-D3B9-4647-8CFE-AC19611869F6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.DataQuickStart.Tests.2010", "test\Spring\Spring.DataQuickStart.Tests\Spring.DataQuickStart.Tests.2010.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
-
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.DataQuickStart.2010", "src\Spring\Spring.DataQuickStart\Spring.DataQuickStart.csproj", "{92B2A60E-D3B9-4647-8CFE-AC19611869F6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.DataQuickStart.Tests.2010", "test\Spring\Spring.DataQuickStart.Tests\Spring.DataQuickStart.Tests.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
+
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2010.csproj b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.csproj
similarity index 97%
rename from examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2010.csproj
rename to examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.csproj
index 69d50e3d..577fd210 100644
--- a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2010.csproj
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2010.csproj b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.csproj
similarity index 93%
rename from examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2010.csproj
rename to examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.csproj
index 221b0199..a1e25411 100644
--- a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2010.csproj
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.csproj
@@ -1,27 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="DataQuickStart\GenericTemplate\ExampleTests.xml" />
-    <EmbeddedResource Include="DataQuickStart\Template\ExampleTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.DataQuickStart\Spring.DataQuickStart.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DataQuickStart\GenericTemplate\ExampleTests.xml" />
+    <EmbeddedResource Include="DataQuickStart\Template\ExampleTests.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/project.json b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/project.json
deleted file mode 100644
index fcc734f03cc2db389e930ce4896ef5ee0fa21060..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 332
zcmZ9HO9}!p5JcZv@D7r-ilA;hggXx)ejtc(7$Y*sTwSdgJ4y&iI-Tm*)vxD+Ap=HQ
zjy(q&?eK{LJG@?3{jBt#m5wzVDLnC;cg&fx)SfA0w4QN^9Y<QWoJG5HQGBYXsekqm
zq=_s_&%RLpiCNonlanYfiEKX2sWI(#>g}bU$Vs5nbdBn5wwhj7{d6{AQe=1ed;^QO
BDd_+J

diff --git a/examples/Spring/Spring.EmsQuickStart/Spring.EmsQuickStart.2010.sln b/examples/Spring/Spring.EmsQuickStart/Spring.EmsQuickStart.sln
similarity index 87%
rename from examples/Spring/Spring.EmsQuickStart/Spring.EmsQuickStart.2010.sln
rename to examples/Spring/Spring.EmsQuickStart/Spring.EmsQuickStart.sln
index 91046c8f..926841ef 100644
--- a/examples/Spring/Spring.EmsQuickStart/Spring.EmsQuickStart.2010.sln
+++ b/examples/Spring/Spring.EmsQuickStart/Spring.EmsQuickStart.sln
@@ -1,35 +1,35 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.EmsQuickStart.Common.2010", "src\Spring\Spring.EmsQuickStart.Common\Spring.EmsQuickStart.Common.2010.csproj", "{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.EmsQuickStart.Server.2010", "src\Spring\Spring.EmsQuickStart.Server\Spring.EmsQuickStart.Server.2010.csproj", "{85E7B947-8153-45E4-B572-BEDB191F1FB2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.EmsQuickStart.Client.2010", "src\Spring\Spring.EmsQuickStart.Client\Spring.EmsQuickStart.Client.2010.csproj", "{87D0B725-A652-4A6B-A95F-197F7155769F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
-
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.EmsQuickStart.Common.2010", "src\Spring\Spring.EmsQuickStart.Common\Spring.EmsQuickStart.Common.csproj", "{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.EmsQuickStart.Server.2010", "src\Spring\Spring.EmsQuickStart.Server\Spring.EmsQuickStart.Server.csproj", "{85E7B947-8153-45E4-B572-BEDB191F1FB2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.EmsQuickStart.Client.2010", "src\Spring\Spring.EmsQuickStart.Client\Spring.EmsQuickStart.Client.csproj", "{87D0B725-A652-4A6B-A95F-197F7155769F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
+
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.2010.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.2010.csproj
deleted file mode 100644
index 4b63f19b..00000000
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.2010.csproj
+++ /dev/null
@@ -1,56 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <OutputType>WinExe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.EmsQuickStart.Common\Spring.EmsQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Ems">
-      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.Ems.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Update="UI\StockForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="UI\StockForm.designer.cs">
-      <DependentUpon>StockForm.cs</DependentUpon>
-    </Compile>
-    <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Content Include="Config\Application.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Messaging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj
index 23b2b5e5..83b1988e 100644
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj
@@ -1,147 +1,51 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{87D0B725-A652-4A6B-A95F-197F7155769F}</ProjectGuid>
+    <TargetFramework>net452</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.EmsQuickStart.Client</RootNamespace>
-    <AssemblyName>Spring.EmsQuickStart.Client</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>http://localhost/Spring.EmsQuickStart.Client/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <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>
+    <ProjectReference Include="..\Spring.EmsQuickStart.Common\Spring.EmsQuickStart.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Aop, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
+    <Reference Include="Spring.Messaging">
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
+    <Reference Include="Spring.Messaging.Ems">
+      <HintPath>..\..\..\..\..\..\bin\net\4.0\debug\Spring.Messaging.Ems.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Data, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Ems, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.Ems.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
     <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Gateways\EmsSyncStockServiceGateway.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Gateways\IStockService.cs" />
-    <Compile Include="Gateways\EmsStockServiceGateway.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Gateways\ISyncStockService.cs" />
-    <Compile Include="Gateways\RequestReplyEmsTemplate.cs" />
-    <Compile Include="Handlers\StockAppHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\StockForm.resx">
-      <DependentUpon>StockForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
+    <Compile Update="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <Compile Update="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Update="UI\StockForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Update="UI\StockForm.designer.cs">
+      <DependentUpon>StockForm.cs</DependentUpon>
+    </Compile>
     <None Include="App.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="UI\StockController.cs" />
-    <Compile Include="UI\StockForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\StockForm.designer.cs">
-      <DependentUpon>StockForm.cs</DependentUpon>
-    </Compile>
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.EmsQuickStart.Common\Spring.EmsQuickStart.Common.csproj">
-      <Project>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</Project>
-      <Name>Spring.EmsQuickStart.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="Config\Application.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -149,39 +53,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj.user b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj.user
deleted file mode 100644
index 143f0270..00000000
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/Spring.EmsQuickStart.Client.csproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
-    <PublishUrlHistory>
-    </PublishUrlHistory>
-    <InstallUrlHistory>
-    </InstallUrlHistory>
-    <SupportUrlHistory>
-    </SupportUrlHistory>
-    <UpdateUrlHistory>
-    </UpdateUrlHistory>
-    <BootstrapperUrlHistory>
-    </BootstrapperUrlHistory>
-    <ErrorReportUrlHistory>
-    </ErrorReportUrlHistory>
-    <FallbackCulture>en-US</FallbackCulture>
-    <VerifyUploadedFiles>true</VerifyUploadedFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/project.json b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Client/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.2010.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.2010.csproj
deleted file mode 100644
index 0db6ef47..00000000
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.2010.csproj
+++ /dev/null
@@ -1,41 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Ems">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging.Ems\$(TargetFramework)\Spring.Messaging.Ems.dll</HintPath>
-    </Reference>
-    <Reference Include="TIBCO.EMS">
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Data\TradeResponse.cs">
-      <DependentUpon>TradeResponse.xsd</DependentUpon>
-    </Compile>
-    <Compile Update="Data\TradeRequest.cs">
-      <DependentUpon>TradeRequest.xsd</DependentUpon>
-    </Compile>
-    <None Include="Data\TradeResponse.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Data\TradeResponse.xsx">
-      <DependentUpon>TradeResponse.xsd</DependentUpon>
-    </None>
-    <None Include="Data\TradeRequest.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Data\TradeRequest.xsx">
-      <DependentUpon>TradeRequest.xsd</DependentUpon>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.csproj
index 7ede3c8e..0db6ef47 100644
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Common/Spring.EmsQuickStart.Common.csproj
@@ -1,100 +1,30 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.EmsQuickStart.Common</RootNamespace>
-    <AssemblyName>Spring.EmsQuickStart.Common</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>http://localhost/Spring.EmsQuickStart.Common/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
+  <PropertyGroup />
   <ItemGroup>
-    <Reference Include="Spring.Aop, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
+    <Reference Include="Spring.Messaging">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Data, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
+    <Reference Include="Spring.Messaging.Ems">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging.Ems\$(TargetFramework)\Spring.Messaging.Ems.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Messaging, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Ems, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.Ems.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="TIBCO.EMS">
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converters\ITypeMapper.cs" />
-    <Compile Include="Converters\TypeMapper.cs" />
-    <Compile Include="Converters\XmlMessageConverter.cs" />
-    <Compile Include="Data\TradeResponse.cs">
+    <Compile Update="Data\TradeResponse.cs">
       <DependentUpon>TradeResponse.xsd</DependentUpon>
     </Compile>
-    <Compile Include="Data\TradeRequest.cs">
+    <Compile Update="Data\TradeRequest.cs">
       <DependentUpon>TradeRequest.xsd</DependentUpon>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Data\TradeResponse.xsd">
       <SubType>Designer</SubType>
     </None>
@@ -108,39 +38,4 @@
       <DependentUpon>TradeRequest.xsd</DependentUpon>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.2010.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.2010.csproj
deleted file mode 100644
index 695450c6..00000000
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.2010.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.EmsQuickStart.Common\Spring.EmsQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Ems">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging.Ems\$(TargetFramework)\Spring.Messaging.Ems.dll</HintPath>
-    </Reference>
-    <Reference Include="TIBCO.EMS">
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\*.xml" CopyToOutputDirectory="Preserve" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.csproj b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.csproj
index 4f4c82e7..16f8c464 100644
--- a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/Spring.EmsQuickStart.Server.csproj
@@ -1,159 +1,28 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{85E7B947-8153-45E4-B572-BEDB191F1FB2}</ProjectGuid>
+    <TargetFramework>net452</TargetFramework>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.EmsQuickStart.Server</RootNamespace>
-    <AssemblyName>Spring.EmsQuickStart.Server</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>http://localhost/Spring.EmsQuickStart.Server/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <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>
+    <ProjectReference Include="..\Spring.EmsQuickStart.Common\Spring.EmsQuickStart.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Aop, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
+    <Reference Include="Spring.Messaging">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Core, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Core.dll</HintPath>
+    <Reference Include="Spring.Messaging.Ems">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging.Ems\$(TargetFramework)\Spring.Messaging.Ems.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.Data, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Ems, Version=1.3.2.20942, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\bin\net\3.5\debug\Spring.Messaging.Ems.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="TIBCO.EMS">
       <HintPath>..\..\..\..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Gateways\IMarketDataService.cs" />
-    <Compile Include="Gateways\MarketDataServiceGateway.cs" />
-    <Compile Include="Handlers\LoggingExceptionListener.cs" />
-    <Compile Include="Handlers\StockAppHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\ICreditCheckService.cs" />
-    <Compile Include="Services\IExecutionVenueService.cs" />
-    <Compile Include="Services\ITradingService.cs" />
-    <Compile Include="Services\Stubs\CreditCheckServiceStub.cs" />
-    <Compile Include="Services\Stubs\ExecutionVenueServiceStub.cs" />
-    <Compile Include="Services\Stubs\TradingServiceStub.cs" />
+    <Content Include="Config\*.xml" CopyToOutputDirectory="Preserve" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.EmsQuickStart.Common\Spring.EmsQuickStart.Common.csproj">
-      <Project>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</Project>
-      <Name>Spring.EmsQuickStart.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\ServiceStubs.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Messaging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Handlers.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/project.json b/examples/Spring/Spring.EmsQuickStart/src/Spring/Spring.EmsQuickStart.Server/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Integration.Tests/Spring.EmsQuickStart.Integration.Tests.2010.csproj b/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Integration.Tests/Spring.EmsQuickStart.Integration.Tests.csproj
similarity index 98%
rename from examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Integration.Tests/Spring.EmsQuickStart.Integration.Tests.2010.csproj
rename to examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Integration.Tests/Spring.EmsQuickStart.Integration.Tests.csproj
index 62eeb84e..110d1109 100644
--- a/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Integration.Tests/Spring.EmsQuickStart.Integration.Tests.2010.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Integration.Tests/Spring.EmsQuickStart.Integration.Tests.csproj
@@ -1,50 +1,50 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E641F51F-1B51-4B94-B419-F902EABCE4D4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.EmsQuickStart.Integration.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2010\Spring.NmsQuickStart.Integration.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_4_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.NmsQuickStart.Integration.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E641F51F-1B51-4B94-B419-F902EABCE4D4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.EmsQuickStart.Integration.Tests</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.NmsQuickStart.Integration.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_4_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.NmsQuickStart.Integration.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Tests/Spring.EmsQuickStart.Tests.2010.csproj b/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Tests/Spring.EmsQuickStart.Tests.csproj
similarity index 97%
rename from examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Tests/Spring.EmsQuickStart.Tests.2010.csproj
rename to examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Tests/Spring.EmsQuickStart.Tests.csproj
index ceef2ba3..8f6cb4a9 100644
--- a/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Tests/Spring.EmsQuickStart.Tests.2010.csproj
+++ b/examples/Spring/Spring.EmsQuickStart/test/Spring/Spring.EmsQuickStart.Tests/Spring.EmsQuickStart.Tests.csproj
@@ -1,50 +1,50 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.EmsQuickStart.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2010\Spring.NmsQuickStart.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_4_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.NmsQuickStart.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.EmsQuickStart.Tests</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.NmsQuickStart.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_4_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.NmsQuickStart.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2010.csproj b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.csproj
similarity index 97%
rename from examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2010.csproj
rename to examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.csproj
index 2bbc0876..9a90f1ee 100644
--- a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2010.csproj
+++ b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Threading, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>lib\net\2.0\Spring.Threading.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Services" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Threading, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>lib\net\2.0\Spring.Threading.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Services" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2010.sln b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.sln
similarity index 87%
rename from examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2010.sln
rename to examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.sln
index 52a1da0d..3448a996 100644
--- a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.2010.sln
+++ b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.sln
@@ -1,19 +1,19 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Examples.Pool.2010", "Spring.Examples.Pool.2010.csproj", "{C261D9ED-85C3-4B35-BE48-7156F5B17430}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Examples.Pool.2010", "Spring.Examples.Pool.csproj", "{C261D9ED-85C3-4B35-BE48-7156F5B17430}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2010.sln b/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.sln
similarity index 92%
rename from examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2010.sln
rename to examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.sln
index aeb2fb34..2316a3cc 100644
--- a/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2010.sln
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.sln
@@ -1,19 +1,19 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.AppContext.2010", "src\Spring.IocQuickStart.AppContext.2010.csproj", "{880EA873-E951-465A-AC5B-BA899A2C744E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{880EA873-E951-465A-AC5B-BA899A2C744E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{880EA873-E951-465A-AC5B-BA899A2C744E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{880EA873-E951-465A-AC5B-BA899A2C744E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{880EA873-E951-465A-AC5B-BA899A2C744E}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.AppContext.2010", "src\Spring.IocQuickStart.AppContext.csproj", "{880EA873-E951-465A-AC5B-BA899A2C744E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2010.csproj b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.csproj
similarity index 97%
rename from examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2010.csproj
rename to examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.csproj
index d97fe4e6..6a6c4350 100644
--- a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2010.csproj
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.csproj
@@ -1,18 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.IocQuickStart</RootNamespace>
-    <OutputType>WinExe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="AppContext\ResourcesDisplayForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.IocQuickStart</RootNamespace>
+    <OutputType>WinExe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="AppContext\ResourcesDisplayForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2010.sln b/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.sln
similarity index 91%
rename from examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2010.sln
rename to examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.sln
index a6ee091e..c010f805 100644
--- a/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2010.sln
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.sln
@@ -1,19 +1,19 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.EventRegistry.2010", "src\Spring.IocQuickStart.EventRegistry.2010.csproj", "{0D35F19E-308E-4A0B-88B1-7E7C2D665053}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.EventRegistry.2010", "src\Spring.IocQuickStart.EventRegistry.csproj", "{0D35F19E-308E-4A0B-88B1-7E7C2D665053}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2010.csproj b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.csproj
similarity index 97%
rename from examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2010.csproj
rename to examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.csproj
index c201cca5..3716cc0b 100644
--- a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2010.csproj
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.IocQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.IocQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2010.sln b/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.sln
similarity index 91%
rename from examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2010.sln
rename to examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.sln
index 208f2a8e..81f84130 100644
--- a/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2010.sln
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.sln
@@ -1,19 +1,19 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.MovieFinder.2010", "src\Spring.IocQuickStart.MovieFinder.2010.csproj", "{C261D9ED-85C3-4B35-BE48-7156F5B17430}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.MovieFinder.2010", "src\Spring.IocQuickStart.MovieFinder.csproj", "{C261D9ED-85C3-4B35-BE48-7156F5B17430}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2010.csproj b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.csproj
similarity index 97%
rename from examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2010.csproj
rename to examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.csproj
index 55d371b8..e99383be 100644
--- a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2010.csproj
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.csproj
@@ -1,24 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.IocQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="MovieFinder\*.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Common.Logging" Version="3.4.1" />
-    <PackageReference Include="Common.Logging.Log4Net1215" Version="3.4.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="movies.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.IocQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MovieFinder\*.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Common.Logging" Version="3.4.1" />
+    <PackageReference Include="Common.Logging.Log4Net1215" Version="3.4.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="movies.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/project.json b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/project.json
deleted file mode 100644
index 861178452f6ea207681fe7a05be43f1e4a1fb466..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 532
zcmb7B%L>9U5S+8%KS<76Z0*UbSMeW2Ybk15Vnw9%*VRe3t0jkmESm>AJ3E=YUoEDX
zV8$>wB16qA{i(zO1#dT2)~pNCV1o)*MnznNE%%&J@Rs*TgB2@Fp9XXCk9S3$({h$f
z`oCXPq}Y+8L5zeMkFZ_5>Xe!tUZ*Al)#^$|{dzVy!D7$1XLyjo;vBf+d=xK*IqkVy
ybYGSsqhKxWRMOBx$E<#<<I1VK;cVyjf=Ws}`AaqX^^ZdKu<M7@S2={Jll21+VMYi5

diff --git a/examples/Spring/Spring.MsmqQuickStart/Spring.MsmqQuickStart.2010.sln b/examples/Spring/Spring.MsmqQuickStart/Spring.MsmqQuickStart.sln
similarity index 86%
rename from examples/Spring/Spring.MsmqQuickStart/Spring.MsmqQuickStart.2010.sln
rename to examples/Spring/Spring.MsmqQuickStart/Spring.MsmqQuickStart.sln
index bad5d438..cfa0b0d4 100644
--- a/examples/Spring/Spring.MsmqQuickStart/Spring.MsmqQuickStart.2010.sln
+++ b/examples/Spring/Spring.MsmqQuickStart/Spring.MsmqQuickStart.sln
@@ -1,32 +1,32 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.MsmqQuickStart.Common.2010", "src\Spring\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.2010.csproj", "{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.MsmqQuickStart.Server.2010", "src\Spring\Spring.MsmqQuickStart.Server\Spring.MsmqQuickStart.Server.2010.csproj", "{85E7B947-8153-45E4-B572-BEDB191F1FB2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.MsmqQuickStart.Client.2010", "src\Spring\Spring.MsmqQuickStart.Client\Spring.MsmqQuickStart.Client.2010.csproj", "{87D0B725-A652-4A6B-A95F-197F7155769F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.MsmqQuickStart.Common.2010", "src\Spring\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.csproj", "{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.MsmqQuickStart.Server.2010", "src\Spring\Spring.MsmqQuickStart.Server\Spring.MsmqQuickStart.Server.csproj", "{85E7B947-8153-45E4-B572-BEDB191F1FB2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.MsmqQuickStart.Client.2010", "src\Spring\Spring.MsmqQuickStart.Client\Spring.MsmqQuickStart.Client.csproj", "{87D0B725-A652-4A6B-A95F-197F7155769F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2010.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2010.csproj
deleted file mode 100644
index 438f16f8..00000000
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.2010.csproj
+++ /dev/null
@@ -1,46 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <OutputType>WinExe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Update="UI\StockForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="UI\StockForm.designer.cs">
-      <DependentUpon>StockForm.cs</DependentUpon>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Content Include="Config\*.xml" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Common.Logging" Version="3.4.1" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.csproj
index 99f7b125..ea65526d 100644
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Spring.MsmqQuickStart.Client.csproj
@@ -1,120 +1,46 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{87D0B725-A652-4A6B-A95F-197F7155769F}</ProjectGuid>
+    <TargetFramework>net452</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.MsmqQuickStart.Client</RootNamespace>
-    <AssemblyName>Spring.MsmqQuickStart.Client</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Gateways\IStockService.cs" />
-    <Compile Include="Gateways\MsmqStockServiceGateway.cs" />
-    <Compile Include="Handlers\StockAppHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\StockForm.resx">
-      <DependentUpon>StockForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Messaging">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Messaging" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
+    <Compile Update="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="UI\StockController.cs" />
-    <Compile Include="UI\StockForm.cs">
+    <Compile Update="UI\StockForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\StockForm.designer.cs">
+    <Compile Update="UI\StockForm.designer.cs">
       <DependentUpon>StockForm.cs</DependentUpon>
     </Compile>
-    <None Include="project.json" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Content Include="Config\*.xml" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Messaging\Spring.Messaging.2005.csproj">
-      <Project>{0E23AE41-D8D8-41C2-84A2-D35564049F0D}</Project>
-      <Name>Spring.Messaging.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.csproj">
-      <Project>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</Project>
-      <Name>Spring.MsmqQuickStart.Common</Name>
-    </ProjectReference>
+    <PackageReference Include="Common.Logging" Version="3.4.1" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\Application.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Messaging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/project.json b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2010.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2010.csproj
deleted file mode 100644
index 1909da92..00000000
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.2010.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="Spring.Data">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="System.Messaging" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Data\TradeResponse.cs">
-      <DependentUpon>TradeResponse.xsd</DependentUpon>
-    </Compile>
-    <Compile Update="Data\TradeRequest.cs">
-      <DependentUpon>TradeRequest.xsd</DependentUpon>
-    </Compile>
-    <None Include="Data\TradeResponse.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Data\TradeResponse.xsx">
-      <DependentUpon>TradeResponse.xsd</DependentUpon>
-    </None>
-    <None Include="Data\TradeRequest.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Data\TradeRequest.xsx">
-      <DependentUpon>TradeRequest.xsd</DependentUpon>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.csproj
index 7692b268..1909da92 100644
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/Spring.MsmqQuickStart.Common.csproj
@@ -1,66 +1,34 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.MsmqQuickStart.Common</RootNamespace>
-    <AssemblyName>Spring.MsmqQuickStart.Common</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
+  <PropertyGroup />
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="Spring.Data">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="Spring.Messaging">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="System.Messaging" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Data\TradeResponse.cs">
+    <Compile Update="Data\TradeResponse.cs">
       <DependentUpon>TradeResponse.xsd</DependentUpon>
     </Compile>
-    <Compile Include="Data\TradeRequest.cs">
+    <Compile Update="Data\TradeRequest.cs">
       <DependentUpon>TradeRequest.xsd</DependentUpon>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Messaging\Spring.Messaging.2005.csproj">
-      <Project>{0E23AE41-D8D8-41C2-84A2-D35564049F0D}</Project>
-      <Name>Spring.Messaging.2005</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Data\TradeResponse.xsd">
       <SubType>Designer</SubType>
     </None>
@@ -73,14 +41,5 @@
     <None Include="Data\TradeRequest.xsx">
       <DependentUpon>TradeRequest.xsd</DependentUpon>
     </None>
-    <None Include="project.json" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/project.json b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2010.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2010.csproj
deleted file mode 100644
index 6189109f..00000000
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.2010.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Messaging" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\*.xml" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Common.Logging" Version="3.4.1" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.csproj b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.csproj
index 7c8c09d4..a2587901 100644
--- a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Spring.MsmqQuickStart.Server.csproj
@@ -1,98 +1,25 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{85E7B947-8153-45E4-B572-BEDB191F1FB2}</ProjectGuid>
+    <TargetFramework>net452</TargetFramework>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.MsmqQuickStart.Server</RootNamespace>
-    <AssemblyName>Spring.MsmqQuickStart.Server</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <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>
+    <ProjectReference Include="..\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Messaging">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Messaging" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Gateways\IMarketDataService.cs" />
-    <Compile Include="Gateways\MarketDataServiceGateway.cs" />
-    <Compile Include="Handlers\StockAppHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\ICreditCheckService.cs" />
-    <Compile Include="Services\IExecutionVenueService.cs" />
-    <Compile Include="Services\ITradingService.cs" />
-    <Compile Include="Services\Stubs\CreditCheckServiceStub.cs" />
-    <Compile Include="Services\Stubs\ExecutionVenueServiceStub.cs" />
-    <Compile Include="Services\Stubs\TradingServiceStub.cs" />
+    <Content Include="Config\*.xml" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
-    <None Include="project.json" />
+    <PackageReference Include="Common.Logging" Version="3.4.1" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Messaging\Spring.Messaging.2005.csproj">
-      <Project>{0E23AE41-D8D8-41C2-84A2-D35564049F0D}</Project>
-      <Name>Spring.Messaging.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.MsmqQuickStart.Common\Spring.MsmqQuickStart.Common.csproj">
-      <Project>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</Project>
-      <Name>Spring.MsmqQuickStart.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\ServiceStubs.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Messaging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Handlers.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/project.json b/examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Integration.Tests/Spring.MsmqQuickStart.Integration.Tests.2010.csproj b/examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Integration.Tests/Spring.MsmqQuickStart.Integration.Tests.csproj
similarity index 98%
rename from examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Integration.Tests/Spring.MsmqQuickStart.Integration.Tests.2010.csproj
rename to examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Integration.Tests/Spring.MsmqQuickStart.Integration.Tests.csproj
index 90edb000..2b760726 100644
--- a/examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Integration.Tests/Spring.MsmqQuickStart.Integration.Tests.2010.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Integration.Tests/Spring.MsmqQuickStart.Integration.Tests.csproj
@@ -1,45 +1,45 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E641F51F-1B51-4B94-B419-F902EABCE4D4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.MsmqQuickStart.Integration.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Integration.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Integration.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E641F51F-1B51-4B94-B419-F902EABCE4D4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.MsmqQuickStart.Integration.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Integration.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Integration.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Tests/Spring.MsmqQuickStart.Tests.2010.csproj b/examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Tests/Spring.MsmqQuickStart.Tests.csproj
similarity index 98%
rename from examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Tests/Spring.MsmqQuickStart.Tests.2010.csproj
rename to examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Tests/Spring.MsmqQuickStart.Tests.csproj
index f3a4b184..919ca6ce 100644
--- a/examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Tests/Spring.MsmqQuickStart.Tests.2010.csproj
+++ b/examples/Spring/Spring.MsmqQuickStart/test/Spring/Spring.MsmqQuickStart.Tests/Spring.MsmqQuickStart.Tests.csproj
@@ -1,45 +1,45 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.MsmqQuickStart.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.MsmqQuickStart.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.NmsQuickStart.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Mvc3QuickStart/src/Spring.Mvc3QuickStart/project.json b/examples/Spring/Spring.Mvc3QuickStart/src/Spring.Mvc3QuickStart/project.json
deleted file mode 100644
index e644d398d7ed957fb0ffe02628ce41951f1cdabe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1166
zcmb7@Sxdt}6ot>T;D3-jYv|^JZz2kU6&KWJo5oU?q@=B)rGH)hCbyHtR-_D*nK0*`
zIrq%H-(NFrYC~I$Kz+p;F_V0kDAJI>F(-$d8#2(bQoS-#aG}mw2aF+qg9S2Bo0CR9
z18u_}=!EkLsEIyws!R_s#Cj(>({mBmA*Pwn1|02t-{90Zo^+)tQ5hVjDJamPS}Sp(
zZgmEusqW=EWAa;$Z~qa0ht?P3`m8Pkmv=qd6t7Yl>J9(;#6-22z2dGej1d{7;8Hzu
zL#QM6BVCZG`|H9{Mtf&l_}gUe=5G1B|7W`<i%)LKYI@vTRT(=lAFQGA9<4oH!aZQ;
zE5=@DeQsk5dA9^dT&;|8BIE5N)+xJqNqxQAx@738IfG$HzGb#8GTpCvc7xX$C|AE$
zC%^ff=Vf)(@usy}5C5b6o4Sf~on=1xINy(Rs^0H|g%8!9@h+DgY+am?_e7lq_e}GG
wrOIen=c)CjWA==`*Bz!h0{YeYw8M)e^k9T@)5<-i-c?bSYgLa!nL7La0MRg=;{X5v

diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/project.json b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/project.json
deleted file mode 100644
index c199a5a0854b1c5de509db736f9084d7aca0355a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1590
zcmb7^Nl)WI5QX0vY5oK987v2w0dXUU?ZC`%0M5iAQdT3!37h!qGkn#ZcASNTDC&5t
zdiCmc_51(tT|cy?ZGMrOdejqZ;O+)W)#ho)mt(&B$VexAFVs^$c^_$Cv3{}=)*f$n
zK#X+e;@ZT%>YV5Y^+9`9#(lTU4S9)nd7qZq9o=X|d``BnAE^d@ZLUf+F4nECh&iQ3
zUk%s~Kxi(>-(OlM)*UQ+<Tbe#Tr&`6t9uTi$1dM9Sa<m!k<lsD@~W63Nm=U}#FUOQ
zqB6CJk5O}o=D*=-PuChd4NUJy2QE8C-voUV{n`-iud6k7{g{$rCxeoqi}kz~k-W+|
zysP?b((66B4LbTm|E6`H_4cLi)yZ1V*JGc6+@^wmx^%i1CEv}}t+O}1GT%=^%&x4`
z(dWdfGaqfTXQ$ETqsIQOLYSX$o45vw<sc5h9HXPnQ3vf_N_KW8*H7Q~uveXm@6`$O
zeF^V^T?sR@2TNNu9j(+L%*qw#twrY#bnX>MxsG@<KZlFmXU^4f5Nyt-?q&549fz<B
zzS@ODwMw(t=2+%(!8bqfyKo;(*j1e_oVuygdbc%iDmdd_i+6pLC{;usYkO_3Yo}!D
l$ib5>ruvI;S@XVKbQ<8FDT<FOb*6lmWi9ftD9_ISe**i#<V*kn

diff --git a/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/project.json b/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/project.json
deleted file mode 100644
index 671e4e88..00000000
--- a/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "Antlr": "3.5.0.2",
-    "EntityFramework": "5.0.0-rc",
-    "jQuery": "1.10.2",
-    "jQuery.UI.Combined": "1.10.3",
-    "jQuery.Validation": "1.11.1",
-    "knockoutjs": "3.0.0",
-    "Microsoft.AspNet.Mvc": "5.2.3",
-    "Microsoft.AspNet.Providers": "1.1",
-    "Microsoft.AspNet.Providers.Core": "1.0",
-    "Microsoft.AspNet.Web.Optimization": "1.1.2",
-    "Microsoft.AspNet.WebApi.OData": "5.7.0",
-    "Microsoft.AspNet.WebApi.WebHost": "5.2.3",
-    "Microsoft.jQuery.Unobtrusive.Ajax": "3.0.0",
-    "Microsoft.jQuery.Unobtrusive.Validation": "3.0.0",
-    "Microsoft.Web.Infrastructure": "1.0.0.0",
-    "Modernizr": "2.7.1",
-    "WebGrease": "1.5.2"
-  },
-  "frameworks": {
-    "net45": {}
-  },
-  "runtimes": {
-    "win-anycpu": {},
-    "win": {}
-  }
-}
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/Spring.NmsQuickStart.2010.sln b/examples/Spring/Spring.NmsQuickStart/Spring.NmsQuickStart.sln
similarity index 84%
rename from examples/Spring/Spring.NmsQuickStart/Spring.NmsQuickStart.2010.sln
rename to examples/Spring/Spring.NmsQuickStart/Spring.NmsQuickStart.sln
index ce4589de..80b4bfea 100644
--- a/examples/Spring/Spring.NmsQuickStart/Spring.NmsQuickStart.2010.sln
+++ b/examples/Spring/Spring.NmsQuickStart/Spring.NmsQuickStart.sln
@@ -1,44 +1,44 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Integration.Tests.2010", "test\Spring\Spring.NmsQuickStart.Integration.Tests\Spring.NmsQuickStart.Integration.Tests.2010.csproj", "{E641F51F-1B51-4B94-B419-F902EABCE4D4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Tests.2010", "test\Spring\Spring.NmsQuickStart.Tests\Spring.NmsQuickStart.Tests.2010.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Common.2010", "src\Spring\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.2010.csproj", "{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Server.2010", "src\Spring\Spring.NmsQuickStart.Server\Spring.NmsQuickStart.Server.2010.csproj", "{85E7B947-8153-45E4-B572-BEDB191F1FB2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Client.2010", "src\Spring\Spring.NmsQuickStart.Client\Spring.NmsQuickStart.Client.2010.csproj", "{87D0B725-A652-4A6B-A95F-197F7155769F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Integration.Tests.2010", "test\Spring\Spring.NmsQuickStart.Integration.Tests\Spring.NmsQuickStart.Integration.Tests.csproj", "{E641F51F-1B51-4B94-B419-F902EABCE4D4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Tests.2010", "test\Spring\Spring.NmsQuickStart.Tests\Spring.NmsQuickStart.Tests.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Common.2010", "src\Spring\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.csproj", "{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Server.2010", "src\Spring\Spring.NmsQuickStart.Server\Spring.NmsQuickStart.Server.csproj", "{85E7B947-8153-45E4-B572-BEDB191F1FB2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.NmsQuickStart.Client.2010", "src\Spring\Spring.NmsQuickStart.Client\Spring.NmsQuickStart.Client.csproj", "{87D0B725-A652-4A6B-A95F-197F7155769F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E641F51F-1B51-4B94-B419-F902EABCE4D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85E7B947-8153-45E4-B572-BEDB191F1FB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87D0B725-A652-4A6B-A95F-197F7155769F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2010.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2010.csproj
deleted file mode 100644
index 3588207b..00000000
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.2010.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <OutputType>WinExe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Apache.NMS.ActiveMQ" Version="1.7.2" />
-    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Nms">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging.Nms\$(TargetFramework)\Spring.Messaging.Nms.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Gateways\NmsStockServiceGateway.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Update="UI\StockForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="UI\StockForm.designer.cs">
-      <DependentUpon>StockForm.cs</DependentUpon>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Content Include="Config\*.xml" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.csproj
index 281bb701..fc22dcef 100644
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Spring.NmsQuickStart.Client.csproj
@@ -1,129 +1,52 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{87D0B725-A652-4A6B-A95F-197F7155769F}</ProjectGuid>
+    <TargetFramework>net452</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.NmsQuickStart.Client</RootNamespace>
-    <AssemblyName>Spring.NmsQuickStart.Client</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Apache.NMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.dll</HintPath>
-    </Reference>
-    <Reference Include="Apache.NMS.ActiveMQ, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.ActiveMQ.dll</HintPath>
-    </Reference>
-    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Gateways\IStockService.cs" />
-    <Compile Include="Gateways\NmsStockServiceGateway.cs">
+    <PackageReference Include="Apache.NMS.ActiveMQ" Version="1.7.2" />
+    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Messaging">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Messaging.Nms">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging.Nms\$(TargetFramework)\Spring.Messaging.Nms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Gateways\NmsStockServiceGateway.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Gateways\RequestReplyNmsTemplate.cs" />
-    <Compile Include="Handlers\StockAppHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\StockForm.resx">
-      <DependentUpon>StockForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
+    <Compile Update="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
+    <Compile Update="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="UI\StockController.cs" />
-    <Compile Include="UI\StockForm.cs">
+    <Compile Update="UI\StockForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\StockForm.designer.cs">
+    <Compile Update="UI\StockForm.designer.cs">
       <DependentUpon>StockForm.cs</DependentUpon>
     </Compile>
-    <None Include="project.json" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Content Include="Config\*.xml" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2005.csproj">
-      <Project>{AEB1578C-9018-4D49-B440-789F38DD2F29}</Project>
-      <Name>Spring.Messaging.Nms.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.csproj">
-      <Project>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</Project>
-      <Name>Spring.NmsQuickStart.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\Application.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Messaging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/project.json b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2010.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2010.csproj
deleted file mode 100644
index 212170cd..00000000
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.2010.csproj
+++ /dev/null
@@ -1,39 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Apache.NMS.ActiveMQ" Version="1.7.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Nms">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging.Nms\$(TargetFramework)\Spring.Messaging.Nms.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Data\TradeResponse.cs">
-      <DependentUpon>TradeResponse.xsd</DependentUpon>
-    </Compile>
-    <Compile Update="Data\TradeRequest.cs">
-      <DependentUpon>TradeRequest.xsd</DependentUpon>
-    </Compile>
-    <None Include="Data\TradeResponse.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Data\TradeResponse.xsx">
-      <DependentUpon>TradeResponse.xsd</DependentUpon>
-    </None>
-    <None Include="Data\TradeRequest.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Data\TradeRequest.xsx">
-      <DependentUpon>TradeRequest.xsd</DependentUpon>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.csproj
index c7beb130..212170cd 100644
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Common/Spring.NmsQuickStart.Common.csproj
@@ -1,76 +1,28 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.NmsQuickStart.Common</RootNamespace>
-    <AssemblyName>Spring.NmsQuickStart.Common</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Apache.NMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.dll</HintPath>
-    </Reference>
-    <Reference Include="Apache.NMS.ActiveMQ, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.ActiveMQ.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <PackageReference Include="Apache.NMS.ActiveMQ" Version="1.7.2" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converters\ITypeMapper.cs" />
-    <Compile Include="Converters\TypeMapper.cs" />
-    <Compile Include="Converters\XmlMessageConverter.cs" />
-    <Compile Include="Data\TradeResponse.cs">
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Messaging">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Messaging.Nms">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging.Nms\$(TargetFramework)\Spring.Messaging.Nms.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Data\TradeResponse.cs">
       <DependentUpon>TradeResponse.xsd</DependentUpon>
     </Compile>
-    <Compile Include="Data\TradeRequest.cs">
+    <Compile Update="Data\TradeRequest.cs">
       <DependentUpon>TradeRequest.xsd</DependentUpon>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2005.csproj">
-      <Project>{AEB1578C-9018-4D49-B440-789F38DD2F29}</Project>
-      <Name>Spring.Messaging.Nms.2005</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Data\TradeResponse.xsd">
       <SubType>Designer</SubType>
     </None>
@@ -84,12 +36,4 @@
       <DependentUpon>TradeRequest.xsd</DependentUpon>
     </None>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2010.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2010.csproj
deleted file mode 100644
index 800518b1..00000000
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.2010.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Apache.NMS.ActiveMQ" Version="1.7.2" />
-    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Messaging.Nms">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging.Nms\$(TargetFramework)\Spring.Messaging.Nms.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\*.xml" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.csproj b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.csproj
index 2e1507f1..4a43af81 100644
--- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Spring.NmsQuickStart.Server.csproj
@@ -1,106 +1,28 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{85E7B947-8153-45E4-B572-BEDB191F1FB2}</ProjectGuid>
+    <TargetFramework>net452</TargetFramework>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.NmsQuickStart.Server</RootNamespace>
-    <AssemblyName>Spring.NmsQuickStart.Server</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup />
   <ItemGroup>
-    <Reference Include="Apache.NMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Apache.NMS.dll</HintPath>
+    <ProjectReference Include="..\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Apache.NMS.ActiveMQ" Version="1.7.2" />
+    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.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 Include="Spring.Messaging">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging\$(TargetFramework)\Spring.Messaging.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 Include="Spring.Messaging.Nms">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Messaging.Nms\$(TargetFramework)\Spring.Messaging.Nms.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Gateways\IMarketDataService.cs" />
-    <Compile Include="Gateways\MarketDataServiceGateway.cs" />
-    <Compile Include="Handlers\LoggingExceptionListener.cs" />
-    <Compile Include="Handlers\StockAppHandler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\ICreditCheckService.cs" />
-    <Compile Include="Services\IExecutionVenueService.cs" />
-    <Compile Include="Services\ITradingService.cs" />
-    <Compile Include="Services\Stubs\CreditCheckServiceStub.cs" />
-    <Compile Include="Services\Stubs\ExecutionVenueServiceStub.cs" />
-    <Compile Include="Services\Stubs\TradingServiceStub.cs" />
+    <Content Include="Config\*.xml" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2005.csproj">
-      <Project>{AEB1578C-9018-4D49-B440-789F38DD2F29}</Project>
-      <Name>Spring.Messaging.Nms.2005</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.NmsQuickStart.Common\Spring.NmsQuickStart.Common.csproj">
-      <Project>{AC5A3035-75DD-48E5-ABCA-38FBC8193F22}</Project>
-      <Name>Spring.NmsQuickStart.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Config\ServiceStubs.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Messaging.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Config\Handlers.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/project.json b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2010.csproj b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.csproj
similarity index 97%
rename from examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2010.csproj
rename to examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.csproj
index db3032a0..98a4b31e 100644
--- a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.2010.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring</RootNamespace>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring</RootNamespace>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2010.csproj b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.csproj
similarity index 97%
rename from examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2010.csproj
rename to examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.csproj
index c9900264..aaba5354 100644
--- a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.2010.csproj
+++ b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.csproj
@@ -1,62 +1,62 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net40</TargetFramework>
-    <Configurations>Debug;Release</Configurations>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.NmsQuickStart.Tests</AssemblyName>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2010\Spring.NmsQuickStart.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2010\Spring.NmsQuickStart.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.NmsQuickStart.Tests</AssemblyName>
-    <FileUpgradeFlags />
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup />
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net40</TargetFramework>
+    <Configurations>Debug;Release</Configurations>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.NmsQuickStart.Tests</AssemblyName>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.NmsQuickStart.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.NmsQuickStart.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.NmsQuickStart.Tests</AssemblyName>
+    <FileUpgradeFlags />
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup />
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Scheduling.Quartz.Example/Spring.Scheduling.Quartz.Example.2010.sln b/examples/Spring/Spring.Scheduling.Quartz.Example/Spring.Scheduling.Quartz.Example.sln
similarity index 92%
rename from examples/Spring/Spring.Scheduling.Quartz.Example/Spring.Scheduling.Quartz.Example.2010.sln
rename to examples/Spring/Spring.Scheduling.Quartz.Example/Spring.Scheduling.Quartz.Example.sln
index e2d81dce..f3e47874 100644
--- a/examples/Spring/Spring.Scheduling.Quartz.Example/Spring.Scheduling.Quartz.Example.2010.sln
+++ b/examples/Spring/Spring.Scheduling.Quartz.Example/Spring.Scheduling.Quartz.Example.sln
@@ -1,23 +1,23 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz.Example.2010", "src\Spring.Scheduling.Quartz.Example.2010.csproj", "{0C0D8C65-90DE-4914-9940-4C684C54971B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
-
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz.Example.2010", "src\Spring.Scheduling.Quartz.Example.csproj", "{0C0D8C65-90DE-4914-9940-4C684C54971B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C0D8C65-90DE-4914-9940-4C684C54971B}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
+
diff --git a/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2010.csproj b/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.csproj
similarity index 97%
rename from examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2010.csproj
rename to examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.csproj
index 7151d795..e1f512fc 100644
--- a/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.2010.csproj
+++ b/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.csproj
@@ -1,21 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Scheduling.Quartz2">
-      <HintPath>..\..\..\..\build\$(Configuration)\Spring.Scheduling.Quartz2\$(TargetFramework)\Spring.Scheduling.Quartz2.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="spring-objects.xml" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
-    <PackageReference Include="Quartz" Version="2.6.2" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Scheduling.Quartz2">
+      <HintPath>..\..\..\..\build\$(Configuration)\Spring.Scheduling.Quartz2\$(TargetFramework)\Spring.Scheduling.Quartz2.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="spring-objects.xml" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
+    <PackageReference Include="Quartz" Version="2.6.2" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2010.sln b/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.sln
similarity index 89%
rename from examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2010.sln
rename to examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.sln
index 910087e1..8fa04ef1 100644
--- a/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2010.sln
+++ b/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.sln
@@ -1,28 +1,28 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.25807.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.TxQuickStart.2010", "src\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2010.csproj", "{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.TxQuickStart.Tests.2010", "test\Spring\Spring.TxQuickStart.Tests\Spring.TxQuickStart.Tests.2010.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.25807.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.TxQuickStart.2010", "src\Spring\Spring.TxQuickStart\Spring.TxQuickStart.csproj", "{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.TxQuickStart.Tests.2010", "test\Spring\Spring.TxQuickStart.Tests\Spring.TxQuickStart.Tests.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2010.csproj b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.csproj
similarity index 97%
rename from examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2010.csproj
rename to examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.csproj
index a1fe1930..c921a24f 100644
--- a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2010.csproj
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.csproj
@@ -1,21 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TxQuickStart\application-config.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TxQuickStart\application-config.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/project.json b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2010.csproj b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.csproj
similarity index 94%
rename from examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2010.csproj
rename to examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.csproj
index 473bffeb..9148e02e 100644
--- a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2010.csproj
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.csproj
@@ -1,30 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Data">
-      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TxQuickStart\*.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Common.Logging.Log4Net1215" Version="3.4.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.TxQuickStart\Spring.TxQuickStart.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data">
+      <HintPath>..\..\..\..\..\..\build\$(Configuration)\Spring.Data\$(TargetFramework)\Spring.Data.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TxQuickStart\*.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Common.Logging.Log4Net1215" Version="3.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/project.json b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/project.json
deleted file mode 100644
index 84458f826b96b405efc1e3ca0c1b9463cebbf858..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 568
zcmb7BT?>Lh5S-_r{}A_Fl4dWx_8PwR1ENf%Qn`!>@vm2Nu3KUt#Ig6m&Cbm3zMd7v
z7-7O?a6pWLku|prd!&3_`Lp7`APv^YapB5|^RVHWaHV`DEz)4YpLr7oQ}PdIc@3wf
zmMHz7FD^nv<S5}IVE6-U=f-tN&knDu!H??*TVm1<##Od#E7Q)^tWoa<M_BCGpBQ(l
zSe$wtbiI~-i+b4VSExTMT}HuL+~}mF7ssqK(Wxk>o`%|PA~QP4@Zcm1=Ib2$?ES1S
LPOEYVaVPs5{wzuY

diff --git a/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2010.sln b/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.sln
similarity index 91%
rename from examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2010.sln
rename to examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.sln
index 982c3d82..cb5d1c83 100644
--- a/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2010.sln
+++ b/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.sln
@@ -1,83 +1,83 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ClientApp.2010", "src\Spring.WcfQuickStart.ClientApp\Spring.WcfQuickStart.ClientApp.2010.csproj", "{D58B3101-4433-49C5-B41B-51134424FC42}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EEC5B531-104B-44E6-975B-44C0C8973405} = {EEC5B531-104B-44E6-975B-44C0C8973405}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ServerApp.2010", "src\Spring.WcfQuickStart.ServerApp\Spring.WcfQuickStart.ServerApp.2010.csproj", "{27AAD98C-4281-4DD4-9E20-1371C58C5283}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ServerWeb.2010", "src\Spring.WcfQuickStart.ServerWeb\Spring.WcfQuickStart.ServerWeb.2010.csproj", "{EEC5B531-104B-44E6-975B-44C0C8973405}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Contracts.2010", "src\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2010.csproj", "{53263837-0643-45FE-96A2-46D425E1A36F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Aspects.2010", "src\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2010.csproj", "{B52BBAA3-1B30-4905-827C-1D81EBA56A15}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|.NET.ActiveCfg = Release|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|.NET.ActiveCfg = Release|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|.NET.ActiveCfg = Release|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|.NET.ActiveCfg = Release|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|.NET.ActiveCfg = Release|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ClientApp.2010", "src\Spring.WcfQuickStart.ClientApp\Spring.WcfQuickStart.ClientApp.csproj", "{D58B3101-4433-49C5-B41B-51134424FC42}"
+	ProjectSection(ProjectDependencies) = postProject
+		{EEC5B531-104B-44E6-975B-44C0C8973405} = {EEC5B531-104B-44E6-975B-44C0C8973405}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ServerApp.2010", "src\Spring.WcfQuickStart.ServerApp\Spring.WcfQuickStart.ServerApp.csproj", "{27AAD98C-4281-4DD4-9E20-1371C58C5283}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ServerWeb.2010", "src\Spring.WcfQuickStart.ServerWeb\Spring.WcfQuickStart.ServerWeb.csproj", "{EEC5B531-104B-44E6-975B-44C0C8973405}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Contracts.2010", "src\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj", "{53263837-0643-45FE-96A2-46D425E1A36F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Aspects.2010", "src\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj", "{B52BBAA3-1B30-4905-827C-1D81EBA56A15}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D58B3101-4433-49C5-B41B-51134424FC42}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|.NET.ActiveCfg = Release|Any CPU
+		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D58B3101-4433-49C5-B41B-51134424FC42}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|.NET.ActiveCfg = Release|Any CPU
+		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{27AAD98C-4281-4DD4-9E20-1371C58C5283}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EEC5B531-104B-44E6-975B-44C0C8973405}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|.NET.ActiveCfg = Release|Any CPU
+		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EEC5B531-104B-44E6-975B-44C0C8973405}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{53263837-0643-45FE-96A2-46D425E1A36F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|.NET.ActiveCfg = Release|Any CPU
+		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{53263837-0643-45FE-96A2-46D425E1A36F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|.NET.ActiveCfg = Release|Any CPU
+		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B52BBAA3-1B30-4905-827C-1D81EBA56A15}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj
similarity index 97%
rename from examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj
rename to examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj
index 7d999f77..299a5d48 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj
@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.csproj
similarity index 89%
rename from examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj
rename to examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.csproj
index 78dd28f1..57c2b1d3 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.csproj
@@ -1,27 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2010.csproj" />
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\$(TargetFramework)\Spring.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Config\*.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj" />
+    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Services">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\$(TargetFramework)\Spring.Services.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Config\*.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj
similarity index 96%
rename from examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj
rename to examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj
index 93027a9e..b126a9dc 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="System.ServiceModel" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <Reference Include="System.ServiceModel" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.csproj
similarity index 89%
rename from examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2010.csproj
rename to examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.csproj
index 0f054ec5..8c03a95d 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.2010.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.csproj
@@ -1,24 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2010.csproj" />
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\$(TargetFramework)\Spring.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj" />
+    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\$(TargetFramework)\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\$(TargetFramework)\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Services">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\$(TargetFramework)\Spring.Services.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.csproj
similarity index 96%
rename from examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2010.csproj
rename to examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.csproj
index 8b601086..da150c39 100644
--- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.2010.csproj
+++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.csproj
@@ -1,114 +1,114 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EEC5B531-104B-44E6-975B-44C0C8973405}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
-    <AssemblyName>Spring.WcfQuickStart.ServerWeb</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <UseIISExpress>false</UseIISExpress>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_3_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spring.Aop">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\net452\Spring.Aop.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Core">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\net452\Spring.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Spring.Services">
-      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\net452\Spring.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Calculator.svc" />
-    <Compile Include="CalculatorService.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2010.csproj">
-      <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
-      <Name>Spring.WcfQuickStart.Aspects</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2010.csproj">
-      <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
-      <Name>Spring.WcfQuickStart.Contracts</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>2637</DevelopmentServerPort>
-          <DevelopmentServerVPath>/Spring.WcfQuickStart.ServerWeb/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EEC5B531-104B-44E6-975B-44C0C8973405}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.WcfQuickStart</RootNamespace>
+    <AssemblyName>Spring.WcfQuickStart.ServerWeb</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <UseIISExpress>false</UseIISExpress>
+    <TargetFrameworkProfile />
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_3_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Aop\net452\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Core\net452\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Services">
+      <HintPath>..\..\..\..\..\build\$(Configuration)\Spring.Services\net452\Spring.Services.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Calculator.svc" />
+    <Compile Include="CalculatorService.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj">
+      <Project>{B52BBAA3-1B30-4905-827C-1D81EBA56A15}</Project>
+      <Name>Spring.WcfQuickStart.Aspects</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj">
+      <Project>{53263837-0643-45FE-96A2-46D425E1A36F}</Project>
+      <Name>Spring.WcfQuickStart.Contracts</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>False</AutoAssignPort>
+          <DevelopmentServerPort>2637</DevelopmentServerPort>
+          <DevelopmentServerVPath>/Spring.WcfQuickStart.ServerWeb/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.2010.sln b/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.sln
similarity index 98%
rename from examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.2010.sln
rename to examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.sln
index c4f690b9..b40c1d65 100644
--- a/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.2010.sln
+++ b/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.sln
@@ -1,55 +1,55 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2035
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.Web.Extensions.Example.2010", "src\Spring.Web.Extensions.Example.2010\", "{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5.2"
-		ProjectReferences = ""
-		Debug.AspNetCompiler.VirtualPath = "/Spring.Web.Extensions.Example.2010"
-		Debug.AspNetCompiler.PhysicalPath = "src\Spring.Web.Extensions.Example.2010\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Web.Extensions.Example.2010\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/Spring.Web.Extensions.Example.2010"
-		Release.AspNetCompiler.PhysicalPath = "src\Spring.Web.Extensions.Example.2010\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Web.Extensions.Example.2010\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "3792"
-		SlnRelativePath = "src\Spring.Web.Extensions.Example.2010\"
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|.NET.ActiveCfg = Debug|Any CPU
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C054F554-2FC4-4900-8AA2-9C476B327D39}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.Web.Extensions.Example.2010", "src\Spring.Web.Extensions.Example.2010\", "{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5.2"
+		ProjectReferences = ""
+		Debug.AspNetCompiler.VirtualPath = "/Spring.Web.Extensions.Example.2010"
+		Debug.AspNetCompiler.PhysicalPath = "src\Spring.Web.Extensions.Example.2010\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Web.Extensions.Example.2010\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/Spring.Web.Extensions.Example.2010"
+		Release.AspNetCompiler.PhysicalPath = "src\Spring.Web.Extensions.Example.2010\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Web.Extensions.Example.2010\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "3792"
+		SlnRelativePath = "src\Spring.Web.Extensions.Example.2010\"
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|.NET.ActiveCfg = Debug|Any CPU
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C054F554-2FC4-4900-8AA2-9C476B327D39}
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.WebQuickStart/.nuget/project.json b/examples/Spring/Spring.WebQuickStart/.nuget/project.json
deleted file mode 100644
index 0e926add05fa9fb90a003124c6ae22187e80f11a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 386
zcmZ9I%?iRW5QM+8;5$gpTKv6u^(x+c0MS~C*p^xmDSdTyV!Bnzl5Da&Gnvi%RWoG3
zNZ~jUQ)p%1Q^t{0x0^a^^#jteV=qKX)z%#gB34>cRmM_tY{<DPav>wO%84S?E$LWu
zbv$#Xig{?nx3l9+$w4YH4=I#fdS1Ni;5-wiV%cifG@Z)7V!)Q%<)e}tuWZxVe5PsH
e>22?OA}1M7{YfFd{YYQE&-&qPDvt>6!u|nL$T3j>

diff --git a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2010.sln b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.sln
similarity index 93%
rename from examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2010.sln
rename to examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.sln
index defddb38..ed22b211 100644
--- a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2010.sln
+++ b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.sln
@@ -1,203 +1,203 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2035
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.2005", "src\Spring.WebQuickStart.2005\", "{B4F56253-6425-4065-8A93-EF88F8730E57}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5.2"
-		ProjectReferences = "{BA4789EB-281A-48EA-8763-28B9F0596A18}|Spring.Web.dll;{710961A3-0DF4-49E4-A26E-F5B9C044AC84}|Spring.Core.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.2005"
-		Debug.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.2005\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.2005\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.2005"
-		Release.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.2005\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.2005\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "4724"
-		SlnRelativePath = "src\Spring.WebQuickStart.2005\"
-		DefaultWebSiteLanguage = "Visual C#"
-	EndProjectSection
-EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.Providers", "src\Spring.WebQuickStart.Providers\", "{F42A333D-D305-4649-8B5A-6F5862F0F62A}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5.2"
-		ProjectReferences = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}|Spring.Core.dll;{BA4789EB-281A-48EA-8763-28B9F0596A18}|Spring.Web.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.Providers"
-		Debug.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.Providers\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.Providers\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.Providers"
-		Release.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.Providers\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.Providers\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "1343"
-		SlnRelativePath = "src\Spring.WebQuickStart.Providers\"
-		DefaultWebSiteLanguage = "Visual C#"
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Core.2010", "..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Core.Tests.2010", "..\..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2010.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.2010", "..\..\..\src\Spring\Spring.Web\Spring.Web.2010.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Tests.2010", "..\..\..\test\Spring\Spring.Web.Tests\Spring.Web.Tests.2010.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Aop.2010", "..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.2010", "..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Template.Velocity.2010", "..\..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2010.csproj", "{6630B5A3-5471-40F7-B058-4C1D17B219EF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Services.2010", "..\..\..\src\Spring\Spring.Services\Spring.Services.2010.csproj", "{88601B69-E2E6-44CA-A2B4-82CD635A16AA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Nms.2010", "..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2010.csproj", "{E2B834B9-9476-470B-9D5D-97183124A31F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|.NET.ActiveCfg = Debug|Any CPU
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|.NET.ActiveCfg = Debug|Any CPU
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|.NET.Build.0 = Debug|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|.NET.ActiveCfg = Release|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|.NET.Build.0 = Release|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|.NET.Build.0 = Debug|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|.NET.ActiveCfg = Release|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|.NET.Build.0 = Release|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|.NET.Build.0 = Debug|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|.NET.ActiveCfg = Release|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|.NET.Build.0 = Release|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FCE7DAD6-0825-438B-A579-EB142A7F4628}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.2005", "src\Spring.WebQuickStart.2005\", "{B4F56253-6425-4065-8A93-EF88F8730E57}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5.2"
+		ProjectReferences = "{BA4789EB-281A-48EA-8763-28B9F0596A18}|Spring.Web.dll;{710961A3-0DF4-49E4-A26E-F5B9C044AC84}|Spring.Core.dll;"
+		Debug.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.2005"
+		Debug.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.2005\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.2005\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.2005"
+		Release.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.2005\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.2005\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "4724"
+		SlnRelativePath = "src\Spring.WebQuickStart.2005\"
+		DefaultWebSiteLanguage = "Visual C#"
+	EndProjectSection
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.Providers", "src\Spring.WebQuickStart.Providers\", "{F42A333D-D305-4649-8B5A-6F5862F0F62A}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5.2"
+		ProjectReferences = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}|Spring.Core.dll;{BA4789EB-281A-48EA-8763-28B9F0596A18}|Spring.Web.dll;"
+		Debug.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.Providers"
+		Debug.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.Providers\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.Providers\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.Providers"
+		Release.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.Providers\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.Providers\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "1343"
+		SlnRelativePath = "src\Spring.WebQuickStart.Providers\"
+		DefaultWebSiteLanguage = "Visual C#"
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Core.2010", "..\..\..\src\Spring\Spring.Core\Spring.Core.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Core.Tests.2010", "..\..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.2010", "..\..\..\src\Spring\Spring.Web\Spring.Web.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.Tests.2010", "..\..\..\test\Spring\Spring.Web.Tests\Spring.Web.Tests.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Aop.2010", "..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.2010", "..\..\..\src\Spring\Spring.Data\Spring.Data.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Template.Velocity.2010", "..\..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.csproj", "{6630B5A3-5471-40F7-B058-4C1D17B219EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Services.2010", "..\..\..\src\Spring\Spring.Services\Spring.Services.csproj", "{88601B69-E2E6-44CA-A2B4-82CD635A16AA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Messaging.Nms.2010", "..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.csproj", "{E2B834B9-9476-470B-9D5D-97183124A31F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|.NET.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|.NET.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|.NET.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|.NET.Build.0 = Debug|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|.NET.ActiveCfg = Release|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|.NET.Build.0 = Release|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6630B5A3-5471-40F7-B058-4C1D17B219EF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|.NET.Build.0 = Debug|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|.NET.ActiveCfg = Release|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|.NET.Build.0 = Release|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{88601B69-E2E6-44CA-A2B4-82CD635A16AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|.NET.Build.0 = Debug|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|.NET.Build.0 = Release|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E2B834B9-9476-470B-9D5D-97183124A31F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {FCE7DAD6-0825-438B-A579-EB142A7F4628}
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/SpringAir/SpringAir.2010.sln b/examples/Spring/SpringAir/SpringAir.sln
similarity index 92%
rename from examples/Spring/SpringAir/SpringAir.2010.sln
rename to examples/Spring/SpringAir/SpringAir.sln
index d3bee39d..f1c52f75 100644
--- a/examples/Spring/SpringAir/SpringAir.2010.sln
+++ b/examples/Spring/SpringAir/SpringAir.sln
@@ -1,172 +1,172 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.25807.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "SpringAir.Web.2010", "src\SpringAir.Web.2010\", "{839602F5-8077-497D-9CCB-C9F02741CA55}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5.2"
-		ProjectReferences = "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}|SpringAir.Core.dll;{78B285FE-27F3-44F4-84B1-7A589AB48EF3}|SpringAir.Data.Ado.dll;{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}|SpringAir.Web.2010.References.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/SpringAir.Web.2010"
-		Debug.AspNetCompiler.PhysicalPath = "src\SpringAir.Web.2010\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\SpringAir.Web.2010\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/SpringAir.Web.2010"
-		Release.AspNetCompiler.PhysicalPath = "src\SpringAir.Web.2010\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\SpringAir.Web.2010\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "4816"
-		SlnRelativePath = "src\SpringAir.Web.2010\"
-		DefaultWebSiteLanguage = "Visual C#"
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpringAir.Core.2010", "src\SpringAir.Core\SpringAir.Core.2010.csproj", "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpringAir.Core.Tests.2010", "test\SpringAir.Core.Tests\SpringAir.Core.Tests.2010.csproj", "{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpringAir.Data.Ado.2010", "src\SpringAir.Data.Ado\SpringAir.Data.Ado.2010.csproj", "{78B285FE-27F3-44F4-84B1-7A589AB48EF3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpringAir.Data.Ado.Tests.2010", "test\SpringAir.Data.Ado.Tests\SpringAir.Data.Ado.Tests.2010.csproj", "{B0A6F98E-5363-4575-BB6B-A84E91895468}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpringAir.Web.2010.References", "src\SpringAir.Web.2005.References\SpringAir.Web.2010.References.csproj", "{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.2010", "..\..\..\src\Spring\Spring.Web\Spring.Web.2010.csproj", "{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Core.2010", "..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj", "{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.2010", "..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj", "{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Aop.2010", "..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj", "{57379674-B969-4D3A-BFF7-D9520C4D37C9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|.NET = Debug|.NET
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|.NET = Release|.NET
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|.NET.ActiveCfg = Debug|Any CPU
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|.NET.ActiveCfg = Release|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|.NET.ActiveCfg = Release|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|.NET.ActiveCfg = Release|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|.NET.ActiveCfg = Release|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|.NET.Build.0 = Debug|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|.NET.ActiveCfg = Release|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|.NET.Build.0 = Release|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|.NET.Build.0 = Debug|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|.NET.ActiveCfg = Release|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|.NET.Build.0 = Release|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|.NET.Build.0 = Debug|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|.NET.ActiveCfg = Release|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|.NET.Build.0 = Release|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|.NET.Build.0 = Debug|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|.NET.ActiveCfg = Release|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|.NET.Build.0 = Release|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {59B5AD7C-24F8-4048-9E93-1B5D061970E0}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.25807.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "SpringAir.Web.2010", "src\SpringAir.Web.2010\", "{839602F5-8077-497D-9CCB-C9F02741CA55}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5.2"
+		ProjectReferences = "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}|SpringAir.Core.dll;{78B285FE-27F3-44F4-84B1-7A589AB48EF3}|SpringAir.Data.Ado.dll;{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}|SpringAir.Web.2010.References.dll;"
+		Debug.AspNetCompiler.VirtualPath = "/SpringAir.Web.2010"
+		Debug.AspNetCompiler.PhysicalPath = "src\SpringAir.Web.2010\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\SpringAir.Web.2010\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/SpringAir.Web.2010"
+		Release.AspNetCompiler.PhysicalPath = "src\SpringAir.Web.2010\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\SpringAir.Web.2010\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "4816"
+		SlnRelativePath = "src\SpringAir.Web.2010\"
+		DefaultWebSiteLanguage = "Visual C#"
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpringAir.Core.2010", "src\SpringAir.Core\SpringAir.Core.csproj", "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpringAir.Core.Tests.2010", "test\SpringAir.Core.Tests\SpringAir.Core.Tests.csproj", "{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpringAir.Data.Ado.2010", "src\SpringAir.Data.Ado\SpringAir.Data.Ado.csproj", "{78B285FE-27F3-44F4-84B1-7A589AB48EF3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpringAir.Data.Ado.Tests.2010", "test\SpringAir.Data.Ado.Tests\SpringAir.Data.Ado.Tests.csproj", "{B0A6F98E-5363-4575-BB6B-A84E91895468}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpringAir.Web.2010.References", "src\SpringAir.Web.2005.References\SpringAir.Web.2010.References.csproj", "{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Web.2010", "..\..\..\src\Spring\Spring.Web\Spring.Web.csproj", "{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Core.2010", "..\..\..\src\Spring\Spring.Core\Spring.Core.csproj", "{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Data.2010", "..\..\..\src\Spring\Spring.Data\Spring.Data.csproj", "{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring.Aop.2010", "..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj", "{57379674-B969-4D3A-BFF7-D9520C4D37C9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|.NET.ActiveCfg = Debug|Any CPU
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|.NET.ActiveCfg = Release|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|.NET.ActiveCfg = Release|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|.NET.ActiveCfg = Release|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|.NET.ActiveCfg = Release|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|.NET.Build.0 = Debug|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|.NET.ActiveCfg = Release|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|.NET.Build.0 = Release|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A0FEC2A6-6B6A-40B5-959C-97195C4CBF87}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|.NET.Build.0 = Debug|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|.NET.ActiveCfg = Release|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|.NET.Build.0 = Release|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1B1FACC5-ECBA-4569-8D68-49E5AEC5B2E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|.NET.Build.0 = Debug|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|.NET.ActiveCfg = Release|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|.NET.Build.0 = Release|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9539D4A2-2EB5-4425-9E2E-5D01C6099A55}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|.NET.Build.0 = Debug|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|.NET.ActiveCfg = Release|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|.NET.Build.0 = Release|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{57379674-B969-4D3A-BFF7-D9520C4D37C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {59B5AD7C-24F8-4048-9E93-1B5D061970E0}
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2010.csproj b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.csproj
similarity index 86%
rename from examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2010.csproj
rename to examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.csproj
index 67eeee1b..e1e60209 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2010.csproj
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>SpringAir</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>SpringAir</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2010.csproj b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.csproj
similarity index 83%
rename from examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2010.csproj
rename to examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.csproj
index 25c21e2d..e4a82a5b 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2010.csproj
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.csproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>SpringAir</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\SpringAir.Core\SpringAir.Core.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Data\Ado\ItineraryDao.cs" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>SpringAir</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\SpringAir.Core\SpringAir.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="Data\Ado\ItineraryDao.cs" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2010.References.csproj b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.References.csproj
similarity index 79%
rename from examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2010.References.csproj
rename to examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.References.csproj
index e0440cee..3439a2d1 100644
--- a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2010.References.csproj
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.References.csproj
@@ -1,19 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>SpringAir</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Web\Spring.Web.2010.csproj" />
-    <ProjectReference Include="..\SpringAir.Core\SpringAir.Core.2010.csproj" />
-    <ProjectReference Include="..\SpringAir.Data.Ado\SpringAir.Data.Ado.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.Transactions" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>SpringAir</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\..\..\..\..\src\Spring\Spring.Web\Spring.Web.csproj" />
+    <ProjectReference Include="..\SpringAir.Core\SpringAir.Core.csproj" />
+    <ProjectReference Include="..\SpringAir.Data.Ado\SpringAir.Data.Ado.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Transactions" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/project.json b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/project.json
deleted file mode 100644
index 9ddb555af0ae71d850786e668b451723e7641f5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmaKo!3x4K5JcxJ_z#k^7C}#5z4{ZPwG=Teu_7Y<b@iojtM(wvCRuiNb|%lqU1N<j
zA)NNgRg=DZdF@nEo$0LTC#2I_l}<zjF4Km)AWEv@jdWVjnRn?lh5!Fl)^P@QrA@!{
zrmuy`-cAPvZBdcyih`iyKxcH6TzN2!mc5I%XZdDK*q{qO8r(!?b8g;^({9J^=zE3|
YuN(hWGjG2&WFJm_aONr^lDc%h06fq(Z~y=R

diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2010.csproj b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.csproj
similarity index 93%
rename from examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2010.csproj
rename to examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.csproj
index 02dbe000..c7344751 100644
--- a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2010.csproj
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>SpringAir</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\SpringAir.Core\SpringAir.Core.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.XML" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>SpringAir</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\SpringAir.Core\SpringAir.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.XML" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/project.json b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/project.json
deleted file mode 100644
index fcc734f03cc2db389e930ce4896ef5ee0fa21060..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 332
zcmZ9HO9}!p5JcZv@D7r-ilA;hggXx)ejtc(7$Y*sTwSdgJ4y&iI-Tm*)vxD+Ap=HQ
zjy(q&?eK{LJG@?3{jBt#m5wzVDLnC;cg&fx)SfA0w4QN^9Y<QWoJG5HQGBYXsekqm
zq=_s_&%RLpiCNonlanYfiEKX2sWI(#>g}bU$Vs5nbdBn5wwhj7{d6{AQe=1ed;^QO
BDd_+J

diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2010.csproj b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.csproj
similarity index 90%
rename from examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2010.csproj
rename to examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.csproj
index 6b2f6594..16c6ec71 100644
--- a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2010.csproj
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.csproj
@@ -1,18 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <RootNamespace>SpringAir</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="Data\Ado\ReflectiveDbConnectionFactoryTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\SpringAir.Core\SpringAir.Core.2010.csproj" />
-    <ProjectReference Include="..\..\src\SpringAir.Data.Ado\SpringAir.Data.Ado.2010.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <RootNamespace>SpringAir</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Data\Ado\ReflectiveDbConnectionFactoryTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\SpringAir.Core\SpringAir.Core.csproj" />
+    <ProjectReference Include="..\..\src\SpringAir.Data.Ado\SpringAir.Data.Ado.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/project.json b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/project.json
deleted file mode 100644
index fcc734f03cc2db389e930ce4896ef5ee0fa21060..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 332
zcmZ9HO9}!p5JcZv@D7r-ilA;hggXx)ejtc(7$Y*sTwSdgJ4y&iI-Tm*)vxD+Ap=HQ
zjy(q&?eK{LJG@?3{jBt#m5wzVDLnC;cg&fx)SfA0w4QN^9Y<QWoJG5HQGBYXsekqm
zq=_s_&%RLpiCNonlanYfiEKX2sWI(#>g}bU$Vs5nbdBn5wwhj7{d6{AQe=1ed;^QO
BDd_+J

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index a8423b73..370c4ca5 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,13 +2,8 @@
 
   <PropertyGroup>
 
-    <CleanedProjectName>$(MSBuildProjectName.Replace('.2010', ''))</CleanedProjectName>
-  
-    <OutputPath>..\..\..\build\$(Configuration)\$(CleanedProjectName)</OutputPath>
+    <OutputPath>..\..\..\build\$(Configuration)\$(MSBuildProjectName)</OutputPath>
 
-    <AssemblyName>$(CleanedProjectName)</AssemblyName>
-    <PackageId>$(CleanedProjectName)</PackageId>
-    <DocumentationFile>$(CleanedProjectName).xml</DocumentationFile>
     <RootNamespace>Spring</RootNamespace>
 
     <AssemblyOriginatorKeyFile>..\..\..\Spring.Net.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Spring/Spring.Aop/Spring.Aop.build b/src/Spring/Spring.Aop/Spring.Aop.build
deleted file mode 100644
index 200b9939..00000000
--- a/src/Spring/Spring.Aop/Spring.Aop.build
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Aop" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-
-
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-		<!-- build Spring.Aop -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-		     output="${current.bin.dir}/${project::get-name()}.dll"
-             doc="${current.bin.dir}/${project::get-name()}.xml"
-   			 nostdlib="true"
-			 noconfig="true"
-			>
-			<arg line="${compiler.args}"/>
-			<nowarn>
-				<warning number="${nowarn.numbers}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../GenCommonAssemblyInfo.cs" />
-			</sources>
-			<resources basedir="Resources">
-				<include name="**/*" />
-			</resources>
-            		<resources basedir="." prefix="Spring.Aop.Config">
-                	  <include name="Aop\Config\spring-aop-1.1.xsd" />
-	                </resources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Data.dll" />
-                <include name="System.Xml.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-		        <include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/antlr.runtime.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-			</references>
-		</csc>
-	</target>
-</project>
diff --git a/src/Spring/Spring.Aop/Spring.Aop.2010.csproj b/src/Spring/Spring.Aop/Spring.Aop.csproj
similarity index 88%
rename from src/Spring/Spring.Aop/Spring.Aop.2010.csproj
rename to src/Spring/Spring.Aop/Spring.Aop.csproj
index 2bbc988a..0b45dff5 100644
--- a/src/Spring/Spring.Aop/Spring.Aop.2010.csproj
+++ b/src/Spring/Spring.Aop/Spring.Aop.csproj
@@ -1,22 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
-    <Description>Interfaces and classes that provide AOP support in Spring.Net</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Antlr3.Runtime" Version="3.5.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-      <SubType>Code</SubType>
-    </Compile>
-    <None Include="Aop\Config\spring-aop-1.1.xsx">
-      <DependentUpon>spring-aop-1.1.xsd</DependentUpon>
-    </None>
-    <EmbeddedResource Include="Aop\Config\spring-aop-1.1.xsd" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
+    <Description>Interfaces and classes that provide AOP support in Spring.Net</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Antlr3.Runtime" Version="3.5.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+      <SubType>Code</SubType>
+    </Compile>
+    <None Include="Aop\Config\spring-aop-1.1.xsx">
+      <DependentUpon>spring-aop-1.1.xsd</DependentUpon>
+    </None>
+    <EmbeddedResource Include="Aop\Config\spring-aop-1.1.xsd" />
+  </ItemGroup>
 </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.csproj
similarity index 98%
rename from src/Spring/Spring.Core/Spring.Core.2010.csproj
rename to src/Spring/Spring.Core/Spring.Core.csproj
index 4a7c5f1e..31c1a5e0 100644
--- a/src/Spring/Spring.Core/Spring.Core.2010.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.csproj
@@ -1,45 +1,45 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
-    <Description>Core functionality for Spring.Net IoC container</Description>
-    <NoWarn>219, 162, 618, 1591</NoWarn>
-  </PropertyGroup>
-  <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>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
-    <PackageReference Include="System.CodeDom" Version="4.5.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
-    <PackageReference Include="System.Reflection" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <Compile Remove="Threading\CallContextStorage.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="Context\Config\spring-context-1.3.xsd" />
-    <EmbeddedResource Include="Context\Config\spring-context-2.0.xsd" />
-    <EmbeddedResource Include="Objects\Factory\Xml\spring-tool-1.1.xsd" />
-    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.1.xsd" />
-    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.3.xsd" />
-    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-2.0.xsd" />
-    <EmbeddedResource Include="Validation\Config\spring-validation-1.3.xsd" />
-    <EmbeddedResource Include="Validation\Config\spring-validation-1.1.xsd" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
+    <Description>Core functionality for Spring.Net IoC container</Description>
+    <NoWarn>219, 162, 618, 1591</NoWarn>
+  </PropertyGroup>
+  <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>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
+    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="System.Configuration" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
+    <PackageReference Include="System.CodeDom" Version="4.5.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
+    <PackageReference Include="System.Reflection" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <Compile Remove="Threading\CallContextStorage.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Common.Logging" Version="$(CommonLoggingVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="Context\Config\spring-context-1.3.xsd" />
+    <EmbeddedResource Include="Context\Config\spring-context-2.0.xsd" />
+    <EmbeddedResource Include="Objects\Factory\Xml\spring-tool-1.1.xsd" />
+    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.1.xsd" />
+    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.3.xsd" />
+    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-2.0.xsd" />
+    <EmbeddedResource Include="Validation\Config\spring-validation-1.3.xsd" />
+    <EmbeddedResource Include="Validation\Config\spring-validation-1.1.xsd" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.2010.csproj b/src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.csproj
similarity index 96%
rename from src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.2010.csproj
rename to src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.csproj
index 864427ef..4d71fd36 100644
--- a/src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.2010.csproj
+++ b/src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.csproj
@@ -5,9 +5,9 @@
     <NoWarn>618</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj" />
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Configuration" />
diff --git a/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.2010.csproj b/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.csproj
similarity index 97%
rename from src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.2010.csproj
rename to src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.csproj
index 93539e9a..329c5afe 100644
--- a/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.2010.csproj
+++ b/src/Spring/Spring.Data.NHibernate4/Spring.Data.NHibernate4.csproj
@@ -11,9 +11,9 @@
     <DefineConstants>$(DefineConstants);NH_4_0</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj" />
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Iesi.Collections" Version="4.0.1.4000" />
diff --git a/src/Spring/Spring.Data.NHibernate5/Spring.Data.NHibernate5.2010.csproj b/src/Spring/Spring.Data.NHibernate5/Spring.Data.NHibernate5.csproj
similarity index 97%
rename from src/Spring/Spring.Data.NHibernate5/Spring.Data.NHibernate5.2010.csproj
rename to src/Spring/Spring.Data.NHibernate5/Spring.Data.NHibernate5.csproj
index 94a82a27..5bac0836 100644
--- a/src/Spring/Spring.Data.NHibernate5/Spring.Data.NHibernate5.2010.csproj
+++ b/src/Spring/Spring.Data.NHibernate5/Spring.Data.NHibernate5.csproj
@@ -6,9 +6,9 @@
     <NoWarn>0618</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj" />
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NHibernate" Version="5.1.3" />
diff --git a/src/Spring/Spring.Data/Spring.Data.2010.csproj b/src/Spring/Spring.Data/Spring.Data.csproj
similarity index 91%
rename from src/Spring/Spring.Data/Spring.Data.2010.csproj
rename to src/Spring/Spring.Data/Spring.Data.csproj
index 2cb0cad3..62c314d9 100644
--- a/src/Spring/Spring.Data/Spring.Data.2010.csproj
+++ b/src/Spring/Spring.Data/Spring.Data.csproj
@@ -1,40 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
-    <Description>Interfaces and classes that provide Data access support in Spring.Net</Description>
-    <NoWarn>1591</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-    <None Include="Data\Config\spring-database-1.3.xsx">
-      <DependentUpon>spring-database-1.3.xsd</DependentUpon>
-    </None>
-    <EmbeddedResource Include="Data\Common\dbproviders_netcore.xml" Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-      <LogicalName>Spring.Data.Common.dbproviders.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Data\Common\dbproviders.xml" Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
-      <LogicalName>Spring.Data.Common.dbproviders.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Data\Config\spring-database-1.1.xsd" />
-    <EmbeddedResource Include="Transaction\Config\spring-tx-1.1.xsd" />
-    <EmbeddedResource Include="Data\Config\spring-database-1.3.xsd" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <Compile Remove="Data\Core\ServiceDomainPlatformTransactionManager.cs" />
-    <Compile Remove="Data\Support\DefaultServiceDomainAdapter.cs" />
-    <Compile Remove="Data\Support\IServiceDomainAdapter.cs" />
-    <Compile Remove="Data\Support\SimpleServiceConfig.cs" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
+    <Description>Interfaces and classes that provide Data access support in Spring.Net</Description>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+    </Compile>
+    <None Include="Data\Config\spring-database-1.3.xsx">
+      <DependentUpon>spring-database-1.3.xsd</DependentUpon>
+    </None>
+    <EmbeddedResource Include="Data\Common\dbproviders_netcore.xml" Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+      <LogicalName>Spring.Data.Common.dbproviders.xml</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Common\dbproviders.xml" Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
+      <LogicalName>Spring.Data.Common.dbproviders.xml</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Config\spring-database-1.1.xsd" />
+    <EmbeddedResource Include="Transaction\Config\spring-tx-1.1.xsd" />
+    <EmbeddedResource Include="Data\Config\spring-database-1.3.xsd" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <Compile Remove="Data\Core\ServiceDomainPlatformTransactionManager.cs" />
+    <Compile Remove="Data\Support\DefaultServiceDomainAdapter.cs" />
+    <Compile Remove="Data\Support\IServiceDomainAdapter.cs" />
+    <Compile Remove="Data\Support\SimpleServiceConfig.cs" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build
deleted file mode 100644
index 8dc70fc2..00000000
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Messaging.Ems" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
- 
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
- 
-    <target name="build">
-
-		<call target="copycommonlogginglibtobin" />
-
-		<csc target="library" define="${current.build.defines.csc}"
-            warnaserror="false"
-            optimize="${build.optimize}"
-            debug="${current.build.debug}"
-            output="${current.bin.dir}/${project::get-name()}.dll"
-            doc="${current.bin.dir}/${project::get-name()}.xml"
-           	nostdlib="true"
-			noconfig="true"
-            >
-            <arg line="${compiler.args}"/>
-            <nowarn>
-				<warning number="${nowarn.numbers}" />
-                <warning number="1591" />
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../GenCommonAssemblyInfo.cs" />
-            </sources>
-	    <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-        	<include name="**/*.keys" />
-	        <include name="**/*.xsd" />
-        	<exclude name="**/obj/**" />
-	    </resources>
-	    <references>
-			<include name="mscorlib.dll"/>
-			<include name="Microsoft.CSharp.dll"/>
-			<include name="System.dll"/>
-			<include name="System.Core.dll"/>
-			<include name="System.Configuration.dll"/>
-			<include name="System.Data.dll" />
-			<include name="System.Xml.dll" />
-			<include name="${current.bin.dir}/Common.Logging.dll"/>
-			<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-			<include name="${current.bin.dir}/Spring.Core.dll" />
-			<include name="${current.bin.dir}/Spring.Aop.dll" />
-			<include name="${current.bin.dir}/Spring.Data.dll" />
-			<include name="${current.bin.dir}/TIBCO.EMS.dll" />
-	    </references>
-        </csc>
-    </target>
-
-</project>
diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2010.csproj b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.csproj
similarity index 79%
rename from src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2010.csproj
rename to src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.csproj
index 3779e87e..4d2b60af 100644
--- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2010.csproj
+++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.csproj
@@ -1,30 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <Description>TIBCO EMS support</Description>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DefineConstants>$(DefineConstants);TIBCO_EMS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DefineConstants>$(DefineConstants);TIBCO_EMS</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.XML" />
-    <Reference Include="TIBCO.EMS">
-      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-    <EmbeddedResource Include="Messaging\Ems\Config\spring-ems-1.3.xsd" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <Description>TIBCO EMS support</Description>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DefineConstants>$(DefineConstants);TIBCO_EMS</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DefineConstants>$(DefineConstants);TIBCO_EMS</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.XML" />
+    <Reference Include="TIBCO.EMS">
+      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+    </Compile>
+    <EmbeddedResource Include="Messaging\Ems\Config\spring-ems-1.3.xsd" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
deleted file mode 100644
index a4a04292..00000000
--- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Messaging.Nms" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
- 
-    <target name="build">
-	
-		<call target="copycommonlogginglibtobin" />
-	
-        <csc target="library" define="${current.build.defines.csc}"
-            warnaserror="true"
-            optimize="${build.optimize}"
-            debug="${current.build.debug}"
-            output="${current.bin.dir}/${project::get-name()}.dll"
-            doc="${current.bin.dir}/${project::get-name()}.xml"
-           	nostdlib="true"
-			noconfig="true"
-            >
-            <arg line="${compiler.args}"/>
-            <nowarn>
-				<warning number="${nowarn.numbers}" />
-                <warning number="1591" />
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../GenCommonAssemblyInfo.cs" />
-            </sources>
-	    <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-        	<include name="**/*.keys" />
-	        <include name="**/*.xsd" />
-        	<exclude name="**/obj/**" />
-	    </resources>
-	    <references>
-			<include name="mscorlib.dll"/>
-			<include name="Microsoft.CSharp.dll"/>
-			<include name="System.dll"/>
-			<include name="System.Core.dll"/>
-			<include name="System.Configuration.dll"/>
-			<include name="System.Data.dll" />
-			<include name="System.Xml.dll" />
-			<include name="${current.bin.dir}/Common.Logging.dll"/>
-			<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-			<include name="${current.bin.dir}/Spring.Core.dll" />
-			<include name="${current.bin.dir}/Spring.Aop.dll" />
-			<include name="${current.bin.dir}/Spring.Data.dll" />
-			<include name="${current.bin.dir}/Apache.NMS.dll" />
-	    </references>
-        </csc>
-    </target>
-
-</project>
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2010.csproj b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.csproj
similarity index 72%
rename from src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2010.csproj
rename to src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.csproj
index d5794936..b79a9307 100644
--- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2010.csproj
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.csproj
@@ -1,23 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>$(TargetFullFrameworkVersion)</TargetFramework>
-    <Description>ActiveMQ support</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Apache.NMS" Version="1.7.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-    <EmbeddedResource Include="Messaging\Nms\Config\spring-nms-1.2.xsd">
-      <SubType />
-    </EmbeddedResource>
-    <EmbeddedResource Include="Messaging\Nms\Config\spring-nms-1.3.xsd" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>$(TargetFullFrameworkVersion)</TargetFramework>
+    <Description>ActiveMQ support</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Apache.NMS" Version="1.7.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+    </Compile>
+    <EmbeddedResource Include="Messaging\Nms\Config\spring-nms-1.2.xsd">
+      <SubType />
+    </EmbeddedResource>
+    <EmbeddedResource Include="Messaging\Nms\Config\spring-nms-1.3.xsd" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Messaging/Spring.Messaging.build b/src/Spring/Spring.Messaging/Spring.Messaging.build
deleted file mode 100644
index 5f5828a9..00000000
--- a/src/Spring/Spring.Messaging/Spring.Messaging.build
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Messaging" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
- 
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
- 
-    <target name="build">
-	
-		<call target="copycommonlogginglibtobin" />
-		
-        <csc target="library" define="${current.build.defines.csc}"
-            warnaserror="true"
-            optimize="${build.optimize}"
-            debug="${current.build.debug}"
-            output="${current.bin.dir}/${project::get-name()}.dll"
-            doc="${current.bin.dir}/${project::get-name()}.xml"
-           	nostdlib="true"
-			noconfig="true"
-            >
-            <arg line="${compiler.args}"/>
-            <nowarn>
-				<warning number="${nowarn.numbers}" />
-                <warning number="1591" />
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../GenCommonAssemblyInfo.cs" />
-            </sources>
-	        <references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Configuration.dll"/>
-				<include name="System.Messaging.dll"/>
-				<include name="System.Transactions.dll"/>
-				<include name="System.Xml.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-	        </references>
-        </csc>
-    </target>
-
-</project>
diff --git a/src/Spring/Spring.Messaging/Spring.Messaging.2010.csproj b/src/Spring/Spring.Messaging/Spring.Messaging.csproj
similarity index 82%
rename from src/Spring/Spring.Messaging/Spring.Messaging.2010.csproj
rename to src/Spring/Spring.Messaging/Spring.Messaging.csproj
index db9d35c3..835da5d7 100644
--- a/src/Spring/Spring.Messaging/Spring.Messaging.2010.csproj
+++ b/src/Spring/Spring.Messaging/Spring.Messaging.csproj
@@ -1,22 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
-    <Description>Interfaces and classes that provide MSMQ 3.0 support in Spring.Net</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Transactions" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Experimental.System.Messaging" Version="1.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
+    <Description>Interfaces and classes that provide MSMQ 3.0 support in Spring.Net</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
+    <Reference Include="System.Messaging" />
+    <Reference Include="System.Transactions" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="Experimental.System.Messaging" Version="1.0.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build b/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build
deleted file mode 100644
index 2a5a61e7..00000000
--- a/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Scheduling.Quartz2" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
- 
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-	
-    <target name="build">
-	
-	
-		<call target="copycommonlogginglibtobin" />
-		<call target="copyquartz2libtobin" />
-		
-        <csc target="library" define="${current.build.defines.csc},QUARTZ_2_0"
-            warnaserror="true"
-            optimize="${build.optimize}"
-            debug="${current.build.debug}"
-            output="${current.bin.dir}/${project::get-name()}.dll"
-            doc="${current.bin.dir}/${project::get-name()}.xml"
-			nostdlib="true"
-			noconfig="true"
-            >
-            <arg line="${compiler.args}"/>
-            <nowarn>
-				<warning number="${nowarn.numbers}" />
-                <warning number="1591" />
-				<warning number="1701" />
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../GenCommonAssemblyInfo.cs" />
-            </sources>
-	    <references>
-			<include name="mscorlib.dll"/>
-			<include name="Microsoft.CSharp.dll"/>
-			<include name="System.dll"/>
-			<include name="System.Core.dll"/>
-			<include name="System.Configuration.dll"/>
-			<include name="System.Data.dll" />
-			<include name="${current.bin.dir}/Spring.Core.dll" />
-			<include name="${current.bin.dir}/Spring.Data.dll" />
-			<include name="${current.bin.dir}/Common.Logging.dll"/>
-			<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-			<include name="${current.bin.dir}/Quartz.dll" />
-			<include name="${current.bin.dir}/C5.dll" />
-	    </references>
-        </csc>
-    </target>
-
-</project>
-
diff --git a/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.2010.csproj b/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.csproj
similarity index 76%
rename from src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.2010.csproj
rename to src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.csproj
index 26206f91..4c046dc6 100644
--- a/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.2010.csproj
+++ b/src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.csproj
@@ -4,8 +4,8 @@
     <Description>Spring.NET Integration with the Quartz Scheduling Library 2.x</Description>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj" />
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Quartz" Version="2.6.2" />
diff --git a/src/Spring/Spring.Services/Spring.Services.build b/src/Spring/Spring.Services/Spring.Services.build
deleted file mode 100644
index 80bfaf5e..00000000
--- a/src/Spring/Spring.Services/Spring.Services.build
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Services" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-  <!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-
-  <target name="build">
-
-	<!-- build Spring.Services -->
-
-	<call target="copycommonlogginglibtobin" />
-	
-    <csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-			 optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-			 output="${current.bin.dir}/${project::get-name()}.dll"
-			 doc="${current.bin.dir}/${project::get-name()}.xml"
-		     nostdlib="true"
-			 noconfig="true"
-			 >
-      <arg line="${compiler.args}"/>
-      <nowarn>
-        <warning number="${nowarn.numbers}" />
-      </nowarn>
-      <sources failonempty="true">
-        <include name="**/*.cs" />
-        <include name="../GenCommonAssemblyInfo.cs" />
-      </sources>
-      <resources basedir="." prefix="Spring.Remoting.Config">
-        <include name="Remoting/Config/spring-remoting-1.1.xsd" />
-      </resources>
-      <resources basedir="." prefix="Spring.ServiceModel.Config">
-        <include name="ServiceModel/Config/spring-wcf-1.3.xsd" />
-      </resources>
-      <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-        <include name="**/*.keys" />
-        <exclude name="**/obj/**" />
-      </resources>
-      <references>
-		<include name="mscorlib.dll"/>
-		<include name="Microsoft.CSharp.dll"/>
-		<include name="System.dll"/>
-		<include name="System.Core.dll"/>
-		<include name="System.Configuration.dll"/>
-		<include name="System.EnterpriseServices.dll"/>
-        <include name="System.Web.Services.dll" />
-		<include name="System.ServiceModel.dll" />        
-		<include name="System.ServiceModel.Activation.dll" />        
-		<include name="System.ServiceModel.Web.dll" />        
-		<include name="System.Web.dll" />
-		<include name="System.Web.Services.dll" />
-		<include name="System.Xml.dll"/>
-		<include name="${current.bin.dir}/Common.Logging.dll"/>
-		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-        <include name="${current.bin.dir}/Spring.Core.dll" />
-        <include name="${current.bin.dir}/Spring.Aop.dll" />
-        <include name="${current.bin.dir}/Spring.Web.dll" />
-      </references>
-    </csc>
-  </target>
-</project>
diff --git a/src/Spring/Spring.Services/Spring.Services.2010.csproj b/src/Spring/Spring.Services/Spring.Services.csproj
similarity index 91%
rename from src/Spring/Spring.Services/Spring.Services.2010.csproj
rename to src/Spring/Spring.Services/Spring.Services.csproj
index 12ebe0de..97223778 100644
--- a/src/Spring/Spring.Services/Spring.Services.2010.csproj
+++ b/src/Spring/Spring.Services/Spring.Services.csproj
@@ -1,27 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <Description>Interfaces and classes that provide portable service abstractions in Spring.Net</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.ServiceModel.Activation" />
-    <Reference Include="System.ServiceModel.Web" />
-    <Reference Include="System.Web.Services" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-      <SubType>Code</SubType>
-    </Compile>
-    <None Include="Spring.Services.build" />
-    <EmbeddedResource Include="EnterpriseServices\EnterpriseServices.keys" />
-    <EmbeddedResource Include="Remoting\Config\spring-remoting-1.1.xsd" />
-    <EmbeddedResource Include="ServiceModel\Config\spring-wcf-1.3.xsd" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <Description>Interfaces and classes that provide portable service abstractions in Spring.Net</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.configuration" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Activation" />
+    <Reference Include="System.ServiceModel.Web" />
+    <Reference Include="System.Web.Services" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+      <SubType>Code</SubType>
+    </Compile>
+    <None Include="Spring.Services.build" />
+    <EmbeddedResource Include="EnterpriseServices\EnterpriseServices.keys" />
+    <EmbeddedResource Include="Remoting\Config\spring-remoting-1.1.xsd" />
+    <EmbeddedResource Include="ServiceModel\Config\spring-wcf-1.3.xsd" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.build b/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.build
deleted file mode 100644
index 246abc1a..00000000
--- a/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.build
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Template.Velocity.Castle" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
- 
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<property name="nvelocity.lib.dir" value="${nuget.packages.dir}/Castle.NVelocity/1.1.1/lib/net35" overwrite="true"/>
-
-	<if test="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}">
-		<property name="nvelocity.lib.dir" value="${nuget.packages.dir}/Castle.NVelocity/1.1.1/lib/net40" overwrite="true"/>
-	</if>
-	
-    <target name="build">
-
-		<call target="copycommonlogginglibtobin" />
-		<call target="copynvelocitylibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-            warnaserror="true"
-            optimize="${build.optimize}"
-            debug="${current.build.debug}"
-            output="${current.bin.dir}/${project::get-name()}.dll"
-            doc="${current.bin.dir}/${project::get-name()}.xml"
-           	nostdlib="true"
-			noconfig="true"
-            >
-            <arg line="${compiler.args}"/>
-            <nowarn>
-				<warning number="${nowarn.numbers}" />
-                <warning number="1591" />
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../Spring.Template.Velocity/**/*.cs" />
-                <exclude name="../Spring.Template.Velocity/**/SpringResourceLoader.cs" />
-                <exclude name="../Spring.Template.Velocity/**/TemplateNamespaceParser.cs" />
-                <exclude name="../Spring.Template.Velocity/**/AssemblyInfo.cs" />
-                <include name="../GenCommonAssemblyInfo.cs" />
-            </sources>
-            <resources basedir="." prefix="Spring.Template.Velocity.Config">
-	            <include name="../Spring.Template.Velocity/Template/Velocity/Config/spring-nvelocity-1.3.xsd" />
-      	    </resources>
-	    <references>
-			<include name="mscorlib.dll"/>
-			<include name="Microsoft.CSharp.dll"/>
-			<include name="System.dll"/>
-			<include name="System.Core.dll"/>
-			<include name="System.Configuration.dll"/>
-			<include name="System.Xml.dll" />
-			<include name="${current.bin.dir}/Common.Logging.dll"/>
-			<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-			<include name="${current.bin.dir}/Spring.Core.dll" />
-            <include name="${current.bin.dir}/NVelocity.dll" />
-	    </references>
-        </csc>
-    </target>
-
-</project>
diff --git a/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.2010.csproj b/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.csproj
similarity index 93%
rename from src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.2010.csproj
rename to src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.csproj
index 49f084e6..7b5d0613 100644
--- a/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.2010.csproj
+++ b/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.csproj
@@ -1,35 +1,35 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Castle.NVelocity" Version="1.1.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Template.Velocity\Template\Velocity\CommonsLoggingLogSystem.cs">
-      <Link>Template\Velocity\CommonsLoggingLogSystem.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Template.Velocity\Template\Velocity\VelocityConstants.cs">
-      <Link>Template\Velocity\VelocityConstants.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Template.Velocity\Template\Velocity\VelocityEngineFactory.cs">
-      <Link>Template\Velocity\VelocityEngineFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Template.Velocity\Template\Velocity\VelocityEngineFactoryObject.cs">
-      <Link>Template\Velocity\VelocityEngineFactoryObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Template.Velocity\Template\Velocity\VelocityEngineUtils.cs">
-      <Link>Template\Velocity\VelocityEngineUtils.cs</Link>
-    </Compile>
-    <EmbeddedResource Include="..\Spring.Template.Velocity\Template\Velocity\Config\spring-nvelocity-1.3.xsd">
-      <Link>Template\Velocity\Config\spring-nvelocity-1.3.xsd</Link>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Castle.NVelocity" Version="1.1.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Template.Velocity\Template\Velocity\CommonsLoggingLogSystem.cs">
+      <Link>Template\Velocity\CommonsLoggingLogSystem.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Template.Velocity\Template\Velocity\VelocityConstants.cs">
+      <Link>Template\Velocity\VelocityConstants.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Template.Velocity\Template\Velocity\VelocityEngineFactory.cs">
+      <Link>Template\Velocity\VelocityEngineFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Template.Velocity\Template\Velocity\VelocityEngineFactoryObject.cs">
+      <Link>Template\Velocity\VelocityEngineFactoryObject.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Template.Velocity\Template\Velocity\VelocityEngineUtils.cs">
+      <Link>Template\Velocity\VelocityEngineUtils.cs</Link>
+    </Compile>
+    <EmbeddedResource Include="..\Spring.Template.Velocity\Template\Velocity\Config\spring-nvelocity-1.3.xsd">
+      <Link>Template\Velocity\Config\spring-nvelocity-1.3.xsd</Link>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build
deleted file mode 100644
index f4326dba..00000000
--- a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Template.Velocity" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
- 
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<property name="nvelocity.lib.dir" value="${nuget.packages.dir}/NVelocity/1.0.3/lib" overwrite="true"/>
-
-    <target name="build">
-	
-		<call target="copycommonlogginglibtobin" />
-		<call target="copynvelocitylibtobin" />
-		
-        <csc target="library" define="${current.build.defines.csc}"
-            warnaserror="true"
-            optimize="${build.optimize}"
-            debug="${current.build.debug}"
-            output="${current.bin.dir}/${project::get-name()}.dll"
-            doc="${current.bin.dir}/${project::get-name()}.xml"
-           	nostdlib="true"
-			noconfig="true"
-            >
-            <arg line="${compiler.args}"/>
-            <nowarn>
-				<warning number="${nowarn.numbers}" />
-                <warning number="1591" />
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../GenCommonAssemblyInfo.cs" />
-            </sources>
-            <resources basedir="." prefix="Spring.Template.Velocity.Config">
-	            <include name="Template/Velocity/Config/spring-nvelocity-1.3.xsd" />
-      	    </resources>
-	    <references>
-			<include name="mscorlib.dll"/>
-			<include name="Microsoft.CSharp.dll"/>
-			<include name="System.dll"/>
-			<include name="System.Core.dll"/>
-			<include name="System.Configuration.dll"/>
-			<include name="System.Xml.dll" />
-			<include name="${current.bin.dir}/Common.Logging.dll"/>
-			<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-			<include name="${current.bin.dir}/Spring.Core.dll" />
-			<include name="${current.bin.dir}/NVelocity.dll" />
-	    </references>
-        </csc>
-    </target>
-
-</project>
diff --git a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2010.csproj b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.csproj
similarity index 87%
rename from src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2010.csproj
rename to src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.csproj
index d867c7d3..fe65bada 100644
--- a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.2010.csproj
+++ b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.csproj
@@ -1,21 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <Description>Spring.NET Intergration with the NVelocity templating Engine</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NVelocity" Version="1.0.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-    <EmbeddedResource Include="Template\Velocity\Config\spring-nvelocity-1.3.xsd" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <Description>Spring.NET Intergration with the NVelocity templating Engine</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NVelocity" Version="1.0.3" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+    </Compile>
+    <EmbeddedResource Include="Template\Velocity\Config\spring-nvelocity-1.3.xsd" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
deleted file mode 100644
index c9ab8bac..00000000
--- a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Testing.Microsoft" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
- 
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-    <target name="build">
-
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-            warnaserror="true"
-            optimize="${build.optimize}"
-            debug="${current.build.debug}"
-            output="${current.bin.dir}/${project::get-name()}.dll"
-            doc="${current.bin.dir}/${project::get-name()}.xml"
-           	nostdlib="true"
-			noconfig="true"
-			>
-            <arg line="${compiler.args}"/>
-            <nowarn>
-				<warning number="${nowarn.numbers}" />
-                <warning number="219" />
-                <warning number="162" />
-                <warning number="1591" />
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../GenCommonAssemblyInfo.cs" />
-            </sources>
-		    <references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Configuration.dll"/>
-				<include name="System.Data.dll" />
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${vs-net.mstest.bin.dir.current}\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" asis="true"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-		    </references>
-        </csc>
-    </target>
-</project>
-
diff --git a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.2010.csproj b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj
similarity index 75%
rename from src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.2010.csproj
rename to src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj
index 7b2f0a93..f987b5e6 100644
--- a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.2010.csproj
+++ b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj
@@ -1,18 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <Description>Interfaces and classes that provide Microsoft Unit Testing integration in Spring.Net</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <Description>Interfaces and classes that provide Microsoft Unit Testing integration in Spring.Net</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
deleted file mode 100644
index 1d843582..00000000
--- a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Testing.NUnit" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-    <target name="build">
-
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-            warnaserror="true"
-            optimize="${build.optimize}"
-            debug="${current.build.debug}"
-            output="${current.bin.dir}/${project::get-name()}.dll"
-            doc="${current.bin.dir}/${project::get-name()}.xml"
-			nostdlib="true"
-			noconfig="true"
-            >
-            <arg line="${compiler.args}"/>
-            <nowarn>
-				<warning number="${nowarn.numbers}" />
-                <warning number="219" />
-                <warning number="162" />
-                <warning number="1591" />
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../GenCommonAssemblyInfo.cs" />
-            </sources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Configuration.dll"/>
-				<include name="System.Data.dll" />
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-			    <include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-			</references>
-        </csc>
-    </target>
-
-</project>
-
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2010.csproj b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.csproj
similarity index 78%
rename from src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2010.csproj
rename to src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.csproj
index cb0c1b67..b60fdb1c 100644
--- a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2010.csproj
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.csproj
@@ -1,20 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
-    <Description>Interfaces and classes that provide NUnit integration in Spring.Net</Description>
-    <NoWarn>1587, 1591, 219, 162, 618</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.10.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-    <None Include="Spring.Testing.NUnit.build" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
+    <Description>Interfaces and classes that provide NUnit integration in Spring.Net</Description>
+    <NoWarn>1587, 1591, 219, 162, 618</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit" Version="3.10.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+    </Compile>
+    <None Include="Spring.Testing.NUnit.build" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.build b/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.build
deleted file mode 100644
index 4c87f84c..00000000
--- a/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.build
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Conversation.NHibernate3" default="build" xmlns="http://nant.sf.net/release/0.91-alpha2/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-
-		<!-- build Spring.Data.NHibernate -->
-
-		<call target="copycommonlogginglibtobin" />
-		<call target="copynh3libtobin" />
-
-		<csc target="library" define="${current.build.defines.csc}"
-				warnaserror="true"
-                optimize="${build.optimize}"
-				debug="${current.build.debug}"
-				output="${current.bin.dir}/${project::get-name()}.dll"
-				doc="${current.bin.dir}/${project::get-name()}.xml"
-				nostdlib="true"
-				noconfig="true"
-				>
-			<arg line="${compiler.args}"/>
-			<nowarn>
-				<warning number="${nowarn.numbers}" />
-			</nowarn>
-			<sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../Spring.Web.Conversation.NHibernate3/**/*.cs" />
-                <include name="../GenCommonAssemblyInfo.cs" />
-                <exclude name="../Spring.Web.Conversation.NHibernate3/AssemblyInfo.cs"/>
-			</sources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Configuration.dll"/>
-				<include name="System.Data.dll" />
-				<include name="System.Web.dll" />
-				<include name="System.EnterpriseServices.dll" />
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-				<include name="${current.bin.dir}/Spring.Data.NHibernate3.dll" />
-				
-				<include name="${current.bin.dir}/NHibernate.dll"/>
-				<include name="${current.bin.dir}/Iesi.Collections.dll"/>
-				
-				</references>
-		</csc>
-	</target>
-</project>
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.2010.csproj b/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.csproj
similarity index 75%
rename from src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.2010.csproj
rename to src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.csproj
index 6ce2374b..ac762d0d 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.2010.csproj
+++ b/src/Spring/Spring.Web.Conversation.NHibernate3/Spring.Web.Conversation.NHibernate3.csproj
@@ -4,9 +4,9 @@
     <Description>Conversation-Per-Business-Transaction support for Spring.Net using NHibernate</Description>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data.NHibernate3\Spring.Data.NHibernate3.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj" />
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Data.NHibernate3\Spring.Data.NHibernate3.csproj" />
+    <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Web" />
diff --git a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
deleted file mode 100644
index 1813382c..00000000
--- a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Extensions" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-	<!-- build Spring.Web.Extensions -->
-
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}" 
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}" 
-		     output="${current.bin.dir}/${project::get-name()}.dll" 
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-   			 nostdlib="true"
-			 noconfig="true"
-		     >
-			<arg line="${compiler.args}"/>	
-			<nowarn>
-				<warning number="${nowarn.numbers}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../GenCommonAssemblyInfo.cs" />
-			</sources>
-			<resources basedir="Resources">
-				<include name="**/*" />
-			</resources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Configuration.dll" />
- 				<include name="System.Xml.dll" />
- 				<include name="System.Web.dll" />
- 				<include name="System.Web.Extensions.dll" />
- 				<include name="System.Web.Services.dll" />
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Web.dll" />
-			</references>
-		</csc>
-	</target>
-</project>
diff --git a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2010.csproj b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.csproj
similarity index 77%
rename from src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2010.csproj
rename to src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.csproj
index 2ce3f781..ac76842c 100644
--- a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2010.csproj
+++ b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.csproj
@@ -1,20 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <Description>Interfaces and classes that provide ASP.NET AJAX 1.0 support in Spring.Net</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Web\Spring.Web.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Services" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <Description>Interfaces and classes that provide ASP.NET AJAX 1.0 support in Spring.Net</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Web\Spring.Web.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Services" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build b/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build
deleted file mode 100644
index 54187b98..00000000
--- a/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Mvc3" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-		<!-- build Spring.Web.Mvc -->
-
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}" 
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}" 
-		     output="${current.bin.dir}/${project::get-name()}.dll" 
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-		     >
-			<arg line="${compiler.args}"/>	
-			<nowarn>
-				<warning number="${nowarn.numbers},0108,0114,0612,0109" />
-				<warning number="${nowarn.numbers},1591" if="${nant.settings.currentframework=='mono-2.0'}"/>
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../GenCommonAssemblyInfo.cs" />
-			</sources>
-			<resources basedir="Resources">
-				<include name="**/*" />
-			</resources>
-			<references>
-			    <include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Configuration.dll" />
-				<include name="System.Core.dll"/>
- 				<include name="System.Xml.dll" />
- 				<include name="System.Web.dll" />
-				<include name="System.Web.Abstractions.dll"/>
-				<include name="System.Web.ApplicationServices.dll" />        
-				<include name="System.Web.Routing.dll"/>
- 				<include name="System.Web.Services.dll" />
-
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/antlr.runtime.dll" />
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Aop.dll" />
-				<include name="${current.bin.dir}/Spring.Web.dll" />
-			
-				<include name="${nuget.packages.dir}/Microsoft.AspNet.Mvc/3.0.20105.1/lib/net40/System.Web.Mvc.dll" />
-			</references>
-		</csc>
-	</target>
-</project>
diff --git a/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.2010.csproj b/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.csproj
similarity index 81%
rename from src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.2010.csproj
rename to src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.csproj
index f908f048..a067e07d 100644
--- a/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.2010.csproj
+++ b/src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.csproj
@@ -1,24 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <Description>Interfaces and classes that provide ASP.NET MVC3 application support in Spring.Net</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Web\Spring.Web.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNet.Mvc" Version="3.0.20105.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Data.DataSetExtensions" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <Description>Interfaces and classes that provide ASP.NET MVC3 application support in Spring.Net</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Web\Spring.Web.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNet.Mvc" Version="3.0.20105.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Data.DataSetExtensions" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build b/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build
deleted file mode 100644
index a7bdc571..00000000
--- a/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Mvc4" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-		<!-- build Spring.Web.Mvc -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}" 
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}" 
-		     output="${current.bin.dir}/${project::get-name()}.dll" 
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-		     >
-			<arg line="${compiler.args}"/>	
-			<nowarn>
-				<warning number="${nowarn.numbers},0108,0114,0612,0109" />
-				<warning number="${nowarn.numbers},1591" if="${nant.settings.currentframework=='mono-2.0'}"/>
-			</nowarn>
-			<sources failonempty="true">
-				<include name="../Spring.Web.Mvc3/**/*.cs" />
-				<exclude name="../Spring.Web.Mvc3/**/SpringMvcApplication.cs" />
-				<include name="**/*.cs" />
-				<include name="../GenCommonAssemblyInfo.cs" />
-			</sources>
-			<resources basedir="Resources">
-				<include name="**/*" />
-			</resources>
-			<references>
-			    <include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Configuration.dll" />
-				<include name="System.Core.dll"/>
- 				<include name="System.Xml.dll" />
- 				<include name="System.Web.dll" />
-				<include name="System.Web.Abstractions.dll"/>
-				<include name="System.Web.ApplicationServices.dll" />        
-				<include name="System.Web.Routing.dll"/>
- 				<include name="System.Web.Services.dll" />
-
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/antlr.runtime.dll" />
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Aop.dll" />
-				<include name="${current.bin.dir}/Spring.Web.dll" />
-			
-				<include name="${nuget.packages.dir}/Microsoft.AspNet.Mvc/4.0.30506/lib/net40/System.Web.Mvc.dll" />
-				<include name="${nuget.packages.dir}/Microsoft.AspNet.WebApi.Core/4.0.30506/lib/net40/System.Web.Http.dll" />
-				<include name="${nuget.packages.dir}/Microsoft.AspNet.WebApi.WebHost/4.0.30506/lib/net40/System.Web.Http.WebHost.dll" />
-				
-			</references>
-		</csc>
-	</target>
-</project>
diff --git a/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.2010.csproj b/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.csproj
similarity index 90%
rename from src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.2010.csproj
rename to src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.csproj
index d3627104..e191cec7 100644
--- a/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.2010.csproj
+++ b/src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.csproj
@@ -4,8 +4,8 @@
     <Description>Interfaces and classes that provide ASP.NET MVC4 application support in Spring.Net</Description>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Web\Spring.Web.2010.csproj" />
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Web\Spring.Web.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="4.0.30506.0" />
diff --git a/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build b/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build
deleted file mode 100644
index 219ed7e2..00000000
--- a/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Mvc5" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-		<!-- build Spring.Web.Mvc -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}" 
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}" 
-		     output="${current.bin.dir}/${project::get-name()}.dll" 
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-		     >
-			<arg line="${compiler.args}"/>	
-			<nowarn>
-				<warning number="${nowarn.numbers},0108,0114,0612,0109" />
-				<warning number="${nowarn.numbers},1591" if="${nant.settings.currentframework=='mono-2.0'}"/>
-			</nowarn>
-			<sources failonempty="true">
-				<include name="../Spring.Web.Mvc3/**/*.cs" />
-				<exclude name="../Spring.Web.Mvc3/**/SpringMvcApplication.cs" />
-				<include name="../Spring.Web.Mvc4/**/*.cs" />
-				<include name="**/*.cs" />
-				<include name="../GenCommonAssemblyInfo.cs" />
-			</sources>
-			<resources basedir="Resources">
-				<include name="**/*" />
-			</resources>
-			<references>
-			    <include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Configuration.dll" />
-				<include name="System.Core.dll"/>
- 				<include name="System.Xml.dll" />
- 				<include name="System.Web.dll" />
-				<include name="System.Web.Abstractions.dll"/>
-				<include name="System.Web.ApplicationServices.dll" />        
-				<include name="System.Web.Routing.dll"/>
- 				<include name="System.Web.Services.dll" />
-
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/antlr.runtime.dll" />
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Aop.dll" />
-				<include name="${current.bin.dir}/Spring.Web.dll" />
-			
-				<include name="${nuget.packages.dir}/Microsoft.AspNet.Mvc/5.0.0/lib/net45/System.Web.Mvc.dll" />
-				<include name="${nuget.packages.dir}/Microsoft.AspNet.WebApi.Core/5.0.0/lib/net45/System.Web.Http.dll" />
-				<include name="${nuget.packages.dir}/Microsoft.AspNet.WebApi.WebHost/5.0.0/lib/net45/System.Web.Http.WebHost.dll" />
-				
-			</references>
-		</csc>
-	</target>
-</project>
diff --git a/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.2010.csproj b/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.csproj
similarity index 92%
rename from src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.2010.csproj
rename to src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.csproj
index c5c68dd1..089dcd32 100644
--- a/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.2010.csproj
+++ b/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.csproj
@@ -4,8 +4,8 @@
     <Description>Interfaces and classes that provide ASP.NET MVC5 application support in Spring.Net</Description>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\Spring.Web\Spring.Web.2010.csproj" />
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\Spring.Web\Spring.Web.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.3" />
diff --git a/src/Spring/Spring.Web/Spring.Web.build b/src/Spring/Spring.Web/Spring.Web.build
deleted file mode 100644
index 404434d3..00000000
--- a/src/Spring/Spring.Web/Spring.Web.build
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-	<!-- build Spring.Web -->
-		
-		<call target="copycommonlogginglibtobin" />
-
-	<csc target="library" define="${current.build.defines.csc}" 
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}" 
-		     output="${current.bin.dir}/${project::get-name()}.dll" 
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-   			 nostdlib="true"
-			 noconfig="true"
-		     >
-			<arg line="${compiler.args}"/>	
-			<nowarn>
-				<warning number="${nowarn.numbers},0108,0114,0612,0109" />
-				<warning number="${nowarn.numbers},1591" if="${nant.settings.currentframework=='mono-2.0'}"/>
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../GenCommonAssemblyInfo.cs" />
-			</sources>
-			<resources basedir="Resources">
-				<include name="**/*" />
-			</resources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Configuration.dll" />
- 				<include name="System.DirectoryServices.dll" />
- 				<include name="System.Xml.dll" />
- 				<include name="System.Web.dll" />
- 				<include name="System.Web.Services.dll" />
-				<include if="${net-4.0.installed and net-4.0}" name="System.Web.ApplicationServices.dll" />        
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/antlr.runtime.dll" />
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Aop.dll" />
-			</references>
-		</csc>
-	</target>
-</project>
diff --git a/src/Spring/Spring.Web/Spring.Web.2010.csproj b/src/Spring/Spring.Web/Spring.Web.csproj
similarity index 88%
rename from src/Spring/Spring.Web/Spring.Web.2010.csproj
rename to src/Spring/Spring.Web/Spring.Web.csproj
index 567d0eac..cb867d7a 100644
--- a/src/Spring/Spring.Web/Spring.Web.2010.csproj
+++ b/src/Spring/Spring.Web/Spring.Web.csproj
@@ -1,23 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <Description>Interfaces and classes that provide web application support in Spring.Net</Description>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.DirectoryServices" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.Services" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <Description>Interfaces and classes that provide web application support in Spring.Net</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.DirectoryServices" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.Services" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 9ac0a9c9..b8570fd4 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -4,11 +4,8 @@
 
     <NoWarn>618, 1591</NoWarn>
 
-    <CleanedProjectName>$(MSBuildProjectName.Replace('.2010', ''))</CleanedProjectName>
-  
-    <OutputPath>..\..\..\build\$(Configuration)\$(CleanedProjectName)</OutputPath>
+    <OutputPath>..\..\..\build\$(Configuration)\$(MSBuildProjectName)</OutputPath>
 
-    <AssemblyName>$(CleanedProjectName)</AssemblyName>
     <RootNamespace>Spring</RootNamespace>
     <Deterministic>true</Deterministic>
 
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
deleted file mode 100644
index fdfac60d..00000000
--- a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Aop.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-		<!-- build Spring.Aop -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			 >
-			<nowarn>
-				<warning number="${nowarn.numbers.test},0219" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-			<resources basedir="Resources">
-				<include name="**/*" />
-			</resources>
-			<resources basedir="Data" prefix="" dynamicprefix="true" failonempty="true">
-					<include name="**/*" />
-			</resources>
-			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
-					<include name="**/*.xml" />
-					<exclude name="Data/**/*" />
-					<exclude name="obj/**/*" />
-			</resources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Data.dll" />
-				<include name="System.Web.dll" />
-				<include name="System.Xml.dll" />
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Aop.dll" />
-				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
-			</references>
-		</csc>
-
-		<copy todir="${current.bin.dir}">
-			<fileset basedir="${project::get-base-directory()}/Data">
-				<include name="**/*.xml" />
-			</fileset>
-		</copy>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-
-<!--
-	<target name="test" depends="build">
-		<nunit2outproc>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			  outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-		</nunit2outproc>
-	</target>
--->
-<!--
-	<target name="test-mono-1.0" >
-		<nunit2outproc>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll"
-			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
-		</nunit2outproc>
-	</target>
--->
-</project>
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj
similarity index 96%
rename from test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj
rename to test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj
index 32202b03..ff0e7de4 100644
--- a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj
@@ -1,34 +1,34 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;$(TargetFullFrameworkVersion)</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
-    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
-    <Reference Include="System.Web" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <Compile Remove="Aop\Framework\AutoProxy\AbstractAutoProxyCreatorTests.cs" />
-    <Compile Remove="Aop\Framework\Adapter\ThrowsAdviceInterceptorTests.cs" />
-    <Compile Remove="Aop\Framework\AutoProxy\AbstractAutoProxyCreatorTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
-    <Content Include="App.config" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="Data\**\*.xml" CopyToOutputDirectory="PreserveNewest" />
-    <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" />
-    <EmbeddedResource Include="Aop\Framework\DynamicProxy\IsAopProxyTests.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.1;$(TargetFullFrameworkVersion)</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
+    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
+    <Reference Include="System.Web" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <Compile Remove="Aop\Framework\AutoProxy\AbstractAutoProxyCreatorTests.cs" />
+    <Compile Remove="Aop\Framework\Adapter\ThrowsAdviceInterceptorTests.cs" />
+    <Compile Remove="Aop\Framework\AutoProxy\AbstractAutoProxyCreatorTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
+    <Content Include="App.config" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="Data\**\*.xml" CopyToOutputDirectory="PreserveNewest" />
+    <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" />
+    <EmbeddedResource Include="Aop\Framework\DynamicProxy\IsAopProxyTests.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
deleted file mode 100644
index a22cc670..00000000
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Core.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-	<!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-    -->
-<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-		<!--
-	        <copy file="../../../src/Spring/Spring.Core/Pool/Support/ISync.cs" todir="../../../CloverBuild/Pool/Support" verbose="true"/>
-		-->
-		
-		<call target="copycommonlogginglibtobin" />
-		<!-- <copy file="${iesi3.lib.dir}/Iesi.Collections.dll" todir="${current.bin.dir}" /> -->
-
-		<csc target="library" define="${current.build.defines.csc}"
-			warnaserror="true"
-		    optimize="${build.optimize}"
-			debug="${current.build.debug}"
-			output="${current.bin.dir}/${project::get-name()}.dll"
-			doc="${current.bin.dir}/${project::get-name()}.xml"
-			nostdlib="true"
-			noconfig="true"
-			>
-			<nowarn>
-				<warning number="${nowarn.numbers.test},0219,0169,0612" /> <!-- add 0414 for mono 2.0 -->
-				<warning number="${nowarn.numbers},1574" if="${nant.settings.currentframework=='mono-2.0'}"/>
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-				<exclude name="Objects\Factory\Config\ConnectionStringsVariableSourceTests.cs" if="${framework::get-target-framework() != 'net-2.0'}"/>
-				<exclude name="**/Fail*.cs"/>
-      </sources>
-			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
-				<include name="**/*.resx" />
-				<exclude name="**/*.*sr*.resx" if="${nant.settings.currentframework == 'mono-2.0'}"/>
-				<include name="**/*.xsd" />
-				<include name="**/*.txt" />
-				<include name="**/*.vb" />
-				<include name="**/*.properties" />
-				<include name="**/*.xml" />
-				<include name="**/*.config" />
-<!--
-				<include name="**/SimpleAppContext.xml" />
-				<include name="**/Factory/Attributes/*.xml" />
-				<include name="**/Context/Support/*.xml" />
-				<include name="**/aliasedObjects.xml" />
-				<include name="**/contextlifecycle.xml" />
--->
-			</resources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.EnterpriseServices.dll" />
-				<include name="System.Drawing.dll" />
-				<include name="System.Data.dll" />
-				<include name="System.Configuration.dll" />
-				<include name="System.Web.Services.dll" />
-				<include name="System.Web.dll" />
-				<include name="System.Runtime.Serialization.Formatters.Soap.dll" />
-				<include name="System.Transactions.dll" />
-				<include name="System.Windows.Forms.dll" />
-                <include name="System.Xml.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Aop.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-				<include name="${current.bin.dir}/Spring.Services.dll" />
-				<include name="${current.bin.dir}/Spring.Messaging.NMS.dll" />
-				<include name="${current.bin.dir}/Spring.Template.Velocity.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
-			</references>
-		</csc>
-
-		<!-- Mono's al tells me Culture name sr-SP-Cyrl is not supported. Not sure if that's a limitation of my installation (James Fitzsimons) -->
- 		<if test="${nant.settings.currentframework!='mono-2.0'}">
-			<!-- for some reason, on my new machine the csc task doesn't create the resource assembly for the sr-SP-Cyrl culture so do it by hand (MLP)-->
-			<!--
-			<if test="${framework::get-target-framework() != 'net-2.0'}">
-			  <mkdir dir="${current.bin.dir}/sr-SP-Cyrl"/>
-			  <copy file="Resources/Spring.Context.Tests.sr-SP-Cyrl.resx" todir="${current.bin.dir}/sr-SP-Cyrl"/>
-			  <resgen input="${current.bin.dir}/sr-SP-Cyrl/Spring.Context.Tests.sr-SP-Cyrl.resx" output="${current.bin.dir}/sr-SP-Cyrl/Spring.Resources.Spring.Context.Tests.sr-SP-Cyrl.resources" />
-			  <copy file="Resources/Tesla.sr-SP-Cyrl.resx" todir="${current.bin.dir}/sr-SP-Cyrl"/>
-			  <resgen input="${current.bin.dir}/sr-SP-Cyrl/Tesla.sr-SP-Cyrl.resx" output="${current.bin.dir}/sr-SP-Cyrl/Spring.Resources.Tesla.sr-SP-Cyrl.resources" />
-			  <al output="${current.bin.dir}/sr-SP-Cyrl/Spring.Core.Tests.resources.dll"
-			      target="lib"
-			      culture="sr-SP-Cyrl">
-			    <sources>
-			      <include name="${current.bin.dir}/sr-SP-Cyrl/Spring.Resources.Spring.Context.Tests.sr-SP-Cyrl.resources"/>
-			      <include name="${current.bin.dir}/sr-SP-Cyrl/Spring.Resources.Tesla.sr-SP-Cyrl.resources" />
-			    </sources>
-			  </al>
-			</if>
-			-->
-		</if>
-		
-		<!-- Visual Studio (and more importantly, csc.exe) is incapable of compiling RESX files for e.g., Cultures not present on the OS + CLR version;
-		      this means that for us to have resource files availabel for each of the various OS + CLR combinations possible to support the right test
-			  assertions we need to manually compile each of the resource files external to the NANT csc task itself and manually copy the assemblied into
-			  their expected locations -->
-		<property name="resource.designator" value="sr-Cyrl-CS" />
-		<call target="compile-resource-files" />
-		
-		<property name="resource.designator" value="sr-Cyrl-RS" />
-		<call target="compile-resource-files" />
-		
-		<property name="resource.designator" value="sr-SP-Cyrl" />
-		<call target="compile-resource-files" />
-
-		<copy todir="${current.bin.dir}">
-			<fileset basedir="${project::get-base-directory()}/Data">
-				<include name="**/*.xml" />
-                          <include name="**/*.test" />
-			</fileset>
-		</copy>
-		<!-- copy nh libs -->
-		<copy todir="${current.bin.dir}" overwrite="true">
-			<fileset basedir="${nh3.lib.dir}">
-				<include name="**/*.dll" />
-			</fileset>
-		</copy>
-
-
-        <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
-
-        </target>
-
-	<target name="compile-resource-files">
-		<if test="${framework::get-target-framework() != 'net-2.0'}">
-		  <mkdir dir="${current.bin.dir}/sr-SP-Cyrl"/>
-		  <copy file="Resources/Spring.Context.Tests.${resource.designator}.resx" todir="${current.bin.dir}/${resource.designator}"/>
-		  <resgen input="${current.bin.dir}/${resource.designator}/Spring.Context.Tests.${resource.designator}.resx" output="${current.bin.dir}/${resource.designator}/Spring.Resources.Spring.Context.Tests.${resource.designator}.resources" />
-		  <copy file="Resources/Tesla.${resource.designator}.resx" todir="${current.bin.dir}/${resource.designator}"/>
-		  <resgen input="${current.bin.dir}/${resource.designator}/Tesla.${resource.designator}.resx" output="${current.bin.dir}/${resource.designator}/Spring.Resources.Tesla.${resource.designator}.resources" />
-		  <al output="${current.bin.dir}/${resource.designator}/Spring.Core.Tests.resources.dll"
-			  target="lib"
-			  culture="${resource.designator}">
-			<sources>
-			  <include name="${current.bin.dir}/${resource.designator}/Spring.Resources.Spring.Context.Tests.${resource.designator}.resources"/>
-			  <include name="${current.bin.dir}/${resource.designator}/Spring.Resources.Tesla.${resource.designator}.resources" />
-			</sources>
-		  </al>
-		</if>
-	</target>
-		
-		
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-<!--
-	<target name="test2" depends="build">
-	  <if test="${nant.settings.currentframework!='mono-2.0'}">
-		<nunit2outproc>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
-			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
-		</nunit2outproc>
-	  </if>
-	  <if test="${nant.settings.currentframework=='mono-2.0'}">
-	    <nunit2>
-	      <formatter type="Plain" />
-	      <formatter type="Xml" usefile="true" extension=".xml"
-			 outputdir="${current.bin.dir}/results" />
-	      <test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
-		    appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
-	    </nunit2>
-	  </if>
-	</target>
--->
-
-<!--
-	<target name="test-mono-1.0" >
-		<nunit2outproc>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll"
-			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
-		</nunit2outproc>
-	</target>
--->
-</project>
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj
similarity index 93%
rename from test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
rename to test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj
index 1c32ba48..8dff6bbc 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj
@@ -1,75 +1,75 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;$(TargetFullFrameworkVersion)</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Services\Spring.Services.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
-    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Configuration" />
-    <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" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <Compile Remove="Context\Attributes\FailAssemblyObjectDefinitionScannerTests.cs" />
-    <Compile Remove="Context\Support\ApplicationContextAwareProcessorTests.cs" />
-    <Compile Remove="Expressions\ExpressionEvaluatorTests.cs" />
-    <Compile Remove="Globalization\AbstractLocalizerTests.cs" />
-    <Compile Remove="Globalization\Localizers\ResourceSetLocalizerTests.cs" />
-    <Compile Remove="Objects\TestTransparentProxyFactory.cs" />
-    <Compile Remove="SecurityTemplate.cs" />
-    <Compile Remove="Threading\CallContextStorageTests.cs" />
-    <Compile Remove="Util\ObjectUtilsTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Data\**">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Compile Remove="Context\Attributes\FailAssemblyObjectDefinitionScannerTests.cs" />
-    <EmbeddedResource Include="Context\Attributes\*.xml" />
-    <EmbeddedResource Include="Context\Support\*.xml" />
-    <EmbeddedResource Include="Context\Support\testobject.xsd" />
-    <EmbeddedResource Include="Context\Config\ConfigFiles\*.xml" />
-    <EmbeddedResource Include="Context\*.xml" />
-    <EmbeddedResource Include="Data\Spring\Objects\Factory\Config\*.properties" />
-    <EmbeddedResource Include="Core\TypeResolution\aliasedObjects.xml" />
-    <EmbeddedResource Include="Core\IO\TestResource.txt" />
-    <EmbeddedResource Include="Core\IO\ConfigSectionResourceTests_config1.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\*.xml" />
-    <EmbeddedResource Include="Objects\Factory\Attributes\*.config" />
-    <EmbeddedResource Include="Objects\Factory\Xml\*.xsd" />
-    <EmbeddedResource Include="Validation\*.xml" />
-    <EmbeddedResource Include="Util\ConfigXmlDocumentTests_SampleConfig.xml" />
-    <EmbeddedResource Include="Objects\Factory\TestResource.txt" />
-    <EmbeddedResource Include="Reflection\Dynamic\SafePropertyTests_TestObject.vb" />
-    <EmbeddedResource Include="Resources\SimpleAppContext.xml" />
-    <EmbeddedResource Include="TestResource.txt" />
-  </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(ProjectDir)Data&quot; &quot;$(OutDir)&quot; /y /s /q /d" />
-    <Exec Command="copy &quot;$(ProjectDir)App.config&quot; &quot;$(OutDir)testhost.dll.config&quot;" />
-  </Target>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.1;$(TargetFullFrameworkVersion)</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Services\Spring.Services.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
+    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Configuration" />
+    <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" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <Compile Remove="Context\Attributes\FailAssemblyObjectDefinitionScannerTests.cs" />
+    <Compile Remove="Context\Support\ApplicationContextAwareProcessorTests.cs" />
+    <Compile Remove="Expressions\ExpressionEvaluatorTests.cs" />
+    <Compile Remove="Globalization\AbstractLocalizerTests.cs" />
+    <Compile Remove="Globalization\Localizers\ResourceSetLocalizerTests.cs" />
+    <Compile Remove="Objects\TestTransparentProxyFactory.cs" />
+    <Compile Remove="SecurityTemplate.cs" />
+    <Compile Remove="Threading\CallContextStorageTests.cs" />
+    <Compile Remove="Util\ObjectUtilsTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Data\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Compile Remove="Context\Attributes\FailAssemblyObjectDefinitionScannerTests.cs" />
+    <EmbeddedResource Include="Context\Attributes\*.xml" />
+    <EmbeddedResource Include="Context\Support\*.xml" />
+    <EmbeddedResource Include="Context\Support\testobject.xsd" />
+    <EmbeddedResource Include="Context\Config\ConfigFiles\*.xml" />
+    <EmbeddedResource Include="Context\*.xml" />
+    <EmbeddedResource Include="Data\Spring\Objects\Factory\Config\*.properties" />
+    <EmbeddedResource Include="Core\TypeResolution\aliasedObjects.xml" />
+    <EmbeddedResource Include="Core\IO\TestResource.txt" />
+    <EmbeddedResource Include="Core\IO\ConfigSectionResourceTests_config1.xml" />
+    <EmbeddedResource Include="Objects\Factory\Attributes\*.xml" />
+    <EmbeddedResource Include="Objects\Factory\Attributes\*.config" />
+    <EmbeddedResource Include="Objects\Factory\Xml\*.xsd" />
+    <EmbeddedResource Include="Validation\*.xml" />
+    <EmbeddedResource Include="Util\ConfigXmlDocumentTests_SampleConfig.xml" />
+    <EmbeddedResource Include="Objects\Factory\TestResource.txt" />
+    <EmbeddedResource Include="Reflection\Dynamic\SafePropertyTests_TestObject.vb" />
+    <EmbeddedResource Include="Resources\SimpleAppContext.xml" />
+    <EmbeddedResource Include="TestResource.txt" />
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="xcopy &quot;$(ProjectDir)Data&quot; &quot;$(OutDir)&quot; /y /s /q /d" />
+    <Exec Command="copy &quot;$(ProjectDir)App.config&quot; &quot;$(OutDir)testhost.dll.config&quot;" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
deleted file mode 100644
index eaaef5d9..00000000
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Data.Integration.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-  <include buildfile="${spring.basedir}/common-project.include" />
-
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-  <target name="build">
-    <!-- build Spring.Data.Integration.Tests -->
-	
-	<call target="copycommonlogginglibtobin" />
-	
-    <csc target="library" define="${current.build.defines.csc}"
-         warnaserror="true"
-         optimize="${build.optimize}"
-         debug="${current.build.debug}"
-         output="${current.bin.dir}/${project::get-name()}.dll"
-         doc="${current.bin.dir}/${project::get-name()}.xml"
-		 nostdlib="true"
-		 noconfig="true"
-		 >
-      <nowarn>
-        <warning number="${nowarn.numbers.test}" />
-        <warning number="${nowarn.numbers.test},219" if="${nant.settings.currentframework=='mono-2.0'}" />
-      </nowarn>
-      <sources failonempty="true">
-        <include name="**/*.cs" />
-      </sources>
-      <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-		<include name="**/*.xml" />
-	  </resources>
-      <references>
-		<include name="mscorlib.dll"/>
-		<include name="Microsoft.CSharp.dll"/>
-		<include name="System.dll"/>
-		<include name="System.Core.dll"/>
-        <include name="System.Data.dll" />
-        <include name="System.Data.Common.dll" />
-        <include name="System.Drawing.dll" />
-        <include name="System.EnterpriseServices.dll" />
-        <include name="System.Transactions.dll" />
-        <include name="System.Logging.dll" />
-        <include name="System.Data.OracleClient.dll" />
-        <include name="System.Xml.dll" />
-		<include name="${current.bin.dir}/Common.Logging.dll"/>
-		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-		<include name="${current.bin.dir}/Spring.Core.dll" />
-		<include name="${current.bin.dir}/Spring.Aop.dll" />
-		<include name="${current.bin.dir}/Spring.Data.dll" />
-		<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-		<include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-		<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-      </references>
-    </csc>
-  </target>
-  <target name="test" depends="build">
-    <call target="common.run-tests" if="${test.integration.data}" />
-  </target>
-</project>
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.csproj
similarity index 90%
rename from test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2010.csproj
rename to test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.csproj
index ab01dee3..4db8f032 100644
--- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.csproj
@@ -1,33 +1,33 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net452</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
-    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Transactions" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Data\DTC1.1AppContext.xml" />
-    <Content Include="Data\Spring.Data.Integration.Tests_CreditsAndDebits_database.sql" />
-    <Content Include="Data\Spring.Data.Integration.Tests_Credits_database.sql" />
-    <Content Include="Data\Spring.Data.Integration.Tests_Debits_database.sql" />
-    <Content Include="Data\Spring.Data.Integration.Tests_Spring_database.sql" />
-    <EmbeddedResource Include="Data\*.xml" />
-    <EmbeddedResource Include="Data\Generic\GenericAdoTemplateTests.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net452</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
+    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data.OracleClient" />
+    <Reference Include="System.Transactions" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Data\DTC1.1AppContext.xml" />
+    <Content Include="Data\Spring.Data.Integration.Tests_CreditsAndDebits_database.sql" />
+    <Content Include="Data\Spring.Data.Integration.Tests_Credits_database.sql" />
+    <Content Include="Data\Spring.Data.Integration.Tests_Debits_database.sql" />
+    <Content Include="Data\Spring.Data.Integration.Tests_Spring_database.sql" />
+    <EmbeddedResource Include="Data\*.xml" />
+    <EmbeddedResource Include="Data\Generic\GenericAdoTemplateTests.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.csproj
similarity index 98%
rename from test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.2010.csproj
rename to test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.csproj
index 0be58ebd..c724f9ff 100644
--- a/test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.csproj
@@ -3,10 +3,10 @@
     <TargetFrameworks>net452</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate3\Spring.Data.NHibernate3.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate3\Spring.Data.NHibernate3.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="$(Log4NetVersion)" />
diff --git a/test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.csproj
similarity index 95%
rename from test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.2010.csproj
rename to test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.csproj
index 7a3bdd5e..17d90a1f 100644
--- a/test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate3.Tests/Spring.Data.NHibernate3.Tests.csproj
@@ -3,11 +3,11 @@
     <TargetFrameworks>net452</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate3\Spring.Data.NHibernate3.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate3\Spring.Data.NHibernate3.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
diff --git a/test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.csproj
similarity index 98%
rename from test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.2010.csproj
rename to test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.csproj
index 4fa2494e..a5cd7d1b 100644
--- a/test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.csproj
@@ -3,10 +3,10 @@
     <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate4\Spring.Data.NHibernate4.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate4\Spring.Data.NHibernate4.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="$(Log4NetVersion)" />
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj
index da8e0157..9ae8238d 100644
--- a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj
+++ b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj
@@ -4,11 +4,11 @@
     <RootNamespace>Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate4\Spring.Data.NHibernate4.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate4\Spring.Data.NHibernate4.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
diff --git a/test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.csproj
similarity index 96%
rename from test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.2010.csproj
rename to test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.csproj
index d69fad65..0c1966f1 100644
--- a/test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.csproj
@@ -3,11 +3,11 @@
     <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate4\Spring.Data.NHibernate4.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate4\Spring.Data.NHibernate4.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj
similarity index 98%
rename from test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.2010.csproj
rename to test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj
index e34fd446..0251974c 100644
--- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj
@@ -4,10 +4,10 @@
     <DefineConstants>$(DefineConstants);NH_5</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate5\Spring.Data.NHibernate5.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate5\Spring.Data.NHibernate5.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="log4net" Version="$(Log4NetVersion)" />
diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.2010.csproj b/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj
similarity index 96%
rename from test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.2010.csproj
rename to test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj
index b8dfc2b9..9e2a517d 100644
--- a/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj
@@ -4,11 +4,11 @@
     <DefineConstants>$(DefineConstants);NH_5</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate5\Spring.Data.NHibernate5.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate5\Spring.Data.NHibernate5.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
deleted file mode 100644
index 80db535a..00000000
--- a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Data.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-		<!-- build Spring.Data.Tests -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			 >
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-			        <include name="**/*.xml" />
-			</resources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Data.dll" />
-				<include name="System.Data.Common.dll" />
-				<include name="System.Data.OracleClient.dll" />
-				<include name="System.Drawing.dll" />
-				<include name="System.EnterpriseServices.dll" />
-				<include name="System.Transactions.dll" />
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Aop.dll" />
-				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-				<include name="${nuget.packages.dir}/odp.net.managed/121.1.1/lib/net40/Oracle.ManagedDataAccess.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
-			</references>
-		</csc>
-
-		<copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-
-<!--
-	<target name="test" depends="build">
-		<nunit2outproc>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-		</nunit2outproc>
-	</target>
--->
-</project>
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2010.csproj b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj
similarity index 94%
rename from test/Spring/Spring.Data.Tests/Spring.Data.Tests.2010.csproj
rename to test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj
index 3da71c4b..32808f2a 100644
--- a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2010.csproj
+++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj
@@ -1,40 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;$(TargetFullFrameworkVersion)</TargetFrameworks>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Transactions" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
-    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.5.1" Condition=" '$(TargetFramework)' == 'netcoreapp2.1' " />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <Compile Remove="Data\Core\ServiceDomainTransactionManagerTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
-    <Content Include="Data\**\*.xml" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="App.config" />
-    <Content Include="Transaction\Config\TxNamespaceParserTests_TxAttributeDriven.xml" />
-    <EmbeddedResource Include="Data\AutoDeclarativeTxTests.xml" />
-    <EmbeddedResource Include="Data\Common\AdditionalProviders.xml" />
-    <EmbeddedResource Include="Data\Common\DbProviderFactoryTests.xml" />
-    <EmbeddedResource Include="Transaction\Interceptor\MatchAlwaysTransactionAttributeSourceTests.xml" />
-    <EmbeddedResource Include="Transaction\Config\TxNamespaceParserTests.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.1;$(TargetFullFrameworkVersion)</TargetFrameworks>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data.OracleClient" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Transactions" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
+    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.5.1" Condition=" '$(TargetFramework)' == 'netcoreapp2.1' " />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <Compile Remove="Data\Core\ServiceDomainTransactionManagerTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
+    <Content Include="Data\**\*.xml" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="App.config" />
+    <Content Include="Transaction\Config\TxNamespaceParserTests_TxAttributeDriven.xml" />
+    <EmbeddedResource Include="Data\AutoDeclarativeTxTests.xml" />
+    <EmbeddedResource Include="Data\Common\AdditionalProviders.xml" />
+    <EmbeddedResource Include="Data\Common\DbProviderFactoryTests.xml" />
+    <EmbeddedResource Include="Transaction\Interceptor\MatchAlwaysTransactionAttributeSourceTests.xml" />
+    <EmbeddedResource Include="Transaction\Config\TxNamespaceParserTests.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.2010.csproj b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.2010.csproj
deleted file mode 100644
index c746737d..00000000
--- a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.2010.csproj
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Ems\Spring.Messaging.Ems.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="TIBCO.EMS">
-      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="TIBCO.EMS.ADMIN">
-      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.ADMIN.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GenCommonAssemblyInfo.cs">
-      <Link>GenCommonAssemblyInfo.cs</Link>
-    </Compile>
-    <EmbeddedResource Include="Messaging\Ems\Core\EmsTemplateTests.xml" />
-    <EmbeddedResource Include="Messaging\Ems\Config\EmsNamespaceHandlerTests.xml" />
-    <EmbeddedResource Include="Messaging\Ems\Listener\SimpleMessageListenerContainerTests.xml" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build
deleted file mode 100644
index 87a9d2ce..00000000
--- a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Messaging.Ems.Integration.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-  <include buildfile="${spring.basedir}/common-project.include" />
-
-  <!--
-  Required properties:
-    * current.bin.dir           - (path) root level to build to
-    * current.build.debug       - (true|false) debug build?
-    * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
- <include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-  <target name="build">
-
-    <!-- build Spring.Messaging.Ems.Integration.Tests -->
-	
-	<call target="copycommonlogginglibtobin" />
-	
-    <csc target="library" define="${current.build.defines.csc}"
-        warnaserror="true"
-        optimize="${build.optimize}"
-        debug="${current.build.debug}"
-        output="${current.bin.dir}/${project::get-name()}.dll"
-        doc="${current.bin.dir}/${project::get-name()}.xml">
-      <nowarn>
-        <warning number="${nowarn.numbers.test}" />
-      </nowarn>
-      <sources failonempty="true">
-        <include name="../Spring.Messaging.Ems.Integration.Tests/**/*.cs" />
-        <include name="**/*.cs" />
-        <exclude name="AssemblyInfo.cs" />
-      </sources>
-      <references>
-		<!--
-		<include name="mscorlib.dll"/>
-		<include name="System.dll"/>
-		<include name="System.Core.dll"/>
-		<include name="System.Data.dll" />
-		<include name="System.Xml.dll" />
-		-->
-		<include name="${current.bin.dir}/Common.Logging.dll"/>
-		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-        <include name="${current.bin.dir}/Spring.Core.dll" />
-        <include name="${current.bin.dir}/Spring.Aop.dll" />
-        <include name="${current.bin.dir}/Spring.Data.dll" />
-        <include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-        <include name="${current.bin.dir}/Spring.Messaging.EMS.dll" />
-        <include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-        <include name="${current.bin.dir}/TIBCO.EMS.dll" />
-        <include name="${current.bin.dir}/TIBCO.EMS.ADMIN.dll" />
-		<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-	  </references>
-      <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-        <include name="**/*.xml" />
-        <include name="**/*.sql" />
-      </resources>
-      <resources prefix="Spring" dynamicprefix="true" basedir="../Spring.Data.NHibernate.Integration.Tests" failonempty="true">
-        <include name="**/*.sql" />
-      </resources>
-    </csc>
-
-    <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-          tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
-
-    <copy todir="${current.bin.dir}" overwrite="true">
-      <fileset basedir="${project::get-base-directory()}">
-        <include name="Spring.Messaging.Ems.Integration.Tests.dll.config" />
-      </fileset>
-    </copy>
-
-  </target>
-
-  <target name="test" depends="build">
-    <property name="test.assemblyfile" value="${project::get-name()}.dll" />
-    <call target="common.run-tests" if="${test.integration.ems}" />
-  </target>
-
-</project>
diff --git a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.csproj b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.csproj
index b8f2ad90..d6a32cec 100644
--- a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.csproj
+++ b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.csproj
@@ -1,115 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{FA934E92-C8C2-428A-BE2A-26818F17A787}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Messaging.Ems.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Ems.Integration.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Ems.Integration.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Ems\Spring.Messaging.Ems.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="TIBCO.EMS">
       <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
-    </Reference>
-    <Reference Include="TIBCO.EMS.ADMIN, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="TIBCO.EMS.ADMIN">
       <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.ADMIN.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
+    <Compile Include="..\GenCommonAssemblyInfo.cs">
+      <Link>GenCommonAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Messaging\Ems\Config\EmsNamespaceHandlerTests.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestMessageListener.cs" />
-    <Compile Include="Messaging\Ems\Core\EmsTemplateTests.cs" />
-    <Compile Include="Messaging\Ems\Core\SimpleGateway.cs" />
-    <Compile Include="Messaging\Ems\Core\SimpleMessageListener.cs" />
-    <Compile Include="Messaging\Ems\Core\SimplePublisher.cs" />
-    <Compile Include="Messaging\Ems\Listener\SimpleMessageListenerContainerTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2008.csproj">
-      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
-      <Name>Spring.Aop.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2008.csproj">
-      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
-      <Name>Spring.Data.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Ems\Spring.Messaging.Ems.2008.csproj">
-      <Project>{900E3839-301E-48B1-BAEB-B6645620ACFF}</Project>
-      <Name>Spring.Messaging.Ems.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj">
-      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
-      <Name>Spring.Testing.NUnit.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Messaging.Ems.Integration.Tests.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Messaging\Ems\Core\EmsTemplateTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Messaging\Ems\Config\EmsNamespaceHandlerTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Messaging\Ems\Listener\SimpleMessageListenerContainerTests.xml" />
   </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.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build b/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build
deleted file mode 100644
index 63d37241..00000000
--- a/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Messaging.Ems.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-	<target name="build">
-		<!-- build Spring.Data.Tests -->
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-                     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-		        <resources prefix="Spring" dynamicprefix="true" failonempty="false">
-			        <include name="**/*.xml" />
-			</resources>
-			<references basedir="${current.bin.dir}">
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude name="CloverRuntime.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
-			</references>
-		</csc>
-
-                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-
-<!--
-	<target name="test" depends="build">
-		<nunit2outproc>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-		</nunit2outproc>
-	</target>
--->
-
-</project>
diff --git a/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2010.csproj b/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.csproj
similarity index 95%
rename from test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2010.csproj
rename to test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.csproj
index 99c53ed0..12bb5d88 100644
--- a/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.2010.csproj
+++ b/test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.csproj
@@ -1,158 +1,158 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Messaging.Ems.Tests</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>http://localhost/Spring.Messaging.Ems.Tests/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Messaging.Ems.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>1591,0618,0067</NoWarn>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Messaging.Ems.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
-    </Reference>
-    <Reference Include="TIBCO.EMS.ADMIN, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.ADMIN.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.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.Messaging.Ems\Spring.Messaging.Ems.2010.csproj">
-      <Project>{900E3839-301E-48B1-BAEB-B6645620ACFF}</Project>
-      <Name>Spring.Messaging.Ems.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="Messaging\Ems\Connections\CachingConnectionFactoryTests.cs" />
-    <Compile Include="Messaging\Ems\Connections\MessageTransactionManagerTests.cs" />
-    <Compile Include="Messaging\Ems\Connections\SingleConnectionFactoryTests.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestConnection.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestExceptionListener.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestMessageConsumer.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestMessageListener.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestMessageProducer.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestSession.cs" />
-    <Compile Include="Messaging\Ems\Connections\TestTopicSubscriber.cs" />
-    <Compile Include="Messaging\Ems\Core\MessageTemplateTests.cs" />
-    <Compile Include="Messaging\Ems\Core\SimpleMessageConverterTests.cs" />
-    <Compile Include="Messaging\Ems\Core\SimpleMessageListenerContainerTests.cs" />
-    <Compile Include="Messaging\Ems\Integration\LoggingExceptionHandler.cs" />
-    <Compile Include="Messaging\Ems\Integration\SimpleMessageListener.cs" />
-    <Compile Include="Messaging\Ems\Integration\SimpleMessageListenerContainerTests.cs" />
-    <Compile Include="Messaging\Ems\Jndi\ExpectedLookupContext.cs" />
-    <Compile Include="Messaging\Ems\Jndi\JndiLookupFactoryObjectTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Messaging\Ems\Integration\SimpleMessageListenerContainerTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 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 />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{66BD9467-AAC7-4FD9-901B-AB08C8C1FC21}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Messaging.Ems.Tests</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>http://localhost/Spring.Messaging.Ems.Tests/</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Web</InstallFrom>
+    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Messaging.Ems.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>1591,0618,0067</NoWarn>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2010\Spring.Messaging.Ems.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.dll</HintPath>
+    </Reference>
+    <Reference Include="TIBCO.EMS.ADMIN, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\TIBCO.EMS.ADMIN.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Ems\Spring.Messaging.Ems.csproj">
+      <Project>{900E3839-301E-48B1-BAEB-B6645620ACFF}</Project>
+      <Name>Spring.Messaging.Ems.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.csproj">
+      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
+      <Name>Spring.Testing.NUnit.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.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="Messaging\Ems\Connections\CachingConnectionFactoryTests.cs" />
+    <Compile Include="Messaging\Ems\Connections\MessageTransactionManagerTests.cs" />
+    <Compile Include="Messaging\Ems\Connections\SingleConnectionFactoryTests.cs" />
+    <Compile Include="Messaging\Ems\Connections\TestConnection.cs" />
+    <Compile Include="Messaging\Ems\Connections\TestExceptionListener.cs" />
+    <Compile Include="Messaging\Ems\Connections\TestMessageConsumer.cs" />
+    <Compile Include="Messaging\Ems\Connections\TestMessageListener.cs" />
+    <Compile Include="Messaging\Ems\Connections\TestMessageProducer.cs" />
+    <Compile Include="Messaging\Ems\Connections\TestSession.cs" />
+    <Compile Include="Messaging\Ems\Connections\TestTopicSubscriber.cs" />
+    <Compile Include="Messaging\Ems\Core\MessageTemplateTests.cs" />
+    <Compile Include="Messaging\Ems\Core\SimpleMessageConverterTests.cs" />
+    <Compile Include="Messaging\Ems\Core\SimpleMessageListenerContainerTests.cs" />
+    <Compile Include="Messaging\Ems\Integration\LoggingExceptionHandler.cs" />
+    <Compile Include="Messaging\Ems\Integration\SimpleMessageListener.cs" />
+    <Compile Include="Messaging\Ems\Integration\SimpleMessageListenerContainerTests.cs" />
+    <Compile Include="Messaging\Ems\Jndi\ExpectedLookupContext.cs" />
+    <Compile Include="Messaging\Ems\Jndi\JndiLookupFactoryObjectTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Messaging\Ems\Integration\SimpleMessageListenerContainerTests.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 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 />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.2010.csproj b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.2010.csproj
deleted file mode 100644
index 1448255b..00000000
--- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.2010.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging\Spring.Messaging.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Apache.NMS" Version="$(ApacheNmsVersion)" />
-    <PackageReference Include="Apache.NMS.ActiveMQ" Version="$(ApacheNmsVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Messaging\Nms\Core\NmsTemplateTests.xml" />
-    <EmbeddedResource Include="Messaging\Nms\Listener\SimpleMessageListenerContainerTests.xml" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build
deleted file mode 100644
index 22908b95..00000000
--- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Messaging.Nms.Integration.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-  <include buildfile="${spring.basedir}/common-project.include" />
-
-  <!--
-  Required properties:
-    * current.bin.dir           - (path) root level to build to
-    * current.build.debug       - (true|false) debug build?
-    * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-  <target name="build">
-
-    <!-- build Spring.Messaging.Nms.Integration.Tests -->
-	
-	<call target="copycommonlogginglibtobin" />
-	
-    <csc target="library" define="${current.build.defines.csc}"
-        warnaserror="true"
-        optimize="${build.optimize}"
-        debug="${current.build.debug}"
-        output="${current.bin.dir}/${project::get-name()}.dll"
-        doc="${current.bin.dir}/${project::get-name()}.xml"
-		nostdlib="true"
-		noconfig="true"
-	  >
-      <nowarn>
-        <warning number="${nowarn.numbers.test}" />
-      </nowarn>
-      <sources failonempty="true">
-        <include name="../Spring.Messaging.Nms.Integration.Tests/**/*.cs" />
-        <include name="**/*.cs" />
-        <exclude name="AssemblyInfo.cs" />
-      </sources>
-      <references>
-		<include name="mscorlib.dll"/>
-		<include name="Microsoft.CSharp.dll"/>
-		<include name="System.dll"/>
-		<include name="System.Core.dll"/>
-        <include name="System.Data.dll" />
-        <include name="System.EnterpriseServices.dll" />
-		<include name="${current.bin.dir}/Common.Logging.dll"/>
-		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-        <include name="${current.bin.dir}/Spring.Core.dll" />
-        <include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-        <include name="${current.bin.dir}/Spring.Messaging.dll" />
-        <include name="${current.bin.dir}/Spring.Messaging.Nms.dll" />
-        <include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-        <include name="${current.bin.dir}/Apache.NMS.dll" />
-        <include name="${current.bin.dir}/Apache.NMS.ActiveMQ.dll" />
-		<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-      </references>
-      <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-        <include name="**/*.xml" />
-        <include name="**/*.sql" />
-      </resources>
-      <resources prefix="Spring" dynamicprefix="true" basedir="../Spring.Data.NHibernate.Integration.Tests" failonempty="true">
-        <include name="**/*.sql" />
-      </resources>
-    </csc>
-
-    <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-          tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
-
-    <copy todir="${current.bin.dir}" overwrite="true">
-      <fileset basedir="${project::get-base-directory()}">
-        <include name="Spring.Messaging.Nms.Integration.Tests.dll.config" />
-      </fileset>
-    </copy>
-
-  </target>
-
-  <target name="test" depends="build">
-    <property name="test.assemblyfile" value="${project::get-name()}.dll" />
-    <call target="common.run-tests.nunit" if="${test.integration.nms}" />
-  </target>
-
-</project>
diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.csproj b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.csproj
index b12920d0..54ac3099 100644
--- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.csproj
+++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.csproj
@@ -1,99 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E5323AC8-137E-4EF7-BC62-3BD6FC0576CD}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Messaging.Nms.Integration.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Nms.Integration.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Messaging.Nms.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Apache.NMS, Version=1.1.0.1642, Culture=neutral, PublicKeyToken=82756feee3957618, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Apache.NMS.dll</HintPath>
-    </Reference>
-    <Reference Include="Apache.NMS.ActiveMQ, Version=1.1.0.1642, Culture=neutral, PublicKeyToken=82756feee3957618, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Net\2.0\Apache.NMS.ActiveMQ.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging\Spring.Messaging.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Spring.Messaging.Nms.Integration.Tests.dll.config" />
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Messaging\Nms\Core\NmsTemplateTests.cs" />
-    <Compile Include="Messaging\Nms\Core\SimpleGateway.cs" />
-    <Compile Include="Messaging\Nms\Core\SimpleMessageListener.cs" />
-    <Compile Include="Messaging\Nms\Listener\SimpleMessageListenerContainerTests.cs" />
+    <PackageReference Include="Apache.NMS" Version="$(ApacheNmsVersion)" />
+    <PackageReference Include="Apache.NMS.ActiveMQ" Version="$(ApacheNmsVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Messaging\Nms\Core\NmsTemplateTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2008.csproj">
-      <Project>{AEB1578C-9018-4D49-B440-789F38DD2F29}</Project>
-      <Name>Spring.Messaging.Nms.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2008.csproj">
-      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
-      <Name>Spring.Testing.NUnit.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Messaging\Nms\Listener\SimpleMessageListenerContainerTests.xml" />
   </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.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
deleted file mode 100644
index 342c0ed4..00000000
--- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Messaging.Nms.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-
-	<target name="build">
-		<!-- build Spring.Data.Tests -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			>
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-		        <resources prefix="Spring" dynamicprefix="true" failonempty="false">
-			        <include name="**/*.xml" />
-			</resources>
-			  <references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Data.dll" />
-				<include name="System.EnterpriseServices.dll" />
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-				<include name="${current.bin.dir}/Spring.Messaging.Nms.dll" />
-				<include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-				<include name="${current.bin.dir}/Apache.NMS.dll" />
-				<include name="${current.bin.dir}/Apache.NMS.ActiveMQ.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
-			  </references>
-		</csc>
-
-                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-
-<!--
-	<target name="test" depends="build">
-		<nunit2outproc>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-		</nunit2outproc>
-	</target>
--->
-</project>
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.csproj
similarity index 88%
rename from test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2010.csproj
rename to test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj
index 26fd8655..bb63ed72 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2010.csproj
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj
@@ -1,31 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
-    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
-    <PackageReference Include="Apache.NMS" Version="$(ApacheNmsVersion)" />
-    <PackageReference Include="Apache.NMS.ActiveMQ" Version="$(ApacheNmsVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Accessibility" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <EmbeddedResource Include="Messaging\Nms\Integration\SimpleMessageListenerContainerTests.xml" />
-    <EmbeddedResource Include="Messaging\Nms\Config\NmsNamespaceHandlerTests.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
+    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
+    <PackageReference Include="Apache.NMS" Version="$(ApacheNmsVersion)" />
+    <PackageReference Include="Apache.NMS.ActiveMQ" Version="$(ApacheNmsVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Accessibility" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <EmbeddedResource Include="Messaging\Nms\Integration\SimpleMessageListenerContainerTests.xml" />
+    <EmbeddedResource Include="Messaging\Nms\Config\NmsNamespaceHandlerTests.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build
deleted file mode 100644
index 04f6bb2b..00000000
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Messaging.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-		<!-- build Spring.Data.Tests -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			>
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-			        <include name="**/*.xml" />
-			</resources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Messaging.dll"/>
-				<include name="System.Transactions.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-				<include name="${current.bin.dir}/Spring.Messaging.dll" />
-				<include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
-			</references>
-		</csc>
-
-                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <!-- call target="common.run-tests" / -->
-    </target>
-
-<!--
-	<target name="test" depends="build">
-		<nunit2outproc>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-		</nunit2outproc>
-	</target>
--->
-</project>
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2010.csproj b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.csproj
similarity index 88%
rename from test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2010.csproj
rename to test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.csproj
index bdff9000..b31a1ed8 100644
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2010.csproj
+++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.csproj
@@ -1,31 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging\Spring.Messaging.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
-    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Transactions" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <EmbeddedResource Include="Messaging\Listener\*.xml" />
-    <EmbeddedResource Include="Messaging\Core\*.xml" />
-    <EmbeddedResource Include="Messaging\queue-context.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging\Spring.Messaging.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
+    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Messaging" />
+    <Reference Include="System.Transactions" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <EmbeddedResource Include="Messaging\Listener\*.xml" />
+    <EmbeddedResource Include="Messaging\Core\*.xml" />
+    <EmbeddedResource Include="Messaging\queue-context.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.build b/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.build
deleted file mode 100644
index 74ecb84d..00000000
--- a/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.build
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Scheduling.Quartz.Integration.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-	<!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-    -->
-	<target name="build">
-
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-      		     output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml">
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-			<references basedir="${current.bin.dir}">
-				<include name="*.dll" />
-				<exclude name="${project::get-name()}.dll" />
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
-			</references>
-		</csc>
-		<copy todir="${current.bin.dir}">
-			<fileset basedir="${project::get-name()}/Data">
-				<include name="**/*.xml" />
-			        <include name="**/*.test" />
-			</fileset>
-		</copy>
-		<copy todir="${current.bin.dir}">
-			<fileset basedir="${project::get-name()}">
-				<include name="**/*.config" />
-			</fileset>
-		</copy>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-
-<!--
-	<target name="test" depends="build">
-		<nunit2>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
-			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
-		</nunit2>
-	</target>
--->
-
-<!--
-	<target name="test-mono-1.0" >
-		<nunit2>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll"
-			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
-		</nunit2>
-	</target>
--->
-</project>
diff --git a/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.2010.csproj b/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.csproj
similarity index 97%
rename from test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.2010.csproj
rename to test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.csproj
index 5ec60336..7f3f224e 100644
--- a/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.2010.csproj
+++ b/test/Spring/Spring.Scheduling.Quartz.Integration.Tests/Spring.Scheduling.Quartz.Integration.Tests.csproj
@@ -57,15 +57,15 @@
     <EmbeddedResource Include="Scheduling\Quartz\LocalDataSourceJobStoreTest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj">
       <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
       <Name>Spring.Core.2010</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj">
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj">
       <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
       <Name>Spring.Data.2010</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz\Spring.Scheduling.Quartz.2010.csproj">
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz\Spring.Scheduling.Quartz.csproj">
       <Project>{E823D54C-CE82-4868-929F-5F95A999F61E}</Project>
       <Name>Spring.Scheduling.Quartz.2010</Name>
     </ProjectReference>
diff --git a/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.build b/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.build
deleted file mode 100644
index b5ab49f1..00000000
--- a/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.build
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Scheduling.Quartz2.Integration.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-	<!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-    -->
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-
-		<call target="copycommonlogginglibtobin" />
-		<call target="copyquartz2libtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-      		 output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			>
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-				<include name="${current.bin.dir}/Spring.Scheduling.Quartz2.dll" />
-				<include name="${current.bin.dir}/Quartz.dll" />
-				<include name="${current.bin.dir}/C5.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
-			</references>
-		</csc>
-		<copy todir="${current.bin.dir}">
-			<fileset basedir="${project::get-name()}/Data">
-				<include name="**/*.xml" />
-			        <include name="**/*.test" />
-			</fileset>
-		</copy>
-		<copy todir="${current.bin.dir}">
-			<fileset basedir="${project::get-name()}">
-				<include name="**/*.config" />
-			</fileset>
-		</copy>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-
-<!--
-	<target name="test" depends="build">
-		<nunit2>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
-			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
-		</nunit2>
-	</target>
--->
-
-<!--
-	<target name="test-mono-1.0" >
-		<nunit2>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll"
-			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
-		</nunit2>
-	</target>
--->
-</project>
diff --git a/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.2010.csproj b/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.csproj
similarity index 89%
rename from test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.2010.csproj
rename to test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.csproj
index 5bf73ef3..2758f42c 100644
--- a/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.2010.csproj
+++ b/test/Spring/Spring.Scheduling.Quartz2.Integration.Tests/Spring.Scheduling.Quartz2.Integration.Tests.csproj
@@ -3,9 +3,9 @@
     <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz2\Spring.Scheduling.Quartz2.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz2\Spring.Scheduling.Quartz2.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
diff --git a/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build b/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build
deleted file mode 100644
index 51a0829e..00000000
--- a/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Scheduling.Quartz2.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-	<!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-    -->
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-
-		<call target="copycommonlogginglibtobin" />
-		<call target="copyquartz2libtobin" />
-
-		<csc target="library" define="${current.build.defines.csc},QUARTZ_2_0"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-      		 output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			 >
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-				<include name="${current.bin.dir}/Spring.Scheduling.Quartz2.dll" />
-				<include name="${current.bin.dir}/Quartz.dll" />
-				<include name="${current.bin.dir}/C5.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
-			</references>
-		</csc>
-
-		<copy todir="${current.bin.dir}">
-			<fileset basedir="${project::get-base-directory()}">
-				<include name="**/*.xml" />
-				<include name="**/*.test" />
-			</fileset>
-		</copy>
-		<copy todir="${current.bin.dir}">
-			<fileset basedir="${project::get-base-directory()}">
-				<include name="**/*.config" />
-			</fileset>
-		</copy>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-
-<!--
-	<target name="test" depends="build">
-		<nunit2>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
-			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
-		</nunit2>
-	</target>
--->
-<!--
-	<target name="test-mono-1.0" >
-		<nunit2>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll"
-			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
-		</nunit2>
-	</target>
--->
-</project>
diff --git a/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.2010.csproj b/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.csproj
similarity index 91%
rename from test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.2010.csproj
rename to test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.csproj
index 1265de89..458106ee 100644
--- a/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.2010.csproj
+++ b/test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.csproj
@@ -3,9 +3,9 @@
     <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz2\Spring.Scheduling.Quartz2.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz2\Spring.Scheduling.Quartz2.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
deleted file mode 100644
index 8d003200..00000000
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Services.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-  <!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-  <target name="build">
-
-    <!-- build Spring.Services.Tests -->
-	<call target="copycommonlogginglibtobin" />
-	
-    <csc target="library" define="${current.build.defines.csc}"
-         warnaserror="true"
-         optimize="${build.optimize}"
-         debug="${current.build.debug}"
-         output="${current.bin.dir}/${project::get-name()}.dll"
-         doc="${current.bin.dir}/${project::get-name()}.xml"
-		 nostdlib="true"
-		 noconfig="true"
-		 >
-      <nowarn>
-        <warning number="${nowarn.numbers.test}" />
-      </nowarn>
-      <sources failonempty="true">
-        <include name="**/*.cs" />
-        <include name="../CommonAssemblyInfo.cs" />
-        <exclude name="**/WindowsService/**" />
-      </sources>
-      <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-        <include name="**/*.xml" />
-        <include name="**/*.wsdl" />
-        <include name="**/*.config" />
-      </resources>
-      <references>
-		<include name="mscorlib.dll"/>
-		<include name="Microsoft.CSharp.dll"/>
-		<include name="System.dll"/>
-		<include name="System.Configuration.dll"/>
-		<include name="System.Core.dll"/>
-        <include name="System.EnterpriseServices.dll" />
-        <include name="System.ServiceModel.dll" />
-        <include name="System.Runtime.Remoting.dll" />
-        <include name="System.Runtime.Serialization.dll" />
-		<include name="System.Web.dll"/>
-		<include name="System.Web.Services.dll"/>
-		<include name="System.Xml.dll"/>
-		<include name="${current.bin.dir}/Common.Logging.dll"/>
-		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-        <include name="${current.bin.dir}/Spring.Core.dll" />
-        <include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-        <include name="${current.bin.dir}/Spring.Aop.dll" />
-        <include name="${current.bin.dir}/Spring.Aop.Tests.dll" />
-        <include name="${current.bin.dir}/Spring.Services.dll" />
-		<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-		<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
-      </references>
-    </csc>
-    <copy todir="${current.bin.dir}" verbose="${copy-verbose}" >
-      <fileset basedir="${project::get-base-directory()}/Data">
-        <include name="**/*.xml" />
-        <include name="**/*.wsdl" />
-        <include name="**/*.xsd" />
-      </fileset>
-    </copy>
-    <copy todir="${current.bin.dir}" verbose="${copy-verbose}">
-      <fileset basedir="${project::get-base-directory()}">
-        <include name="**/*.config" />
-        <include name="**/*.xml" />
-      </fileset>
-    </copy>
-    <copy file="${project::get-base-directory()}/${project::get-name()}.dll-1.1.config" 
-          tofile="${current.bin.dir}/${project::get-name()}.dll.config" 
-          if="${framework::get-target-framework() == 'net-1.1'}"/>
-    <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config" 
-          tofile="${current.bin.dir}/${project::get-name()}.dll.config" 
-          if="${framework::get-target-framework() != 'net-1.1'}"/>
-  </target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-
-<!--
-  <target name="test" depends="build">
-
-    <nunit2outproc>
-      <formatter type="Plain" />
-      <formatter type="Xml" usefile="true" extension=".xml"
-                 outputdir="${current.bin.dir}/results" />
-      <test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-    </nunit2outproc>
-  </target>
--->
-</project>
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2010.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.csproj
similarity index 93%
rename from test/Spring/Spring.Services.Tests/Spring.Services.Tests.2010.csproj
rename to test/Spring/Spring.Services.Tests/Spring.Services.Tests.csproj
index 39109f4b..33e84143 100644
--- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2010.csproj
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.csproj
@@ -1,51 +1,51 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Services\Spring.Services.2010.csproj" />
-    <ProjectReference Include="..\Spring.Aop.Tests\Spring.Aop.Tests.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
-    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
-    <PackageReference Include="log4net" Version="$(Log4NetVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Web.Services" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Data\**\*">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="ServiceComponentExporterTests.TestServicedComponents.dll.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="ServiceComponentExporterTests.TestServicedComponents.exe.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Content Include="ServiceComponentExporterTests.TestServicedComponents.Services.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <EmbeddedResource Include="Data\Spring\Remoting\*.xml" />
-    <EmbeddedResource Include="Data\Spring\Web\Services\*.wsdl" />
-    <EmbeddedResource Include="Data\Spring\Web\Services\configurableFactory.xml" />
-    <EmbeddedResource Include="EnterpriseServices\ExeConfigurationSystemTests.config" />
-    <EmbeddedResource Include="ServiceModel\Config\*.xml" />
-    <EmbeddedResource Remove="WindowsService\**" />
-    <None Remove="WindowsService\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="WindowsService\**" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Services\Spring.Services.csproj" />
+    <ProjectReference Include="..\Spring.Aop.Tests\Spring.Aop.Tests.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
+    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
+    <PackageReference Include="log4net" Version="$(Log4NetVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Web.Services" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Data\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <None Include="ServiceComponentExporterTests.TestServicedComponents.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ServiceComponentExporterTests.TestServicedComponents.exe.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <Content Include="ServiceComponentExporterTests.TestServicedComponents.Services.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <EmbeddedResource Include="Data\Spring\Remoting\*.xml" />
+    <EmbeddedResource Include="Data\Spring\Web\Services\*.wsdl" />
+    <EmbeddedResource Include="Data\Spring\Web\Services\configurableFactory.xml" />
+    <EmbeddedResource Include="EnterpriseServices\ExeConfigurationSystemTests.config" />
+    <EmbeddedResource Include="ServiceModel\Config\*.xml" />
+    <EmbeddedResource Remove="WindowsService\**" />
+    <None Remove="WindowsService\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="WindowsService\**" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Tests.build
deleted file mode 100644
index 39cb40db..00000000
--- a/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Tests.build
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<project name="Spring.Services.WindowsService.Tests" default="build">
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
--->
-
-    <target name="copy-test-support-files">
-
-      <!-- test files -->
-    	<copy todir="${current.bin.dir}">
-    	    <fileset basedir="${project::get-base-directory()}">
-    	        <include name="Data/**/*.xml" />
-    	        <include name="Data/**/*.test" />
-    	    </fileset>
-    	</copy>
-
-      <!-- agiledocs -->
-    	<copy todir="${current.bin.dir}">
-    	    <fileset basedir="${project::get-base-directory()}/../../../doc/reference/src/templated">
-    	        <include name="*.dll" />
-    	    </fileset>
-    	</copy>
-
-      <!-- process definition files from src -->
-    	<!-- rough <copy> does not work ? ... -->
-    	<foreach item="File" property="filename">
-    	    <in>
-    		    <items>
-    				<include name="${project::get-base-directory()}/../../../src/Spring/Spring.Services/WindowsService/Process/**/*.xml"/>
-    		    </items>
-    		</in>
-    		<do>
-    			<copy todir="${current.bin.dir}/Data/Xml" verbose="true" file="${filename}"/>
-    		</do>
-    	</foreach>
-    </target>
-
-    <target name="build" depends="copy-test-support-files">
-        <csc target="library" define="${current.build.defines.csc}"
-			warnaserror="true"
-                        optimize="${build.optimize}"
-			debug="${current.build.debug}"
-			output="${current.bin.dir}/${project::get-name()}.dll" >
-            <nowarn>
-                <warning number="${nowarn.numbers}" />
-				<warning number="${nowarn.numbers.test}" />
-            </nowarn>
-            <sources failonempty="true">
-                <include name="WindowsService/Common/**/*.cs" />
-                <include name="WindowsService/TestUtils.cs" />
-                <include name="../CommonAssemblyInfo.cs" />
-            </sources>
-            <resources prefix="Spring.Services" dynamicprefix="true" failonempty="true">
-                <include name="tests.config" />
-            </resources>
-            <references basedir="${current.bin.dir}">
-                <include name="*.dll"/>
-                <exclude name="${project::get-name()}.dll"/>
-            </references>
-        </csc>
-    </target>
-
-    <target name="test" depends="build">
-         <nunit2outproc>
-            <formatter type="Plain" />
-            <formatter type="Xml" usefile="true" extension=".xml"
-	               outputdir="${current.bin.dir}/results" />
-            <test
-		assemblyname="${current.bin.dir}/${project::get-name()}.dll"
-		appconfig="${current.bin.dir}/${project::get-name()}.dll.config"/>
-         </nunit2outproc>
-    </target>
-
-
-</project>
diff --git a/test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.2010.csproj b/test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.2010.csproj
deleted file mode 100644
index 325a567a..00000000
--- a/test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.2010.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Template.Velocity.Castle\Spring.Template.Velocity.Castle.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
-    <Compile Include="..\Spring.Core.Tests\CompilerOptionsTests.cs">
-      <Link>CompilerOptionsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Core.Tests\ExceptionsTest.cs">
-      <Link>ExceptionsTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Core.Tests\Objects\Factory\Xml\ReadOnlyXmlTestResource.cs">
-      <Link>Objects\Factory\Xml\ReadOnlyXmlTestResource.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Core.Tests\StandardsComplianceTest.cs">
-      <Link>StandardsComplianceTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Template.Velocity.Tests\Template\Velocity\VelocityEngineFactoryObjectTests.cs">
-      <Link>Template\Velocity\VelocityEngineFactoryObjectTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Template.Velocity.Tests\Template\Velocity\VelocityEngineTestBase.cs">
-      <Link>Template\Velocity\VelocityEngineTestBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Template.Velocity.Tests\VelocityCompilerOptionsTests.cs">
-      <Link>VelocityCompilerOptionsTests.cs</Link>
-    </Compile>
-    <None Include="Template\Velocity\config.properties">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <EmbeddedResource Include="..\Spring.Template.Velocity.Tests\Template\Velocity\EmbeddedTemplate.vm">
-      <Link>Template\Velocity\EmbeddedTemplate.vm</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Spring.Template.Velocity.Tests\Template\Velocity\SimpleTemplate.vm">
-      <Link>Template\Velocity\SimpleTemplate.vm</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\Velocity\VelocityEngineFactoryObjectTests.xml" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.build b/test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.build
deleted file mode 100644
index 26d95ccc..00000000
--- a/test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.build
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Template.Velocity.Castle.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-	<!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-    -->
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-	
-	<property name="nvelocity.lib.dir" value="${nuget.packages.dir}/Castle.NVelocity/1.1.1/lib/net35" overwrite="true"/>
-
-	<if test="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}">
-		<property name="nvelocity.lib.dir" value="${nuget.packages.dir}/Castle.NVelocity/1.1.1/lib/net40" overwrite="true"/>
-	</if>
-
-	<target name="build">
-	
-		<call target="copycommonlogginglibtobin" />
-		<call target="copynvelocitylibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-      		 output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			 >
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../Spring.Template.Velocity.Tests/**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-				<exclude name="../Spring.Template.Velocity.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs" />
-			</sources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Configuration.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Template.Velocity.Castle.dll" />
-				<include name="${current.bin.dir}/NVelocity.dll" />
-
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-			</references>
-			<resources prefix="Spring.Template.Velocity" failonempty="true">
-				<include name="**/*.xml" />
-				<include name="../Spring.Template.Velocity.Tests/**/*.xsd" />
-			  <include name="../Spring.Template.Velocity.Tests/**/*.test" />
-			  <include name="../Spring.Template.Velocity.Tests/**/*.vm" />
-			  <include name="**/*.properties" />
-				<include name="../Spring.Template.Velocity.Tests/**/*.config" />
-			</resources>
-		</csc>
-		<copy todir="${current.bin.dir}" verbose="true" overwrite="true" failonerror="true">
-			<fileset basedir="${spring.basedir}/test/Spring/Spring.Template.Velocity.Tests">
-				<include name="**/*.xml" />
-				<include name="**/*.xsd" />
-				<include name="**/*.test" />
-				<include name="**/*.vm" />
-				<include name="**/*.properties" />
-				<include name="**/*.config" />
-			</fileset>
-		</copy>
-		
-		<copy todir="${current.bin.dir}" verbose="true" overwrite="true" failonerror="true">
-			<fileset basedir="${project::get-base-directory()}">
-				<include name="**/*.xml" />
-				<include name="**/*.xsd" />
-				<include name="**/*.test" />
-				<include name="**/*.vm" />
-				<include name="**/*.properties" />
-				<include name="**/*.config" />
-			</fileset>
-		</copy>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-<!--
-	<target name="test" depends="build">
-		<nunit2>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
-			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
-		</nunit2>
-	</target>
-
-	<target name="test-mono-1.0" >
-		<nunit2>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll"
-			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
-		</nunit2>
-	</target>
--->
-</project>
diff --git a/test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.csproj b/test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.csproj
index 036673ba..26d11131 100644
--- a/test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.csproj
+++ b/test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.csproj
@@ -1,93 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8D6ED392-8A1F-41C0-A765-22CF384EDEA1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.Template.Velocity.Castle.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\Spring.Template.Velocity.Castle.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.2008\Spring.Template.Velocity.Castle.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Template.Velocity.Castle\Spring.Template.Velocity.Castle.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Template\Velocity\Config\TemplateNamespaceParserTests.cs" />
-    <Compile Include="Template\Velocity\VelocityEngineFactoryObjectTests.cs" />
-    <Compile Include="Template\Velocity\VelocityEngineTestBase.cs" />
-    <Compile Include="VelocityCompilerOptionsTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2008.csproj">
-      <Project>{BF3AB954-8375-407C-9E98-4C51D8072784}</Project>
-      <Name>Spring.Template.Velocity.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
+    <Compile Include="..\Spring.Core.Tests\CompilerOptionsTests.cs">
+      <Link>CompilerOptionsTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Core.Tests\ExceptionsTest.cs">
+      <Link>ExceptionsTest.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Core.Tests\Objects\Factory\Xml\ReadOnlyXmlTestResource.cs">
+      <Link>Objects\Factory\Xml\ReadOnlyXmlTestResource.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Core.Tests\StandardsComplianceTest.cs">
+      <Link>StandardsComplianceTest.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Template.Velocity.Tests\Template\Velocity\VelocityEngineFactoryObjectTests.cs">
+      <Link>Template\Velocity\VelocityEngineFactoryObjectTests.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Template.Velocity.Tests\Template\Velocity\VelocityEngineTestBase.cs">
+      <Link>Template\Velocity\VelocityEngineTestBase.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Template.Velocity.Tests\VelocityCompilerOptionsTests.cs">
+      <Link>VelocityCompilerOptionsTests.cs</Link>
+    </Compile>
+    <None Include="Template\Velocity\config.properties">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <EmbeddedResource Include="..\Spring.Template.Velocity.Tests\Template\Velocity\EmbeddedTemplate.vm">
+      <Link>Template\Velocity\EmbeddedTemplate.vm</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\Spring.Template.Velocity.Tests\Template\Velocity\SimpleTemplate.vm">
+      <Link>Template\Velocity\SimpleTemplate.vm</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
     <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>
-    <None Include="project.json" />
-  </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.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj
deleted file mode 100644
index f14e5cb4..00000000
--- a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
-    <None Include="Template\Velocity\config.properties">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <EmbeddedResource Include="Template\Velocity\VelocityEngineFactoryObjectTests.xml" />
-    <EmbeddedResource Include="Template\Velocity\SimpleTemplate.vm">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Template\Velocity\EmbeddedTemplate.vm" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
deleted file mode 100644
index e9f266d4..00000000
--- a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Template.Velocity.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-	<!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-    -->
-
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<property name="nvelocity.lib.dir" value="${nuget.packages.dir}/NVelocity/1.0.3/lib" overwrite="true"/>
-	
-	<target name="build">
-
-		<call target="copycommonlogginglibtobin" />
-		<call target="copynvelocitylibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-      		 output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			 >
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Configuration.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Template.Velocity.dll" />
-				<include name="${current.bin.dir}/NVelocity.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-			</references>
-			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
-				<include name="**/*.xml" />
-				<include name="**/*.xsd" />
-			  <include name="**/*.test" />
-			  <include name="**/*.vm" />
-			  <include name="**/*.properties" />
-				<include name="**/*.config" />
-			</resources>
-		</csc>
-		<copy todir="${current.bin.dir}" overwrite="true" failonerror="true">
-			<fileset basedir="${project::get-base-directory()}">
-				<include name="**/*.xml" />
-				<include name="**/*.xsd" />
-			        <include name="**/*.test" />
-			        <include name="**/*.vm" />
-			        <include name="**/*.properties" />
-				<include name="**/*.config" />
-			</fileset>
-		</copy>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-<!--
-	<target name="test" depends="build">
-		<nunit2>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
-			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
-		</nunit2>
-	</target>
-
-	<target name="test-mono-1.0" >
-		<nunit2>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll"
-			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
-		</nunit2>
-	</target>
--->
-</project>
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj
index 70cec555..baa04490 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj
+++ b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj
@@ -1,93 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <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>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkSubset>
-    </TargetFrameworkSubset>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.NET.2008\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.2008\Spring.Template.Velocity.Tests\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Template\Velocity\Config\TemplateNamespaceParserTests.cs" />
-    <Compile Include="Template\Velocity\VelocityEngineFactoryObjectTests.cs" />
-    <Compile Include="Template\Velocity\VelocityEngineTestBase.cs" />
-    <Compile Include="VelocityCompilerOptionsTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
-      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
-      <Name>Spring.Core.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Template.Velocity\Spring.Template.Velocity.2008.csproj">
-      <Project>{BF3AB954-8375-407C-9E98-4C51D8072784}</Project>
-      <Name>Spring.Template.Velocity.2008</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
-      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
-      <Name>Spring.Core.Tests.2008</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Template\Velocity\VelocityEngineFactoryObjectTests.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Template\Velocity\SimpleTemplate.vm">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
     <None Include="Template\Velocity\config.properties">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <EmbeddedResource Include="Template\Velocity\EmbeddedTemplate.vm">
+    <EmbeddedResource Include="Template\Velocity\VelocityEngineFactoryObjectTests.xml" />
+    <EmbeddedResource Include="Template\Velocity\SimpleTemplate.vm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
-    <None Include="project.json" />
+    <EmbeddedResource Include="Template\Velocity\EmbeddedTemplate.vm" />
   </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.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
deleted file mode 100644
index 0059dbb4..00000000
--- a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Testing.Microsoft.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-		<!-- build Spring.Data.Tests -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			 >
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-			        <include name="**/*.xml" />
-			</resources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="${vs-net.mstest.bin.dir.current}\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-				<include name="${current.bin.dir}/Spring.Data.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Testing.Microsoft.dll" />
-			</references>
-		</csc>
-
-                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests.mstest" />
-    </target>
-
-</project>
diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2010.csproj b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj
similarity index 83%
rename from test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2010.csproj
rename to test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj
index 261e7773..713268e5 100644
--- a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.2010.csproj
+++ b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj
@@ -1,21 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.Microsoft\Spring.Testing.Microsoft.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <EmbeddedResource Include="Testing\Microsoft\TestApplicationContext.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.Microsoft\Spring.Testing.Microsoft.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <EmbeddedResource Include="Testing\Microsoft\TestApplicationContext.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
deleted file mode 100644
index 71677a8f..00000000
--- a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Testing.NUnit.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-
-<!--
-    Required properties:
-      * current.bin.dir           - (path) root level to build to
-      * current.build.debug       - (true|false) debug build?
-      * current.build.defines.csc - framework-specific build defines for C# compiler
- -->
-<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-	<target name="build">
-		<!-- build Spring.Data.Tests -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-		<csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			>
-			<nowarn>
-				<warning number="${nowarn.numbers.test}" />
-			</nowarn>
-			<sources failonempty="true">
-				<include name="**/*.cs" />
-				<include name="../CommonAssemblyInfo.cs" />
-			</sources>
-		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-			        <include name="**/*.xml" />
-			</resources>
-			<references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Data.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Data.dll" />
-				<include name="${current.bin.dir}/Spring.Data.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Testing.NUnit.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
-			</references>
-		</csc>
-
-                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
-	</target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-<!--
-	<target name="test" depends="build">
-		<nunit2outproc>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-		</nunit2outproc>
-	</target>
--->
-</project>
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.csproj
similarity index 87%
rename from test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2010.csproj
rename to test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj
index b0c564df..e991f12b 100644
--- a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2010.csproj
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj
@@ -1,25 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;$(TargetFullFrameworkVersion)</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
-    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Spring.Testing.NUnit.Tests.build" />
-    <Content Include="App.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <EmbeddedResource Include="Testing\NUnit\TestApplicationContext.xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.1;$(TargetFullFrameworkVersion)</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
+    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Testing.NUnit.Tests.build" />
+    <Content Include="App.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <EmbeddedResource Include="Testing\NUnit\TestApplicationContext.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build b/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build
deleted file mode 100644
index 37642aad..00000000
--- a/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Conversation.NHibernate3.Tests" default="test" xmlns="http://nant.sf.net/release/0.91-alpha2/nant.xsd">
-
-  <include buildfile="${spring.basedir}/common-project.include" />
-
-  <!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-    -->
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-  <target name="build">
-
-	<call target="copycommonlogginglibtobin" />
-	<call target="copynh3libtobin" />
-  
-    <csc target="library" define="${current.build.defines.csc}"
-		     warnaserror="true"
-		     optimize="${build.optimize}"
-		     debug="${current.build.debug}"
-      		 output="${current.bin.dir}/${project::get-name()}.dll"
-		     doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			>
-      <nowarn>
-        <warning number="${nowarn.numbers.test}" />
-      </nowarn>
-      <sources failonempty="true">
-        <include name="**/*.cs" />
-        <include name="../CommonAssemblyInfo.cs" />
-        <exclude name="bin/**/*" />
-      </sources>
-      <references>
-		<include name="mscorlib.dll"/>
-		<include name="Microsoft.CSharp.dll"/>
-		<include name="System.dll"/>
-		<include name="System.Configuration.dll"/>
-		<include name="System.Core.dll"/>
-        <include name="System.Data.dll" />
-        <include name="System.EnterpriseServices.dll" />
-        <include name="System.Web.dll" />
-		<include name="${current.bin.dir}/Common.Logging.dll"/>
-		<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-		<include name="${current.bin.dir}/Spring.Core.dll" />
-		<include name="${current.bin.dir}/Spring.Aop.dll" />
-		<include name="${current.bin.dir}/Spring.Data.dll" />
-		<include name="${current.bin.dir}/Spring.Data.NHibernate3.dll" />
-		<include name="${current.bin.dir}/Spring.Web.dll" />
-		<include name="${current.bin.dir}/Spring.Web.Conversation.NHibernate3.dll" />
-		<include name="${current.bin.dir}/NUnitAspEx.dll" />
-		<include name="${spring.basedir}/test/Spring/${project::get-name()}/lib/Net/2.0/System.Data.SQLite.dll" />
-		<include name="${current.bin.dir}/NHibernate.dll"/>
-		<include name="${current.bin.dir}/Iesi.Collections.dll"/>
-		<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-      </references>
-      <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-        <include name="**/*.xml" />
-        <exclude name="Data/**/*" />
-        <exclude name="obj/**/*" />
-        <exclude name="bin/**/*" />
-      </resources>
-    </csc>
-
-    <copy file="${project::get-base-directory()}/app.config"
-          tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
-  </target>
-
-  <target name="test" depends="build">
-    <!--moving temporary files that break the build or test of this project (MOVE)-->
-    <mkdir dir="${current.bin.dir}/nunitaspex_excluded"/>
-    <move todir="${current.bin.dir}/nunitaspex_excluded" failonerror="true">
-      <fileset basedir="${current.bin.dir}">
-        <include name="Spring*NHibernate4*.dll"/>
-      </fileset>
-    </move>
-
-	<copy todir="${current.bin.dir}/Data/Spring/Conversation/WebConversationStateTest">
-      <fileset basedir="${project::get-base-directory()}/Data/Spring/Conversation/WebConversationStateTest">
-     		<include name="**/*" />
-      </fileset>
-    </copy>
-    
-<!--
-		System.Data.SQLite.dll requires an x86 and an x64 folder directly underneath its own location so that it can
-		dynamically load the appropriate Interop assembly for the running processor architecture.
-		
-		The 'intended' deployment mechanism for System.Data.SQLite.dll is an XCOPY of the folder structure to
-		the runtime location of the app.  This task reproduces that XCOPY result by recursively copying the entirety
-		of the necessary SQLite folder structure into the /bin/ dir of the website content that's eventually
-		passed through NUnitASP during the test-run.
-	-->
-	<copy todir="${current.bin.dir}/Data/Spring/Conversation/WebConversationStateTest/bin">
-      <fileset basedir="${project::get-base-directory()}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}">
-     		<include name="**/*" />
-      </fileset>
-    </copy>
-	
-    <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-    <call target="common.run-tests" />
-    
-    <!--moving temporary files that break the build or test of this project (UNDO MOVE)-->
-    <move todir="${current.bin.dir}">
-      <fileset basedir="${current.bin.dir}/nunitaspex_excluded">
-        <include name="Spring*NHibernate4*.dll"/>
-      </fileset>
-    </move>
-  </target>
-  <!--
-	<target name="test" depends="build">
-		<nunit2outproc>
-			<formatter type="Plain" />
-			<formatter type="Xml" usefile="true" extension=".xml"
-			           outputdir="${current.bin.dir}/results" />
-			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
-			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
-		</nunit2outproc>
-	</target>
--->
-</project>
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.2010.csproj b/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.csproj
similarity index 94%
rename from test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.2010.csproj
rename to test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.csproj
index 2509ea36..97488c2f 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.csproj
@@ -4,12 +4,12 @@
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Conversation.NHibernate3\Spring.Web.Conversation.NHibernate3.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate3\Spring.Data.NHibernate3.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web\Spring.Web.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Conversation.NHibernate3\Spring.Web.Conversation.NHibernate3.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate3\Spring.Data.NHibernate3.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web\Spring.Web.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
diff --git a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
deleted file mode 100644
index 2a291580..00000000
--- a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Mvc.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-    <!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-            * lib.dir                   - framework-specific assembly references
-    -->
-    <target name="build">
-        <!-- build Spring.Web.Mvc -->
-        <csc target="library" define="${current.build.defines.csc}" 
-	     warnaserror="true" 
-             optimize="${build.optimize}"
-	     debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll" 
-	     doc="${current.bin.dir}/${project::get-name()}.xml">
-            <nowarn>
-                <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
-                <warning number="${nowarn.numbers.test},1587" if="${nant.settings.currentframework=='mono-2.0'}"/>
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../CommonAssemblyInfo.cs" />
-            </sources>
-            <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-                <include name="**/*.resx" />
-                <include name="**/*.xsd" />
-                <include name="**/*.txt" />
-                <include name="**/*.xml" />
-                <exclude name="Data/**/*" />
-                <exclude name="obj/**/*" />
-            </resources>
-            <references basedir="${current.bin.dir}">
-                <include name="*.dll" />
-				<include name="System.Configuration.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-				<include name="System.Drawing.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-				<include name="System.Xml.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-				<include name="System.Web.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-				<include name="System.Web.Services.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-				<include name="System.Data.dll" if="${nant.settings.currentframework=='mono-2.0'}" />
-				
-				<include name="System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-4.0'}" />
-				<include name="System.Web.Routing.dll" if="${nant.settings.currentframework=='net-4.0'}" />
-
-				<include name="${programfiles}\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
-				<include name="${programfilesx86}\Microsoft ASP.NET\ASP.NET MVC 2\Assemblies\System.Web.Mvc.dll" />
-				<include name="${programfiles}\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Routing.dll" if="${nant.settings.currentframework=='net-3.5'}" />
-				<include name="${programfiles}\Reference Assemblies\Microsoft\Framework\v3.5\System.Web.Abstractions.dll"  if="${nant.settings.currentframework=='net-3.5'}" />
-					
-                <exclude name="${project::get-name()}.dll" />
-            
-				<exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
-				<exclude name="Spring.Web.Mvc3.dll" />
-				<exclude name="Spring.Web.Mvc3.Tests.dll" />
-				<exclude name="Spring.Web.Mvc4.dll" />
-				<exclude name="Spring.Web.Mvc4.Tests.dll" />
-            </references>
-        </csc>
-        <copy todir="${current.bin.dir}">
-            <fileset basedir="${project::get-base-directory()}/Data">
-                <include name="**/*.*" />
-            </fileset>
-		</copy>
-		<copy todir="${current.bin.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-                <include name="**/*.xml" />
-            </fileset>
-		</copy>
-    </target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-<!--
-    <target name="test" depends="build">
-        <nunit2outproc>
-            <formatter type="Plain" />
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" />
-            <test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-        </nunit2outproc>
-    </target>
--->
-</project>
diff --git a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.csproj
similarity index 95%
rename from test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj
rename to test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.csproj
index 96159746..fc5752a8 100644
--- a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.csproj
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D4032434-D9A8-437B-95E8-9D4DE0AD9932}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.Web.Mvc.Tests</RootNamespace>
-    <AssemblyName>Spring.Web.Mvc.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Mvc.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_3_5;NET_4_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="ControllerFactoryTestExtension.cs" />
-    <Compile Include="Controllers\NamedContextController.cs" />
-    <Compile Include="Controllers\SecondContainerRegisteredController.cs" />
-    <Compile Include="Controllers\NotInContainerController.cs" />
-    <Compile Include="Controllers\FirstContainerRegisteredController.cs" />
-    <Compile Include="SpringControllerFactoryTests.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>
-      <Private>True</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Mvc\Spring.Web.Mvc.2010.csproj">
-      <Project>{5166CE3A-14BE-478A-88DA-729A39DE1E29}</Project>
-      <Name>Spring.Web.Mvc.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.Web.Tests\Spring.Web.Tests.2010.csproj">
-      <Project>{C67E47AA-1ACD-41B4-A465-4D336A2319CA}</Project>
-      <Name>Spring.Web.Tests.2010</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="objects.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="namedContextObjects.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="objectsMatchByType.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D4032434-D9A8-437B-95E8-9D4DE0AD9932}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.Web.Mvc.Tests</RootNamespace>
+    <AssemblyName>Spring.Web.Mvc.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Mvc.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_3_5;NET_4_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="ControllerFactoryTestExtension.cs" />
+    <Compile Include="Controllers\NamedContextController.cs" />
+    <Compile Include="Controllers\SecondContainerRegisteredController.cs" />
+    <Compile Include="Controllers\NotInContainerController.cs" />
+    <Compile Include="Controllers\FirstContainerRegisteredController.cs" />
+    <Compile Include="SpringControllerFactoryTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2010</Name>
+      <Private>True</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Mvc\Spring.Web.Mvc.csproj">
+      <Project>{5166CE3A-14BE-478A-88DA-729A39DE1E29}</Project>
+      <Name>Spring.Web.Mvc.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web\Spring.Web.csproj">
+      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
+      <Name>Spring.Web.2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Web.Tests\Spring.Web.Tests.csproj">
+      <Project>{C67E47AA-1ACD-41B4-A465-4D336A2319CA}</Project>
+      <Name>Spring.Web.Tests.2010</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="objects.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="namedContextObjects.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="objectsMatchByType.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <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.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build b/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build
deleted file mode 100644
index c5f4be6e..00000000
--- a/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Mvc3.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-    <!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-            * lib.dir                   - framework-specific assembly references
-    -->
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-    <target name="build">
-
-		<!--
-		<copy todir="${current.bin.dir}" flatten="true" overwrite="true">
-            <fileset basedir="${nuget.packages.dir}">
-                <include name="Microsoft.AspNet.Mvc.3.0.*/**/*.dll" />
-            </fileset>
-		</copy>
-		-->
-
-		<!-- build Spring.Web.Mvc -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-        <csc target="library" define="${current.build.defines.csc}" 
-			 warnaserror="true" 
-             optimize="${build.optimize}"
-			 debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll" 
-			 doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			 >
-            <nowarn>
-                <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
-                <warning number="${nowarn.numbers.test},1587" if="${nant.settings.currentframework=='mono-2.0'}"/>
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../CommonAssemblyInfo.cs" />
-            </sources>
-            <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-                <include name="**/*.resx" />
-                <include name="**/*.xsd" />
-                <include name="**/*.txt" />
-                <include name="**/*.xml" />
-                <exclude name="Data/**/*" />
-                <exclude name="obj/**/*" />
-            </resources>
-            <references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Configuration.dll" />
-				<include name="System.Drawing.dll" />
-				<include name="System.Xml.dll" />
-				<include name="System.Xml.Linq.dll" />
-				<include name="System.Web.dll" />
-				<include name="System.Web.Abstractions.dll" />
-				<include name="System.Web.Helpers.dll" />
-				<include name="System.Web.Mvc.dll" />
-				<include name="System.Web.Razor.dll" />
-				<include name="System.Web.Routing.dll" />
-				<include name="System.Web.WebPages.dll" />
-				<include name="System.Web.WebPages.Deployment.dll" />
-				<include name="System.Web.WebPages.Razor.dll" />
-				<include name="System.Web.Services.dll" />
-				<include name="System.Data.dll" />
-				
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Web.Mvc3.dll" />
-
-                <include name="${nuget.packages.dir}/Microsoft.AspNet.Mvc/3.0.20105.1/lib/net40/System.Web.Mvc.dll" />
- 
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-            </references>
-        </csc>
-        <copy todir="${current.bin.dir}">
-            <fileset basedir="${project::get-base-directory()}/Data">
-                <include name="**/*.*" />
-            </fileset>
-		</copy>
-		<copy todir="${current.bin.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-                <include name="**/*.xml" />
-            </fileset>
-		</copy>
-    </target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <copy file="${nuget.packages.dir}/Microsoft.AspNet.Mvc/3.0.20105.1/lib/net40/System.Web.Mvc.dll" todir="${current.bin.dir}" />
-        <call target="common.run-tests" />
-    </target>
-<!--
-    <target name="test" depends="build">
-        <nunit2outproc>
-            <formatter type="Plain" />
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" />
-            <test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-        </nunit2outproc>
-    </target>
--->
-</project>
diff --git a/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.2010.csproj b/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.csproj
similarity index 92%
rename from test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.2010.csproj
rename to test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.csproj
index 97cd3ecc..b796552f 100644
--- a/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.csproj
@@ -1,24 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Mvc3\Spring.Web.Mvc3.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Data.DataSetExtensions" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
-    <Content Include="*.xml" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Mvc3\Spring.Web.Mvc3.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Abstractions" />
+    <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Data.DataSetExtensions" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
+    <Content Include="*.xml" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build b/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build
deleted file mode 100644
index 7146747e..00000000
--- a/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Mvc4.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-    <!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-            * lib.dir                   - framework-specific assembly references
-    -->
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-    <target name="build">
-
-		<!-- build Spring.Web.Mvc -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-        <csc target="library" define="${current.build.defines.csc}" 
-			 warnaserror="true" 
-             optimize="${build.optimize}"
-			 debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll" 
-			 doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			>
-            <nowarn>
-                <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
-                <warning number="${nowarn.numbers.test},1587"/>
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../CommonAssemblyInfo.cs" />
-				<include name="../Spring.Web.Mvc3.Tests/**/*.cs" />
-				<include name="../Spring.Web.Mvc4.Tests/**/*.cs" />
-            </sources>
-            <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-                <include name="../Spring.Web.Mvc3.Tests/**/*.resx" />
-                <include name="../Spring.Web.Mvc3.Tests/**/*.xsd" />
-                <include name="../Spring.Web.Mvc3.Tests/**/*.txt" />
-                <include name="../Spring.Web.Mvc3.Tests/**/*.xml" />
-                <exclude name="../Spring.Web.Mvc3.Tests/Data/**/*" />
-                <exclude name="../Spring.Web.Mvc3.Tests/obj/**/*" />
-                <exclude name="../Spring.Web.Mvc3.Tests/bin/**/*" />
-            </resources>
-            <references>
-				<lib>
-					<include name="${nuget.packages.dir}/Microsoft.AspNet.Mvc/4.0.30506/lib/net40" />
-					<include name="${nuget.packages.dir}/Microsoft.AspNet.WebApi.Client/4.0.30506/lib/net40" />
-					<include name="${nuget.packages.dir}/Microsoft.AspNet.WebApi.Core/4.0.30506/lib/net40" />
-					<include name="${nuget.packages.dir}/Microsoft.AspNet.WebApi.WebHost/4.0.30506/lib/net40" />
-				</lib>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Configuration.dll" />
-				<include name="System.Drawing.dll" />
-				<include name="System.Xml.dll" />
-				<include name="System.Xml.Linq.dll" />
-				<include name="System.Web.dll" />
-				<include name="System.Web.Abstractions.dll" />
-				<include name="System.Web.Helpers.dll" />
-				<include name="System.Web.Http.dll" />
-				<include name="System.Web.Http.WebHost.dll" />
-				<include name="System.Web.Mvc.dll" />
-				<include name="System.Web.Razor.dll" />
-				<include name="System.Web.Routing.dll" />
-				<include name="System.Web.WebPages.dll" />
-				<include name="System.Web.WebPages.Deployment.dll" />
-				<include name="System.Web.WebPages.Razor.dll" />
-				<include name="System.Web.Services.dll" />
-				<include name="System.Data.dll" />
-				
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-
-                <include name="${current.bin.dir}/Spring.Core.dll" />
-                <include name="${current.bin.dir}/Spring.Web.Mvc4.dll" />
-
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>            
-            </references>
-        </csc>
-        <copy todir="${current.bin.dir}">
-            <fileset basedir="${project::get-base-directory()}/Data">
-                <include name="**/*.*" />
-            </fileset>
-		</copy>
-		<copy todir="${current.bin.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-                <include name="**/*.xml" />
-            </fileset>
-		</copy>
-    </target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-		<copy todir="${current.bin.dir}" flatten="true">
-            <fileset basedir="${nuget.packages.dir}">
-                <include name="Microsoft.AspNet*.4.0.*/**/*.dll" />
-            </fileset>
-		</copy>
-        <call target="common.run-tests" />
-    </target>
-<!--
-    <target name="test" depends="build">
-        <nunit2outproc>
-            <formatter type="Plain" />
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" />
-            <test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-        </nunit2outproc>
-    </target>
--->
-</project>
diff --git a/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.2010.csproj b/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.csproj
similarity index 94%
rename from test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.2010.csproj
rename to test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.csproj
index 4a51bb7e..00a2287e 100644
--- a/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.csproj
@@ -3,8 +3,8 @@
     <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Mvc4\Spring.Web.Mvc4.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Mvc4\Spring.Web.Mvc4.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
diff --git a/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build b/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build
deleted file mode 100644
index 03e31ff1..00000000
--- a/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Mvc5.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-    <!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-            * lib.dir                   - framework-specific assembly references
-    -->
-	
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-    <target name="build">
-
-		<copy todir="${current.bin.dir}" flatten="true" overwrite="true">
-      <fileset basedir="${nuget.packages.dir}">
-          <include name="Microsoft.AspNet.*.5.0.0/**/*.dll" />
-      </fileset>
-		</copy>
-
-		
-		<!-- build Spring.Web.Mvc -->
-		
-		<call target="copycommonlogginglibtobin" />
-		
-        <csc target="library" define="${current.build.defines.csc}" 
-			 warnaserror="true" 
-             optimize="${build.optimize}"
-			 debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll" 
-			 doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			>
-            <nowarn>
-                <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
-                <warning number="${nowarn.numbers.test},1587"/>
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../CommonAssemblyInfo.cs" />
-				<include name="../Spring.Web.Mvc3.Tests/**/*.cs" />
-				<include name="../Spring.Web.Mvc4.Tests/**/*.cs" />
-				<include name="../Spring.Web.Mvc5.Tests/**/*.cs" />
-            </sources>
-            <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-                <include name="../Spring.Web.Mvc3.Tests/**/*.resx" />
-                <include name="../Spring.Web.Mvc3.Tests/**/*.xsd" />
-                <include name="../Spring.Web.Mvc3.Tests/**/*.txt" />
-                <include name="../Spring.Web.Mvc3.Tests/**/*.xml" />
-                <exclude name="../Spring.Web.Mvc3.Tests/Data/**/*" />
-                <exclude name="../Spring.Web.Mvc3.Tests/obj/**/*" />
-                <exclude name="../Spring.Web.Mvc3.Tests/bin/**/*" />
-            </resources>
-            <references>
-			    <include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Configuration.dll" />
-				<include name="System.Core.dll"/>
- 				<include name="System.Xml.dll" />
- 				<include name="System.Web.dll" />
-				<include name="System.Web.Abstractions.dll"/>
-				<include name="System.Web.ApplicationServices.dll" />        
-				<include name="System.Web.Routing.dll"/>
- 				<include name="System.Web.Services.dll" />
-
-				<include name="${nuget.packages.dir}/Microsoft.AspNet.Mvc/5.0.0/lib/net45/System.Web.Mvc.dll" />
-				<include name="${nuget.packages.dir}/Microsoft.AspNet.WebApi.Core/5.0.0/lib/net45/System.Web.Http.dll" />
-				<include name="${nuget.packages.dir}/Microsoft.AspNet.WebApi.WebHost/5.0.0/lib/net45/System.Web.Http.WebHost.dll" />
-
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				
-                <include name="${current.bin.dir}/Spring.Core.dll" />
-                <include name="${current.bin.dir}/Spring.Aop.dll" />
-                <include name="${current.bin.dir}/Spring.Web.Mvc5.dll" />
-
- 				<include name="${nunit.lib.dir}/nunit.framework.dll"/>           
-
-            </references>
-        </csc>
-        <copy todir="${current.bin.dir}">
-            <fileset basedir="${project::get-base-directory()}/Data">
-                <include name="**/*.*" />
-            </fileset>
-		</copy>
-		<copy todir="${current.bin.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-                <include name="**/*.xml" />
-            </fileset>
-		</copy>
-    </target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-		<copy todir="${current.bin.dir}" flatten="true">
-            <fileset basedir="${nuget.packages.dir}">
-                <include name="Microsoft.AspNet*.5.0.*/**/*.dll" />
-            </fileset>
-		</copy>
-        <call target="common.run-tests" />
-    </target>
-<!--
-    <target name="test" depends="build">
-        <nunit2outproc>
-            <formatter type="Plain" />
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" />
-            <test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-        </nunit2outproc>
-    </target>
--->
-</project>
diff --git a/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.2010.csproj b/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.csproj
similarity index 94%
rename from test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.2010.csproj
rename to test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.csproj
index 10bde29a..d7295bfe 100644
--- a/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.csproj
@@ -3,8 +3,8 @@
     <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Mvc5\Spring.Web.Mvc5.2010.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Mvc5\Spring.Web.Mvc5.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
deleted file mode 100644
index 977991ff..00000000
--- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" ?>
-<project name="Spring.Web.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
-
-    <include buildfile="${spring.basedir}/common-project.include" />
-    <!--
-        Required properties:
-            * current.bin.dir           - (path) root level to build to
-            * build.debug               - (true|false) debug build?
-            * current.build.defines.csc - framework-specific build defines
-            * lib.dir                   - framework-specific assembly references
-    -->
-	
-	<include buildfile="${spring.basedir}/CopyLibToBinHelpers.include"/>
-
-    <target name="build">
-        <!-- build Spring.Web -->
-		
-		<call target="copycommonlogginglibtobin" />
-		<call target="copynh3libtobin" />
-		
-        <csc target="library" define="${current.build.defines.csc}" 
-			 warnaserror="true" 
-             optimize="${build.optimize}"
-			 debug="${current.build.debug}"
-             output="${current.bin.dir}/${project::get-name()}.dll" 
-			 doc="${current.bin.dir}/${project::get-name()}.xml"
-			 nostdlib="true"
-			 noconfig="true"
-			>
-            <nowarn>
-                <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
-                <warning number="${nowarn.numbers.test},1587"/>
-            </nowarn>
-            <sources failonempty="true">
-                <include name="**/*.cs" />
-                <include name="../CommonAssemblyInfo.cs" />
-            </sources>
-            <resources prefix="Spring" dynamicprefix="true" failonempty="true">
-                <include name="**/*.resx" />
-                <include name="**/*.xsd" />
-                <include name="**/*.txt" />
-                <include name="**/*.xml" />
-                <exclude name="Data/**/*" />
-                <exclude name="obj/**/*" />
-            </resources>
-            <references>
-				<include name="mscorlib.dll"/>
-				<include name="Microsoft.CSharp.dll"/>
-				<include name="System.dll"/>
-				<include name="System.Core.dll"/>
-				<include name="System.Configuration.dll" />
-				<include name="System.Drawing.dll" />
-				<include name="System.Xml.dll" />
-				<include name="System.Web.dll" />
-				<include name="System.Web.Services.dll" />
-				<include name="System.Data.dll" />
-				<include name="${current.bin.dir}/Common.Logging.dll"/>
-				<include name="${current.bin.dir}/Common.Logging.Core.dll"/>
-				<include name="${current.bin.dir}/Spring.Core.dll" />
-				<include name="${current.bin.dir}/Spring.Core.Tests.dll" />
-				<include name="${current.bin.dir}/Spring.Web.dll" />
-				<include name="${nunit.lib.dir}/nunit.framework.dll"/>
-				<include name="${current.bin.dir}/Rhino.Mocks.dll"/>
-                <include name="${current.bin.dir}/NUnitAsp.dll" />
-                <include name="${current.bin.dir}/NUnitAspEx.dll" />
-            </references>
-        </csc>
-        <copy todir="${current.bin.dir}">
-            <fileset basedir="${project::get-base-directory()}/Data">
-                <include name="**/*.*" />
-            </fileset>
-        </copy>
-
-    </target>
-
-    <target name="test" depends="build">
-        <!-- property name="test.assemblyname" value="${project::get-name()}" / -->
-        <call target="common.run-tests" />
-    </target>
-<!--
-    <target name="test" depends="build">
-        <nunit2outproc>
-            <formatter type="Plain" />
-            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" />
-            <test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
-        </nunit2outproc>
-    </target>
--->
-</project>
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.csproj
similarity index 95%
rename from test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj
rename to test/Spring/Spring.Web.Tests/Spring.Web.Tests.csproj
index 54da618c..b267c680 100644
--- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.csproj
@@ -1,50 +1,50 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj" />
-    <ProjectReference Include="..\..\..\src\Spring\Spring.Web\Spring.Web.2010.csproj" />
-    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
-    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="NUnitAsp, Version=1.5.1.27647, Culture=neutral, PublicKeyToken=f9bdb8e9d00f2b23">
-      <HintPath>..\..\..\lib\Net\2.0\NUnitAsp.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="NUnitAspEx, Version=1.0.2892.39670, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\lib\Net\2.0\NUnitAspEx.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
-    <Content Include="Data\**\*" CopyToOutputDirectory="PreserveNewest" />
-    <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" />
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\DisablesSession.aspx" />
-    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResultSave.aspx" />
-    <EmbeddedResource Include="Context\Support\*.xml" />
-    <EmbeddedResource Include="Web\Support\ControlInterceptionTests.objects.xml" />
-  </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(ProjectDir)Data&quot; &quot;$(OutDir)&quot; /y /s /q /d" />
-  </Target>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web\Spring.Web.csproj" />
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="$(FakeItEasyVersion)" />
+    <PackageReference Include="FakeItEasy.Analyzer" Version="$(FakeItEasyVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="NUnitAsp, Version=1.5.1.27647, Culture=neutral, PublicKeyToken=f9bdb8e9d00f2b23">
+      <HintPath>..\..\..\lib\Net\2.0\NUnitAsp.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="NUnitAspEx, Version=1.0.2892.39670, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\lib\Net\2.0\NUnitAspEx.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
+    <Content Include="Data\**\*" CopyToOutputDirectory="PreserveNewest" />
+    <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" />
+    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\DisablesSession.aspx" />
+    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResultSave.aspx" />
+    <EmbeddedResource Include="Context\Support\*.xml" />
+    <EmbeddedResource Include="Web\Support\ControlInterceptionTests.objects.xml" />
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="xcopy &quot;$(ProjectDir)Data&quot; &quot;$(OutDir)&quot; /y /s /q /d" />
+  </Target>
 </Project>
\ No newline at end of file