chore: opinionated webview install

Author: andrewbabbittdev

src/BlazorDesktop.Sample/Program.cs

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

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

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

src/BlazorDesktop/BlazorDesktop.csproj

@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="8.0.61" />
-    <PackageReference Include="WebView2.Runtime.AutoInstaller" Version="1.0.0" />
   </ItemGroup>
 
 </Project>

src/BlazorDesktop/Hosting/BlazorDesktopHost.cs

@@ -20,15 +20,8 @@ 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>
-    /// <param name="host">The <see cref="IHost"/> instance.</param>
     internal BlazorDesktopHost(IHost host)
     {
         _host = host;

src/BlazorDesktop/Hosting/BlazorDesktopHostBuilder.cs

@@ -44,15 +44,8 @@ public sealed class BlazorDesktopHostBuilder
     /// </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>
     private BlazorDesktopHostBuilder(string[]? args)
     {
         _hostApplicationBuilder = InitializeHostApplicationBuilder(args);
@@ -111,11 +104,6 @@ public BlazorDesktopHost Build()
         return new(_hostApplicationBuilder.Build());
     }
 
-    /// <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();
@@ -129,22 +117,16 @@ private static HostApplicationBuilder InitializeHostApplicationBuilder(string[]?
         });
     }
 
-    /// <summary>
-    /// Initializes the default services.
-    /// </summary>
     private void InitializeDefaultServices()
     {
+        Services.AddHttpClient();
         Services.AddWpfBlazorWebView();
         Services.AddSingleton<WebViewInstaller>();
         Services.AddSingleton<Application>();
         Services.AddSingleton<Window, BlazorDesktopWindow>();
         Services.AddHostedService<BlazorDesktopService>();
     }
 
-    /// <summary>
-    /// Initializes the root components.
-    /// </summary>
-    /// <returns>A <see cref="RootComponentMappingCollection"/>.</returns>
     private RootComponentMappingCollection InitializeRootComponents()
     {
         var rootComponents = new RootComponentMappingCollection();
@@ -154,10 +136,6 @@ private RootComponentMappingCollection InitializeRootComponents()
         return rootComponents;
     }
 
