添加从IServiceCollection获取IHostBuilder的方法

Author: stratosblue

samples/UseHostSample/HostSampleModule.cs

@@ -22,6 +22,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var services = context.Services;
             var configure = services.GetConfiguration();
+            var hostBuilder = services.GetRequiredHostBuilder();
 
             Console.WriteLine($"Current User: {configure["USERNAME"] ?? configure["USER"]}");
         }

src/Cuture.Extensions.Modularity.Hosting/Extensions/IHostBuilder/InternalHostBuilderExtensions.cs

@@ -1,5 +1,7 @@
 using System;
 
+using Cuture.Extensions.Modularity.Internal;
+
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -50,21 +52,29 @@ internal static IHostBuilder InternalAddModuleSource(this IHostBuilder hostBuild
 
                 hostBuilder.ConfigureServices((context, services) =>
                 {
+                    services.AddObjectAccessor<IHostBuilderContainer>(new(hostBuilder));
                     services.AddObjectAccessor<IConfiguration>(context.Configuration);
 
-                    foreach (var item in loadContext.ModuleSources)
+                    try
                     {
-                        services.LoadModule(item.Key, item.Value);
-                    }
+                        foreach (var item in loadContext.ModuleSources)
+                        {
+                            services.LoadModule(item.Key, item.Value);
+                        }
+
+                        foreach (var item in loadContext.OptionActions)
+                        {
+                            services.OptionModuleLoadBuilder(item);
+                        }
 
-                    foreach (var item in loadContext.OptionActions)
+                        services.ModuleLoadComplete();
+                    }
+                    finally
                     {
-                        services.OptionModuleLoadBuilder(item);
+                        //TODO 不直接移除IConfiguration
+                        services.RemoveObjectAccessor<IConfiguration>();
+                        services.RemoveObjectAccessor<IHostBuilderContainer>();
                     }
-
-                    services.ModuleLoadComplete();
-
-                    services.RemoveObjectAccessor<IConfiguration>();
                 });
             }
 

src/Cuture.Extensions.Modularity.Hosting/Extensions/IServiceCollection/HostBuilderServiceCollectionExtensions.cs

@@ -0,0 +1,29 @@
+using System;
+
+using Cuture.Extensions.Modularity.Internal;
+
+using Microsoft.Extensions.Hosting;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    /// <summary>
+    ///
+    /// </summary>
+    public static class HostBuilderServiceCollectionExtensions
+    {
+        #region Public 方法
+
+        /// <summary>
+        /// 从<see cref="IServiceCollection"/>中获取<see cref="IHostBuilder"/>
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public static IHostBuilder? GetHostBuilder(this IServiceCollection services) => services.GetObjectAccessorValue<IHostBuilderContainer>()?.Value;
+
+        /// <inheritdoc cref="GetHostBuilder(IServiceCollection)"/>
+        public static IHostBuilder GetRequiredHostBuilder(this IServiceCollection services) => services.GetObjectAccessorValue<IHostBuilderContainer>()?.Value
+                                                                                               ?? throw new InvalidOperationException($"Not found {nameof(IHostBuilder)} in serviceCollection.");
+
+        #endregion Public 方法
+    }
+}

src/Cuture.Extensions.Modularity.Hosting/Internal/IHostBuilderAccessor.cs

@@ -0,0 +1,23 @@
+using System;
+
+using Microsoft.Extensions.Hosting;
+
+namespace Cuture.Extensions.Modularity.Internal;
+
+internal class IHostBuilderContainer
+{
+    #region Public 属性
+
+    public IHostBuilder Value { get; set; }
+
+    #endregion Public 属性
+
+    #region Public 构造函数
+
+    public IHostBuilderContainer(IHostBuilder value)
+    {
+        Value = value ?? throw new ArgumentNullException(nameof(value));
+    }
+
+    #endregion Public 构造函数
+}

src/Directory.Build.props

@@ -29,7 +29,7 @@
 
   <!--Package Info-->
   <PropertyGroup>
-    <VersionPrefix>1.1.7</VersionPrefix>
+    <VersionPrefix>1.1.8</VersionPrefix>
 
     <PackageIdPrefix>Cuture.Extensions</PackageIdPrefix>
     <Authors>Stratos</Authors>
@@ -51,6 +51,6 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All" />
   </ItemGroup>
 </Project>