From d40c9076902e172d7479e598144c9d21062adbfe Mon Sep 17 00:00:00 2001 From: Marko Lahma Date: Sat, 21 Nov 2020 21:54:00 +0200 Subject: [PATCH] Update libs, generate symbol packages, target NET 5.0 in tests (#197) * update libs, target NET 5.0 in tests * correct metadata and symbol configuration * add artifact definition to appveyor.yml, set ContinuousIntegrationBuild --- BreakingChanges.txt | 2 +- Spring.build | 6 ++-- Spring.include | 12 +++---- appveyor.yml | 13 +++++-- changelog.txt | 6 ++-- .../Spring.AopQuickStart.Common.csproj | 2 +- .../Spring.AopQuickStart.Step1.csproj | 2 +- .../Spring.AopQuickStart.Step2.csproj | 2 +- .../Spring.AopQuickStart.Step3.csproj | 2 +- .../Spring.AopQuickStart.Step4.csproj | 2 +- .../Spring.AopQuickStart.Step5.csproj | 2 +- .../Spring.AopQuickStart.Step6.csproj | 2 +- .../Spring.AopQuickStart.Step7.csproj | 2 +- .../Spring.CachingQuickStart.Web.csproj | 8 ++--- .../src/Spring.Aspects/Spring.Aspects.csproj | 2 +- .../Spring.Calculator.ClientApp.csproj | 2 +- .../Spring.Calculator.Contract.csproj | 2 +- ...alculator.RegisterComponentServices.csproj | 2 +- .../Spring.Calculator.RemoteApp.csproj | 2 +- .../Spring.Calculator.Services.csproj | 2 +- .../Spring.Calculator.Web.csproj | 2 +- .../src/Primes/Primes.csproj | 2 +- .../src/SpringApp/SpringApp.csproj | 2 +- .../test/Primes.Tests/Primes.Tests.csproj | 2 +- .../Spring.Northwind.IntegrationTests.csproj | 6 ++-- .../Spring.DataQuickStart.csproj | 2 +- .../Spring.DataQuickStart.Tests.csproj | 2 +- .../Spring.EmsQuickStart.Client.csproj | 2 +- .../Spring.EmsQuickStart.Common.csproj | 2 +- .../Spring.EmsQuickStart.Server.csproj | 2 +- .../Spring.Examples.Pool.csproj | 2 +- .../Spring.IocQuickStart.AppContext.csproj | 2 +- .../Spring.IocQuickStart.EventRegistry.csproj | 2 +- .../Spring.IocQuickStart.MovieFinder.csproj | 2 +- .../Spring.MsmqQuickStart.Client.csproj | 2 +- .../Spring.MsmqQuickStart.Common.csproj | 2 +- .../Spring.MsmqQuickStart.Server.csproj | 2 +- .../Spring.Mvc5QuickStart.csproj | 12 +++---- .../Spring.Mvc5QuickStart/Web.config | 32 +++++++++--------- .../Spring.NmsQuickStart.Client.csproj | 2 +- .../Spring.NmsQuickStart.Common.csproj | 2 +- .../Spring.NmsQuickStart.Server.csproj | 2 +- ...ing.NmsQuickStart.Integration.Tests.csproj | 2 +- .../Spring.Scheduling.Quartz.Example.csproj | 2 +- .../Spring.TxQuickStart.csproj | 2 +- .../Spring.TxQuickStart.Tests.csproj | 2 +- .../Spring.WcfQuickStart.Aspects.csproj | 2 +- .../Spring.WcfQuickStart.ClientApp.csproj | 2 +- .../Spring.WcfQuickStart.Contracts.csproj | 2 +- .../Spring.WcfQuickStart.ServerApp.csproj | 2 +- .../Spring.WcfQuickStart.ServerWeb.csproj | 8 ++--- .../Spring.Web.Extensions.Example.sln | 2 +- .../Bin/Spring.Aop.dll.refresh | Bin 120 -> 120 bytes .../Bin/Spring.Core.dll.refresh | Bin 124 -> 124 bytes .../Bin/Spring.Web.Extensions.dll.refresh | Bin 164 -> 164 bytes .../Bin/Spring.Web.dll.refresh | Bin 120 -> 120 bytes .../Spring.WebQuickStart.sln | 4 +-- examples/Spring/SpringAir/SpringAir.sln | 2 +- .../src/SpringAir.Core/SpringAir.Core.csproj | 2 +- .../SpringAir.Data.Ado.csproj | 2 +- .../SpringAir.Web.References.csproj | 2 +- .../SpringAir.Core.Tests.csproj | 8 ++--- .../SpringAir.Data.Ado.Tests.csproj | 8 ++--- src/Directory.Build.props | 19 +++++++---- src/Spring/Spring.Core/Spring.Core.csproj | 12 +++---- .../Spring.Data.NHibernate5.csproj | 2 +- .../Spring.Messaging.Ems.csproj | 3 +- .../Spring.Messaging/Spring.Messaging.csproj | 6 ++-- .../Spring.Scheduling.Quartz3.csproj | 2 +- .../Spring.Services/Spring.Services.csproj | 2 +- .../Spring.Template.Velocity.Castle.csproj | 2 +- .../Spring.Template.Velocity.csproj | 7 ++-- .../Spring.Testing.Microsoft.csproj | 4 +-- .../Spring.Testing.NUnit.csproj | 2 +- .../Spring.Web.Extensions.csproj | 2 +- .../Spring.Web.Mvc5/Spring.Web.Mvc5.csproj | 6 ++-- src/Spring/Spring.Web/Spring.Web.csproj | 2 +- src/SpringSource_Leaves32x32.png | Bin 0 -> 711 bytes test/Directory.Build.props | 12 +++---- .../Spring.Aop.Tests/Spring.Aop.Tests.csproj | 7 ++-- .../Spring.Benchmark/Spring.Benchmark.csproj | 4 +-- .../Core/IO/ConfigSectionResourceTests.cs | 2 ++ .../Core/IO/FileSystemResourceCommonTests.cs | 4 +-- .../PropertyRetrievingFactoryObjectTests.cs | 6 ++-- .../Spring.Core.Tests.csproj | 12 ++++--- .../Spring.Core.Tests/TestAssemblySetup.cs | 2 +- .../Data/TransactionTemplateTests.cs | 6 ++-- .../Spring.Data.Integration.Tests.csproj | 8 ++--- ....Data.NHibernate5.Integration.Tests.csproj | 6 ++-- .../Spring.Data.NHibernate5.Tests.csproj | 4 +-- .../Spring.Data.Tests.csproj | 8 ++--- ...ing.Messaging.Ems.Integration.Tests.csproj | 2 +- ...ing.Messaging.Nms.Integration.Tests.csproj | 2 +- .../Spring.Messaging.Nms.Tests.csproj | 4 +-- .../Spring.Messaging.Tests.csproj | 4 +-- ...cheduling.Quartz3.Integration.Tests.csproj | 4 +-- .../Spring.Scheduling.Quartz3.Tests.csproj | 4 +-- .../Spring.Services.Tests.csproj | 6 ++-- ...ring.Template.Velocity.Castle.Tests.csproj | 2 +- .../Spring.Template.Velocity.Tests.csproj | 2 +- .../Spring.Testing.Microsoft.Tests.csproj | 6 ++-- .../Spring.Testing.NUnit.Tests.csproj | 4 +-- .../Spring.Web.Mvc5.Tests.csproj | 2 +- .../Spring.Web.Tests/Spring.Web.Tests.csproj | 6 ++-- 104 files changed, 216 insertions(+), 201 deletions(-) create mode 100644 src/SpringSource_Leaves32x32.png diff --git a/BreakingChanges.txt b/BreakingChanges.txt index 365eeb4c..c15c803f 100644 --- a/BreakingChanges.txt +++ b/BreakingChanges.txt @@ -1,7 +1,7 @@ Changes (2.0 to 3.0) ======================== -1. .NET Framework 4.5.2 is the lowest framework supported +1. .NET Framework 4.6.1 is the lowest framework supported 2. Following features were removed as obsolete: ASP.NET MVC 3 and 4 support, NHibernate 3 and 4 support diff --git a/Spring.build b/Spring.build index 2f1a853e..ba7f26c0 100644 --- a/Spring.build +++ b/Spring.build @@ -376,7 +376,7 @@ Commandline Examples: - + @@ -418,7 +418,6 @@ Commandline Examples: - @@ -429,7 +428,7 @@ Commandline Examples: - + @@ -1424,6 +1423,7 @@ Commandline Examples: + diff --git a/Spring.include b/Spring.include index 5b285f8e..d878dd78 100644 --- a/Spring.include +++ b/Spring.include @@ -20,16 +20,16 @@ - - + + - - + + - - + + diff --git a/appveyor.yml b/appveyor.yml index 0e6d68f6..f6c289b0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,13 @@ version: 1.0.{build} image: Visual Studio 2019 + services: - mssql2017 - msmq + hosts: SpringQA: 127.0.0.1 + build_script: - rem set the alias for SpringQA so that integration test conn strings resolve properly... - 'powershell "%APPVEYOR_BUILD_FOLDER%\build-support\appveyor-set-sql-alias-for-springqa.ps1" ' @@ -17,11 +20,17 @@ build_script: - rem attempt to access the database via its alias to validate alias is functional... - sqlcmd -S "SpringQA" -U springqa -P springqa -Q "select * from Vacations" - rem actually invoke the build + test run -- call build-ci.cmd +- call build-ci.cmd test package-nuget + test: off + +artifacts: +- path: nuget-packages/*.*nupkg + name: NuGet + on_finish: - ps: >- $wc = New-Object 'System.Net.WebClient' - Get-ChildItem -Path (Join-Path $($env:APPVEYOR_BUILD_FOLDER) \build\net) -Recurse -File -Filter "*-TestResults.xml" | % { $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", $_.FullName) } \ No newline at end of file + Get-ChildItem -Path (Join-Path $($env:APPVEYOR_BUILD_FOLDER) \build\net) -Recurse -File -Filter "*-TestResults.xml" | % { $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", $_.FullName) } diff --git a/changelog.txt b/changelog.txt index 675019d6..e778df84 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,18 +3,18 @@ SPRING.NET FRAMEWORK CHANGELOG http://www.springframework.net ***************************************************************************************** -Release Version 3.0.0 XXXX XX, 2018 +Release Version 3.0.0 XXXX XX, 2020 Release Notes - Spring.NET - Version 3.0.0 Breaking Changes -* .NET 4.5.2 is the lowest full framework supported +* .NET 4.6.1 is the lowest full framework supported * Tranasaction definitions no longer have EnterpriseServicesInteropOption, it was replaced by TransactionScopeAsyncFlowOption New Feature Highlights -* .NET Core support Spring.Aop, Spring.Core, Spring.Data, Spring.Messaging, Spring.Testing.NUnit +* .NET Core support for all core projects and integration projects which offer .NET standard compatible libraries ***************************************************************************************** diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.csproj index 823c3cff..44712363 100644 --- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.csproj +++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.AopQuickStart diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.csproj index ea127b5c..7ff527f2 100644 --- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.csproj +++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.AopQuickStart Exe diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.csproj index ea127b5c..7ff527f2 100644 --- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.csproj +++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.AopQuickStart Exe diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.csproj index ea127b5c..7ff527f2 100644 --- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.csproj +++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.AopQuickStart Exe diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.csproj index ea127b5c..7ff527f2 100644 --- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.csproj +++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.AopQuickStart Exe 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 index ea127b5c..7ff527f2 100644 --- 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 @@ -1,6 +1,6 @@  - net452 + net461 Spring.AopQuickStart Exe diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.csproj index 3c9efe6c..a1812c7b 100644 --- a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.csproj +++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.AopQuickStart Exe 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 index ea127b5c..7ff527f2 100644 --- 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 @@ -1,6 +1,6 @@  - net452 + net461 Spring.AopQuickStart Exe diff --git a/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.csproj b/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.csproj index 127f25bf..5a7333bc 100644 --- a/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.csproj +++ b/examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/Spring.CachingQuickStart.Web.csproj @@ -12,7 +12,7 @@ Properties Spring.CachingQuickStart Spring.CachingQuickStart.Web - v4.5.2 + v4.6.1 false AnyCPU @@ -35,13 +35,13 @@ - ..\..\..\..\..\build\$(Configuration)\Spring.Aop\net452\Spring.Aop.dll + ..\..\..\..\..\build\$(Configuration)\Spring.Aop\net461\Spring.Aop.dll - ..\..\..\..\..\build\$(Configuration)\Spring.Aop\net452\Spring.Core.dll + ..\..\..\..\..\build\$(Configuration)\Spring.Aop\net461\Spring.Core.dll - ..\..\..\..\..\build\$(Configuration)\Spring.Web\net452\Spring.Web.dll + ..\..\..\..\..\build\$(Configuration)\Spring.Web\net461\Spring.Web.dll 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 a35dbc59..cb26caa3 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.csproj @@ -1,6 +1,6 @@  - net452 + net461 diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.csproj index 14899ae8..08353816 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.csproj @@ -1,6 +1,6 @@  - net452 + net461 Exe diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.csproj index 6ff13845..f54ddc6b 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.Calculator true false diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.csproj index 0c1a9d47..344b7b5c 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.csproj @@ -1,6 +1,6 @@  - net452 + net461 Exe diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.csproj index 22698e76..554487b7 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.csproj @@ -1,6 +1,6 @@  - net452 + net461 Exe diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.csproj index 47c9ebc3..89f7462d 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.Calculator true false diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.csproj index 0b5fee0b..51f58426 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.csproj @@ -13,7 +13,7 @@ Properties Spring.Calculator Spring.Calculator.Web - v4.5.2 + v4.6.1 false diff --git a/examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.csproj b/examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.csproj index 16f77c6a..2f6a6b47 100644 --- a/examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.csproj +++ b/examples/Spring/Spring.CodeConfig.Migration/src/Primes/Primes.csproj @@ -1,6 +1,6 @@  - net452 + net461 diff --git a/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj b/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj index d4452dfd..25247f64 100644 --- a/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj +++ b/examples/Spring/Spring.CodeConfig.Migration/src/SpringApp/SpringApp.csproj @@ -1,6 +1,6 @@  - net452 + net461 Exe 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 638147da..7c6801f8 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,6 +1,6 @@  - net452 + net461 Primes 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 2108a77f..98670566 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 @@ -14,8 +14,8 @@ rem xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Northwind.In - - - + + + \ No newline at end of file diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.csproj b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.csproj index 577fd210..e1170181 100644 --- a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.csproj +++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.csproj b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.csproj index a1e25411..6af9628a 100644 --- a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.csproj +++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring 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 83b1988e..f339e517 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,6 +1,6 @@  - net452 + net461 WinExe 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 0db6ef47..deb7a631 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,6 +1,6 @@  - net452 + net461 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 16f8c464..907b425b 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,6 +1,6 @@  - net452 + net461 Exe diff --git a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.csproj b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.csproj index 9a90f1ee..157ee83e 100644 --- a/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.csproj +++ b/examples/Spring/Spring.Examples.Pool/Spring.Examples.Pool.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring Exe diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.csproj b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.csproj index 6a6c4350..61e63549 100644 --- a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.csproj +++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.IocQuickStart WinExe diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.csproj b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.csproj index 3716cc0b..53c4232c 100644 --- a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.csproj +++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.IocQuickStart Exe diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.csproj b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.csproj index e99383be..4c71169b 100644 --- a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.csproj +++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.IocQuickStart Exe 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 ea65526d..654c9d64 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,6 +1,6 @@  - net452 + net461 WinExe 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 1909da92..280120fd 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,6 +1,6 @@  - net452 + net461 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 a2587901..c461a993 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,6 +1,6 @@  - net452 + net461 Exe diff --git a/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart.csproj b/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart.csproj index 1804afdb..cc8b0f68 100644 --- a/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart.csproj +++ b/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart.csproj @@ -13,7 +13,7 @@ Properties Spring.Mvc5QuickStart Spring.Mvc5QuickStart - v4.5.2 + v4.6.1 false false @@ -47,8 +47,8 @@ - - + + @@ -56,13 +56,13 @@ - ..\..\..\..\build\$(Configuration)\Spring.Core\net452\Spring.Core.dll + ..\..\..\..\build\$(Configuration)\Spring.Core\net461\Spring.Core.dll - ..\..\..\..\build\$(Configuration)\Spring.Web\net452\Spring.Web.dll + ..\..\..\..\build\$(Configuration)\Spring.Web\net461\Spring.Web.dll - ..\..\..\..\build\$(Configuration)\Spring.Web.Mvc5\net452\Spring.Web.Mvc5.dll + ..\..\..\..\build\$(Configuration)\Spring.Web.Mvc5\net461\Spring.Web.Mvc5.dll diff --git a/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/Web.config b/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/Web.config index 6113405d..4b9ee969 100644 --- a/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/Web.config +++ b/examples/Spring/Spring.Mvc5QuickStart/Spring.Mvc5QuickStart/Web.config @@ -84,22 +84,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + 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 54128f39..2c5e0fc2 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,6 +1,6 @@  - net452 + net461 WinExe 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 9398460d..8b9b0ecf 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,6 +1,6 @@  - net452 + net461 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 2374b4ee..40defaed 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,6 +1,6 @@  - net452 + net461 Exe diff --git a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.csproj b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.csproj index 98a4b31e..9371c551 100644 --- a/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.csproj +++ b/examples/Spring/Spring.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Integration.Tests/Spring.NmsQuickStart.Integration.Tests.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring \ No newline at end of file diff --git a/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.csproj b/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.csproj index 074494ef..3bb66c2e 100644 --- a/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.csproj +++ b/examples/Spring/Spring.Scheduling.Quartz.Example/src/Spring.Scheduling.Quartz.Example.csproj @@ -1,6 +1,6 @@  - net452 + net461 Exe diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.csproj b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.csproj index c921a24f..3ee64add 100644 --- a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.csproj +++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.csproj b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.csproj index 9148e02e..ee9f6b61 100644 --- a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.csproj +++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj index 299a5d48..a7c6b8f9 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.WcfQuickStart diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.csproj index 57c2b1d3..7a0f9e65 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.WcfQuickStart Exe diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj index b126a9dc..70b842a7 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.WcfQuickStart diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.csproj index 8c03a95d..7f53326b 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerApp/Spring.WcfQuickStart.ServerApp.csproj @@ -1,6 +1,6 @@  - net452 + net461 Spring.WcfQuickStart Exe diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.csproj index da150c39..d05f7a23 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ServerWeb/Spring.WcfQuickStart.ServerWeb.csproj @@ -12,7 +12,7 @@ Properties Spring.WcfQuickStart Spring.WcfQuickStart.ServerWeb - v4.5.2 + v4.6.1 false AnyCPU @@ -38,13 +38,13 @@ - ..\..\..\..\..\build\$(Configuration)\Spring.Aop\net452\Spring.Aop.dll + ..\..\..\..\..\build\$(Configuration)\Spring.Aop\net461\Spring.Aop.dll - ..\..\..\..\..\build\$(Configuration)\Spring.Core\net452\Spring.Core.dll + ..\..\..\..\..\build\$(Configuration)\Spring.Core\net461\Spring.Core.dll - ..\..\..\..\..\build\$(Configuration)\Spring.Services\net452\Spring.Services.dll + ..\..\..\..\..\build\$(Configuration)\Spring.Services\net461\Spring.Services.dll diff --git a/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.sln b/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.sln index b40c1d65..e7faaf5d 100644 --- a/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.sln +++ b/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.sln @@ -5,7 +5,7 @@ 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" + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6.1" ProjectReferences = "" Debug.AspNetCompiler.VirtualPath = "/Spring.Web.Extensions.Example.2010" Debug.AspNetCompiler.PhysicalPath = "src\Spring.Web.Extensions.Example.2010\" diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2010/Bin/Spring.Aop.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2010/Bin/Spring.Aop.dll.refresh index 964b4a5f2209190bf611b7b6b85c97e68eb16415..93c018b8c3e2e9a7bb91d8eb1403b0cc799b91e2 100644 GIT binary patch delta 11 Scmb=Zm=MNn#$Y%xQXT*nL<33y delta 11 Scmb=Zm=MNn%3w4xQXT*nLIX+w diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2010/Bin/Spring.Core.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2010/Bin/Spring.Core.dll.refresh index d3d97d893eade67b12b9b4347bdf54734b93cd55..75bc82e5ca88e8898ef88409ea49ca51f83f857e 100644 GIT binary patch delta 11 Scmb=anGnHj#$Y%xS`h#it^-&A delta 11 Scmb=anGnHj%3w4xS`h#itOHm8 diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2010/Bin/Spring.Web.Extensions.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2010/Bin/Spring.Web.Extensions.dll.refresh index 8429eaa66553885f7dc341bc2187c690f5a94264..a388944fb6f1093ff0fc0ad65de28865728fc4ac 100644 GIT binary patch delta 13 UcmZ3&xP);+4zn49;lzAX036l><^TWy delta 13 UcmZ3&xP);+4znqP(ZqaH036f<<^TWy diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2010/Bin/Spring.Web.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2010/Bin/Spring.Web.dll.refresh index 30bb71cb93264317f0a42f3f6356c011a88376d6..a485b8b4d67e8cb2b4bae5ed4c8ae6f58bad1ac6 100644 GIT binary patch delta 11 Scmb=Zm=MNn#$Y%xQXT*nL<33y delta 11 Scmb=Zm=MNn%3w4xQXT*nLIX+w diff --git a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.sln b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.sln index ed22b211..fd96a85d 100644 --- a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.sln +++ b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.sln @@ -5,7 +5,7 @@ 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" + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6.1" 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\" @@ -28,7 +28,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Spring.WebQuickStart.2005", 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" + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6.1" 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\" diff --git a/examples/Spring/SpringAir/SpringAir.sln b/examples/Spring/SpringAir/SpringAir.sln index f1c52f75..97623b18 100644 --- a/examples/Spring/SpringAir/SpringAir.sln +++ b/examples/Spring/SpringAir/SpringAir.sln @@ -5,7 +5,7 @@ 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" + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6.1" 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\" diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.csproj b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.csproj index e1e60209..5fabfce7 100644 --- a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.csproj +++ b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.csproj @@ -1,6 +1,6 @@  - net452 + net461 SpringAir diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.csproj b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.csproj index e4a82a5b..d12cc854 100644 --- a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.csproj +++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.csproj @@ -1,6 +1,6 @@  - net452 + net461 SpringAir diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.References.csproj b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.References.csproj index 3439a2d1..1f8b3b23 100644 --- a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.References.csproj +++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.References.csproj @@ -1,6 +1,6 @@  - net452 + net461 SpringAir diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.csproj b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.csproj index c7344751..a4c38139 100644 --- a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.csproj +++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.csproj @@ -1,12 +1,12 @@  - net452 + net461 SpringAir - - - + + + diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.csproj b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.csproj index 16c6ec71..574918e4 100644 --- a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.csproj +++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.csproj @@ -1,15 +1,15 @@  - net452 + net461 SpringAir - - - + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e19b3079..7e533eec 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -18,8 +18,9 @@ 3.4.1 SpringSource + SpringSource_Leaves32x32.png http://springframework.net/images/SpringSource_Leaves32x32.png - http://www.springframework.net/license.html + Apache-2.0 http://www.springframework.net/ Library @@ -28,6 +29,8 @@ true true + true + snupkg True @@ -35,15 +38,14 @@ True AnyCPU - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - latest - net452 + 9.0 + net461 - + @@ -52,12 +54,15 @@ Full - DEBUG;TRACE;DEBUG_DYNAMIC;$(DefineConstants) + $(DefineConstants);DEBUG_DYNAMIC; - true TRACE;$(DefineConstants) + + + + diff --git a/src/Spring/Spring.Core/Spring.Core.csproj b/src/Spring/Spring.Core/Spring.Core.csproj index 31c1a5e0..70dceef0 100644 --- a/src/Spring/Spring.Core/Spring.Core.csproj +++ b/src/Spring/Spring.Core/Spring.Core.csproj @@ -13,13 +13,7 @@ - - - - - - @@ -27,6 +21,12 @@ + + + + + + diff --git a/src/Spring/Spring.Data.NHibernate5/Spring.Data.NHibernate5.csproj b/src/Spring/Spring.Data.NHibernate5/Spring.Data.NHibernate5.csproj index 7638a906..f4d8eaad 100644 --- a/src/Spring/Spring.Data.NHibernate5/Spring.Data.NHibernate5.csproj +++ b/src/Spring/Spring.Data.NHibernate5/Spring.Data.NHibernate5.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.csproj b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.csproj index 4d2b60af..7c2ba956 100644 --- a/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.csproj +++ b/src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.csproj @@ -1,6 +1,6 @@  - net452 + net461 TIBCO EMS support @@ -15,7 +15,6 @@ - ..\..\..\lib\Net\2.0\TIBCO.EMS.dll False diff --git a/src/Spring/Spring.Messaging/Spring.Messaging.csproj b/src/Spring/Spring.Messaging/Spring.Messaging.csproj index 835da5d7..85729a59 100644 --- a/src/Spring/Spring.Messaging/Spring.Messaging.csproj +++ b/src/Spring/Spring.Messaging/Spring.Messaging.csproj @@ -11,12 +11,12 @@ - - - GenCommonAssemblyInfo.cs + + + \ No newline at end of file diff --git a/src/Spring/Spring.Scheduling.Quartz3/Spring.Scheduling.Quartz3.csproj b/src/Spring/Spring.Scheduling.Quartz3/Spring.Scheduling.Quartz3.csproj index 84540539..3dd057d8 100644 --- a/src/Spring/Spring.Scheduling.Quartz3/Spring.Scheduling.Quartz3.csproj +++ b/src/Spring/Spring.Scheduling.Quartz3/Spring.Scheduling.Quartz3.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Spring/Spring.Services/Spring.Services.csproj b/src/Spring/Spring.Services/Spring.Services.csproj index 97223778..ea2d6d39 100644 --- a/src/Spring/Spring.Services/Spring.Services.csproj +++ b/src/Spring/Spring.Services/Spring.Services.csproj @@ -1,6 +1,6 @@  - net452 + net461 Interfaces and classes that provide portable service abstractions in Spring.Net diff --git a/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.csproj b/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.csproj index 7b5d0613..a33d7838 100644 --- a/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.csproj +++ b/src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.csproj @@ -1,6 +1,6 @@  - net452 + net461 diff --git a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.csproj b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.csproj index fe65bada..775a0fb4 100644 --- a/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.csproj +++ b/src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.csproj @@ -1,16 +1,13 @@  - net452 + net461;netstandard2.0 Spring.NET Intergration with the NVelocity templating Engine - - - - + diff --git a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj index f987b5e6..5ef008eb 100644 --- a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj +++ b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj @@ -1,6 +1,6 @@  - net452 + net461 Interfaces and classes that provide Microsoft Unit Testing integration in Spring.Net @@ -8,7 +8,7 @@ - + diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.csproj b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.csproj index b60fdb1c..b9f0e2a2 100644 --- a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.csproj +++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.csproj b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.csproj index ac76842c..f997497b 100644 --- a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.csproj +++ b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.csproj @@ -1,6 +1,6 @@  - net452 + net461 Interfaces and classes that provide ASP.NET AJAX 1.0 support in Spring.Net diff --git a/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.csproj b/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.csproj index 167ea2bb..a71a0003 100644 --- a/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.csproj +++ b/src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.csproj @@ -1,6 +1,6 @@  - net452 + net461 Interfaces and classes that provide ASP.NET MVC5 application support in Spring.Net @@ -8,8 +8,8 @@ - - + + diff --git a/src/Spring/Spring.Web/Spring.Web.csproj b/src/Spring/Spring.Web/Spring.Web.csproj index cb867d7a..fd82aeb6 100644 --- a/src/Spring/Spring.Web/Spring.Web.csproj +++ b/src/Spring/Spring.Web/Spring.Web.csproj @@ -1,6 +1,6 @@  - net452 + net461 Interfaces and classes that provide web application support in Spring.Net diff --git a/src/SpringSource_Leaves32x32.png b/src/SpringSource_Leaves32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..b04b0882ff5d36cfbc41349509e55d11f41081e0 GIT binary patch literal 711 zcmV;&0yzDNP)9^wD1B0RC%0P{xbmRj6jE|Mo{LUQVSKS1_QLrdp+g=?GtDV zCAJNTxt9Q+T5}B0VFffOQDNdpWn2Hw%)21a9>dU@MB79uT_Ztq`LJ+-F)e|knw@zUhGYf9 z^OWpXnP=3xIAdW{=9*z3g{YhOKJqL^Z9ftByO0(0Kbfiv zflb?joJ^qy*i>iEsOr()asv207Fz5f+uZZSN^lh%tm7Er1*6c`;Ox{mpR3dw(e85( z42HI(wQ-$TN!hx#j0r%;tS%E9glCHbBi+nnv^`6Hm1?QkZ>e!qspazL?Yw&y8M(`_ z9%#e&3iG5S|JSw_x52zg=+09Dv}5E|8o8BbK5N}1F!y)3+}e1vpj~E2HW1ascQ{v= thR^m;z3;+3.4.1 2.0.8 - 3.10.1 - 3.10.0 - 4.8.1 - 15.8.0 + 3.12.0 + 3.17.0 + 6.2.1 + 6.0.0 + 16.8.0 True False True AnyCPU - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb latest - net452 + net461 diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj index 6e772f13..6660ab98 100644 --- a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj +++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj @@ -1,6 +1,7 @@  - netcoreapp3.0;$(TargetFullFrameworkVersion) + net5.0;$(TargetFullFrameworkVersion) + $(NoWarn);SYSLIB0011 @@ -8,7 +9,7 @@ - + @@ -16,7 +17,7 @@ - + diff --git a/test/Spring/Spring.Benchmark/Spring.Benchmark.csproj b/test/Spring/Spring.Benchmark/Spring.Benchmark.csproj index 69df9ad6..d70a4895 100644 --- a/test/Spring/Spring.Benchmark/Spring.Benchmark.csproj +++ b/test/Spring/Spring.Benchmark/Spring.Benchmark.csproj @@ -2,12 +2,12 @@ Exe - net472;netcoreapp3.0 + net472;net5.0 Spring.Benchmark - + diff --git a/test/Spring/Spring.Core.Tests/Core/IO/ConfigSectionResourceTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/ConfigSectionResourceTests.cs index 75ad897f..29a55e56 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/ConfigSectionResourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/ConfigSectionResourceTests.cs @@ -45,6 +45,7 @@ namespace Spring.Core.IO return csr; } +#if NETFRAMEWORK [Test] public void CanCreate() { @@ -55,6 +56,7 @@ namespace Spring.Core.IO Assert.IsTrue(csr.Description.StartsWith("config [") ); Assert.IsTrue(csr.Description.EndsWith("#objects]") ); } +#endif [Test] public void ThrowsOnNullSectionName() diff --git a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs index 1e1a4df1..e9cce0aa 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2011 the original author or authors. + * Copyright � 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ namespace Spring.Core.IO /// protected static FileInfo GetAssemblyLocation(Assembly assembly) { - return new FileInfo(new Uri(assembly.CodeBase).LocalPath); + return new FileInfo(new Uri(assembly.Location).LocalPath); } protected static FileInfo CreateFileForTheCurrentDirectory() diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs index fb3f8c01..af002088 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2011 the original author or authors. + * Copyright � 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ using System; using System.Globalization; +using System.Threading; using NUnit.Framework; using Spring.Core; @@ -287,9 +288,10 @@ namespace Spring.Objects.Factory.Config fac.AfterPropertiesSet(); DateTime then = (DateTime) fac.GetObject(); Assert.IsNotNull(then); + Thread.Sleep(TimeSpan.FromMilliseconds(10)); DateTime now = (DateTime) fac.GetObject(); Assert.IsNotNull(now); - Assert.IsFalse(ReferenceEquals(then, now)); + Assert.AreNotEqual(then, now); } } diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj index 0bcb149d..be94a107 100644 --- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj +++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj @@ -1,6 +1,8 @@  - netcoreapp3.0;$(TargetFullFrameworkVersion) + net5.0;$(TargetFullFrameworkVersion) + $(NoWarn);SYSLIB0001;SYSLIB0003;SYSLIB0011 + false @@ -14,11 +16,12 @@ - + - + + @@ -30,7 +33,7 @@ - + @@ -40,7 +43,6 @@ - diff --git a/test/Spring/Spring.Core.Tests/TestAssemblySetup.cs b/test/Spring/Spring.Core.Tests/TestAssemblySetup.cs index 67e6fc25..a2d77fb7 100644 --- a/test/Spring/Spring.Core.Tests/TestAssemblySetup.cs +++ b/test/Spring/Spring.Core.Tests/TestAssemblySetup.cs @@ -15,7 +15,7 @@ namespace Spring public void SetUp() { // while R# is broken (https://youtrack.jetbrains.com/issue/RSRP-451142) - string codeBase = Assembly.GetExecutingAssembly().CodeBase; + string codeBase = Assembly.GetExecutingAssembly().Location; UriBuilder uri = new UriBuilder(codeBase); string path = Uri.UnescapeDataString(uri.Path); var pathToUse = Path.GetDirectoryName(path); diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs index 0f166319..4f6d0727 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2011 the original author or authors. + * Copyright � 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -188,10 +188,10 @@ namespace Spring.Data //other AdoCommands can be executed within same tx. } - catch (Exception e) + catch (Exception) { transactionManager.Rollback(status); - throw e; + throw; } transactionManager.Commit(status); Assert.AreEqual(2, iCount); diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.csproj index cd411d05..47e839d6 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.csproj +++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0;$(TargetFullFrameworkVersion) + net5.0;$(TargetFullFrameworkVersion) @@ -11,18 +11,18 @@ - + + - - + diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj index d4e6fa66..17e58cd5 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Spring.Data.NHibernate5.Integration.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0;net461 + net5.0;net461 @@ -11,11 +11,11 @@ - + - + diff --git a/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj b/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj index e6c98126..a0b1b0f4 100644 --- a/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj +++ b/test/Spring/Spring.Data.NHibernate5.Tests/Spring.Data.NHibernate5.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0;net461 + net5.0;net461 @@ -15,7 +15,7 @@ - + diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj index 10e40358..812355fd 100644 --- a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj +++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0;$(TargetFullFrameworkVersion) + net5.0;$(TargetFullFrameworkVersion) false @@ -17,13 +17,13 @@ - + + - - + 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 d6a32cec..6740fe1f 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,6 +1,6 @@  - net452 + net461 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 f3ad1354..ec5431ef 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,6 +1,6 @@  - netcoreapp3.0;net452 + net461 diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj index 29b7b903..f46568f0 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj +++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0;net452 + net5.0;net461 @@ -11,7 +11,7 @@ - + diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.csproj b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.csproj index b31a1ed8..09b0c9e2 100644 --- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.csproj +++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.csproj @@ -1,6 +1,6 @@  - net452 + net461 @@ -11,7 +11,7 @@ - + diff --git a/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj b/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj index bda5b5e7..3c424121 100644 --- a/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj +++ b/test/Spring/Spring.Scheduling.Quartz3.Integration.Tests/Spring.Scheduling.Quartz3.Integration.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0;$(TargetFullFrameworkVersion) + net5.0;$(TargetFullFrameworkVersion) @@ -9,7 +9,7 @@ - + diff --git a/test/Spring/Spring.Scheduling.Quartz3.Tests/Spring.Scheduling.Quartz3.Tests.csproj b/test/Spring/Spring.Scheduling.Quartz3.Tests/Spring.Scheduling.Quartz3.Tests.csproj index 96c0aea3..17731026 100644 --- a/test/Spring/Spring.Scheduling.Quartz3.Tests/Spring.Scheduling.Quartz3.Tests.csproj +++ b/test/Spring/Spring.Scheduling.Quartz3.Tests/Spring.Scheduling.Quartz3.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0;$(TargetFullFrameworkVersion) + net5.0;$(TargetFullFrameworkVersion) @@ -9,7 +9,7 @@ - + diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.csproj index 33e84143..94ba0f52 100644 --- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.csproj +++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.csproj @@ -1,6 +1,6 @@  - net452 + net461 @@ -11,8 +11,8 @@ - - + + 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 26d11131..713e2c26 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,6 +1,6 @@  - net452 + net461 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 baa04490..a70aa252 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,6 +1,6 @@  - net452 + net461 diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj index 713268e5..c1c83bd0 100644 --- a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj +++ b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj @@ -1,6 +1,6 @@  - net452 + net461 @@ -11,8 +11,8 @@ - - + + diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj index 3364dd5d..93836367 100644 --- a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj +++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0;$(TargetFullFrameworkVersion) + net5.0;$(TargetFullFrameworkVersion) @@ -11,7 +11,7 @@ - + diff --git a/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.csproj b/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.csproj index d2019bfd..05eb36ae 100644 --- a/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.csproj +++ b/test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.csproj @@ -1,6 +1,6 @@  - net452 + net461 diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.csproj index b267c680..eca9c03d 100644 --- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.csproj +++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.csproj @@ -1,6 +1,6 @@  - net452 + net461 @@ -9,7 +9,7 @@ - + @@ -23,10 +23,8 @@ ..\..\..\lib\Net\2.0\NUnitAspEx.dll False - -