Added AOT compatibility to assembly and dependency context DI extensions.

prochnowc · prochnowc · commit cf881fdbbe4d · 2025-06-20T08:18:39.000+02:00
diff --git a/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions/AssemblyReflectionBuilderExtensions.cs b/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions/AssemblyReflectionBuilderExtensions.cs
@@ -2,6 +2,7 @@
 // Copyright (c) The AppCore .NET project.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using AppCoreNet.Diagnostics;
 using AppCoreNet.Extensions.DependencyInjection.Facilities;
 
@@ -10,6 +11,7 @@ namespace AppCoreNet.Extensions.DependencyInjection;
 /// <summary>
 /// Provides extension methods to resolve service descriptors and facilities by reflection.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover services.")]
 public static class AssemblyReflectionBuilderExtensions
 {
     /// <summary>
@@ -33,12 +35,21 @@ public static IServiceDescriptorReflectionBuilder Assemblies(
     /// Adds service descriptors from the calling assembly by reflection.
     /// </summary>
     /// <param name="builder">The <see cref="IServiceDescriptorReflectionBuilder"/>.</param>
+    /// <param name="configure">The delegate to configure the <see cref="AssemblyResolver"/>.</param>
     /// <returns>The <see cref="IServiceDescriptorReflectionBuilder"/> to allow chaining.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> is <c>null</c>. </exception>
-    public static IServiceDescriptorReflectionBuilder Assembly(this IServiceDescriptorReflectionBuilder builder)
+    public static IServiceDescriptorReflectionBuilder Assembly(
+        this IServiceDescriptorReflectionBuilder builder,
+        Action<AssemblyServiceDescriptorResolver>? configure = null)
     {
         var assembly = System.Reflection.Assembly.GetCallingAssembly();
-        return Assemblies(builder, c => c.Add(assembly));
+        return Assemblies(
+            builder,
+            c =>
+            {
+                c.Add(assembly);
+                configure?.Invoke(c);
+            });
     }
 
     /// <summary>
@@ -67,10 +78,14 @@ public static IFacilityReflectionBuilder Assemblies(
     /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> or <paramref name="configure"/> is <c>null</c>. </exception>
     public static IFacilityReflectionBuilder Assembly(
         this IFacilityReflectionBuilder builder,
-        Action<AssemblyResolver> configure)
+        Action<AssemblyResolver>? configure = null)
     {
         var assembly = System.Reflection.Assembly.GetCallingAssembly();
-        return Assemblies(builder, c => c.Add(assembly));
+        return Assemblies(builder, c =>
+        {
+            c.Add(assembly);
+            configure?.Invoke(c);
+        });
     }
 
     /// <summary>
@@ -99,9 +114,13 @@ public static IFacilityExtensionReflectionBuilder Assemblies(
     /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> or <paramref name="configure"/> is <c>null</c>. </exception>
     public static IFacilityExtensionReflectionBuilder Assembly(
         this IFacilityExtensionReflectionBuilder builder,
-        Action<AssemblyResolver> configure)
+        Action<AssemblyResolver>? configure = null)
     {
         var assembly = System.Reflection.Assembly.GetCallingAssembly();
-        return Assemblies(builder, c => c.Add(assembly));
+        return Assemblies(builder, c =>
+        {
+            c.Add(assembly);
+            configure?.Invoke(c);
+        });
     }
 }
diff --git a/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions/AssemblyScanner.cs b/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions/AssemblyScanner.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using AppCoreNet.Diagnostics;
@@ -12,6 +13,7 @@ namespace AppCoreNet.Extensions.DependencyInjection;
 /// <summary>
 /// Represents a type used to scan assemblies for exported types.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover types.")]
 public class AssemblyScanner
 {
     private static readonly List<string> _defaultExcludedAssemblies =
diff --git a/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions/AssemblyServiceDescriptorResolver.cs b/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions/AssemblyServiceDescriptorResolver.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using AppCoreNet.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
@@ -12,6 +13,7 @@ namespace AppCoreNet.Extensions.DependencyInjection;
 /// <summary>
 /// Builds an <see cref="IEnumerable{T}"/> of <see cref="ServiceDescriptor"/> by scanning assemblies.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover services.")]
 public class AssemblyServiceDescriptorResolver : IServiceDescriptorResolver
 {
     private readonly List<Assembly> _assemblies = new();
diff --git a/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions/Facilities/AssemblyResolver.cs b/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions/Facilities/AssemblyResolver.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using AppCoreNet.Diagnostics;
@@ -13,6 +14,7 @@ namespace AppCoreNet.Extensions.DependencyInjection.Facilities;
 /// <summary>
 /// Builds an <see cref="IEnumerable{T}"/> of <see cref="IFacility"/> by scanning assemblies.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover types.")]
 public class AssemblyResolver : IFacilityResolver, IFacilityExtensionResolver
 {
     private readonly IActivator _activator;
@@ -120,24 +122,12 @@ IEnumerable<IFacility> IFacilityResolver.Resolve()
                       .Select(facilityType => (IFacility)_activator.CreateInstance(facilityType)!);
     }
 
-    private IFacilityExtension<IFacility> CreateExtension(Type extensionType)
-    {
-        Type contractType = extensionType.GetInterfaces()
-                                         .First(i => i.GetGenericTypeDefinition() == typeof(IFacilityExtension<>))
-                                         .GenericTypeArguments[0];
-
-        Type extensionWrapperType = typeof(FacilityExtensionWrapper<>).MakeGenericType(contractType);
-        object extension = _activator.CreateInstance(extensionType)!;
-
-        return (IFacilityExtension<IFacility>)System.Activator.CreateInstance(extensionWrapperType, extension)!;
-    }
-
     /// <inheritdoc />
-    IEnumerable<IFacilityExtension<IFacility>> IFacilityExtensionResolver.Resolve(Type facilityType)
+    IEnumerable<IFacilityExtension> IFacilityExtensionResolver.Resolve(Type facilityType)
     {
         Ensure.Arg.NotNull(facilityType);
 
-        var scanner = new AssemblyScanner(typeof(IFacilityExtension<>).MakeGenericType(facilityType), _assemblies)
+        var scanner = new AssemblyScanner(typeof(IFacilityExtension<>), _assemblies)
         {
             IncludePrivateTypes = _withPrivateTypes,
         };
@@ -149,6 +139,18 @@ IEnumerable<IFacilityExtension<IFacility>> IFacilityExtensionResolver.Resolve(Ty
             scanner.Filters.Add(filter);
 
         return scanner.ScanAssemblies()
-                      .Select(CreateExtension);
+                      .Where(t => IsCompatibleExtensionType(t, facilityType))
+                      .Select(t => (IFacilityExtension)_activator.CreateInstance(t)!);
+
+        static bool IsCompatibleExtensionType(Type extensionType, Type facilityType)
+        {
+            IEnumerable<Type> extensionInterfaces =
+                extensionType.GetInterfaces()
+                             .Where(t => t.IsGenericType
+                                         && t.GetGenericTypeDefinition() == typeof(IFacilityExtension<>));
+
+            IEnumerable<Type> extendedFacilityTypes = extensionInterfaces.Select(t => t.GenericTypeArguments[0]);
+            return extendedFacilityTypes.Any(t => t.IsAssignableFrom(facilityType));
+        }
     }
 }
diff --git a/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions/Facilities/FacilityExtensionWrapper.cs b/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.AssemblyExtensions/Facilities/FacilityExtensionWrapper.cs
diff --git a/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.DependencyModelExtensions/DependencyContextReflectionBuilderExtensions.cs b/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.DependencyModelExtensions/DependencyContextReflectionBuilderExtensions.cs
@@ -2,6 +2,7 @@
 // Copyright (c) The AppCore .NET project.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using AppCoreNet.Diagnostics;
 using AppCoreNet.Extensions.DependencyInjection.Facilities;
 using DependencyModel = Microsoft.Extensions.DependencyModel;
@@ -11,8 +12,13 @@ namespace AppCoreNet.Extensions.DependencyInjection;
 /// <summary>
 /// Provides extension methods to resolve service descriptors and facilities by reflection.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover services.")]
 public static class DependencyContextReflectionBuilderExtensions
 {
+    private const string RequiresAssemblyFilesMessage =
+        "DependencyContext for an assembly from a application published as single-file is not supported.";
+
+    [RequiresAssemblyFiles(RequiresAssemblyFilesMessage)]
     private static DependencyModel.DependencyContext ResolveDependencyContext(DependencyModel.DependencyContext? context)
     {
         context ??= DependencyModel.DependencyContext.Default;
@@ -33,6 +39,7 @@ private static DependencyModel.DependencyContext ResolveDependencyContext(Depend
     /// <param name="configure">The delegate to configure the <see cref="DependencyContextServiceDescriptorResolver"/>.</param>
     /// <returns>The <see cref="IServiceDescriptorReflectionBuilder"/> to allow chaining.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> is <c>null</c>. </exception>
+    [RequiresAssemblyFiles(RequiresAssemblyFilesMessage)]
     public static IServiceDescriptorReflectionBuilder DependencyContext(
         this IServiceDescriptorReflectionBuilder builder,
         Action<DependencyContextServiceDescriptorResolver> configure)
@@ -51,6 +58,7 @@ public static IServiceDescriptorReflectionBuilder DependencyContext(
     /// <param name="configure">The delegate to configure the <see cref="DependencyContextServiceDescriptorResolver"/>.</param>
     /// <returns>The <see cref="IServiceDescriptorReflectionBuilder"/> to allow chaining.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> is <c>null</c>. </exception>
+    [RequiresAssemblyFiles(RequiresAssemblyFilesMessage)]
     public static IServiceDescriptorReflectionBuilder DependencyContext(
         this IServiceDescriptorReflectionBuilder builder,
         DependencyModel.DependencyContext? context = null,
@@ -74,6 +82,7 @@ public static IServiceDescriptorReflectionBuilder DependencyContext(
     /// <param name="configure">The delegate to configure the <see cref="DependencyContextResolver"/>.</param>
     /// <returns>The <see cref="IServiceDescriptorReflectionBuilder"/> to allow chaining.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> or <paramref name="configure"/> is <c>null</c>. </exception>
+    [RequiresAssemblyFiles(RequiresAssemblyFilesMessage)]
     public static IFacilityReflectionBuilder DependencyContext(
         this IFacilityReflectionBuilder builder,
         Action<DependencyContextResolver> configure)
@@ -92,6 +101,7 @@ public static IFacilityReflectionBuilder DependencyContext(
     /// <param name="configure">The delegate to configure the <see cref="DependencyContextResolver"/>.</param>
     /// <returns>The <see cref="IServiceDescriptorReflectionBuilder"/> to allow chaining.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> or <paramref name="configure"/> is <c>null</c>. </exception>
+    [RequiresAssemblyFiles(RequiresAssemblyFilesMessage)]
     public static IFacilityReflectionBuilder DependencyContext(
         this IFacilityReflectionBuilder builder,
         DependencyModel.DependencyContext? context = null,
@@ -115,6 +125,7 @@ public static IFacilityReflectionBuilder DependencyContext(
     /// <param name="configure">The delegate to configure the <see cref="DependencyContextResolver"/>.</param>
     /// <returns>The <see cref="IFacilityExtensionReflectionBuilder"/> to allow chaining.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> or <paramref name="configure"/> is <c>null</c>. </exception>
+    [RequiresAssemblyFiles(RequiresAssemblyFilesMessage)]
     public static IFacilityExtensionReflectionBuilder DependencyContext(
         this IFacilityExtensionReflectionBuilder builder,
         Action<DependencyContextResolver> configure)
@@ -134,6 +145,7 @@ public static IFacilityExtensionReflectionBuilder DependencyContext(
     /// <returns>The <see cref="IFacilityExtensionReflectionBuilder"/> to allow chaining.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> or <paramref name="configure"/> is <c>null</c>.</exception>
     /// <exception cref="NotSupportedException">Argument <paramref name="context"/> is <c>null</c> and no default DependencyContext was available.</exception>
+    [RequiresAssemblyFiles(RequiresAssemblyFilesMessage)]
     public static IFacilityExtensionReflectionBuilder DependencyContext(
         this IFacilityExtensionReflectionBuilder builder,
         DependencyModel.DependencyContext? context = null,
diff --git a/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.DependencyModelExtensions/DependencyContextServiceDescriptorResolver.cs b/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.DependencyModelExtensions/DependencyContextServiceDescriptorResolver.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using AppCoreNet.Diagnostics;
@@ -15,6 +16,7 @@ namespace AppCoreNet.Extensions.DependencyInjection;
 /// Builds an <see cref="IEnumerable{T}"/> of <see cref="ServiceDescriptor"/> by scanning assemblies in a
 /// <see cref="DependencyContext"/>.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover services.")]
 public class DependencyContextServiceDescriptorResolver : IServiceDescriptorResolver
 {
     private readonly AssemblyServiceDescriptorResolver _source;
diff --git a/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.DependencyModelExtensions/Facilities/DependencyContextResolver.cs b/DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.DependencyModelExtensions/Facilities/DependencyContextResolver.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using AppCoreNet.Diagnostics;
@@ -16,6 +17,7 @@ namespace AppCoreNet.Extensions.DependencyInjection.Facilities;
 /// Builds an <see cref="IEnumerable{T}"/> of <see cref="IFacility"/> by scanning assemblies in a
 /// <see cref="DependencyContext"/>.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover services.")]
 public class DependencyContextResolver : IFacilityResolver, IFacilityExtensionResolver
 {
     private readonly AssemblyResolver _resolver;
@@ -97,7 +99,7 @@ IEnumerable<IFacility> IFacilityResolver.Resolve()
     }
 
     /// <inheritdoc />
-    IEnumerable<IFacilityExtension<IFacility>> IFacilityExtensionResolver.Resolve(Type facilityType)
+    IEnumerable<IFacilityExtension> IFacilityExtensionResolver.Resolve(Type facilityType)
     {
         return ((IFacilityExtensionResolver)_resolver).Resolve(facilityType);
     }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Generic;`
	`6`	`+using System.Diagnostics.CodeAnalysis;`
`6`	`7`	`using System.Linq;`
`7`	`8`	`using System.Reflection;`
`8`	`9`	`using AppCoreNet.Diagnostics;`
`@@ -16,6 +17,7 @@ namespace AppCoreNet.Extensions.DependencyInjection.Facilities;`
`16`	`17`	`/// Builds an <see cref="IEnumerable{T}"/> of <see cref="IFacility"/> by scanning assemblies in a`
`17`	`18`	`/// <see cref="DependencyContext"/>.`
`18`	`19`	`/// </summary>`
	`20`	`+[RequiresUnreferencedCode("Uses reflection to discover services.")]`
`19`	`21`	`public class DependencyContextResolver : IFacilityResolver, IFacilityExtensionResolver`
`20`	`22`	`{`
`21`	`23`	`private readonly AssemblyResolver _resolver;`
`@@ -97,7 +99,7 @@ IEnumerable<IFacility> IFacilityResolver.Resolve()`
`97`	`99`	`}`
`98`	`100`
`99`	`101`	`/// <inheritdoc />`
`100`		`- IEnumerable<IFacilityExtension<IFacility>> IFacilityExtensionResolver.Resolve(Type facilityType)`
	`102`	`+ IEnumerable<IFacilityExtension> IFacilityExtensionResolver.Resolve(Type facilityType)`
`101`	`103`	`{`
`102`	`104`	`return ((IFacilityExtensionResolver)_resolver).Resolve(facilityType);`
`103`	`105`	`}`