From c6b176aa27ad8547ed489903c0793a7a44b23e75 Mon Sep 17 00:00:00 2001 From: Marko Lahma Date: Thu, 15 Jan 2015 23:30:44 +0200 Subject: [PATCH] upgrade to Common.Logging 3.0.0.0, Quartz 2.3.1 and NHibernate 4.0.2 --- Spring.Net.2010.sln.DotSettings | 1 + Spring.build | 14 +- .../Spring.Aspects/Spring.Aspects.2010.csproj | 11 +- .../src/Spring.Aspects/Spring.Aspects.build | 3 +- .../src/Spring.Aspects/packages.config | 5 + .../Spring.Calculator.ClientApp.build | 3 +- ...Calculator.RegisterComponentServices.build | 3 +- .../Spring.Calculator.RemoteApp.build | 3 +- .../Spring.Calculator.Services.build | 1 + .../Spring.Northwind.Service.2010.csproj | 18 +- .../Spring.Northwind.Service/packages.config | 5 + ...ing.Northwind.Web.Conversation.2010.csproj | 12 +- .../packages.config | 4 + .../Spring.Northwind.Web.2010.csproj | 12 +- .../src/Spring.Northwind.Web/packages.config | 4 + ...ing.Northwind.IntegrationTests.2010.csproj | 7 +- .../packages.config | 2 + .../Spring.IocQuickStart.MovieFinder.build | 9 +- ...ring.IocQuickStart.MovieFinder.2010.csproj | 10 +- .../src/packages.config | 7 + .../Spring.MsmqQuickStart.Client.2010.csproj | 9 +- .../packages.config | 5 + .../Spring.MsmqQuickStart.Common.2010.csproj | 9 +- .../packages.config | 5 + .../Spring.MsmqQuickStart.Server.2010.csproj | 9 +- .../packages.config | 5 + .../Spring.Mvc3QuickStart.csproj | 6 +- .../src/Spring.Mvc3QuickStart/packages.config | 2 +- .../Spring.NmsQuickStart.Client.2010.csproj | 9 +- .../packages.config | 5 + .../Spring.NmsQuickStart.Server.2010.csproj | 9 +- .../packages.config | 5 + ...ring.Scheduling.Quartz.Example.2010.csproj | 7 +- .../src/packages.config | 5 +- .../Spring.TxQuickStart.2010.csproj | 18 +- .../Spring.TxQuickStart/packages.config | 5 + .../Spring.TxQuickStart.Tests.2010.csproj | 12 +- .../Spring.TxQuickStart.Tests/packages.config | 4 + .../src/SpringAir.Core/SpringAir.Core.build | 3 +- .../SpringAir.Web.2003/SpringAir.Web.build | 3 +- .../SpringAir.Web.2010.References.csproj | 20 +- .../packages.config | 5 + .../SpringAir.Web.2005/SpringAir.Web.build | 3 +- .../SpringAir.Web.2010/SpringAir.Web.build | 3 +- lib/Net/2.0/Common.Logging.Log4Net1211.dll | Bin 14336 -> 0 bytes lib/Net/2.0/Common.Logging.Log4Net1211.xml | 244 -- lib/Net/2.0/Common.Logging.dll | Bin 44544 -> 0 bytes lib/Net/3.5/Common.Logging.Core.dll | Bin 0 -> 9728 bytes lib/Net/3.5/Common.Logging.Core.xml | 876 ++++++ lib/Net/3.5/Common.Logging.dll | Bin 0 -> 44032 bytes lib/Net/3.5/Common.Logging.xml | 2692 +++++++---------- lib/Net/4.0/Common.Logging.Core.dll | Bin 0 -> 9728 bytes lib/Net/4.0/Common.Logging.Core.xml | 876 ++++++ lib/Net/4.0/Common.Logging.dll | Bin 0 -> 44544 bytes lib/Net/{2.0 => 4.0}/Common.Logging.xml | 1551 +++------- src/Spring/Spring.Aop/Spring.Aop.2010.csproj | 8 +- src/Spring/Spring.Aop/Spring.Aop.build | 1 + src/Spring/Spring.Aop/packages.config | 3 +- .../Spring.Core/Spring.Core.2010.csproj | 8 +- src/Spring/Spring.Core/Spring.Core.build | 1 + src/Spring/Spring.Core/packages.config | 3 +- .../Spring.Data.NHibernate3.2010.csproj | 5 +- .../Spring.Data.NHibernate3/packages.config | 3 +- .../Spring.Data.NHibernate4.2010.csproj | 9 +- .../Spring.Data.NHibernate4/packages.config | 7 +- .../Spring.Data/Spring.Data.2010.csproj | 8 +- src/Spring/Spring.Data/Spring.Data.build | 1 + src/Spring/Spring.Data/packages.config | 3 +- .../Spring.Messaging.Ems.2010.csproj | 5 +- .../Spring.Messaging.Ems/packages.config | 3 +- .../Spring.Messaging.Nms.2010.csproj | 5 +- .../Spring.Messaging.Nms/packages.config | 3 +- .../Spring.Messaging.2010.csproj | 6 +- src/Spring/Spring.Messaging/packages.config | 3 +- .../Spring.Scheduling.Quartz2.2010.csproj | 14 +- .../Spring.Scheduling.Quartz2.build | 1 + .../Spring.Scheduling.Quartz2/packages.config | 5 +- .../Spring.Services.2010.csproj | 9 +- .../Spring.Services/Spring.Services.build | 1 + src/Spring/Spring.Services/packages.config | 3 +- .../Spring.Template.Velocity.2010.csproj | 5 +- .../Spring.Template.Velocity/packages.config | 3 +- .../Spring.Testing.Microsoft.2010.csproj | 5 +- .../Spring.Testing.Microsoft/packages.config | 3 +- .../Spring.Testing.NUnit.2010.csproj | 6 +- .../Spring.Testing.NUnit.build | 1 + .../Spring.Testing.NUnit/packages.config | 3 +- ...g.Web.Conversation.NHibernate3.2010.csproj | 9 +- .../packages.config | 3 +- .../Spring.Web.Extensions.2010.csproj | 5 +- .../Spring.Web.Extensions/packages.config | 3 +- .../Spring.Web.Mvc3.2010.csproj | 6 +- .../Spring.Web.Mvc3/Spring.Web.Mvc3.build | 1 + src/Spring/Spring.Web.Mvc3/packages.config | 3 +- .../Spring.Web.Mvc4.2010.csproj | 5 +- .../Spring.Web.Mvc4/Spring.Web.Mvc4.build | 1 + src/Spring/Spring.Web.Mvc4/packages.config | 3 +- .../Spring.Web.Mvc5.2010.csproj | 5 +- .../Spring.Web.Mvc5/Spring.Web.Mvc5.build | 1 + src/Spring/Spring.Web.Mvc5/packages.config | 3 +- src/Spring/Spring.Web/Spring.Web.2010.csproj | 5 +- src/Spring/Spring.Web/Spring.Web.build | 1 + src/Spring/Spring.Web/packages.config | 3 +- .../Spring.Aop.Tests.2010.csproj | 5 +- test/Spring/Spring.Aop.Tests/packages.config | 3 +- .../Spring.Core.Tests.2010.csproj | 6 +- test/Spring/Spring.Core.Tests/packages.config | 3 +- .../Spring.Data.Integration.Tests.2010.csproj | 9 +- .../packages.config | 3 +- ....NHibernate3.Integration.Tests.2010.csproj | 4 +- .../packages.config | 3 +- .../Spring.Data.NHibernate3.Tests.2010.csproj | 4 +- .../packages.config | 3 +- ....NHibernate4.Integration.Tests.2010.csproj | 10 +- .../packages.config | 7 +- .../Spring.Data.NHibernate4.Tests.2010.csproj | 9 +- .../packages.config | 7 +- .../Spring.Data.Tests.2010.csproj | 5 +- test/Spring/Spring.Data.Tests/packages.config | 3 +- ...essaging.Ems.Integration.Tests.2010.csproj | 5 +- .../packages.config | 3 +- ...essaging.Nms.Integration.Tests.2010.csproj | 5 +- .../packages.config | 3 +- .../Spring.Messaging.Nms.Tests.2010.csproj | 5 +- .../packages.config | 3 +- .../Spring.Messaging.Tests.2010.csproj | 6 +- .../Spring.Messaging.Tests/packages.config | 3 +- ...ling.Quartz2.Integration.Tests.2010.csproj | 16 +- .../packages.config | 5 +- ...pring.Scheduling.Quartz2.Tests.2010.csproj | 16 +- .../packages.config | 5 +- .../Spring.Services.Tests.2010.csproj | 5 +- .../Spring.Services.Tests/packages.config | 3 +- ...Spring.Template.Velocity.Tests.2010.csproj | 5 +- .../packages.config | 3 +- ...Spring.Testing.Microsoft.Tests.2010.csproj | 5 +- .../packages.config | 3 +- .../Spring.Testing.NUnit.Tests.2010.csproj | 5 +- .../packages.config | 3 +- ...Conversation.NHibernate3.Tests.2010.csproj | 5 +- .../packages.config | 3 +- .../Spring.Web.Mvc3.Tests.2010.csproj | 6 +- .../Spring.Web.Mvc3.Tests/packages.config | 3 +- .../Spring.Web.Mvc4.Tests.2010.csproj | 6 +- .../Spring.Web.Mvc4.Tests/packages.config | 3 +- .../Spring.Web.Mvc5.Tests.2010.csproj | 5 +- .../Spring.Web.Mvc5.Tests/packages.config | 3 +- .../Spring.Web.Tests.2010.csproj | 6 +- test/Spring/Spring.Web.Tests/packages.config | 3 +- 149 files changed, 3865 insertions(+), 3109 deletions(-) create mode 100644 examples/Spring/Spring.Calculator/src/Spring.Aspects/packages.config create mode 100644 examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/packages.config create mode 100644 examples/Spring/Spring.IoCQuickStart.MovieFinder/src/packages.config create mode 100644 examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/packages.config create mode 100644 examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Common/packages.config create mode 100644 examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/packages.config create mode 100644 examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/packages.config create mode 100644 examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/packages.config create mode 100644 examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/packages.config create mode 100644 examples/Spring/SpringAir/src/SpringAir.Web.2005.References/packages.config delete mode 100644 lib/Net/2.0/Common.Logging.Log4Net1211.dll delete mode 100644 lib/Net/2.0/Common.Logging.Log4Net1211.xml delete mode 100644 lib/Net/2.0/Common.Logging.dll create mode 100644 lib/Net/3.5/Common.Logging.Core.dll create mode 100644 lib/Net/3.5/Common.Logging.Core.xml create mode 100644 lib/Net/3.5/Common.Logging.dll create mode 100644 lib/Net/4.0/Common.Logging.Core.dll create mode 100644 lib/Net/4.0/Common.Logging.Core.xml create mode 100644 lib/Net/4.0/Common.Logging.dll rename lib/Net/{2.0 => 4.0}/Common.Logging.xml (61%) diff --git a/Spring.Net.2010.sln.DotSettings b/Spring.Net.2010.sln.DotSettings index 0eda6705..302a7b18 100644 --- a/Spring.Net.2010.sln.DotSettings +++ b/Spring.Net.2010.sln.DotSettings @@ -30,6 +30,7 @@ True SOLUTION True + True True ALWAYS_ADD ALWAYS_ADD diff --git a/Spring.build b/Spring.build index 3ce1aa24..7265feb6 100644 --- a/Spring.build +++ b/Spring.build @@ -471,15 +471,15 @@ Commandline Examples: - - - + + + - + - + @@ -1351,6 +1351,7 @@ Commandline Examples: + @@ -1515,6 +1516,7 @@ Commandline Examples: + @@ -1632,6 +1634,8 @@ Commandline Examples: + + diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj index ed4b3058..498cee2e 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2010.csproj @@ -96,9 +96,11 @@ AllRules.ruleset - - False - ..\..\..\..\..\bin\net\4.0\debug\Common.Logging.dll + + ..\..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll + + + ..\..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll False @@ -129,6 +131,9 @@ true + + + diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.build b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.build index c43aa4bf..a472e910 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.build +++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.build @@ -18,7 +18,8 @@ - + + diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/packages.config b/examples/Spring/Spring.Calculator/src/Spring.Aspects/packages.config new file mode 100644 index 00000000..2f6c2da7 --- /dev/null +++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.build b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.build index 488a8032..1643b1ba 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.build +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.build @@ -21,7 +21,8 @@ - + + diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.build b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.build index f3662f9a..61bcf434 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.build +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.build @@ -21,7 +21,8 @@ - + + diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.build b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.build index 890d2364..9e3675d9 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.build +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.build @@ -20,7 +20,8 @@ - + + diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.build b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.build index 338d8264..3e24752c 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.build +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.build @@ -19,6 +19,7 @@ + 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 index b656ae36..12052fe9 100644 --- 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 @@ -31,6 +31,8 @@ false false true + ..\..\ + true true @@ -52,9 +54,11 @@ AllRules.ruleset - - False - ..\..\..\..\..\lib\Net\2.0\Common.Logging.dll + + ..\..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll + + + ..\..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll False @@ -102,8 +106,16 @@ + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + +