Move PermissionUtil to internal namespace, remove test case

Windsor doesn't have internals visible to test projects, and not worth adding for one test case. This is code brought across unchanged from `Castle.Core` and is likely to be deprecated soon, as CAS is phased out. #612 - Updating Windsor to support Castle.Core@5.0.0 and modern TFMs
castleproject · May 24, 2022 · 2fbbfc1 · 2fbbfc1
1 parent efd2c12
commit 2fbbfc1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 46 deletions.
diff --git a/src/Castle.Windsor.Tests/Compatibility/PermissionUtilTests.cs b/src/Castle.Windsor.Tests/Compatibility/PermissionUtilTests.cs
diff --git a/...e.Windsor/Compatibility/PermissionUtil.cs → ...e.Windsor/Core/Internal/PermissionUtil.cs b/...e.Windsor/Compatibility/PermissionUtil.cs → ...e.Windsor/Core/Internal/PermissionUtil.cs
@@ -14,13 +14,13 @@
 
 #if FEATURE_SECURITY_PERMISSIONS
 
-namespace Castle.Windsor.Compatibility
+namespace Castle.Core.Internal
 {
 	using System;
 	using System.Security;
 	using System.Security.Permissions;
 
-	public static class PermissionUtil
+	internal static class PermissionUtil
 	{
 		public static bool IsGranted(this IPermission permission)
 		{

diff --git a/src/Castle.Windsor/MicroKernel/ComponentActivator/DefaultComponentActivator.cs b/src/Castle.Windsor/MicroKernel/ComponentActivator/DefaultComponentActivator.cs
@@ -26,9 +26,6 @@ namespace Castle.MicroKernel.ComponentActivator
 	using Castle.Core.Internal;
 	using Castle.DynamicProxy;
 	using Castle.MicroKernel.Context;
-#if FEATURE_SECURITY_PERMISSIONS
-	using Castle.Windsor.Compatibility;
-#endif
 
 	/// <summary>
 	/// 	Standard implementation of <see cref = "IComponentActivator" />. Handles the selection of the best constructor, fills the writable properties the component exposes, run the commission and

diff --git a/src/Castle.Windsor/MicroKernel/DefaultKernel.cs b/src/Castle.Windsor/MicroKernel/DefaultKernel.cs
@@ -43,9 +43,6 @@ namespace Castle.MicroKernel
 	using Castle.MicroKernel.SubSystems.Conversion;
 	using Castle.MicroKernel.SubSystems.Naming;
 	using Castle.MicroKernel.SubSystems.Resource;
-#if FEATURE_SECURITY_PERMISSIONS
-	using Castle.Windsor.Compatibility;
-#endif
 	using Castle.Windsor.Diagnostics;
 
 	/// <summary>