Added AOT compatibility to facilities.

Author: prochnowc

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/Facilities/FacilityBuilder.cs

@@ -2,7 +2,7 @@
 // Copyright (c) The AppCore .NET project.
 
 using System;
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 using AppCoreNet.Diagnostics;
 using AppCoreNet.Extensions.DependencyInjection.Activator;
 using Microsoft.Extensions.DependencyInjection;
@@ -12,7 +12,7 @@ namespace AppCoreNet.Extensions.DependencyInjection.Facilities;
 /// <summary>
 /// Provides a builder for facilities.
 /// </summary>
-public class FacilityBuilder
+public sealed class FacilityBuilder
 {
     /// <summary>
     /// Gets the <see cref="IServiceCollection"/>.
@@ -36,35 +36,23 @@ internal FacilityBuilder(IServiceCollection services, IActivator activator, Type
         FacilityType = 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)!;
-    }
-
     /// <summary>
     /// Adds an extension to the facility.
     /// </summary>
     /// <remarks>
-    /// The type <paramref name="extensionType"/> must implement <see cref="IFacilityExtension{T}"/> with the
-    /// type of the facility.
+    /// The type <paramref name="extensionType"/> must implement <see cref="IFacilityExtension"/>.
     /// </remarks>
     /// <param name="extensionType">The type of the extension.</param>
     /// <returns>The <see cref="FacilityBuilder"/> to allow chaining.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="extensionType"/> is null.</exception>
-    /// <exception cref="ArgumentException">Argument <paramref name="extensionType"/> does not implement <see cref="IFacilityExtension{T}"/> with the type of the facility.</exception>
-    public FacilityBuilder AddExtension(Type extensionType)
+    /// <exception cref="ArgumentException">Argument <paramref name="extensionType"/> does not implement <see cref="IFacilityExtension"/> with the type of the facility.</exception>
+    public FacilityBuilder AddExtension(
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type extensionType)
     {
         Ensure.Arg.NotNull(extensionType);
-        Ensure.Arg.OfType(extensionType, typeof(IFacilityExtension<>).MakeGenericType(FacilityType));
+        Ensure.Arg.OfType<IFacilityExtension>(extensionType);
 
-        IFacilityExtension<IFacility> extension = CreateExtension(extensionType);
+        var extension = (IFacilityExtension)Activator.CreateInstance(extensionType)!;
         extension.ConfigureServices(Services);
         return this;
     }
