chore: v1.0.5 (#3)

* feat: WebView2 installer

* chore: Bump Microsoft.AspNetCore.Components.WebView.Wpf to 6.0.200-preview.13.2865

* fix: pipeline

* chore: bump Blazor Desktop to v1.0.5

* fix: pipeline

Author: andrewbabbittdev

.github/workflows/lint-code.yml

@@ -20,10 +20,7 @@ jobs:
       - name: Set up .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
-
-      - name: Install dotnet-format
-        run: dotnet tool install -g dotnet-format
+          dotnet-version: "6.0.101"
 
       - name: Run linters
         uses: AndrewBabbitt97/[email protected]

.github/workflows/scan-code.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   scan-code:
     name: Scan Code
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     permissions:
       actions: read

README.md

@@ -10,7 +10,7 @@ Blazor Desktop allows you to create desktop apps using Blazor. Apps run inside o
 The easiest way to get started with Blazor Desktop is to install the templates, you can do so using the dotnet cli as follows:
 
 ```powershell
-dotnet new --install BlazorDesktop.Templates::1.0.4
+dotnet new --install BlazorDesktop.Templates::1.0.5
 ```
 
 Once you have the templates installed, you can either create a new project from the template either in Visual Studio in the template picker:
@@ -92,6 +92,11 @@ 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:
+```csharp
+builder.Window.UseWebView2Installer(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.**
 
 ## Custom Window Chrome & Draggable Regions

src/BlazorDesktop.Templates/BlazorDesktop.Templates.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>1.0.4</PackageVersion>
+    <PackageVersion>1.0.5</PackageVersion>
     <PackageId>BlazorDesktop.Templates</PackageId>
     <Title>Blazor Desktop Templates</Title>
     <Authors>Andrew Babbitt</Authors>

src/BlazorDesktop.Templates/templates/BlazorDesktop-CSharp/BlazorDesktop-CSharp.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorDesktop" Version="1.0.4" />
+    <PackageReference Include="BlazorDesktop" Version="1.0.5" />
   </ItemGroup>
 
 </Project>

src/BlazorDesktop/BlazorDesktop.csproj

@@ -28,9 +28,9 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageIcon>nuget.png</PackageIcon>
     <RepositoryType>git</RepositoryType>
-    <AssemblyVersion>1.0.4.0</AssemblyVersion>
-    <FileVersion>1.0.4.0</FileVersion>
-    <Version>1.0.4</Version>
+    <AssemblyVersion>1.0.5.0</AssemblyVersion>
+    <FileVersion>1.0.5.0</FileVersion>
+    <Version>1.0.5</Version>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
@@ -47,7 +47,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="6.0.101-preview.11.2349" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="6.0.200-preview.13.2865" />
+    <PackageReference Include="WebView2.Runtime.AutoInstaller" Version="1.0.0" />
   </ItemGroup>
 
   <PropertyGroup>

src/BlazorDesktop/Hosting/ConfigureWindowBuilder.cs

@@ -88,4 +88,15 @@ public ConfigureWindowBuilder UseIcon(string icon)
         _config[WindowDefaults.Icon] = icon;
         return this;
     }
+
+    /// <summary>
+    /// If the WebView2 installer should be used.
+    /// </summary>
+    /// <param name="installer">If the WebView2 installer should be used.</param>
+    /// <returns>The <see cref="ConfigureWindowBuilder"/>.</returns>
+    public ConfigureWindowBuilder UseWebView2Installer(bool installer)
+    {
+        _config[WindowDefaults.WebView2Installer] = installer.ToString();
+        return this;
+    }
 }

src/BlazorDesktop/Hosting/WindowDefaults.cs

@@ -38,4 +38,9 @@ public static class WindowDefaults
     /// The configuration key associated with the icon.
     /// </summary>
     public static readonly string Icon = "window:icon";
+
+    /// <summary>
+    /// The configuration key associated with the WebView2 installer.
+    /// </summary>
+    public static readonly string WebView2Installer = "window:webView2Installer";
 }

src/BlazorDesktop/Services/BlazorDesktopService.cs

@@ -4,6 +4,8 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Windows;
+using BlazorDesktop.Hosting;
+using WebView2.Runtime.AutoInstaller;
 
 namespace BlazorDesktop.Services;
 
@@ -27,35 +29,45 @@ public class BlazorDesktopService : IHostedService, IDisposable
     /// </summary>
     private readonly IServiceProvider _services;
 
+    /// <summary>
+    /// The configuration.
+    /// </summary>
+    private readonly IConfiguration _config;
+
     /// <summary>
     /// Creates a <see cref="BlazorDesktopService"/> instance.
     /// </summary>
     /// <param name="lifetime">The <see cref="IHostApplicationLifetime"/>.</param>
     /// <param name="services">The <see cref="IServiceProvider"/>.</param>
-    public BlazorDesktopService(IHostApplicationLifetime lifetime, IServiceProvider services)
+    /// <param name="config">The <see cref="IConfiguration"/>.</param>
+    public BlazorDesktopService(IHostApplicationLifetime lifetime, IServiceProvider services, IConfiguration config)
     {
         _applicationStoppingRegistration = new();
         _lifetime = lifetime;
         _services = services;
+        _config = config;
     }
 
     /// <summary>
     /// Starts the service.
     /// </summary>
     /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns>A task that represents starting the service.</returns>
-    public Task StartAsync(CancellationToken cancellationToken)
+    public async Task StartAsync(CancellationToken cancellationToken)
     {
         _applicationStoppingRegistration = _lifetime.ApplicationStopping.Register(() =>
         {
             OnApplicationStopping();
         });
 
+        if (_config.GetValue<bool?>(WindowDefaults.WebView2Installer) ?? true)
+        {
+            await WebView2AutoInstaller.CheckAndInstallAsync(silentInstall: false, cancellationToken: cancellationToken);
+        }
+
         var thread = new Thread(ApplicationThread);
         thread.SetApartmentState(ApartmentState.STA);
         thread.Start();
-
-        return Task.CompletedTask;
     }
 
     /// <summary>