Merge pull request #613 from Jevonius/upgrade-castle-core

Upgrade Castle.Core to 5.0.0 (resolves #612)
castleproject · Jul 19, 2022 · 1973e70 · 1973e70
2 parents 855f258 + 2fbbfc1
commit 1973e70
Show file tree

Hide file tree

Showing 36 changed files with 98 additions and 177 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,6 @@ Symbol                              | .NET 4.5           | .NET Standard
 `FEATURE_GAC`                       | :white_check_mark: | :no_entry_sign:
 `FEATURE_GETCALLINGASSEMBLY`        | :white_check_mark: | :no_entry_sign:
 `FEATURE_ISUPPORTINITIALIZE`        | :white_check_mark: | :no_entry_sign:
-`FEATURE_NETCORE_REFLECTION_API`    | :no_entry_sign:    | :white_check_mark:
 `FEATURE_PERFCOUNTERS`              | :white_check_mark: | :no_entry_sign:
 `FEATURE_REMOTING`                  | :white_check_mark: | :no_entry_sign:
 `FEATURE_SECURITY_PERMISSIONS`      | :white_check_mark: | :no_entry_sign:
@@ -52,7 +51,6 @@ Symbol                              | .NET 4.5           | .NET Standard
 * `FEATURE_GAC` - enables support for obtaining assemblies using an assembly's long form name.
 * `FEATURE_GETCALLINGASSEMBLY` - enables code that uses `System.Reflection.Assembly.GetCallingAssembly()`.
 * `FEATURE_ISUPPORTINITIALIZE` - enables support for features that make use of `System.ComponentModel.ISupportInitialize`.
-* `FEATURE_NETCORE_REFLECTION_API` - provides shims to implement missing functionality in .NET Core that have no alternatives.
 * `FEATURE_PERFCOUNTERS` - enables code that uses Windows Performance Counters.
 * `FEATURE_REMOTING` - supports remoting on various types including inheriting from `MarshalByRefObject`.
 * `FEATURE_SECURITY_PERMISSIONS` - enables the use of CAS and `Security[Critical|SafeCritical|Transparent]`.

diff --git a/buildscripts/common.props b/buildscripts/common.props
@@ -35,14 +35,10 @@
 		<ContentTargetFolders>.</ContentTargetFolders>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
+	<PropertyGroup Condition="'$(TargetFramework)'=='net462'">
 		<DefineConstants>$(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</DefineConstants>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.6'">
-		<DefineConstants>$(DefineConstants);FEATURE_NETCORE_REFLECTION_API</DefineConstants>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<Content Include="..\..\CHANGELOG.md" />
 		<Content Include="..\..\LICENSE">

diff --git a/docs/Documentation.csproj b/docs/Documentation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net461</TargetFrameworks>
+		<TargetFrameworks>net462</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>

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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45</TargetFrameworks>
+		<TargetFrameworks>net462</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>
@@ -14,7 +14,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Castle.Core" Version="4.4.1" />
 		<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.3" />
 		<PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />

diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45</TargetFrameworks>
+		<TargetFrameworks>net462</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>

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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45</TargetFrameworks>
+		<TargetFrameworks>net462</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>
@@ -19,7 +19,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Castle.Core" Version="4.4.1" />
 		<PackageReference Include="NUnit" Version="3.8.1" />
 		<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />

diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45</TargetFrameworks>
+		<TargetFrameworks>net462</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>

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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45</TargetFrameworks>
+		<TargetFrameworks>net462</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>
@@ -14,7 +14,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Castle.Core" Version="4.4.1" />
 		<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.3" />
 		<PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />

diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45</TargetFrameworks>
+		<TargetFrameworks>net462</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>

diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netcoreapp2.0</TargetFramework>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/Castle.Facilities.Logging/Castle.Facilities.Logging.csproj b/src/Castle.Facilities.Logging/Castle.Facilities.Logging.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>
@@ -24,6 +24,5 @@
 
 	<ItemGroup>
 		<Compile Include="..\..\buildscripts\CommonAssemblyInfo.cs" />
-		<Compile Include="..\Castle.Windsor\Compatibility\NetCoreReflectionExtensions.cs" />
 	</ItemGroup>
 </Project>
diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net45</TargetFramework>
+		<TargetFramework>net462</TargetFramework>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -10,11 +10,6 @@
 		<SignAssembly>false</SignAssembly>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Castle.Core" Version="4.4.1" />
-		<PackageReference Include="Castle.Core-log4net" Version="4.4.1" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\Castle.Facilities.Logging\Castle.Facilities.Logging.csproj" />
 		<ProjectReference Include="..\Castle.Facilities.WcfIntegration\Castle.Facilities.WcfIntegration.csproj" />

diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net45</TargetFramework>
+		<TargetFramework>net462</TargetFramework>
 
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -12,8 +12,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Castle.Core" Version="4.4.1" />
-		<PackageReference Include="Castle.Core-log4net" Version="4.4.1" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
 		<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" />
 		<PackageReference Include="NUnit" Version="3.8.1" />

diff --git a/src/Castle.Facilities.WcfIntegration/Castle.Facilities.WcfIntegration.csproj b/src/Castle.Facilities.WcfIntegration/Castle.Facilities.WcfIntegration.csproj
@@ -3,7 +3,7 @@
 	<Import Project="..\..\buildscripts\common.props"></Import>
 
 	<PropertyGroup>
-		<TargetFramework>net45</TargetFramework>
+		<TargetFramework>net462</TargetFramework>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageId>Castle.WcfIntegrationFacility</PackageId>
 		<Title>Castle Windsor WCF integration facility</Title>

diff --git a/...ions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj b/...ions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 

diff --git a/...ndsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj b/...ndsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>

diff --git a/src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj b/src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45;net5.0</TargetFrameworks>
+		<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>
@@ -49,10 +49,9 @@
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net45'">
-		<PackageReference Include="Castle.Core" Version="4.4.1" />
-		<PackageReference Include="Castle.Core-log4net" Version="4.4.1" />
-		<PackageReference Include="Castle.Core-NLog" Version="4.4.1" />
+	<ItemGroup Condition="'$(TargetFramework)'=='net462'">
+		<PackageReference Include="Castle.Core-log4net" Version="[5.0.0,6.0)" />
+		<PackageReference Include="Castle.Core-NLog" Version="[5.0.0,6.0)" />
 		<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" />
 	</ItemGroup>
 
@@ -61,7 +60,7 @@
 		<ProjectReference Include="..\Castle.Windsor\Castle.Windsor.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net45'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net462'">
 		<Reference Include="PresentationCore" />
 		<Reference Include="PresentationFramework" />
 		<Reference Include="System.Configuration" />
@@ -70,11 +69,7 @@
 		<Reference Include="WindowsBase" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<Compile Include="..\Castle.Windsor\Compatibility\AppContext.cs" />
-	</ItemGroup>
-
-	<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
+	<PropertyGroup Condition="'$(TargetFramework)'=='net462'">
 		<DefineConstants>$(DefineConstants);NUNIT_SETCULTUREATTRIBUTE;NUNIT_TIMEOUTATTRIBUTE;FEATURE_THREADABORT;FEATURE_WPF;FEATURE_CONSOLETRACELISTENER</DefineConstants>
 	</PropertyGroup>
 

diff --git a/src/Castle.Windsor.Tests/DefaultValueTestCase.cs b/src/Castle.Windsor.Tests/DefaultValueTestCase.cs
@@ -94,7 +94,6 @@ public void Uses_explicit_value_over_default()
 			Assert.AreEqual("Adam Mickiewicz", value.Name);
 		}
 
-#if !NETCOREAPP1_0 // FirstChanceException event was added in .NET Core 2.0
 		[Test]
 		public void First_chance_exceptions_are_not_thrown()
 		{
@@ -112,6 +111,5 @@ public HasCtorWithOptionalInterfaceParameter(IEqualityComparer<int> comparer = n
 			{
 			}
 		}
-#endif
 	}
 }
