From a37534b90401215958102af39435d543dc621a64 Mon Sep 17 00:00:00 2001 From: Jevon Date: Sat, 14 May 2022 08:04:10 +0100 Subject: [PATCH] Update minimum framework version to 4.6.2 #612 - Updating Windsor to support Castle.Core@5.0.0 and modern TFMs --- buildscripts/common.props | 2 +- docs/Documentation.csproj | 2 +- .../Castle.Facilities.AspNet.Mvc.Tests.csproj | 3 +- .../Castle.Facilities.AspNet.Mvc.csproj | 2 +- ...e.Facilities.AspNet.SystemWeb.Tests.csproj | 3 +- .../Castle.Facilities.AspNet.SystemWeb.csproj | 2 +- ...stle.Facilities.AspNet.WebApi.Tests.csproj | 3 +- .../Castle.Facilities.AspNet.WebApi.csproj | 2 +- .../Castle.Facilities.AspNetCore.Tests.csproj | 2 +- .../Castle.Facilities.Logging.csproj | 2 +- ...stle.Facilities.WcfIntegration.Demo.csproj | 7 +---- ...tle.Facilities.WcfIntegration.Tests.csproj | 4 +-- .../Castle.Facilities.WcfIntegration.csproj | 2 +- ...xtensions.DependencyInjection.Tests.csproj | 2 +- ...dsor.Extensions.DependencyInjection.csproj | 2 +- .../Castle.Windsor.Tests.csproj | 13 +++----- src/Castle.Windsor/Castle.Windsor.csproj | 5 ++- .../Compatibility/AppContext.cs | 31 ------------------- .../Registration/AssemblyFilter.cs | 1 - .../Explicit.NuGet.Versions.csproj | 2 +- 20 files changed, 22 insertions(+), 70 deletions(-) delete mode 100644 src/Castle.Windsor/Compatibility/AppContext.cs diff --git a/buildscripts/common.props b/buildscripts/common.props index 250ea1a917..6fc8a29920 100644 --- a/buildscripts/common.props +++ b/buildscripts/common.props @@ -35,7 +35,7 @@ . - + $(DefineConstants);FEATURE_PERFCOUNTERS;FEATURE_GAC;FEATURE_ISUPPORTINITIALIZE;FEATURE_REMOTING;FEATURE_SECURITY_PERMISSIONS;FEATURE_SYSTEM_CONFIGURATION;FEATURE_SERIALIZATION;FEATURE_URIMEMBERS;FEATURE_GETCALLINGASSEMBLY;FEATURE_APPDOMAIN;FEATURE_CODEDOM;FEATURE_ASSEMBLIES;CASTLE_SERVICES_LOGGING;FEATURE_EVENTLOG diff --git a/docs/Documentation.csproj b/docs/Documentation.csproj index 5e3720a507..c9bb3bb6b4 100644 --- a/docs/Documentation.csproj +++ b/docs/Documentation.csproj @@ -1,7 +1,7 @@  - net461 + net462 diff --git a/src/Castle.Facilities.AspNet.Mvc.Tests/Castle.Facilities.AspNet.Mvc.Tests.csproj b/src/Castle.Facilities.AspNet.Mvc.Tests/Castle.Facilities.AspNet.Mvc.Tests.csproj index c2c058efc4..7e31d0e496 100644 --- a/src/Castle.Facilities.AspNet.Mvc.Tests/Castle.Facilities.AspNet.Mvc.Tests.csproj +++ b/src/Castle.Facilities.AspNet.Mvc.Tests/Castle.Facilities.AspNet.Mvc.Tests.csproj @@ -1,7 +1,7 @@  - net45 + net462 @@ -14,7 +14,6 @@ - diff --git a/src/Castle.Facilities.AspNet.Mvc/Castle.Facilities.AspNet.Mvc.csproj b/src/Castle.Facilities.AspNet.Mvc/Castle.Facilities.AspNet.Mvc.csproj index 8590323fee..415b5737cd 100644 --- a/src/Castle.Facilities.AspNet.Mvc/Castle.Facilities.AspNet.Mvc.csproj +++ b/src/Castle.Facilities.AspNet.Mvc/Castle.Facilities.AspNet.Mvc.csproj @@ -1,7 +1,7 @@  - net45 + net462 diff --git a/src/Castle.Facilities.AspNet.SystemWeb.Tests/Castle.Facilities.AspNet.SystemWeb.Tests.csproj b/src/Castle.Facilities.AspNet.SystemWeb.Tests/Castle.Facilities.AspNet.SystemWeb.Tests.csproj index 27ca9073ce..d1040d3555 100644 --- a/src/Castle.Facilities.AspNet.SystemWeb.Tests/Castle.Facilities.AspNet.SystemWeb.Tests.csproj +++ b/src/Castle.Facilities.AspNet.SystemWeb.Tests/Castle.Facilities.AspNet.SystemWeb.Tests.csproj @@ -1,7 +1,7 @@  - net45 + net462 @@ -19,7 +19,6 @@ - diff --git a/src/Castle.Facilities.AspNet.SystemWeb/Castle.Facilities.AspNet.SystemWeb.csproj b/src/Castle.Facilities.AspNet.SystemWeb/Castle.Facilities.AspNet.SystemWeb.csproj index e907aaab2f..3a958406c1 100644 --- a/src/Castle.Facilities.AspNet.SystemWeb/Castle.Facilities.AspNet.SystemWeb.csproj +++ b/src/Castle.Facilities.AspNet.SystemWeb/Castle.Facilities.AspNet.SystemWeb.csproj @@ -1,7 +1,7 @@  - net45 + net462 diff --git a/src/Castle.Facilities.AspNet.WebApi.Tests/Castle.Facilities.AspNet.WebApi.Tests.csproj b/src/Castle.Facilities.AspNet.WebApi.Tests/Castle.Facilities.AspNet.WebApi.Tests.csproj index 44976c2b25..12a4af1d19 100644 --- a/src/Castle.Facilities.AspNet.WebApi.Tests/Castle.Facilities.AspNet.WebApi.Tests.csproj +++ b/src/Castle.Facilities.AspNet.WebApi.Tests/Castle.Facilities.AspNet.WebApi.Tests.csproj @@ -1,7 +1,7 @@  - net45 + net462 @@ -14,7 +14,6 @@ - diff --git a/src/Castle.Facilities.AspNet.WebApi/Castle.Facilities.AspNet.WebApi.csproj b/src/Castle.Facilities.AspNet.WebApi/Castle.Facilities.AspNet.WebApi.csproj index a1e107e1c7..84948f45ae 100644 --- a/src/Castle.Facilities.AspNet.WebApi/Castle.Facilities.AspNet.WebApi.csproj +++ b/src/Castle.Facilities.AspNet.WebApi/Castle.Facilities.AspNet.WebApi.csproj @@ -1,7 +1,7 @@  - net45 + net462 diff --git a/src/Castle.Facilities.AspNetCore.Tests/Castle.Facilities.AspNetCore.Tests.csproj b/src/Castle.Facilities.AspNetCore.Tests/Castle.Facilities.AspNetCore.Tests.csproj index 700f6e5f46..908c771255 100644 --- a/src/Castle.Facilities.AspNetCore.Tests/Castle.Facilities.AspNetCore.Tests.csproj +++ b/src/Castle.Facilities.AspNetCore.Tests/Castle.Facilities.AspNetCore.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp2.0 + netcoreapp3.1 diff --git a/src/Castle.Facilities.Logging/Castle.Facilities.Logging.csproj b/src/Castle.Facilities.Logging/Castle.Facilities.Logging.csproj index 69626689eb..b0471d3748 100644 --- a/src/Castle.Facilities.Logging/Castle.Facilities.Logging.csproj +++ b/src/Castle.Facilities.Logging/Castle.Facilities.Logging.csproj @@ -1,7 +1,7 @@  - net45;netstandard2.0 + net462;netstandard2.0 diff --git a/src/Castle.Facilities.WcfIntegration.Demo/Castle.Facilities.WcfIntegration.Demo.csproj b/src/Castle.Facilities.WcfIntegration.Demo/Castle.Facilities.WcfIntegration.Demo.csproj index d011c06161..d5caa2c3ef 100644 --- a/src/Castle.Facilities.WcfIntegration.Demo/Castle.Facilities.WcfIntegration.Demo.csproj +++ b/src/Castle.Facilities.WcfIntegration.Demo/Castle.Facilities.WcfIntegration.Demo.csproj @@ -1,7 +1,7 @@  - net45 + net462 $(NoWarn);1591 true true @@ -10,11 +10,6 @@ false - - - - - diff --git a/src/Castle.Facilities.WcfIntegration.Tests/Castle.Facilities.WcfIntegration.Tests.csproj b/src/Castle.Facilities.WcfIntegration.Tests/Castle.Facilities.WcfIntegration.Tests.csproj index a14b495793..7422bbe76b 100644 --- a/src/Castle.Facilities.WcfIntegration.Tests/Castle.Facilities.WcfIntegration.Tests.csproj +++ b/src/Castle.Facilities.WcfIntegration.Tests/Castle.Facilities.WcfIntegration.Tests.csproj @@ -1,7 +1,7 @@  - net45 + net462 $(NoWarn);1591 true @@ -12,8 +12,6 @@ - - diff --git a/src/Castle.Facilities.WcfIntegration/Castle.Facilities.WcfIntegration.csproj b/src/Castle.Facilities.WcfIntegration/Castle.Facilities.WcfIntegration.csproj index 2fbbc9f04e..a67bbe9125 100644 --- a/src/Castle.Facilities.WcfIntegration/Castle.Facilities.WcfIntegration.csproj +++ b/src/Castle.Facilities.WcfIntegration/Castle.Facilities.WcfIntegration.csproj @@ -3,7 +3,7 @@ - net45 + net462 true Castle.WcfIntegrationFacility Castle Windsor WCF integration facility diff --git a/src/Castle.Windsor.Extensions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj b/src/Castle.Windsor.Extensions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj index 1207cb7d15..e7e207b0b9 100644 --- a/src/Castle.Windsor.Extensions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj +++ b/src/Castle.Windsor.Extensions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj @@ -1,7 +1,7 @@  - net5.0; + netcoreapp3.1 false diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj b/src/Castle.Windsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj index 1af0d01e46..3de4354436 100644 --- a/src/Castle.Windsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj +++ b/src/Castle.Windsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 diff --git a/src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj b/src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj index 9056a888d2..084e9cb8fe 100644 --- a/src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj +++ b/src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj @@ -1,7 +1,7 @@  - net45;net5.0 + net462;netcoreapp3.1 @@ -49,8 +49,7 @@ - - + @@ -61,7 +60,7 @@ - + @@ -70,11 +69,7 @@ - - - - - + $(DefineConstants);NUNIT_SETCULTUREATTRIBUTE;NUNIT_TIMEOUTATTRIBUTE;FEATURE_THREADABORT;FEATURE_WPF;FEATURE_CONSOLETRACELISTENER diff --git a/src/Castle.Windsor/Castle.Windsor.csproj b/src/Castle.Windsor/Castle.Windsor.csproj index fe5f35ba2b..db4452f2ea 100644 --- a/src/Castle.Windsor/Castle.Windsor.csproj +++ b/src/Castle.Windsor/Castle.Windsor.csproj @@ -1,7 +1,7 @@  - net45;netstandard2.0 + net462;netstandard2.0 @@ -16,7 +16,6 @@ $(NoWarn);NU5125 Castle.Windsor Castle - Castle Windsor @@ -27,7 +26,7 @@ - + diff --git a/src/Castle.Windsor/Compatibility/AppContext.cs b/src/Castle.Windsor/Compatibility/AppContext.cs deleted file mode 100644 index 33797c1d92..0000000000 --- a/src/Castle.Windsor/Compatibility/AppContext.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2004-2017 Castle Project - http://www.castleproject.org/ -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -using System; - -#if NET45 -namespace Castle.Core.Internal -{ - internal static class AppContext - { - public static string BaseDirectory - { - get - { - return AppDomain.CurrentDomain.BaseDirectory; - } - } - } -} -#endif \ No newline at end of file diff --git a/src/Castle.Windsor/MicroKernel/Registration/AssemblyFilter.cs b/src/Castle.Windsor/MicroKernel/Registration/AssemblyFilter.cs index 5e90b8d8b4..31edd62a92 100644 --- a/src/Castle.Windsor/MicroKernel/Registration/AssemblyFilter.cs +++ b/src/Castle.Windsor/MicroKernel/Registration/AssemblyFilter.cs @@ -190,7 +190,6 @@ IEnumerable IAssemblyProvider.GetAssemblies() private static string GetFullPath(string path) { - // NOTE: Can we support this somehow in SL? if (Path.IsPathRooted(path) == false && AppContext.BaseDirectory != null) { path = Path.Combine(AppContext.BaseDirectory, path); diff --git a/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.csproj b/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.csproj index b8e2cb783a..d48a71e81b 100644 --- a/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.csproj +++ b/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.csproj @@ -2,7 +2,7 @@ Exe - net45 + net462 build\ false nev