minor fix

src/Snap.Hutao.Deployment.Runtime/Snap.Hutao.Deployment.Runtime.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>Snap.Hutao.Deployment.Runtime</id>
-    <version>1.9.0</version>
+    <version>1.11.0</version>
     <authors>DGP Studio</authors>
     <developmentDependency>true</developmentDependency>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

src/Snap.Hutao.Deployment/EdgeWebView2Dependency.cs

@@ -1,95 +0,0 @@
-using Microsoft.Win32;
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Net.Http;
-using System.Threading.Tasks;
-
-namespace Snap.Hutao.Deployment;
-
-internal static partial class EdgeWebView2Dependency
-{
-    private const string EdgeWebView2DownloadUrl = "https://go.microsoft.com/fwlink/p/?LinkId=2124703";
-
-    private const string EdgeWebView2PerUserPath = @"HKEY_CURRENT_USER\Software\Microsoft\EdgeUpdate\Clients";
-    private const string EdgeWebView2PerMachinePath = @"HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients";
-    private const string EdgeWebView2GuidKey = "{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}";
-
-    public static async Task EnsureAsync(bool installWebView2, bool isUpdateMode)
-    {
-        if (!installWebView2 || isUpdateMode)
-        {
-            return;
-        }
-
-        if (Registry.GetValue(EdgeWebView2PerUserPath, EdgeWebView2GuidKey, null) is not null || Registry.GetValue(EdgeWebView2PerMachinePath, EdgeWebView2GuidKey, null) is not null)
-        {
-            Console.WriteLine("WebView2 already installed.");
-            return;
-        }
-
-        Console.WriteLine("WebView2 not found, start downloading and installing WebView2...");
-        await DownloadWebView2InstallerAndInstallAsync().ConfigureAwait(false);
-    }
-
-    private static async Task DownloadWebView2InstallerAndInstallAsync()
-    {
-        string webView2InstallerPath = Path.Combine(Path.GetTempPath(), "MicrosoftEdgeWebview2Setup.exe");
-        try
-        {
-            using (HttpClient httpClient = new())
-            {
-                HttpShardCopyWorkerOptions<DownloadStatus> options = new()
-                {
-                    HttpClient = httpClient,
-                    SourceUrl = EdgeWebView2DownloadUrl,
-                    DestinationFilePath = webView2InstallerPath,
-                    StatusFactory = (bytesRead, totalBytes) => new DownloadStatus(bytesRead, totalBytes),
-                };
-
-                using (HttpShardCopyWorker<DownloadStatus> worker = await HttpShardCopyWorker<DownloadStatus>.CreateAsync(options).ConfigureAwait(false))
-                {
-                    Progress<DownloadStatus> progress = new(ConsoleWriteProgress);
-                    await worker.CopyAsync(progress).ConfigureAwait(false);
-                }
-            }
-
-            Console.WriteLine("Start installing WebView2...");
-            Process installerProcess = new()
-            {
-                StartInfo = new()
-                {
-                    Arguments = "/silent /install",
-                    FileName = webView2InstallerPath,
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true,
-                },
-            };
-
-            using (installerProcess)
-            {
-                installerProcess.OutputDataReceived += (sender, e) => Console.WriteLine(e.Data);
-                installerProcess.ErrorDataReceived += (sender, e) => Console.WriteLine(e.Data);
-                installerProcess.Start();
-                Console.WriteLine("-----> WebView2 Output begin -----");
-                installerProcess.BeginOutputReadLine();
-                installerProcess.BeginErrorReadLine();
-
-                await installerProcess.WaitForExitAsync().ConfigureAwait(false);
-                Console.WriteLine("<----- WebView2 Output end -------");
-            }
-        }
-        finally
-        {
-            if (File.Exists(webView2InstallerPath))
-            {
-                File.Delete(webView2InstallerPath);
-            }
-        }
-
-        static void ConsoleWriteProgress(DownloadStatus status)
-        {
-            Console.Write($"\r{status.ProgressDescription}");
-        }
-    }
-}

src/Snap.Hutao.Deployment/Invocation.cs

@@ -15,7 +15,6 @@ internal static partial class Invocation
         string? path = context.ParseResult.GetValueForOption(InvocationOptions.PackagePath);
         string? name = context.ParseResult.GetValueForOption(InvocationOptions.FamilyName);
         bool isUpdateMode = context.ParseResult.GetValueForOption(InvocationOptions.UpdateBehavior);
-        bool installWebView2 = context.ParseResult.GetValueForOption(InvocationOptions.InstallWebView2);
 
         if (!isUpdateMode)
         {
@@ -46,78 +45,11 @@ internal static partial class Invocation
             }
         }
 
