Make most of DynamicProxy's internals internal

CHANGELOG.md

@@ -11,11 +11,8 @@ Deprecations:
  - The following public members have been removed:
     - `Castle.Core.Internal.Lock` (class) along with all related types and methods
     - `Castle.Core.Internal.PermissionUtil.IsGranted` (method)
-    - `Castle.DynamicProxy.Generators.Emitters.AttributesUtil.IsAnyByRef` (method)
-    - `Castle.DynamicProxy.Generators.Emitters.StrongNameUtil.CanStrongNameAssembly` (property)
-    - `Castle.DynamicProxy.Internal.InternalsUtil` (class)
-    - `Castle.DynamicProxy.ModuleScope.DefineType` (method)
-    - `Castle.DynamicProxy.ModuleScope.GetFromCache` (method), `Castle.DynamicProxy.ModuleScope.RegisterInCache` (method), `Castle.DynamicProxy.Generators.CacheKey` (class) and a few other related methods that allowed direct access to DynamicProxy's type cache.
+    - all type members in `Castle.DynamicProxy.ModuleScope` that gave direct access to DynamicProxy's type cache and `ModuleBuilder`s. Only `SaveAssembly`, `LoadAssemblyIntoCache`, and members supporting these two facilities are left public.
+    - almost all types and type members in the `Castle.DynamicProxy.*` sub-namespaces, as most of them are intended for internal use only.
 
 ## 4.4.1 (2020-05-06)
 

src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj

@@ -18,6 +18,10 @@
 		<StartupObject>Program</StartupObject>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <Compile Include="..\Castle.Core\DynamicProxy\Generators\Emitters\StrongNameUtil.cs" Link="DynamicProxy.Tests\StrongNameUtil.cs" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
 		<PackageReference Include="NUnit" Version="3.6.1" />

src/Castle.Core.Tests/DynamicProxy.Tests/DelegateProxyTestCase.cs

