cleanup

Author: halter73

src/DefaultBuilder/src/BootstrapHostBuilder.cs

@@ -20,7 +20,7 @@ internal class BootstrapHostBuilder : IHostBuilder
         private readonly List<Action<HostBuilderContext, IConfigurationBuilder>> _configureAppActions = new();
         private readonly List<Action<HostBuilderContext, IServiceCollection>> _configureServicesActions = new();
 
-        private readonly List<Action<IHostBuilder>> _delayUntilBuildActions = new();
+        private readonly List<Action<IHostBuilder>> _remainingOperations = new();
 
         public BootstrapHostBuilder(ConfigurationManager configuration, WebHostEnvironment webHostEnvironment, IServiceCollection serviceCollection)
         {
@@ -58,7 +58,7 @@ public IHostBuilder ConfigureContainer<TContainerBuilder>(Action<HostBuilderCont
                 throw new ArgumentNullException(nameof(configureDelegate));
             }
 
-            _delayUntilBuildActions.Add(hostBuilder => hostBuilder.ConfigureContainer<TContainerBuilder>(configureDelegate));
+            _remainingOperations.Add(hostBuilder => hostBuilder.ConfigureContainer<TContainerBuilder>(configureDelegate));
             return this;
         }
 
@@ -89,7 +89,7 @@ public IHostBuilder UseServiceProviderFactory<TContainerBuilder>(IServiceProvide
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            _delayUntilBuildActions.Add(hostBuilder => hostBuilder.UseServiceProviderFactory<TContainerBuilder>(factory));
+            _remainingOperations.Add(hostBuilder => hostBuilder.UseServiceProviderFactory<TContainerBuilder>(factory));
             return this;
         }
 
@@ -102,12 +102,17 @@ public IHostBuilder UseServiceProviderFactory<TContainerBuilder>(Func<HostBuilde
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            _delayUntilBuildActions.Add(hostBuilder => hostBuilder.UseServiceProviderFactory<TContainerBuilder>(factory));
+            _remainingOperations.Add(hostBuilder => hostBuilder.UseServiceProviderFactory<TContainerBuilder>(factory));
             return this;
         }
 
-        public void RunDefaultCallbacks()
+        public void RunDefaultCallbacks(HostBuilder innerBuilder)
         {
+            // This is called twice. Once in the WebApplicationBuilde ctor and again in Build() after
+            // WebHostBuilderExtensions.Configure(ConfigureApplication) is called on a GenericWebHostBuilder
+            // that was captured in a ConfigureWebHostDeafaults() callback in the ctor.
+
+            // We clear the Lists so Actions run in the constructor don't get run again during Build().
             foreach (var configureHostAction in _configureHostActions)
             {
                 configureHostAction(_configuration);
@@ -131,19 +136,12 @@ public void RunDefaultCallbacks()
                 configureServicesAction(_hostContext, _serviceCollection);
             }
             _configureServicesActions.Clear();
-        }
-
-        public void RunDelayedCallbacks(IHostBuilder innerBuilder)
-        {
-            // This will only run callbacks added by WebApplicationBuilder.Build().
-            // Other callbacks were run and cleared in the WebApplicationBuilder ctor.
-            RunDefaultCallbacks();
 
-            foreach (var callback in _delayUntilBuildActions)
+            foreach (var callback in _remainingOperations)
             {
                 callback(innerBuilder);
             }
-            _delayUntilBuildActions.Clear();
+            _remainingOperations.Clear();
         }
     }
 }

src/DefaultBuilder/src/WebApplicationBuilder.cs

@@ -20,11 +20,7 @@ public sealed class WebApplicationBuilder
         private const string EndpointRouteBuilderKey = "__EndpointRouteBuilder";
 
         private readonly HostBuilder _hostBuilder = new();
-
         private readonly BootstrapHostBuilder _bootstrapHostBuilder;
-        private readonly ConfigureHostBuilder _deferredHostBuilder;
-        private readonly ConfigureWebHostBuilder _deferredWebHostBuilder;
-
         private readonly WebHostEnvironment _environment;
         private readonly WebApplicationServiceCollection _services = new();
 
@@ -52,11 +48,11 @@ internal WebApplicationBuilder(Assembly? callingAssembly, string[]? args = null)
                 // This runs inline.
                 _bootstrapWebHostBuilder = webHostBuilder;
             });
-            _bootstrapHostBuilder.RunDefaultCallbacks();
+            _bootstrapHostBuilder.RunDefaultCallbacks(_hostBuilder);
 
             Logging = new LoggingBuilder(Services);
-            WebHost = _deferredWebHostBuilder = new ConfigureWebHostBuilder(Configuration, _environment, Services);
-            Host = _deferredHostBuilder = new ConfigureHostBuilder(Configuration, _environment, Services);
+            WebHost = new ConfigureWebHostBuilder(Configuration, _environment, Services);
+            Host = new ConfigureHostBuilder(Configuration, _environment, Services);
 
             // This is important because GenericWebHostBuilder does the following and we want to preserve the WebHostBuilderContext:
             // context.Properties[typeof(WebHostBuilderContext)] = webHostBuilderContext;
@@ -123,7 +119,7 @@ public WebApplication Build()
             _bootstrapWebHostBuilder.Configure(ConfigureApplication);
             _environment.ApplyEnvironmentSettings(_bootstrapWebHostBuilder);
             // This has further modified the _bootstrapHostBuilder, so we need to run the newly added callbacks in the proper order.
-            _bootstrapHostBuilder.RunDelayedCallbacks(_hostBuilder);
+            _bootstrapHostBuilder.RunDefaultCallbacks(_hostBuilder);
 
             // This needs to go here to avoid adding the IHostedService that boots the server twice (the GenericWebHostService).
             // Copy the services that were added via WebApplicationBuilder.Services into the final IServiceCollection
@@ -154,7 +150,7 @@ public WebApplication Build()
             });
 
             // Run the other callbacks on the final host builder
-            _deferredHostBuilder.RunDeferredCallbacks(_hostBuilder);
+            Host.RunDeferredCallbacks(_hostBuilder);
 
             _builtApplication = new WebApplication(_hostBuilder.Build());
 

src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs

@@ -17,7 +17,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Console;
 using Microsoft.Extensions.Options;
 using Xunit;