From 63aa4b2a407de6a08af7490caf949ff4603a9c9d Mon Sep 17 00:00:00 2001 From: Marko Lahma Date: Fri, 2 Dec 2022 20:58:52 +0200 Subject: [PATCH] Upgrade support libraries and switch to central package management (#233) --- NuGet.config | 7 ++++ build-support/nuke-build/_build.csproj | 2 +- examples/Directory.Packages.props | 15 ++++++++ .../src/Spring.Aspects/Spring.Aspects.csproj | 4 +-- .../src/SpringApp/SpringApp.csproj | 4 +-- .../test/Primes.Tests/Primes.Tests.csproj | 8 ++--- .../Spring.Northwind.Web.Conversation.csproj | 4 +-- .../Spring.Northwind.Web.csproj | 4 +-- .../Spring.Northwind.IntegrationTests.csproj | 8 ++--- .../Spring.DataQuickStart.csproj | 4 +-- .../Spring.DataQuickStart.Tests.csproj | 8 ++--- .../Spring.IocQuickStart.MovieFinder.csproj | 6 ++-- .../Spring.MsmqQuickStart.Client.csproj | 4 +-- .../Spring.MsmqQuickStart.Server.csproj | 4 +-- .../Spring.Mvc5QuickStart.csproj | 3 +- .../Spring.NmsQuickStart.Client.csproj | 4 +-- .../Spring.NmsQuickStart.Common.csproj | 6 ++-- .../Spring.NmsQuickStart.Server.csproj | 4 +-- .../Spring.Scheduling.Quartz.Example.csproj | 4 +-- .../Spring.TxQuickStart.Tests.csproj | 10 +++--- .../SpringAir.Core.Tests.csproj | 8 ++--- .../SpringAir.Data.Ado.Tests.csproj | 8 ++--- global.json | 2 +- src/Directory.Build.props | 6 ++-- src/Directory.Packages.props | 34 +++++++++++++++++++ src/Spring/Spring.Aop/Spring.Aop.csproj | 4 +-- src/Spring/Spring.Core/Spring.Core.csproj | 22 ++++++------ .../Spring.Data.NHibernate5.csproj | 4 +-- .../Spring.Messaging.Nms.csproj | 4 +-- .../Spring.Messaging/Spring.Messaging.csproj | 4 +-- .../Spring.Scheduling.Quartz3.csproj | 4 +-- .../Spring.Template.Velocity.Castle.csproj | 4 +-- .../Spring.Template.Velocity.csproj | 4 +-- .../Spring.Testing.Microsoft.csproj | 4 +-- .../Spring.Testing.NUnit.csproj | 4 +-- .../Spring.Web.Mvc5/Spring.Web.Mvc5.csproj | 6 ++-- test/Directory.Build.props | 12 ++----- test/Directory.Packages.props | 22 ++++++++++++ .../Spring.Aop.Tests/Spring.Aop.Tests.csproj | 12 +++---- .../Spring.Benchmark/Spring.Benchmark.csproj | 2 +- .../Spring.Core.Tests.csproj | 16 ++++----- .../Spring.Data.Integration.Tests.csproj | 14 ++++---- ....Data.NHibernate5.Integration.Tests.csproj | 12 +++---- ...estedTxSuspension.Integration.Tests.csproj | 8 ++--- .../Spring.Data.NHibernate5.Tests.csproj | 12 +++---- .../Spring.Data.Tests.csproj | 14 ++++---- ...ing.Messaging.Ems.Integration.Tests.csproj | 8 ++--- ...ing.Messaging.Nms.Integration.Tests.csproj | 12 +++---- .../Spring.Messaging.Nms.Tests.csproj | 16 ++++----- .../Spring.Messaging.Tests.csproj | 12 +++---- ...cheduling.Quartz3.Integration.Tests.csproj | 12 +++---- .../Spring.Scheduling.Quartz3.Tests.csproj | 12 +++---- .../Spring.Services.Tests.csproj | 14 ++++---- ...ring.Template.Velocity.Castle.Tests.csproj | 8 ++--- .../Spring.Template.Velocity.Tests.csproj | 8 ++--- .../Spring.Testing.Microsoft.Tests.csproj | 8 ++--- .../Spring.Testing.NUnit.Tests.csproj | 10 +++--- ....Web.Conversation.NHibernate5.Tests.csproj | 10 +++--- .../Spring.Web.Mvc5.Tests.csproj | 8 ++--- .../Spring.Web.Tests/Spring.Web.Tests.csproj | 12 +++---- 60 files changed, 291 insertions(+), 218 deletions(-) create mode 100644 NuGet.config create mode 100644 examples/Directory.Packages.props create mode 100644 src/Directory.Packages.props create mode 100644 test/Directory.Packages.props diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 00000000..cf37d041 --- /dev/null +++ b/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/build-support/nuke-build/_build.csproj b/build-support/nuke-build/_build.csproj index 9615c233..f395c391 100644 --- a/build-support/nuke-build/_build.csproj +++ b/build-support/nuke-build/_build.csproj @@ -11,7 +11,7 @@ - + diff --git a/examples/Directory.Packages.props b/examples/Directory.Packages.props new file mode 100644 index 00000000..d04e5055 --- /dev/null +++ b/examples/Directory.Packages.props @@ -0,0 +1,15 @@ + + + true + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.csproj b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.csproj index 39aab841..b4c902aa 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.csproj @@ -1,4 +1,4 @@ - + $(TargetFullFrameworkVersion) @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj b/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj index 6e666644..5dd27a45 100644 --- a/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj +++ b/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj @@ -1,4 +1,4 @@ - + $(TargetFullFrameworkVersion) Exe @@ -7,7 +7,7 @@ - + diff --git a/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.csproj b/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.csproj index b343ff41..c087ae65 100644 --- a/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.csproj +++ b/examples/Spring/Spring.CodeConfig.Migration/test/Primes.Tests/Primes.Tests.csproj @@ -1,4 +1,4 @@ - + $(TargetFullFrameworkVersion) Primes @@ -7,8 +7,8 @@ - - - + + + \ No newline at end of file diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.csproj index 6de6b113..f144108f 100644 --- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.csproj +++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.Conversation/Spring.Northwind.Web.Conversation.csproj @@ -42,7 +42,7 @@ 4 - + @@ -177,7 +177,7 @@ -