Added AOT attributes to plugins.

Author: prochnowc

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins.AspNetCore.Mvc/AppCoreNet.Extensions.Hosting.Plugins.AspNetCore.Mvc.csproj

@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Description>Provides MVC plugin extensions to the Microsoft.Extensions.Hosting framework.</Description>
+    <!-- Without this, ILLink analyzers are not added, even though 'IsAotComptabile' is set in the parent 'Directory.Build.props' -->
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,4 +15,10 @@
     <ProjectReference Include="..\AppCoreNet.Extensions.Hosting.Plugins\AppCoreNet.Extensions.Hosting.Plugins.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\..\DependencyInjection\src\AppCoreNet.Extensions.DependencyInjection.Abstractions\ServiceCollectionServiceProvider.cs">
+      <Link>ServiceCollectionServiceProvider.cs</Link>
+    </Compile>
+  </ItemGroup>
+
 </Project>

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins.AspNetCore.Mvc/PluginsMvcBuilderExtensions.cs

@@ -2,6 +2,7 @@
 // Copyright (c) The AppCore .NET project.
 
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using AppCoreNet.Diagnostics;
 using AppCoreNet.Extensions.Hosting.Plugins;
@@ -14,6 +15,8 @@ namespace AppCoreNet.Extensions.DependencyInjection;
 /// <summary>
 /// Provides extension methods to register plugins with MVC.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover services.")]
+[RequiresDynamicCode("Creates the generic plugin service collection.")]
 public static class PluginsMvcBuilderExtensions
 {
     private static void AddApplicationParts(ApplicationPartManager manager, Assembly assembly)

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins.AspNetCore.Mvc/ServiceCollectionServiceProvider.cs

@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Description>Provides plugin extensions to the Microsoft.Extensions.Hosting framework.</Description>
+    <!-- Without this, ILLink analyzers are not added, even though 'IsAotComptabile' is set in the parent 'Directory.Build.props' -->
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins/AppCoreNet.Extensions.Hosting.Plugins.csproj

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using AppCoreNet.Diagnostics;
 using AppCoreNet.Extensions.Hosting.Plugins;
@@ -13,6 +14,7 @@ namespace AppCoreNet.Extensions.DependencyInjection.Facilities;
 /// <summary>
 /// Builds an <see cref="IEnumerable{T}"/> of <see cref="IFacility"/> by scanning plugin assemblies.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover types.")]
 public class PluginFacilityResolver : IFacilityResolver, IFacilityExtensionResolver
 {
     private readonly IPluginManager _pluginManager;
@@ -36,30 +38,28 @@ IEnumerable<IFacility> IFacilityResolver.Resolve()
         }
     }
 
-    private IFacilityExtension<IFacility> CreateExtension(IPluginService<object> pluginService)
-    {
-        Type extensionType = pluginService.GetType()
-                                          .GetInterfaces()
-                                          .First(i => i.GetGenericTypeDefinition() == typeof(IPluginService<>))
-                                          .GenericTypeArguments[0];
-
-        Type contractType = extensionType.GenericTypeArguments[0];
-        Type extensionWrapperType = typeof(FacilityExtensionWrapper<>).MakeGenericType(contractType);
-
-        return (IFacilityExtension<IFacility>)System.Activator.CreateInstance(
-            extensionWrapperType,
-            pluginService.Instance)!;
-    }
-
     /// <inheritdoc />
-    IEnumerable<IFacilityExtension<IFacility>> IFacilityExtensionResolver.Resolve(Type facilityType)
+    IEnumerable<IFacilityExtension> IFacilityExtensionResolver.Resolve(Type facilityType)
     {
-        IPluginServiceCollection<object> services = _pluginManager.GetServices(
-            typeof(IFacilityExtension<>).MakeGenericType(facilityType));
+        IPluginServiceCollection<object> services = _pluginManager.GetServices(typeof(IFacilityExtension));
 
         foreach (IPluginService<object> service in services)
         {
-            yield return CreateExtension(service);
+            if (!IsCompatibleExtensionType(service.Instance.GetType(), facilityType))
+                continue;
+
+            yield return (IFacilityExtension)service.Instance;
+        }
+
+        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));
         }
     }
 }

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins/DependencyInjection/FacilityExtensionWrapper.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;
 
@@ -11,6 +12,7 @@ namespace AppCoreNet.Extensions.DependencyInjection;
 /// <summary>
 /// Provides extension methods to register services and facilities from plugins.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover types.")]
 public static class PluginReflectionBuilderExtensions
 {
     /// <summary>

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins/DependencyInjection/PluginFacilityResolver.cs

@@ -2,6 +2,7 @@
 // Copyright (c) The AppCore .NET project.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using AppCoreNet.Diagnostics;
 using AppCoreNet.Extensions.DependencyInjection.Activator;
 using AppCoreNet.Extensions.Hosting.Plugins;
@@ -15,6 +16,8 @@ namespace AppCoreNet.Extensions.DependencyInjection;
 /// <summary>
 /// Provides extension methods to register plugins.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover services.")]
+[RequiresDynamicCode("Creates the generic plugin service collection.")]
 public static class PluginServiceCollectionExtensions
 {
     private static readonly object _pluginManagerFactorySyncRoot = new();

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins/DependencyInjection/PluginReflectionBuilderExtensions.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using AppCoreNet.Diagnostics;
 using AppCoreNet.Extensions.Hosting.Plugins;
@@ -15,6 +16,7 @@ namespace AppCoreNet.Extensions.DependencyInjection;
 /// <summary>
 /// Builds an <see cref="IEnumerable{T}"/> of <see cref="ServiceDescriptor"/> by scanning plugin assemblies.
 /// </summary>
+[RequiresUnreferencedCode("Uses reflection to discover services.")]
 public class PluginServiceDescriptorResolver : IServiceDescriptorResolver
 {
     private readonly List<Predicate<Type>> _filters = new();

Hosting/src/AppCoreNet.Extensions.Hosting.Plugins/DependencyInjection/PluginServiceCollectionExtensions.cs

@@ -5,6 +5,7 @@
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using AppCoreNet.Diagnostics;
@@ -15,6 +16,8 @@
 
 namespace AppCoreNet.Extensions.Hosting.Plugins;
 
+[RequiresUnreferencedCode("Uses reflection to discover services.")]
+[RequiresDynamicCode("Dynamically creates generic types.")]
 internal sealed class Plugin : IPlugin, IServiceProviderIsService
 {
     private readonly IActivator _activator;