@@ -25,20 +25,16 @@ public class DelegateProxyTestCasE : BasePEVerifyTestCase
 	{
 		private Type GenerateProxyType<TDelegate>()
 		{
-			var scope = generator.ProxyBuilder.ModuleScope;
-			var proxyGenerator = new DelegateProxyGenerator(scope, typeof (TDelegate))
-			                     	{
-			                     		Logger = generator.ProxyBuilder.Logger
-			                     	};
-			return proxyGenerator.GetProxyType();
+			var options = new ProxyGenerationOptions();
+			options.AddDelegateTypeMixin(typeof(TDelegate));
+			return generator.ProxyBuilder.CreateClassProxyType(typeof(object), null, options);
 		}
 
 		private T GetProxyInstance<T>(T func, params IInterceptor[] interceptors)
 		{
 			var type = GenerateProxyType<T>();
 			var instance = Activator.CreateInstance(type, func, interceptors);
-			var methodInfo = instance.GetType().GetMethod("Invoke");
-			return (T)(object)methodInfo.CreateDelegate(typeof(T), instance);
+			return (T)(object)ProxyUtil.CreateDelegateToMixin(instance, typeof(T));
 		}
 
 		[Test]

src/Castle.Core/DynamicProxy/Contributors/ClassMembersCollector.cs

@@ -19,7 +19,7 @@ namespace Castle.DynamicProxy.Contributors
 
 	using Castle.DynamicProxy.Generators;
 
-	public class ClassMembersCollector : MembersCollector
+	internal class ClassMembersCollector : MembersCollector
 	{
 		public ClassMembersCollector(Type targetType)
 			: base(targetType)

src/Castle.Core/DynamicProxy/Contributors/ClassProxyInstanceContributor.cs

@@ -27,7 +27,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Internal;
 	using Castle.DynamicProxy.Tokens;
 
-	public class ClassProxyInstanceContributor : ProxyInstanceContributor
+	internal class ClassProxyInstanceContributor : ProxyInstanceContributor
 	{
 #if FEATURE_SERIALIZATION
 		private readonly bool delegateToBaseGetObjectData;

src/Castle.Core/DynamicProxy/Contributors/ClassProxyTargetContributor.cs

@@ -27,7 +27,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Internal;
 	using Castle.DynamicProxy.Tokens;
 
-	public class ClassProxyTargetContributor : CompositeTypeContributor
+	internal class ClassProxyTargetContributor : CompositeTypeContributor
 	{
 		private readonly IList<MethodInfo> methodsToSkip;
 		private readonly Type targetType;

src/Castle.Core/DynamicProxy/Contributors/ClassProxyWithTargetTargetContributor.cs

@@ -25,7 +25,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
 	using Castle.DynamicProxy.Tokens;
 
-	public class ClassProxyWithTargetTargetContributor : CompositeTypeContributor
+	internal class ClassProxyWithTargetTargetContributor : CompositeTypeContributor
 	{
 		private readonly IList<MethodInfo> methodsToSkip;
 		private readonly Type targetType;

src/Castle.Core/DynamicProxy/Contributors/CompositeTypeContributor.cs

@@ -24,7 +24,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters;
 	using Castle.DynamicProxy.Internal;
 
-	public abstract class CompositeTypeContributor : ITypeContributor
+	internal abstract class CompositeTypeContributor : ITypeContributor
 	{
 		protected readonly INamingScope namingScope;
 

src/Castle.Core/DynamicProxy/Contributors/DelegateTypeGenerator.cs

@@ -22,7 +22,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
 	using Castle.DynamicProxy.Internal;
 
-	public class DelegateTypeGenerator : IGenerator<AbstractTypeEmitter>
+	internal class DelegateTypeGenerator : IGenerator<AbstractTypeEmitter>
 	{
 		private const TypeAttributes DelegateFlags = TypeAttributes.Class |
 		                                             TypeAttributes.Public |

src/Castle.Core/DynamicProxy/Contributors/Delegates.cs

@@ -19,10 +19,10 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters;
 	using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
 
-	public delegate MethodEmitter OverrideMethodDelegate(
+	internal delegate MethodEmitter OverrideMethodDelegate(
 		string name, MethodAttributes attributes, MethodInfo methodToOverride);
 
-	public delegate Expression GetTargetExpressionDelegate(ClassEmitter @class, MethodInfo method);
+	internal delegate Expression GetTargetExpressionDelegate(ClassEmitter @class, MethodInfo method);
 
-	public delegate Reference GetTargetReferenceDelegate(ClassEmitter @class, MethodInfo method);
+	internal delegate Reference GetTargetReferenceDelegate(ClassEmitter @class, MethodInfo method);
 }

src/Castle.Core/DynamicProxy/Contributors/FieldReferenceComparer.cs

@@ -17,7 +17,7 @@ namespace Castle.DynamicProxy.Contributors
 	using System;
 	using System.Collections.Generic;
 
-	public class FieldReferenceComparer : IComparer<Type>
+	internal class FieldReferenceComparer : IComparer<Type>
 	{
 		public int Compare(Type x, Type y)
 		{

src/Castle.Core/DynamicProxy/Contributors/ForwardingMethodGenerator.cs

@@ -18,7 +18,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters;
 	using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
 
-	public class ForwardingMethodGenerator : MethodGenerator
+	internal class ForwardingMethodGenerator : MethodGenerator
 	{
 		private readonly GetTargetReferenceDelegate getTargetReference;
 

src/Castle.Core/DynamicProxy/Contributors/ITypeContributor.cs

@@ -20,7 +20,7 @@ namespace Castle.DynamicProxy.Contributors
 	/// <summary>
 	///   Interface describing elements composing generated type
 	/// </summary>
-	public interface ITypeContributor
+	internal interface ITypeContributor
 	{
 		void CollectElementsToProxy(IProxyGenerationHook hook, MetaType model);
 

src/Castle.Core/DynamicProxy/Contributors/InterfaceMembersCollector.cs

@@ -19,7 +19,7 @@ namespace Castle.DynamicProxy.Contributors
 
 	using Castle.DynamicProxy.Generators;
 
-	public class InterfaceMembersCollector : MembersCollector
+	internal class InterfaceMembersCollector : MembersCollector
 	{
 		public InterfaceMembersCollector(Type @interface)
 			: base(@interface)

src/Castle.Core/DynamicProxy/Contributors/InterfaceMembersOnClassCollector.cs

@@ -19,7 +19,7 @@ namespace Castle.DynamicProxy.Contributors
 
 	using Castle.DynamicProxy.Generators;
 
-	public class InterfaceMembersOnClassCollector : MembersCollector
+	internal class InterfaceMembersOnClassCollector : MembersCollector
 	{
 		private readonly InterfaceMapping map;
 		private readonly bool onlyProxyVirtual;

src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyInstanceContributor.cs

@@ -21,7 +21,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
 	using Castle.DynamicProxy.Tokens;
 
-	public class InterfaceProxyInstanceContributor : ProxyInstanceContributor
+	internal class InterfaceProxyInstanceContributor : ProxyInstanceContributor
 	{
 		protected override Reference GetTargetReference(ClassEmitter emitter)
 		{

src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyTargetContributor.cs

@@ -22,7 +22,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators;
 	using Castle.DynamicProxy.Generators.Emitters;
 
-	public class InterfaceProxyTargetContributor : CompositeTypeContributor
+	internal class InterfaceProxyTargetContributor : CompositeTypeContributor
 	{
 		private readonly bool canChangeTarget;
 		private readonly Type proxyTargetType;

src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithOptionalTargetContributor.cs

@@ -17,7 +17,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators;
 	using Castle.DynamicProxy.Generators.Emitters;
 
-	public class InterfaceProxyWithOptionalTargetContributor : InterfaceProxyWithoutTargetContributor
+	internal class InterfaceProxyWithOptionalTargetContributor : InterfaceProxyWithoutTargetContributor
 	{
 		private readonly GetTargetReferenceDelegate getTargetReference;
 

src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithTargetInterfaceTargetContributor.cs

@@ -18,7 +18,7 @@ namespace Castle.DynamicProxy.Contributors
 
 	using Castle.DynamicProxy.Generators;
 
-	public class InterfaceProxyWithTargetInterfaceTargetContributor : InterfaceProxyTargetContributor
+	internal class InterfaceProxyWithTargetInterfaceTargetContributor : InterfaceProxyTargetContributor
 	{
 		public InterfaceProxyWithTargetInterfaceTargetContributor(Type proxyTargetType, bool allowChangeTarget,
 		                                                          INamingScope namingScope)

src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithoutTargetContributor.cs

@@ -21,7 +21,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators;
 	using Castle.DynamicProxy.Generators.Emitters;
 
-	public class InterfaceProxyWithoutTargetContributor : CompositeTypeContributor
+	internal class InterfaceProxyWithoutTargetContributor : CompositeTypeContributor
 	{
 		private readonly GetTargetExpressionDelegate getTargetExpression;
 		protected bool canChangeTarget = false;

src/Castle.Core/DynamicProxy/Contributors/InvocationWithDelegateContributor.cs

@@ -23,7 +23,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
 	using Castle.DynamicProxy.Tokens;
 
-	public class InvocationWithDelegateContributor : IInvocationCreationContributor
+	internal class InvocationWithDelegateContributor : IInvocationCreationContributor
 	{
 		private readonly Type delegateType;
 		private readonly MetaMethod method;

src/Castle.Core/DynamicProxy/Contributors/InvocationWithGenericDelegateContributor.cs

@@ -25,7 +25,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Internal;
 	using Castle.DynamicProxy.Tokens;
 
-	public class InvocationWithGenericDelegateContributor : IInvocationCreationContributor
+	internal class InvocationWithGenericDelegateContributor : IInvocationCreationContributor
 	{
 		private readonly Type delegateType;
 		private readonly MetaMethod method;

src/Castle.Core/DynamicProxy/Contributors/MembersCollector.cs

@@ -23,7 +23,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators;
 	using Castle.DynamicProxy.Internal;
 
-	public abstract class MembersCollector
+	internal abstract class MembersCollector
 	{
 		private const BindingFlags Flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
 		private ILogger logger = NullLogger.Instance;

src/Castle.Core/DynamicProxy/Contributors/MinimialisticMethodGenerator.cs

@@ -20,7 +20,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters;
 	using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
 
-	public class MinimialisticMethodGenerator : MethodGenerator
+	internal class MinimialisticMethodGenerator : MethodGenerator
 	{
 		public MinimialisticMethodGenerator(MetaMethod method, OverrideMethodDelegate overrideMethod)
 			: base(method, overrideMethod)

src/Castle.Core/DynamicProxy/Contributors/MixinContributor.cs

@@ -24,7 +24,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
 	using Castle.DynamicProxy.Internal;
 
-	public class MixinContributor : CompositeTypeContributor
+	internal class MixinContributor : CompositeTypeContributor
 	{
 		private readonly bool canChangeTarget;
 		private readonly IList<Type> empty = new List<Type>();

src/Castle.Core/DynamicProxy/Contributors/OptionallyForwardingMethodGenerator.cs

@@ -21,7 +21,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters;
 	using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
 
-	public class OptionallyForwardingMethodGenerator : MethodGenerator
+	internal class OptionallyForwardingMethodGenerator : MethodGenerator
 	{
 		// TODO: This class largely duplicates code from Forwarding and Minimalistic generators. Should be refactored to change that
 		private readonly GetTargetReferenceDelegate getTargetReference;

src/Castle.Core/DynamicProxy/Contributors/ProxyInstanceContributor.cs

@@ -30,7 +30,7 @@ namespace Castle.DynamicProxy.Contributors
 #endif
 	using Castle.DynamicProxy.Tokens;
 
-	public abstract class ProxyInstanceContributor : ITypeContributor
+	internal abstract class ProxyInstanceContributor : ITypeContributor
 	{
 		protected readonly Type targetType;
 		private readonly string proxyTypeId;

src/Castle.Core/DynamicProxy/Contributors/WrappedClassMembersCollector.cs

@@ -22,7 +22,7 @@ namespace Castle.DynamicProxy.Contributors
 	using Castle.DynamicProxy.Generators.Emitters;
 	using Castle.DynamicProxy.Internal;
 
-	public class WrappedClassMembersCollector : ClassMembersCollector
+	internal class WrappedClassMembersCollector : ClassMembersCollector
 	{
 		public WrappedClassMembersCollector(Type type) : base(type)
 		{

src/Castle.Core/DynamicProxy/Generators/BaseProxyGenerator.cs

@@ -35,7 +35,7 @@ namespace Castle.DynamicProxy.Generators
 	///   Base class that exposes the common functionalities
 	///   to proxy generation.
 	/// </summary>
-	public abstract class BaseProxyGenerator
+	internal abstract class BaseProxyGenerator
 	{
 		protected readonly Type targetType;
 		private readonly ModuleScope scope;

src/Castle.Core/DynamicProxy/Generators/ClassProxyGenerator.cs

@@ -25,7 +25,7 @@ namespace Castle.DynamicProxy.Generators
 	using Castle.DynamicProxy.Internal;
 	using Castle.DynamicProxy.Serialization;
 
-	public class ClassProxyGenerator : BaseProxyGenerator
+	internal class ClassProxyGenerator : BaseProxyGenerator
 	{
 		public ClassProxyGenerator(ModuleScope scope, Type targetType) : base(scope, targetType)
 		{

src/Castle.Core/DynamicProxy/Generators/ClassProxyWithTargetGenerator.cs

@@ -28,7 +28,7 @@ namespace Castle.DynamicProxy.Generators
 	using Castle.DynamicProxy.Internal;
 	using Castle.DynamicProxy.Serialization;
 
-	public class ClassProxyWithTargetGenerator : BaseProxyGenerator
+	internal class ClassProxyWithTargetGenerator : BaseProxyGenerator
 	{
 		private readonly Type[] additionalInterfacesToProxy;
 

src/Castle.Core/DynamicProxy/Generators/CompositionInvocationTypeGenerator.cs

@@ -22,7 +22,7 @@ namespace Castle.DynamicProxy.Generators
 	using Castle.DynamicProxy.Internal;
 	using Castle.DynamicProxy.Tokens;
 
-	public class CompositionInvocationTypeGenerator : InvocationTypeGenerator
+	internal class CompositionInvocationTypeGenerator : InvocationTypeGenerator
 	{
 		public static readonly Type BaseType = typeof(CompositionInvocation);