-    /// <summary>
-    /// Initializes the environment.
-    /// </summary>
-    /// <returns>A <see cref="BlazorDesktopHostEnvironment"/>.</returns>
     private BlazorDesktopHostEnvironment InitializeEnvironment()
     {
         var hostEnvironment = new BlazorDesktopHostEnvironment(_hostApplicationBuilder.Environment, Configuration);
@@ -167,10 +145,6 @@ private BlazorDesktopHostEnvironment InitializeEnvironment()
         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

@@ -2,29 +2,13 @@
 // 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>

src/BlazorDesktop/Hosting/BlazorDesktopHostEnvironment.cs

@@ -58,9 +58,6 @@ public IFileProvider ContentRootFileProvider
     /// </summary>
     public IFileProvider WebRootFileProvider { get; set; }
 
-    /// <summary>
-    /// The host environment.
-    /// </summary>
     private readonly IHostEnvironment _hostEnvironment;
 
     /// <summary>

src/BlazorDesktop/Hosting/ConfigureWindowBuilder.cs

@@ -9,15 +9,8 @@ namespace BlazorDesktop.Hosting;
 /// </summary>
 public class ConfigureWindowBuilder
 {
-    /// <summary>
-    /// The configuration.
-    /// </summary>
     private readonly IConfiguration _configuration;
 
-    /// <summary>
-    /// Creates a instance of <see cref="ConfigureWindowBuilder"/>.
-    /// </summary>
-    /// <param name="configuration">The configuration.</param>
     internal ConfigureWindowBuilder(IConfiguration configuration)
     {
         _configuration = configuration;

src/BlazorDesktop/Services/BlazorDesktopService.cs

@@ -7,7 +7,6 @@
 using System.Windows;
 using System.Windows.Threading;
 using BlazorDesktop.Wpf;
-using WebView2.Runtime.AutoInstaller;
 
 namespace BlazorDesktop.Services;
 
@@ -16,29 +15,10 @@ namespace BlazorDesktop.Services;
 /// </summary>
 public partial class BlazorDesktopService : IHostedService, IDisposable
 {
-    /// <summary>
-    /// The cancellation token registration.
-    /// </summary>
     private CancellationTokenRegistration _applicationStoppingRegistration;
-
-    /// <summary>
-    /// The application lifetime.
-    /// </summary>
     private readonly IHostApplicationLifetime _lifetime;
-
-    /// <summary>
-    /// The services.
-    /// </summary>
     private readonly IServiceProvider _services;
-
-    /// <summary>
-    /// The <see cref="ILogger{TCategoryName}"/>.
-    /// </summary>
     private readonly ILogger<BlazorDesktopService> _logger;
-
-    /// <summary>
-    /// The web view installer.
-    /// </summary>
     private readonly WebViewInstaller _webViewInstaller;
 
     /// <summary>
@@ -66,10 +46,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
     {
         _applicationStoppingRegistration = _lifetime.ApplicationStopping.Register(OnApplicationStopping);
 
-        if (_webViewInstaller.Enabled)
-        {
-            await WebView2AutoInstaller.CheckAndInstallAsync(silentInstall: _webViewInstaller.SilentInstall, cancellationToken: cancellationToken);
-        }
+        await _webViewInstaller.EnsureInstalledAsync(cancellationToken);
 
         var thread = new Thread(ApplicationThread);
         thread.SetApartmentState(ApartmentState.STA);
@@ -86,18 +63,9 @@ public Task StopAsync(CancellationToken cancellationToken)
         return Task.CompletedTask;
     }
 
-    /// <summary>
-    /// Logs an unhanded component exception,
-    /// </summary>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    /// <param name="message">The message.</param>
-    /// <param name="exception">The <see cref="Exception"/>.</param>
     [LoggerMessage(0, LogLevel.Critical, "Unhandled exception rendering component: {Message}", EventName = "ExceptionRenderingComponent")]
     private static partial void LogUnhandledExceptionRenderingComponent(ILogger logger, string message, Exception exception);
 
-    /// <summary>
-    /// The application thread.
-    /// </summary>
     private void ApplicationThread()
     {
         var app = _services.GetRequiredService<Application>();
@@ -116,11 +84,6 @@ private void ApplicationThread()
         app.Startup -= OnApplicationStartup;
     }
 
-    /// <summary>
-    /// Occurs when the application is starting up.
-    /// </summary>
-    /// <param name="sender">The sending object.</param>
-    /// <param name="e">The arguments.</param>
     private void OnApplicationStartup(object sender, StartupEventArgs e)
     {
         var app = _services.GetRequiredService<Application>();
@@ -130,21 +93,11 @@ private void OnApplicationStartup(object sender, StartupEventArgs e)
         app.MainWindow.Show();
     }
 
-    /// <summary>
-    /// Occurs when the application exits.
-    /// </summary>
-    /// <param name="sender">The sending object.</param>
-    /// <param name="e">The arguments.</param>
     private void OnApplicationExit(object? sender, ExitEventArgs e)
     {
         _lifetime.StopApplication();
     }
 
-    /// <summary>
-    /// Occurs when the application throws an exception.
-    /// </summary>
-    /// <param name="sender">The sending object.</param>
-    /// <param name="e">The arguments.</param>
     private void OnApplicationException(object sender, DispatcherUnhandledExceptionEventArgs e)
     {
         if (e.Exception is TargetInvocationException && e.Exception.InnerException is not null)
@@ -159,9 +112,6 @@ private void OnApplicationException(object sender, DispatcherUnhandledExceptionE
         e.Handled = true;
     }
 
-    /// <summary>
-    /// Occurs when the application is stopping.
-    /// </summary>
     private void OnApplicationStopping()
     {
         var app = _services.GetRequiredService<Application>();

src/BlazorDesktop/Wpf/BlazorDesktopEventForwarder.cs

@@ -11,20 +11,9 @@ namespace BlazorDesktop.Wpf;
 /// </summary>
 public partial class BlazorDesktopEventForwarder
 {
-    /// <summary>
-    /// Posted when the user presses the left mouse button while the cursor is
-    /// within the nonclient area of a window.
-    /// </summary>
     private const int WM_NCLBUTTONDOWN = 0x00A1;
-
-    /// <summary>
-    /// In a title bar.
-    /// </summary>
     private const int HTCAPTION = 2;
 
-    /// <summary>
-    /// The target
-    /// </summary>
     private readonly IntPtr _target;
 
     /// <summary>
@@ -45,21 +34,9 @@ public void MouseDownDrag()
         SendMessage(_target, WM_NCLBUTTONDOWN, HTCAPTION, 0);
     }
 
-    /// <summary>
-    /// Sends the specified message to a window or windows. The SendMessage function calls the window procedure for the specified window and does not return until the window procedure has processed the message.
-    /// </summary>
-    /// <param name="hWnd">A handle to the window whose window procedure will receive the message.</param>
-    /// <param name="msg">The message to be sent.</param>
-    /// <param name="wParam">Additional message-specific information.</param>
-    /// <param name="lParam">Additional message-specific information.</param>
-    /// <returns>The return value specifies the result of the message processing; it depends on the message sent.</returns>
     [LibraryImport("User32", EntryPoint = "SendMessageW", SetLastError = true)]
     internal static partial nint SendMessage(IntPtr hWnd, uint msg, uint wParam, nint lParam);
 
-    /// <summary>
-    /// Releases the mouse capture from a window in the current thread and restores normal mouse input processing.
-    /// </summary>
-    /// <returns>If the function succeeds, the return value is true. If the function fails, the return value is false.</returns>
     [LibraryImport("User32", SetLastError = true)]
     [return: MarshalAs(UnmanagedType.Bool)]
     internal static partial bool ReleaseCapture();