@@ -82,7 +70,7 @@ public FacilityBuilder AddExtensionsFrom(Action<IFacilityExtensionReflectionBuil
         var reflectionBuilder = new FacilityExtensionReflectionBuilder(Activator);
         configure(reflectionBuilder);
 
-        foreach (IFacilityExtension<IFacility> extension in reflectionBuilder.Resolve(FacilityType))
+        foreach (IFacilityExtension extension in reflectionBuilder.Resolve(FacilityType))
         {
             extension.ConfigureServices(Services);
         }

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/Facilities/FacilityBuilder{T}.cs

@@ -2,7 +2,7 @@
 // Copyright (c) The AppCore .NET project.
 
 using System;
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 using AppCoreNet.Diagnostics;
 using AppCoreNet.Extensions.DependencyInjection.Activator;
 using Microsoft.Extensions.DependencyInjection;
@@ -13,12 +13,23 @@ namespace AppCoreNet.Extensions.DependencyInjection.Facilities;
 /// Provides a builder for facilities.
 /// </summary>
 /// <typeparam name="T">The type of the facility.</typeparam>
-public sealed class FacilityBuilder<T> : FacilityBuilder
+public sealed class FacilityBuilder<T>
     where T : IFacility
 {
+    /// <summary>
+    /// Gets the <see cref="IServiceCollection"/>.
+    /// </summary>
+    public IServiceCollection Services { get; }
+
+    /// <summary>
+    /// Gets the <see cref="IActivator"/>.
+    /// </summary>
+    public IActivator Activator { get; }
+
     internal FacilityBuilder(IServiceCollection services, IActivator activator)
-        : base(services, activator, typeof(T))
     {
+        Services = services;
+        Activator = activator;
     }
 
     /// <summary>
@@ -32,9 +43,13 @@ internal FacilityBuilder(IServiceCollection services, IActivator activator)
     /// <returns>The <see cref="FacilityBuilder{T}"/> to allow chaining.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="extensionType"/> is null.</exception>
     /// <exception cref="ArgumentException">Argument <paramref name="extensionType"/> does not implement <see cref="IFacilityExtension{T}"/> with the type of the facility.</exception>
-    public new FacilityBuilder<T> AddExtension(Type extensionType)
+    public FacilityBuilder<T> AddExtension(
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type extensionType)
     {
-        base.AddExtension(extensionType);
+        Ensure.Arg.OfType<IFacilityExtension<T>>(extensionType);
+
+        var extension = (IFacilityExtension<T>)Activator.CreateInstance(extensionType)!;
+        extension.ConfigureServices(Services);
         return this;
     }
 
@@ -43,7 +58,8 @@ internal FacilityBuilder(IServiceCollection services, IActivator activator)
     /// </summary>
     /// <typeparam name="TExtension">The type of the extension.</typeparam>
     /// <returns>The <see cref="FacilityBuilder{T}"/> to allow chaining.</returns>
-    public FacilityBuilder<T> AddExtension<TExtension>()
+    public FacilityBuilder<T> AddExtension<
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TExtension>()
         where TExtension : class, IFacilityExtension<T>
     {
         IFacilityExtension<T> extension = Activator.CreateInstance<TExtension>()!;
@@ -65,14 +81,24 @@ public FacilityBuilder<T> AddExtension(IFacilityExtension<T> extension)
     }
 
     /// <summary>
-    /// Adds facility extensions using a <see cref="IFacilityExtensionReflectionBuilder"/> to the <see cref="IServiceCollection"/>.
+    /// Adds facility extensions using a <see cref="IFacilityExtensionReflectionBuilder"/> to the
+    /// <see cref="IServiceCollection"/>.
     /// </summary>
     /// <param name="configure">The delegate used to configure the facility extension resolvers.</param>
     /// <returns>The <see cref="FacilityBuilder{T}"/>.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="configure"/> is null.</exception>
-    public new FacilityBuilder<T> AddExtensionsFrom(Action<IFacilityExtensionReflectionBuilder> configure)
+    public FacilityBuilder<T> AddExtensionsFrom(Action<IFacilityExtensionReflectionBuilder> configure)
     {
-        base.AddExtensionsFrom(configure);
+        Ensure.Arg.NotNull(configure);
+
+        var reflectionBuilder = new FacilityExtensionReflectionBuilder(Activator);
+        configure(reflectionBuilder);
+
+        foreach (IFacilityExtension extension in reflectionBuilder.Resolve(typeof(T)))
+        {
+            extension.ConfigureServices(Services);
+        }
+
         return this;
     }
 }

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/Facilities/FacilityExtensionReflectionBuilder.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using AppCoreNet.Diagnostics;
 using AppCoreNet.Extensions.DependencyInjection.Activator;
@@ -26,21 +27,18 @@ public IFacilityExtensionReflectionBuilder AddResolver(IFacilityExtensionResolve
         return this;
     }
 
-    public IFacilityExtensionReflectionBuilder AddResolver<T>(Action<T>? configure = null)
+    public IFacilityExtensionReflectionBuilder AddResolver<
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(Action<T>? configure = null)
         where T : IFacilityExtensionResolver
     {
         var resolver = _activator.CreateInstance<T>()!;
         configure?.Invoke(resolver);
         return AddResolver(resolver);
     }
 
-    public IReadOnlyCollection<IFacilityExtension<IFacility>> Resolve(Type facilityType)
+    public IReadOnlyCollection<IFacilityExtension> Resolve(Type facilityType)
     {
-        Type[] facilityTypes = facilityType.GetTypesAssignableFrom()
-                                           .Where(t => t.GetInterfaces().Contains(typeof(IFacility)))
-                                           .ToArray();
-
-        return _resolvers.SelectMany(s => facilityTypes.SelectMany(s.Resolve))
+        return _resolvers.SelectMany(s => s.Resolve(facilityType))
                          .ToList()
                          .AsReadOnly();
     }

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/Facilities/FacilityExtensionWrapper.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using AppCoreNet.Diagnostics;
 using AppCoreNet.Extensions.DependencyInjection.Activator;
@@ -28,7 +29,8 @@ public IFacilityReflectionBuilder AddResolver(IFacilityResolver resolver)
         return this;
     }
 
