Fun/Snap.Hutao.Deployment
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.Deployment.git synced 2025-11-19 21:08:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

add msix corruted message

Browse Source
This commit is contained in:
Lightczx
2024-01-31 13:32:55 +08:00
parent 39ccb73e2f
commit a4fd59df08
4 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/Publish.yml vendored
View File

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

2
src/Snap.Hutao.Deployment.Runtime/Snap.Hutao.Deployment.Runtime.nuspec
View File

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

BIN
src/Snap.Hutao.Deployment.Runtime/Snap.Hutao.Deployment.exe
View File

Binary file not shown.

54
src/Snap.Hutao.Deployment/WindowsAppSDKDependency.cs
View File

@@ -20,30 +20,50 @@ internal static partial class WindowsAppSDKDependency
public static async Task EnsureAsync(string packagePath) public static async Task EnsureAsync(string packagePath)
{ {
using FileStream packageStream = File.OpenRead(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 (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)) 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) private static async Task<string> ExtractSDKVersionFromDepsJsonAsync(ZipArchive package)