diff --git a/src/Castle.Windsor.Tests/Registration/UsingFactoryMethodTestCase.cs b/src/Castle.Windsor.Tests/Registration/UsingFactoryMethodTestCase.cs
@@ -1,4 +1,4 @@
-// Copyright 2004-2012 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2022 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.
@@ -449,11 +449,18 @@ public void Proxying_type_with_no_default_ctor_throws_helpful_message()
 					.UsingFactoryMethod(() => new ClassWithConstructors("something")));
 
 			var exception =
-				Assert.Throws<InvalidProxyConstructorArgumentsException>(() => Kernel.Resolve<ClassWithConstructors>());
+				Assert.Throws<ArgumentException>(() => Kernel.Resolve<ClassWithConstructors>());
 
+#if NET462_OR_GREATER
 			var expected =
 				"Can not instantiate proxy of class: Castle.MicroKernel.Tests.Configuration.Components.ClassWithConstructors." + Environment.NewLine +
-				"Could not find a parameterless constructor.";
+				"Could not find a parameterless constructor.\r\n" +
+				"Parameter name: constructorArguments";
+#else
+			var expected =
+				"Can not instantiate proxy of class: Castle.MicroKernel.Tests.Configuration.Components.ClassWithConstructors." + Environment.NewLine +
+				"Could not find a parameterless constructor. (Parameter 'constructorArguments')";
+#endif
 
 			Assert.AreEqual(expected, exception.Message);
 		}

diff --git a/src/Castle.Windsor.Tests/TestUtils.cs b/src/Castle.Windsor.Tests/TestUtils.cs
@@ -25,7 +25,6 @@ namespace CastleTests
 
 	public static class TestUtils
 	{
-#if !NETCOREAPP1_0 // FirstChanceException event was added in .NET Core 2.0
 		public static void AssertNoFirstChanceExceptions(Action action)
 		{
 			var firstChanceExceptions = new List<Exception>();
@@ -58,7 +57,6 @@ public static void AssertNoFirstChanceExceptions(Action action)
 				Assert.Fail(message.ToString());
 			}
 		}
-#endif
 
 		public static string ConvertToEnvironmentLineEndings(this string value)
 		{

diff --git a/src/Castle.Windsor/Castle.Windsor.csproj b/src/Castle.Windsor/Castle.Windsor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>
@@ -16,18 +16,17 @@
 		<NoWarn>$(NoWarn);NU5125</NoWarn> <!-- remove once tools are truly ready for NuGet's new 'license' element -->
 		<AssemblyName>Castle.Windsor</AssemblyName>
 		<RootNamespace>Castle</RootNamespace>
-		<Title>Castle Windsor</Title>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<Compile Include="..\..\buildscripts\CommonAssemblyInfo.cs" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Castle.Core" Version="4.4.1" />
+		<PackageReference Include="Castle.Core" Version="[5.0.0,6.0)" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net45'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net462'">
 		<Reference Include="System.Configuration" />
 		<Reference Include="System.Runtime.Remoting" />
 		<Reference Include="System.Web" />