chore: Rework hosting internals

Author: andrewbabbittdev

README.md

@@ -96,9 +96,9 @@ It is also possible to configure these values through `appsettings.json` like so
 }
 ```
 
-Blazor Desktop will automatically install WebView2 for the user if they do not already have it installed, you can disable this if you wish:
+Blazor Desktop will automatically install a web view runtime for the user if they do not already have it installed, you can disable this if you wish:
 ```csharp
-builder.Window.UseWebView2Installer(false);
+builder.UseWebViewInstaller(false);
 ```
 
 **The `Window` object itself is also made available inside of the DI container, so you can access all properties on it by using the inject Razor keyword or requesting it through the constructor of a class added as a service.**

src/BlazorDesktop.Sample/Program.cs

@@ -8,6 +8,9 @@
 using Microsoft.AspNetCore.Components.Web;
 
 var builder = BlazorDesktopHostBuilder.CreateDefault(args);
+
+builder.UseWebViewInstaller();
+
 builder.RootComponents.Add<App>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");
 

src/BlazorDesktop.Sample/Properties/launchSettings.json

@@ -4,7 +4,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "environmentVariables": {
-        "DOTNET_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }

src/BlazorDesktop.Templates/templates/BlazorDesktop-CSharp/Program.cs

@@ -4,6 +4,9 @@
 using Microsoft.AspNetCore.Components.Web;
 
 var builder = BlazorDesktopHostBuilder.CreateDefault(args);
+
+builder.UseWebViewInstaller();
+
 builder.RootComponents.Add<App>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");
 

src/BlazorDesktop.Templates/templates/BlazorDesktop-CSharp/Properties/launchSettings.json

@@ -4,7 +4,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "environmentVariables": {
-        "DOTNET_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }

src/BlazorDesktop/Hosting/BlazorDesktopHost.cs

@@ -10,11 +10,6 @@ namespace BlazorDesktop.Hosting;
 /// </summary>
 public sealed class BlazorDesktopHost : IHost, IAsyncDisposable
 {
-    /// <summary>
-    /// The host.
-    /// </summary>
-    private readonly IHost _host;
-
     /// <summary>
     /// Gets the application configuration.
     /// </summary>
@@ -25,6 +20,11 @@ public sealed class BlazorDesktopHost : IHost, IAsyncDisposable
     /// </summary>
     public IServiceProvider Services => _host.Services;
 
+    /// <summary>
+    /// The host.
+    /// </summary>
+    private readonly IHost _host;
+
     /// <summary>
     /// Creates an instance of <see cref="BlazorDesktopHost"/> with a specified <see cref="IHost"/>.
     /// </summary>

src/BlazorDesktop/Hosting/BlazorDesktopHostBuilder.cs

@@ -13,16 +13,11 @@ namespace BlazorDesktop.Hosting;
 /// </summary>
 public sealed class BlazorDesktopHostBuilder
 {
-    /// <summary>
-    /// The host builder.
-    /// </summary>
-    private readonly IHostBuilder _hostBuilder;
-
     /// <summary>
     /// Gets an <see cref="ConfigurationManager"/> that can be used to customize the application's
     /// configuration sources and read configuration attributes.
     /// </summary>
-    public ConfigurationManager Configuration { get; }
+    public ConfigurationManager Configuration => _hostApplicationBuilder.Configuration;
 
     /// <summary>
     /// Gets the collection of root component mappings configured for the application.
@@ -32,7 +27,7 @@ public sealed class BlazorDesktopHostBuilder
     /// <summary>
     /// Gets the service collection.
     /// </summary>
-    public IServiceCollection Services { get; }
+    public IServiceCollection Services => _hostApplicationBuilder.Services;
 
     /// <summary>
     /// Gets information about the app's host environment.
@@ -42,27 +37,31 @@ public sealed class BlazorDesktopHostBuilder
     /// <summary>
     /// Gets the logging builder for configuring logging services.
     /// </summary>
-    public ILoggingBuilder Logging { get; }
+    public ILoggingBuilder Logging => _hostApplicationBuilder.Logging;
 
     /// <summary>
     /// Exposes configuration options for the window.
     /// </summary>
     public ConfigureWindowBuilder Window { get; }
 
+    /// <summary>
+    /// The host application builder.
+    /// </summary>
+    private readonly HostApplicationBuilder _hostApplicationBuilder;
+
     /// <summary>
     /// Creates an instance of <see cref="BlazorDesktopHostBuilder"/> with the minimal configuration.
     /// </summary>
     /// <param name="args">The arguments passed to the application's main method.</param>
-    internal BlazorDesktopHostBuilder(string[]? args)
+    private BlazorDesktopHostBuilder(string[]? args)
     {
-        _hostBuilder = Host.CreateDefaultBuilder(args);
-
-        Configuration = new();
-        RootComponents = new();
-        Services = new ServiceCollection();
-        Logging = new LoggingBuilder(Services);
-        Window = new(Configuration);
-        HostEnvironment = InitializeEnvironment(args);
+        _hostApplicationBuilder = InitializeHostApplicationBuilder(args);
+
+        InitializeDefaultServices();
+
+        RootComponents = InitializeRootComponents();
+        HostEnvironment = InitializeEnvironment();
+        Window = InitializeWindowBuilder();
     }
 
     /// <summary>
@@ -76,61 +75,107 @@ public static BlazorDesktopHostBuilder CreateDefault(string[]? args = default)
         return new(args);
     }
 
+    /// <summary>
+    /// Registers a <see cref="IServiceProviderFactory{TBuilder}" /> instance to be used to create the <see cref="IServiceProvider" />.
+    /// </summary>
+    /// <typeparam name="TBuilder">The type of builder provided by the <see cref="IServiceProviderFactory{TBuilder}" />.</typeparam>
+    /// <param name="factory">The <see cref="IServiceProviderFactory{TBuilder}" />.</param>
+    /// <param name="configure">
+    /// A delegate used to configure the <typeparamref T="TBuilder" />. This can be used to configure services using
+    /// APIs specific to the <see cref="IServiceProviderFactory{TBuilder}" /> implementation.
+    /// </param>
+    /// <exception cref="ArgumentNullException">Occurs when the <paramref name="factory"/> parameter is null.</exception>
+    /// <remarks>
+    /// <para>
+    /// <see cref="ConfigureContainer{TBuilder}(IServiceProviderFactory{TBuilder}, Action{TBuilder})"/> is called by <see cref="Build"/>
+    /// and so the delegate provided by <paramref name="configure"/> will run after all other services have been registered.
+    /// </para>
+    /// <para>
+    /// Multiple calls to <see cref="ConfigureContainer{TBuilder}(IServiceProviderFactory{TBuilder}, Action{TBuilder})"/> will replace
+    /// the previously stored <paramref name="factory"/> and <paramref name="configure"/> delegate.
+    /// </para>
+    /// </remarks>
+    public void ConfigureContainer<TBuilder>(IServiceProviderFactory<TBuilder> factory, Action<TBuilder>? configure = null) where TBuilder : notnull
+    {
+        if (factory == null)
+        {
+            throw new ArgumentNullException(nameof(factory));
+        }
+
+        _hostApplicationBuilder.ConfigureContainer(factory, configure);
+    }
+
     /// <summary>
     /// Builds a <see cref="BlazorDesktopHost"/> instance based on the configuration of this builder.
     /// </summary>
     /// <returns>A <see cref="BlazorDesktopHost"/> object.</returns>
     public BlazorDesktopHost Build()
     {
-        ((BlazorDesktopHostingEnvironment)HostEnvironment).SaveConfig(Configuration);
-
-        var builder = _hostBuilder.ConfigureAppConfiguration(builder =>
-        {
-            builder.AddConfiguration(Configuration);
-        })
-        .ConfigureServices(services =>
-        {
-            services.AddWpfBlazorWebView();
+        return new(_hostApplicationBuilder.Build());
+    }
 
-            services.AddSingleton(HostEnvironment);
-            services.AddSingleton(RootComponents);
-            services.AddSingleton<Window, BlazorDesktopWindow>();
-            services.AddSingleton<Application>();
+    /// <summary>
+    /// Initializes the host application builder.
+    /// </summary>
+    /// <param name="args">The arguments passed to the application's main method.</param>
+    /// <returns>A <see cref="HostApplicationBuilder"/>.</returns>
+    private static HostApplicationBuilder InitializeHostApplicationBuilder(string[]? args)
+    {
+        var configuration = new ConfigurationManager();
 
-            services.AddHostedService<BlazorDesktopService>();
+        configuration.AddEnvironmentVariables("ASPNETCORE_");
 
-            foreach (var service in Services)
-            {
-                services.Add(service);
-            }
+        return new(new HostApplicationBuilderSettings
+        {
+            Args = args,
+            Configuration = configuration
         });
+    }
 
-        return new(builder.Build());
+    /// <summary>
+    /// Initializes the default services.
+    /// </summary>
+    private void InitializeDefaultServices()
+    {
+        Services.AddWpfBlazorWebView();
+        Services.AddSingleton<WebViewInstaller>();
+        Services.AddSingleton<Application>();
+        Services.AddSingleton<Window, BlazorDesktopWindow>();
+        Services.AddHostedService<BlazorDesktopService>();
     }
 
     /// <summary>
-    /// Adds Chromium dev tools to the Blazor Desktop application.
+    /// Initializes the root components.
     /// </summary>
-    /// <returns>The <see cref="BlazorDesktopHostBuilder"/>.</returns>
-    public BlazorDesktopHostBuilder UseDeveloperTools()
+    /// <returns>A <see cref="RootComponentMappingCollection"/>.</returns>
+    private RootComponentMappingCollection InitializeRootComponents()
     {
-        Services.AddBlazorWebViewDeveloperTools();
-        return this;
+        var rootComponents = new RootComponentMappingCollection();
+
+        Services.AddSingleton(rootComponents);
+
+        return rootComponents;
     }
 
     /// <summary>
     /// Initializes the environment.
     /// </summary>
-    /// <param name="args">The arguments passed to the application's main method.</param>
-    /// <returns>A <see cref="BlazorDesktopHostingEnvironment"/>.</returns>
-    private static BlazorDesktopHostingEnvironment InitializeEnvironment(string[]? args)
+    /// <returns>A <see cref="BlazorDesktopHostEnvironment"/>.</returns>
+    private BlazorDesktopHostEnvironment InitializeEnvironment()
     {
-        var environmentHost = Host.CreateDefaultBuilder(args).Build();
-        var environment = new BlazorDesktopHostingEnvironment();
-        var config = environmentHost.Services.GetRequiredService<IConfiguration>();
+        var hostEnvironment = new BlazorDesktopHostEnvironment(_hostApplicationBuilder.Environment, Configuration);
 
-        environment.LoadConfig(config);
+        Services.AddSingleton<IWebHostEnvironment>(hostEnvironment);
 
-        return environment;
+        return hostEnvironment;
+    }
+
+    /// <summary>
+    /// Initializes the window builder.
+    /// </summary>
+    /// <returns>A <see cref="ConfigureWindowBuilder"/>.</returns>
+    private ConfigureWindowBuilder InitializeWindowBuilder()
+    {
+        return new ConfigureWindowBuilder(Configuration);
     }
 }

src/BlazorDesktop/Hosting/BlazorDesktopHostBuilderExtensions.cs

@@ -0,0 +1,39 @@
+// Licensed to the Blazor Desktop Contributors under one or more agreements.
+// The Blazor Desktop Contributors licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using BlazorDesktop.Wpf;
+
+namespace BlazorDesktop.Hosting;
+
+/// <summary>
+/// Extension methods for configuring the <see cref="BlazorDesktopHostBuilder" />.
+/// </summary>
+public static class BlazorDesktopHostBuilderExtensions
+{
+    /// <summary>
+    /// Installs a web view on the machine.
+    /// </summary>
+    /// <param name="builder">The <see cref="BlazorDesktopHostBuilder"/>.</param>
+    /// <param name="useInstaller">If the installer should be used.</param>
+    /// <param name="silentInstall">If the installer should be silent.</param>
+    /// <returns>A reference to the <paramref name="builder"/> after the operation has completed.</returns>
+    public static BlazorDesktopHostBuilder UseWebViewInstaller(this BlazorDesktopHostBuilder builder, bool useInstaller = true, bool silentInstall = false)
+    {
+        builder.Services.AddSingleton(new WebViewInstaller { Enabled = useInstaller, SilentInstall = silentInstall });
+
+        return builder;
+    }
+
+    /// <summary>
+    /// Adds chromium dev tools to the application.
+    /// </summary>
+    /// <param name="builder">The <see cref="BlazorDesktopHostBuilder"/>.</param>
+    /// <returns>A reference to the <paramref name="builder"/> after the operation has completed.</returns>
+    public static BlazorDesktopHostBuilder UseDeveloperTools(this BlazorDesktopHostBuilder builder)
+    {
+        builder.Services.AddBlazorWebViewDeveloperTools();
+
+        return builder;
+    }
+}