7 Commits

Author SHA1 Message Date
Lightczx
de074e40e0 code style [skip ci] 2024-01-31 15:36:29 +08:00
Lightczx
4cf4c6caca fix 2024-01-31 15:24:22 +08:00
Lightczx
02dae0e199 Update Snap.Hutao.Deployment.exe 2024-01-31 13:49:18 +08:00
Lightczx
291c754deb update version 2024-01-31 13:48:46 +08:00
Lightczx
a4fd59df08 add msix corruted message 2024-01-31 13:32:55 +08:00
DismissedLight
39ccb73e2f 1.14 2024-01-18 23:12:32 +08:00
DismissedLight
ae96cdf793 fix IOE on WAS version check 2024-01-18 23:10:03 +08:00
7 changed files with 47 additions and 22 deletions

View File

@@ -7,7 +7,7 @@ on:
jobs:
publish:
runs-on: windows-latest
runs-on: ubuntu-latest
steps:
- name: Checkout Repository

View File

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

View File

@@ -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)
{

View File

@@ -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}
------------------------------------------------------------

View File

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

View File

@@ -20,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);
(string packageName, string msixVersion) = await ExtractRuntimePackageNameAndMsixMinVersionFromAppManifestAsync(package).ConfigureAwait(false);
if (string.IsNullOrEmpty(packageName) || string.IsNullOrEmpty(msixVersion))
ZipArchive package = default!;
try
{
Console.WriteLine("No Windows App Runtime version found in Msix/AppxManifest.xml");
return;
package = new(packageStream, ZipArchiveMode.Read);
}
catch (InvalidDataException)
{
Console.WriteLine("Msix Package corrupted, please re-launch Deployment and try again");
try
{
File.Delete(packagePath);
}
catch
{
}
throw;
}
if (await CheckRuntimeInstalledAndVerifyAsync(packageName, msixVersion).ConfigureAwait(false))
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))
{
Console.WriteLine("No Windows App SDK version found in Msix/Snap.Hutao.deps.json");
return;
}
string sdkVersion = await ExtractSDKVersionFromDepsJsonAsync(package).ConfigureAwait(false);
Console.WriteLine("Start downloading SDK installer...");
await DownloadWindowsAppRuntimeInstallAndInstallAsync(sdkVersion).ConfigureAwait(false);
if (string.IsNullOrEmpty(sdkVersion))
{
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)
@@ -81,7 +101,7 @@ internal static partial class WindowsAppSDKDependency
}
}
return results.Aggregate((result, element) => result || element);
return results.Count > 0 && results.Aggregate((result, element) => result || element);
}
private static async Task DownloadWindowsAppRuntimeInstallAndInstallAsync(string version)