调整从IServiceCollection中获取IConfiguration的逻辑；

Author: stratosblue

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

@@ -2,7 +2,6 @@
 
 using Cuture.Extensions.Modularity.Internal;
 
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
@@ -53,7 +52,7 @@ internal static IHostBuilder InternalAddModuleSource(this IHostBuilder hostBuild
                 hostBuilder.ConfigureServices((context, services) =>
                 {
                     services.AddObjectAccessor<IHostBuilderContainer>(new(hostBuilder));
-                    services.AddObjectAccessor<IConfiguration>(context.Configuration);
+                    services.AddObjectAccessor<IConfigurationContainer>(new(context.Configuration));
 
                     try
                     {
@@ -71,8 +70,7 @@ internal static IHostBuilder InternalAddModuleSource(this IHostBuilder hostBuild
                     }
                     finally
                     {
-                        //TODO 不直接移除IConfiguration
-                        services.RemoveObjectAccessor<IConfiguration>();
+                        services.RemoveObjectAccessor<IConfigurationContainer>();
                         services.RemoveObjectAccessor<IHostBuilderContainer>();
                     }
                 });

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

@@ -1,4 +1,8 @@
-using Microsoft.Extensions.Configuration;
+using System;
+
+using Cuture.Extensions.Modularity.Internal;
+
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -17,13 +21,22 @@ public static class ConfigurationServiceCollectionExtensions
         /// <returns></returns>
         public static IConfiguration? GetConfiguration(this IServiceCollection services)
         {
+            if (services.TryGetObjectAccessorValue<IConfigurationContainer>(out var iConfigurationContainer)
+                && iConfigurationContainer is not null)
+            {
+                return iConfigurationContainer.Value;
+            }
             var hostBuilderContext = services.GetSingletonServiceInstance<HostBuilderContext>();
 
             return hostBuilderContext?.Configuration as IConfigurationRoot
                    ?? services.GetSingletonServiceInstance<IConfiguration>()
                    ?? (services.TryGetObjectAccessorValue<IConfiguration>(out var configuration) ? configuration : null);
         }
 
+        /// <inheritdoc cref="GetConfiguration(IServiceCollection)"/>
+        public static IConfiguration GetRequiredConfiguration(this IServiceCollection services) => services.GetConfiguration()
+                                                                                                   ?? throw new InvalidOperationException($"Not found {nameof(IConfiguration)} in serviceCollection.");
+
         #endregion Public 方法
     }
 }

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

@@ -21,7 +21,7 @@ public static class HostBuilderServiceCollectionExtensions
         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
+        public static IHostBuilder GetRequiredHostBuilder(this IServiceCollection services) => services.GetHostBuilder()
                                                                                                ?? throw new InvalidOperationException($"Not found {nameof(IHostBuilder)} in serviceCollection.");
 
         #endregion Public 方法

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

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

src/Directory.Build.props

@@ -29,7 +29,7 @@
 
   <!--Package Info-->
   <PropertyGroup>
-    <VersionPrefix>1.1.8</VersionPrefix>
+    <VersionPrefix>1.1.9</VersionPrefix>
 
     <PackageIdPrefix>Cuture.Extensions</PackageIdPrefix>
     <Authors>Stratos</Authors>