cleanup

dotnet · Apr 17, 2021 · d114d77 · d114d77
1 parent 5280aa2
commit d114d77
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 31 deletions.
diff --git a/src/DefaultBuilder/src/ConfigureHostBuilder.cs b/src/DefaultBuilder/src/ConfigureHostBuilder.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

diff --git a/src/DefaultBuilder/src/ConfigureWebHostBuilder.cs b/src/DefaultBuilder/src/ConfigureWebHostBuilder.cs
@@ -102,8 +102,7 @@ public IWebHostBuilder UseSetting(string key, string? value)
             return this;
         }
 
-        /// <inheritdoc />
-        public void ExecuteActions(IWebHostBuilder webHostBuilder)
+        internal void ExecuteActions(IWebHostBuilder webHostBuilder)
         {
             _operations?.Invoke(webHostBuilder);
         }

diff --git a/src/DefaultBuilder/src/PublicAPI.Unshipped.txt b/src/DefaultBuilder/src/PublicAPI.Unshipped.txt
@@ -17,7 +17,6 @@ Microsoft.AspNetCore.Builder.ConfigureWebHostBuilder
 Microsoft.AspNetCore.Builder.ConfigureWebHostBuilder.ConfigureAppConfiguration(System.Action<Microsoft.AspNetCore.Hosting.WebHostBuilderContext!, Microsoft.Extensions.Configuration.IConfigurationBuilder!>! configureDelegate) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
 Microsoft.AspNetCore.Builder.ConfigureWebHostBuilder.ConfigureServices(System.Action<Microsoft.AspNetCore.Hosting.WebHostBuilderContext!, Microsoft.Extensions.DependencyInjection.IServiceCollection!>! configureServices) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
 Microsoft.AspNetCore.Builder.ConfigureWebHostBuilder.ConfigureServices(System.Action<Microsoft.Extensions.DependencyInjection.IServiceCollection!>! configureServices) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
-Microsoft.AspNetCore.Builder.ConfigureWebHostBuilder.ExecuteActions(Microsoft.AspNetCore.Hosting.IWebHostBuilder! webHostBuilder) -> void
 Microsoft.AspNetCore.Builder.ConfigureWebHostBuilder.GetSetting(string! key) -> string?
 Microsoft.AspNetCore.Builder.ConfigureWebHostBuilder.UseSetting(string! key, string? value) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder!
 Microsoft.AspNetCore.Builder.WebApplication

diff --git a/src/DefaultBuilder/src/WebApplicationBuilder.cs b/src/DefaultBuilder/src/WebApplicationBuilder.cs
@@ -92,6 +92,32 @@ public WebApplication Build()
             return _builtApplication;
         }
 
+        private void ConfigureWebHost(IWebHostBuilder genericWebHostBuilder)
+        {
+            genericWebHostBuilder.Configure(ConfigureApplication);
+
+            _hostBuilder.ConfigureServices((context, services) =>
+            {
+                foreach (var s in Services)
+                {
+                    services.Add(s);
+                }
+            });
+
+            _hostBuilder.ConfigureAppConfiguration((hostContext, builder) =>
+            {
+                foreach (var s in Configuration.Sources)
+                {
+                    builder.Sources.Add(s);
+                }
+            });
+
+            _deferredHostBuilder.ExecuteActions(_hostBuilder);
+            _deferredWebHostBuilder.ExecuteActions(genericWebHostBuilder);
+
+            _environment.ApplyEnvironmentSettings(genericWebHostBuilder);
+        }
+
         private void ConfigureApplication(WebHostBuilderContext context, IApplicationBuilder app)
         {
             Debug.Assert(_builtApplication is not null);
@@ -154,33 +180,6 @@ private void ConfigureApplication(WebHostBuilderContext context, IApplicationBui
             {
                 app.Properties[item.Key] = item.Value;
             }
-
-        }
-
-        private void ConfigureWebHost(IWebHostBuilder genericWebHostBuilder)
-        {
-            genericWebHostBuilder.Configure(ConfigureApplication);
-
-            _hostBuilder.ConfigureServices((context, services) =>
-            {
-                foreach (var s in Services)
-                {
-                    services.Add(s);
-                }
-            });
-
-            _hostBuilder.ConfigureAppConfiguration((hostContext, builder) =>
-            {
-                foreach (var s in Configuration.Sources)
-                {
-                    builder.Sources.Add(s);
-                }
-            });
-
-            _deferredHostBuilder.ExecuteActions(_hostBuilder);
-            _deferredWebHostBuilder.ExecuteActions(genericWebHostBuilder);
-
-            _environment.ApplyEnvironmentSettings(genericWebHostBuilder);
         }
 
         private class LoggingBuilder : ILoggingBuilder