-    public IFacilityReflectionBuilder AddResolver<T>(Action<T>? configure = null)
+    public IFacilityReflectionBuilder AddResolver<
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(Action<T>? configure = null)
         where T : IFacilityResolver
     {
         var resolver = _activator.CreateInstance<T>()!;
@@ -43,7 +45,7 @@ public IFacilityReflectionBuilder AddExtensionsFrom(Action<IFacilityExtensionRef
         return this;
     }
 
-    public IReadOnlyCollection<(IFacility Facility, IReadOnlyCollection<IFacilityExtension<IFacility>>
+    public IReadOnlyCollection<(IFacility Facility, IReadOnlyCollection<IFacilityExtension>
         FacilityExtensions)> Resolve()
     {
         List<IFacility> facilities =
@@ -58,15 +60,15 @@ public IFacilityReflectionBuilder AddExtensionsFrom(Action<IFacilityExtensionRef
             _extensionsConfig(extensionReflectionBuilder);
         }
 
-        ReadOnlyCollection<IFacilityExtension<IFacility>> emptyFacilityExtensions =
-            new List<IFacilityExtension<IFacility>>().AsReadOnly();
+        ReadOnlyCollection<IFacilityExtension> emptyFacilityExtensions =
+            new List<IFacilityExtension>().AsReadOnly();
 
-        List<(IFacility Facility, IReadOnlyCollection<IFacilityExtension<IFacility>> FacilityExtensions)> result =
+        List<(IFacility Facility, IReadOnlyCollection<IFacilityExtension> FacilityExtensions)> result =
             new();
 
         foreach (IFacility facility in facilities)
         {
-            IReadOnlyCollection<IFacilityExtension<IFacility>> facilityExtensions =
+            IReadOnlyCollection<IFacilityExtension> facilityExtensions =
                 extensionReflectionBuilder?.Resolve(facility.GetType())
                 ?? emptyFacilityExtensions;
 

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/Facilities/FacilityReflectionBuilder.cs

@@ -8,13 +8,20 @@ namespace AppCoreNet.Extensions.DependencyInjection.Facilities;
 /// <summary>
 /// Represents an extension for a facility.
 /// </summary>
-/// <typeparam name="T">The type of the facility.</typeparam>
-public interface IFacilityExtension<in T>
-    where T : IFacility
+public interface IFacilityExtension
 {
     /// <summary>
     /// Must be implemented to register services with the <see cref="IServiceCollection"/>.
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection"/>.</param>
     void ConfigureServices(IServiceCollection services);
+}
+
+/// <summary>
+/// Represents an extension for a facility.
+/// </summary>
+/// <typeparam name="T">The type of the facility.</typeparam>
+public interface IFacilityExtension<in T> : IFacilityExtension
+    where T : IFacility
+{
 }

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/Facilities/IFacilityExtension.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 
 namespace AppCoreNet.Extensions.DependencyInjection.Facilities;
 
@@ -27,6 +28,7 @@ public interface IFacilityExtensionReflectionBuilder
     /// <param name="configure">The configuration delegate.</param>
     /// <returns>The <see cref="IFacilityExtensionReflectionBuilder"/> to allow chaining.</returns>
     [EditorBrowsable(EditorBrowsableState.Advanced)]
-    public IFacilityExtensionReflectionBuilder AddResolver<T>(Action<T>? configure = null)
+    public IFacilityExtensionReflectionBuilder AddResolver<
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(Action<T>? configure = null)
         where T : IFacilityExtensionResolver;
 }

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/Facilities/IFacilityExtensionReflectionBuilder.cs

@@ -17,5 +17,5 @@ public interface IFacilityExtensionResolver
     /// <param name="facilityType">The type of the facility.</param>
     /// <returns>The <see cref="IEnumerable{T}"/> of facility extensions.</returns>
     /// <exception cref="ArgumentNullException">Argument <paramref name="facilityType"/> is null.</exception>
-    IEnumerable<IFacilityExtension<IFacility>> Resolve(Type facilityType);
+    IEnumerable<IFacilityExtension> Resolve(Type facilityType);
 }

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/Facilities/IFacilityExtensionResolver.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 
 namespace AppCoreNet.Extensions.DependencyInjection.Facilities;
 
@@ -27,7 +28,8 @@ public interface IFacilityReflectionBuilder
     /// <param name="configure">The configuration delegate.</param>
     /// <returns>The <see cref="IFacilityReflectionBuilder"/> to allow chaining.</returns>
     [EditorBrowsable(EditorBrowsableState.Advanced)]
-    public IFacilityReflectionBuilder AddResolver<T>(Action<T>? configure = null)
+    public IFacilityReflectionBuilder AddResolver<
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(Action<T>? configure = null)
         where T : IFacilityResolver;
 
     /// <summary>

DependencyInjection/src/AppCoreNet.Extensions.DependencyInjection.Abstractions/Facilities/IFacilityReflectionBuilder.cs

@@ -104,14 +104,14 @@ public static IServiceCollection AddFacilitiesFrom(
 
         configure(builder);
 
-        IReadOnlyCollection<(IFacility Facility, IReadOnlyCollection<IFacilityExtension<IFacility>> FacilityExtensions)>
+        IReadOnlyCollection<(IFacility Facility, IReadOnlyCollection<IFacilityExtension> FacilityExtensions)>
             facilities = builder.Resolve();
 
-        foreach ((IFacility Facility, IReadOnlyCollection<IFacilityExtension<IFacility>> FacilityExtensions) item in facilities)
+        foreach ((IFacility Facility, IReadOnlyCollection<IFacilityExtension> FacilityExtensions) item in facilities)
         {
             item.Facility.ConfigureServices(services);
 
-            foreach (IFacilityExtension<IFacility> facilityExtension in item.FacilityExtensions)
+            foreach (IFacilityExtension facilityExtension in item.FacilityExtensions)
             {
                 facilityExtension.ConfigureServices(services);
             }