Added overloads with optional parameters to DepdencyContext resolvers.

Author: prochnowc

DependencyInjection/src/AppCore.Extensions.DependencyInjection.DependencyModelExtensions/DependencyContextReflectionBuilderExtensions.cs

@@ -6,6 +6,7 @@
 using AppCore.Diagnostics;
 using AppCore.Extensions.DependencyInjection;
 using AppCore.Extensions.DependencyInjection.Facilities;
+using Microsoft.Extensions.DependencyModel;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection;
@@ -24,14 +25,36 @@ public static class DependencyContextReflectionBuilderExtensions
     /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> is <c>null</c>. </exception>
     public static IServiceDescriptorReflectionBuilder DependencyContext(
         this IServiceDescriptorReflectionBuilder builder,
-        Action<DependencyContextServiceDescriptorResolver>? configure = null)
+        Action<DependencyContextServiceDescriptorResolver> configure)
     {
         Ensure.Arg.NotNull(builder);
         Ensure.Arg.NotNull(configure);
 
         return builder.AddResolver(configure);
     }
 
+    /// <summary>
+    /// Adds service descriptors by reflection.
+    /// </summary>
+    /// <param name="builder">The <see cref="IServiceDescriptorReflectionBuilder"/>.</param>
+    /// <param name="context">The <see cref="DependencyModel.DependencyContext"/> to search for service descriptors.</param>
+    /// <param name="configure">The delegate to configure the <see cref="DependencyContextServiceDescriptorResolver"/>.</param>
+    /// <returns>The <see cref="IServiceDescriptorReflectionBuilder"/>.</returns>
+    /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> is <c>null</c>. </exception>
+    public static IServiceDescriptorReflectionBuilder DependencyContext(
+        this IServiceDescriptorReflectionBuilder builder,
+        DependencyContext? context = null,
+        Action<DependencyContextServiceDescriptorResolver>? configure = null)
+    {
+        return DependencyContext(
+            builder,
+            c =>
+            {
+                c.Add(context ?? DependencyModel.DependencyContext.Default);
+                configure?.Invoke(c);
+            });
+    }
+
     /// <summary>
     /// Adds facilities by reflection.
     /// </summary>
@@ -49,6 +72,28 @@ public static IFacilityReflectionBuilder DependencyContext(
         return builder.AddResolver(configure);
     }
 
+    /// <summary>
+    /// Adds facilities by reflection.
+    /// </summary>
+    /// <param name="builder">The <see cref="IFacilityReflectionBuilder"/>.</param>
+    /// <param name="context">The <see cref="DependencyModel.DependencyContext"/> to search for facilities.</param>
+    /// <param name="configure">The delegate to configure the <see cref="DependencyContextResolver"/>.</param>
+    /// <returns>The <see cref="IServiceDescriptorReflectionBuilder"/>.</returns>
+    /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> or <paramref name="configure"/> is <c>null</c>. </exception>
+    public static IFacilityReflectionBuilder DependencyContext(
+        this IFacilityReflectionBuilder builder,
+        DependencyContext? context = null,
+        Action<DependencyContextResolver>? configure = null)
+    {
+        return DependencyContext(
+            builder,
+            c =>
+            {
+                c.Add(context ?? DependencyModel.DependencyContext.Default);
+                configure?.Invoke(c);
+            });
+    }
+
     /// <summary>
     /// Adds facility extensions by reflection.
     /// </summary>
@@ -65,4 +110,26 @@ public static IFacilityExtensionReflectionBuilder DependencyContext(
 
         return builder.AddResolver(configure);
     }
+
+    /// <summary>
+    /// Adds facility extensions by reflection.
+    /// </summary>
+    /// <param name="builder">The <see cref="IFacilityExtensionReflectionBuilder"/>.</param>
+    /// <param name="context">The <see cref="DependencyModel.DependencyContext"/> to search for facilities.</param>
+    /// <param name="configure">The delegate to configure the <see cref="DependencyContextResolver"/>.</param>
+    /// <returns>The <see cref="IFacilityExtensionReflectionBuilder"/>.</returns>
+    /// <exception cref="ArgumentNullException">Argument <paramref name="builder"/> or <paramref name="configure"/> is <c>null</c>. </exception>
+    public static IFacilityExtensionReflectionBuilder DependencyContext(
+        this IFacilityExtensionReflectionBuilder builder,
+        DependencyContext? context = null,
+        Action<DependencyContextResolver>? configure = null)
+    {
+        return DependencyContext(
+            builder,
+            c =>
+            {
+                c.Add(context ?? DependencyModel.DependencyContext.Default);
+                configure?.Invoke(c);
+            });
+    }
 }

DependencyInjection/src/AppCore.Extensions.DependencyInjection.DependencyModelExtensions/Facilities/DependencyContextResolver.cs

@@ -45,7 +45,7 @@ public DependencyContextResolver WithPrivateTypes(bool value = true)
     /// </summary>
     /// <param name="dependencyContext">The <see cref="DependencyContext"/>.</param>
     /// <returns>The <see cref="DependencyContextResolver"/>.</returns>
-    public DependencyContextResolver From(DependencyContext dependencyContext)
+    public DependencyContextResolver Add(DependencyContext dependencyContext)
     {
         Ensure.Arg.NotNull(dependencyContext);