Implement IHostApplicationBuilder on WebApplicationBuilder

src/DefaultBuilder/src/WebApplicationBuilder.cs

@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Builder;
 /// <summary>
 /// A builder for web applications and services.
 /// </summary>
-public sealed class WebApplicationBuilder
+public sealed class WebApplicationBuilder : IHostApplicationBuilder
 {
     private const string EndpointRouteBuilderKey = "__EndpointRouteBuilder";
     private const string AuthenticationMiddlewareSetKey = "__AuthenticationMiddlewareSet";
@@ -300,6 +300,12 @@ private static void AddDefaultServicesSlim(ConfigurationManager configuration, I
     /// </summary>
     public ConfigureHostBuilder Host { get; }
 
+    IDictionary<object, object> IHostApplicationBuilder.Properties => ((IHostApplicationBuilder)_hostApplicationBuilder).Properties;
+
+    IConfigurationManager IHostApplicationBuilder.Configuration => Configuration;
+
+    IHostEnvironment IHostApplicationBuilder.Environment => Environment;
+
     /// <summary>
     /// Builds the <see cref="WebApplication"/>.
     /// </summary>
@@ -407,4 +413,7 @@ private void ConfigureApplication(WebHostBuilderContext context, IApplicationBui
             app.Properties[EndpointRouteBuilderKey] = priorRouteBuilder;
         }
     }
+
+    void IHostApplicationBuilder.ConfigureContainer<TContainerBuilder>(IServiceProviderFactory<TContainerBuilder> factory, Action<TContainerBuilder>? configure) =>
+        _hostApplicationBuilder.ConfigureContainer(factory, configure);
 }

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

@@ -2368,6 +2368,29 @@ public async Task SupportsDisablingMiddlewareAutoRegistration(CreateBuilderFunc
         Assert.True(app.Properties.ContainsKey("__AuthorizationMiddlewareSet"));
     }
 
+    [Theory]
+    [MemberData(nameof(CreateBuilderFuncs))]
+    public void ImplementsIHostApplicationBuilderCorrectly(CreateBuilderFunc createBuilder)
+    {
+        var builder = createBuilder();
+        var iHostApplicationBuilder = (IHostApplicationBuilder)builder;
+
+        builder.Host.Properties["MyProp"] = 1;
+        Assert.Equal(1, iHostApplicationBuilder.Properties["MyProp"]);
+
+        Assert.Same(builder.Host.Properties, iHostApplicationBuilder.Properties);
+        Assert.Same(builder.Configuration, iHostApplicationBuilder.Configuration);
+        Assert.Same(builder.Logging, iHostApplicationBuilder.Logging);
+        Assert.Same(builder.Services, iHostApplicationBuilder.Services);
+        Assert.True(iHostApplicationBuilder.Environment.IsProduction());
+        Assert.NotNull(iHostApplicationBuilder.Environment.ContentRootFileProvider);
+
+        iHostApplicationBuilder.ConfigureContainer(new MyServiceProviderFactory());
+
+        var app = builder.Build();
+        Assert.IsType<MyServiceProvider>(app.Services);
+    }
+
     [Fact]
     public async Task UsingCreateBuilderResultsInRegexConstraintBeingPresent()
     {
@@ -2829,4 +2852,25 @@ public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
             };
         }
     }
+
+    private class MyServiceProviderFactory : IServiceProviderFactory<MyServiceProvider>
+    {
+        public MyServiceProvider CreateBuilder(IServiceCollection services) => new MyServiceProvider(services);
+
+        public IServiceProvider CreateServiceProvider(MyServiceProvider containerBuilder)
+        {
+            containerBuilder.Build();
+            return containerBuilder;
+        }
+    }
+
+    private class MyServiceProvider : IServiceProvider
+    {
+        private IServiceProvider _inner;
+        private IServiceCollection _services;
+
+        public MyServiceProvider(IServiceCollection services) => _services = services;
+        public void Build() => _inner = _services.BuildServiceProvider();
+        public object GetService(Type serviceType) => _inner.GetService(serviceType);
+    }
 }