code style [skip ci]

Co-authored-by: DismissedLight <1686188646@qq.com>

.github/workflows/Publish.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   publish:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout Repository
@@ -18,9 +18,6 @@ jobs:
       with:
         dotnet-version: '8.x'
 
-    - name: Build Tool
-      run: dotnet publish src/Snap.Hutao.Deployment/Snap.Hutao.Deployment.csproj
-
     - name: Pack
       run: dotnet pack src/Snap.Hutao.Deployment.Runtime/Snap.Hutao.Deployment.Runtime.csproj
 

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.15.2</version>
     <authors>DGP Studio</authors>
     <developmentDependency>true</developmentDependency>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

src/Snap.Hutao.Deployment/HttpShardCopyWorker.cs

@@ -55,7 +55,12 @@ internal sealed class HttpShardCopyWorker<TStatus> : IDisposable
     public Task CopyAsync(IProgress<TStatus> progress, CancellationToken token = default)
     {
         ShardProgress shardProgress = new(progress, statusFactory, contentLength);
-        return Parallel.ForEachAsync(shards, token, (shard, token) => CopyShardAsync(shard, shardProgress, token));
+        ParallelOptions options = new()
+        {
+            MaxDegreeOfParallelism = Math.Clamp(Environment.ProcessorCount, 2, 6),
+            CancellationToken = token,
+        };
+        return Parallel.ForEachAsync(shards, options, (shard, token) => CopyShardAsync(shard, shardProgress, token));
 
         async ValueTask CopyShardAsync(Shard shard, IProgress<ShardStatus> progress, CancellationToken token)
         {

src/Snap.Hutao.Deployment/Invocation.cs

@@ -24,6 +24,7 @@ internal static partial class Invocation
         ArgumentException.ThrowIfNullOrEmpty(path);
 
         Console.WriteLine($"""
+            Snap Hutao Deployment Tool [1.15.2]
             PackagePath: {path}
             FamilyName: {name}
             ------------------------------------------------------------
@@ -45,77 +46,11 @@ internal static partial class Invocation
             }
         }
 
-        await Certificate.EnsureGlobalSignCodeSigningRootR45Async().ConfigureAwait(false);
-        await WindowsAppSDKDependency.EnsureAsync(path).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)
         {
@@ -124,14 +59,86 @@ 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)
+            {
+                //Pending enter key
+            }
             FreeConsole();
         }
         else

src/Snap.Hutao.Deployment/Program.cs

@@ -1,5 +1,4 @@
 using System.CommandLine;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
 namespace Snap.Hutao.Deployment;

src/Snap.Hutao.Deployment/Snap.Hutao.Deployment.csproj

@@ -21,6 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
   </ItemGroup>
 
 </Project>

src/Snap.Hutao.Deployment/WindowsAppSDKDependency.cs

@@ -1,8 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
+using System.Linq;
 using System.Net.Http;
+using System.Runtime.InteropServices;
+using System.ServiceProcess;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Windows.Management.Deployment;
@@ -16,30 +20,50 @@ internal static partial class WindowsAppSDKDependency
     public static async Task EnsureAsync(string packagePath)
     {
         using FileStream packageStream = File.OpenRead(packagePath);
-        using ZipArchive package = new(packageStream, ZipArchiveMode.Read);
+        ZipArchive package = default!;
-
+        try
-        (string packageName, string msixVersion) = await ExtractRuntimePackageNameAndMsixMinVersionFromAppManifestAsync(package).ConfigureAwait(false);
-        if (string.IsNullOrEmpty(packageName) || string.IsNullOrEmpty(msixVersion))
         {
-            Console.WriteLine("No Windows App Runtime version found in Msix/AppxManifest.xml");
+            package = new(packageStream, ZipArchiveMode.Read);
-            return;
+        }
+        catch (InvalidDataException)
+        {
+            Console.WriteLine("Msix Package corrupted, please re-launch Deployment and try again");
+            try
+            {
+                File.Delete(packagePath);
+            }
+            catch
+            {
+            }
+
+            throw;
         }
 
-        if (CheckRuntimeInstalled(packageName, msixVersion))
+        using (package)
         {
-            return;
+            (string packageName, string msixVersion) = await ExtractRuntimePackageNameAndMsixMinVersionFromAppManifestAsync(package).ConfigureAwait(false);
-        }
+            if (string.IsNullOrEmpty(packageName) || string.IsNullOrEmpty(msixVersion))
+            {
+                Console.WriteLine("No Windows App Runtime version found in Msix/AppxManifest.xml");
+                return;
+            }
 
-        string sdkVersion = await ExtractSDKVersionFromDepsJsonAsync(package).ConfigureAwait(false);
+            if (await CheckRuntimeInstalledAndVerifyAsync(packageName, msixVersion).ConfigureAwait(false))
+            {
+                return;
+            }
 
-        if (string.IsNullOrEmpty(sdkVersion))
+            string sdkVersion = await ExtractSDKVersionFromDepsJsonAsync(package).ConfigureAwait(false);
-        {
-            Console.WriteLine("No Windows App SDK version found in Msix/Snap.Hutao.deps.json");
-            return;
-        }
 
-        Console.WriteLine("Start downloading SDK installer...");
+            if (string.IsNullOrEmpty(sdkVersion))
-        await DownloadWindowsAppRuntimeInstallAndInstallAsync(sdkVersion).ConfigureAwait(false);
+            {
+                Console.WriteLine("No Windows App SDK version found in Msix/Snap.Hutao.deps.json");
+                return;
+            }
+
+            Console.WriteLine("Start downloading SDK installer...");
+            await DownloadWindowsAppRuntimeInstallAndInstallAsync(sdkVersion).ConfigureAwait(false);
+        };
     }
 
     private static async Task<string> ExtractSDKVersionFromDepsJsonAsync(ZipArchive package)
@@ -63,19 +87,21 @@ internal static partial class WindowsAppSDKDependency
         return string.Empty;
     }
 
-    private static bool CheckRuntimeInstalled(string packageName, string msixVersion)
+    private static async Task<bool> CheckRuntimeInstalledAndVerifyAsync(string packageName, string msixVersion)
     {
         Version msixMinVersion = new(msixVersion);
 
+        List<bool> results = [];
+
         foreach (Windows.ApplicationModel.Package installed in new PackageManager().FindPackages())
         {
             if (installed.Id.Name == packageName && installed.Id.Version.ToVersion() >= msixMinVersion)
             {
-                return true;
+                results.Add(await installed.VerifyContentIntegrityAsync());
             }
         }
 
-        return false;
+        return results.Count > 0 && results.Aggregate((result, element) => result || element);
     }
 
     private static async Task DownloadWindowsAppRuntimeInstallAndInstallAsync(string version)
@@ -100,6 +126,23 @@ internal static partial class WindowsAppSDKDependency
                 }
             }
 
+            ServiceController serviceController = new("appxsvc");
+            if (serviceController.CanStop)
+            {
+                Console.WriteLine("Stopping AppxSvc...");
+                serviceController.Stop();
+                serviceController.WaitForStatus(ServiceControllerStatus.Stopped, TimeSpan.FromSeconds(5));
+
+                if (serviceController.Status is not ServiceControllerStatus.Stopped)
+                {
+                    Console.WriteLine("Can not stop AppxSvc, timeout...");
+                }
+            }
+            else
+            {
+                Console.WriteLine("Can not stop AppxSvc, disallowed...");
+            }
+
             Console.WriteLine("Start installing SDK...");
             Process installerProcess = new()
             {
@@ -116,12 +159,13 @@ internal static partial class WindowsAppSDKDependency
                 installerProcess.OutputDataReceived += (sender, e) => Console.WriteLine(e.Data);
                 installerProcess.ErrorDataReceived += (sender, e) => Console.WriteLine(e.Data);
                 installerProcess.Start();
-                Console.WriteLine("-----> WindowsAppRuntimeInstall Output begin -----");
+                Console.WriteLine("-----> WindowsAppRuntimeInstall Output begin");
                 installerProcess.BeginOutputReadLine();
                 installerProcess.BeginErrorReadLine();
 
                 await installerProcess.WaitForExitAsync().ConfigureAwait(false);
-                Console.WriteLine("<----- WindowsAppRuntimeInstall Output end -------");
+                Marshal.ThrowExceptionForHR(installerProcess.ExitCode);
+                Console.WriteLine("<----- WindowsAppRuntimeInstall Output end");
             }
         }
         finally