-        await Certificate.EnsureGlobalSignCodeSigningRootR45Async().ConfigureAwait(false);
-        await WindowsAppSDKDependency.EnsureAsync(path).ConfigureAwait(false);
-        await EdgeWebView2Dependency.EnsureAsync(installWebView2, isUpdateMode).ConfigureAwait(false);
-        await RunDeploymentCoreAsync(path, name, isUpdateMode).ConfigureAwait(false);
-        await ExitAsync(isUpdateMode).ConfigureAwait(false);
-    }
-
-    private static async Task RunDeploymentCoreAsync(string path, string? name, bool isUpdateMode)
-    {
         try
         {
-            Console.WriteLine("Initializing PackageManager...");
+            await Certificate.EnsureGlobalSignCodeSigningRootR45Async().ConfigureAwait(false);
-            PackageManager packageManager = new();
+            await WindowsAppSDKDependency.EnsureAsync(path).ConfigureAwait(false);
-            AddPackageOptions addPackageOptions = new()
+            await RunDeploymentCoreAsync(path, name, isUpdateMode).ConfigureAwait(false);
-            {
-                ForceAppShutdown = true,
-                RetainFilesOnFailure = true,
-            };
-
-            Console.WriteLine("Start deploying...");
-            IProgress<DeploymentProgress> progress = new Progress<DeploymentProgress>(p =>
-            {
-                Console.WriteLine($"[Deploying]: State: {p.state} Progress: {p.percentage}%");
-            });
-            DeploymentResult result = await packageManager
-                .AddPackageByUriAsync(new Uri(path), addPackageOptions)
-                .AsTask(progress)
-                .ConfigureAwait(false);
-
-            if (result.IsRegistered)
-            {
-                Console.WriteLine("Package deployed.");
-                if (string.IsNullOrEmpty(name))
-                {
-                    Console.WriteLine("FamilyName not provided, enumerating packages.");
-
-                    foreach (Windows.ApplicationModel.Package package in packageManager.FindPackages())
-                    {
-                        try
-                        {
-                            if (package is { DisplayName: "Snap Hutao", PublisherDisplayName: "DGP Studio" })
-                            {
-                                name = package.Id.FamilyName;
-                                Console.WriteLine($"Package found: {name}");
-                            }
-                        }
-                        catch (COMException ex)
-                        {
-                            // ERROR_MRM_MAP_NOT_FOUND or ERROR_NOT_FOUND
-                            if (ex.HResult is not unchecked((int)0x80073B1F) or unchecked((int)0x80070490))
-                            {
-                                throw;
-                            }
-                        }
-                    }
-                }
-
-                Console.WriteLine("Starting app...");
-                Process.Start(new ProcessStartInfo()
-                {
-                    UseShellExecute = true,
-                    FileName = $@"shell:AppsFolder\{name}!App",
-                });
-            }
-            else
-            {
-                Console.WriteLine($"""
-                    ActivityId: {result.ActivityId}
-                    ExtendedErrorCode: {result.ExtendedErrorCode}
-                    ErrorText: {result.ErrorText}
-                    """);
-            }
         }
         catch (Exception ex)
         {
@@ -126,14 +58,83 @@ internal static partial class Invocation
                 {ex}
                 """);
         }
+        finally
+        {
+            await ExitAsync(isUpdateMode).ConfigureAwait(false);
+        }
+    }
+
+    private static async Task RunDeploymentCoreAsync(string path, string? name, bool isUpdateMode)
+    {
+        Console.WriteLine("Initializing PackageManager...");
+        PackageManager packageManager = new();
+        AddPackageOptions addPackageOptions = new()
+        {
+            ForceAppShutdown = true,
+            RetainFilesOnFailure = true,
+        };
+
+        Console.WriteLine("Start deploying...");
+        IProgress<DeploymentProgress> progress = new Progress<DeploymentProgress>(p =>
+        {
+            Console.WriteLine($"[Deploying]: State: {p.state} Progress: {p.percentage}%");
+        });
+        DeploymentResult result = await packageManager
+            .AddPackageByUriAsync(new Uri(path), addPackageOptions)
+            .AsTask(progress)
+            .ConfigureAwait(false);
+
+        if (result.IsRegistered)
+        {
+            Console.WriteLine("Package deployed.");
+            if (string.IsNullOrEmpty(name))
+            {
+                Console.WriteLine("FamilyName not provided, enumerating packages.");
+
+                foreach (Windows.ApplicationModel.Package package in packageManager.FindPackages())
+                {
+                    try
+                    {
+                        if (package is { DisplayName: "Snap Hutao", PublisherDisplayName: "DGP Studio" })
+                        {
+                            name = package.Id.FamilyName;
+                            Console.WriteLine($"Package found: {name}");
+                        }
+                    }
+                    catch (COMException ex)
+                    {
+                        // ERROR_MRM_MAP_NOT_FOUND or ERROR_NOT_FOUND
+                        if (ex.HResult is not (unchecked((int)0x80073B1F) or unchecked((int)0x80070490)))
+                        {
+                            throw;
+                        }
+                    }
+                }
+            }
+
+            Console.WriteLine("Starting app...");
+            Process.Start(new ProcessStartInfo()
+            {
+                UseShellExecute = true,
+                FileName = $@"shell:AppsFolder\{name}!App",
+            });
+        }
+        else
+        {
+            Console.WriteLine($"""
+                    ActivityId: {result.ActivityId}
+                    ExtendedErrorCode: {result.ExtendedErrorCode}
+                    ErrorText: {result.ErrorText}
+                    """);
+        }
     }
 
     private static async ValueTask ExitAsync(bool isUpdateMode)
     {
         if (!isUpdateMode)
         {
-            Console.WriteLine("Press any key to exit...");
+            Console.WriteLine("Press enter to exit...");
-            Console.ReadKey();
+            while (Console.ReadKey(true).Key != ConsoleKey.Enter) ;
             FreeConsole();
         }
         else

src/Snap.Hutao.Deployment/InvocationOptions.cs

@@ -19,9 +19,4 @@ internal static class InvocationOptions
         "--update-behavior",
         () => false,
         "Change behavior of the tool into update mode");
-
-    public static readonly Option<bool> InstallWebView2 = new(
-        "--install-webview2",
-        () => false,
-        "Install WebView2 if not found.");
 }

src/Snap.Hutao.Deployment/Program.cs

@@ -16,7 +16,6 @@ internal static partial class Program
         root.AddOption(InvocationOptions.PackagePath);
         root.AddOption(InvocationOptions.FamilyName);
         root.AddOption(InvocationOptions.UpdateBehavior);
-        root.AddOption(InvocationOptions.InstallWebView2);
 
         root.SetHandler(Invocation.RunDeploymentAsync);