From 97dba57d42b05701c5d451b5e8da8c4a12765bf6 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Wed, 5 Oct 2022 21:47:46 +0800 Subject: [PATCH 1/2] Update installation script Make sure to run Powershell on the Administrator account using the console host Check the version before installing dependencies, and install dependencies only if needed --- scripts/build.sh | 42 ++++++++++++++++++++++++++++++------- scripts/generateWSALinks.py | 7 +++---- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index c283fb0..ee30c0b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -294,8 +294,8 @@ RELEASE_NAME=${RELEASE_NAME_MAP[$RELEASE_TYPE]} || abort echo -e "Build: RELEASE_TYPE=$RELEASE_NAME" WSA_ZIP_PATH=$DOWNLOAD_DIR/wsa-$ARCH-$RELEASE_TYPE.zip -vclibs_PATH=$DOWNLOAD_DIR/vclibs-"$ARCH".appx -xaml_PATH=$DOWNLOAD_DIR/xaml-"$ARCH".appx +vclibs_PATH=$DOWNLOAD_DIR/Microsoft.VCLibs."$ARCH".14.00.Desktop.appx +xaml_PATH=$DOWNLOAD_DIR/Microsoft.UI.Xaml_"$ARCH".appx MAGISK_PATH=$DOWNLOAD_DIR/magisk-$MAGISK_VER.zip if [ "$CUSTOM_MAGISK" ]; then if [ ! -f "$MAGISK_PATH" ]; then @@ -685,13 +685,25 @@ function Test-Administrator { } } +function Test-WindowsTerminal { test-path env:WT_SESSION } + +function Get-InstalledDependencyVersion { + param ( + [string]\$Name, + [string]\$ProcessorArchitecture + ) + process { + return Get-AppxPackage -Name \$Name | ForEach-Object { if (\$_.Architecture -eq \$ProcessorArchitecture) { \$_ } } | Sort-Object -Property Version | Select-Object -ExpandProperty Version -Last 1; + } +} + function Finish { Clear-Host Start-Process "wsa://com.topjohnwu.magisk" Start-Process "wsa://com.android.vending" } -If (-Not (Test-Administrator)) { +If (-Not (Test-Administrator) -Or (Test-WindowsTerminal)) { Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Bypass -Force \$proc = Start-Process -PassThru -WindowStyle Hidden -Verb RunAs ConHost.exe -Args "powershell -ExecutionPolicy Bypass -Command Set-Location '\$PSScriptRoot'; &'\$PSCommandPath' EVAL" \$proc.WaitForExit() @@ -703,7 +715,7 @@ If (-Not (Test-Administrator)) { exit } ElseIf ((\$args.Count -Eq 1) -And (\$args[0] -Eq "EVAL")) { - Start-Process powershell.exe -Args "-ExecutionPolicy Bypass -Command Set-Location '\$PSScriptRoot'; &'\$PSCommandPath'" + Start-Process ConHost.exe -Args "powershell -ExecutionPolicy Bypass -Command Set-Location '\$PSScriptRoot'; &'\$PSCommandPath'" exit } @@ -728,11 +740,27 @@ If (\$(Get-WindowsOptionalFeature -Online -FeatureName 'VirtualMachinePlatform') } } -Add-AppxPackage -ForceApplicationShutdown -ForceUpdateFromAnyVersion -Path vclibs-$ARCH.appx -Add-AppxPackage -ForceApplicationShutdown -ForceUpdateFromAnyVersion -Path xaml-$ARCH.appx +[xml]\$Xml = Get-Content ".\AppxManifest.xml"; +\$Name = \$Xml.Package.Identity.Name; +\$ProcessorArchitecture = \$Xml.Package.Identity.ProcessorArchitecture; +\$Dependencies = \$Xml.Package.Dependencies.PackageDependency; +\$Dependencies | ForEach-Object { + If (\$_.Name -Eq "Microsoft.VCLibs.140.00.UWPDesktop") { + \$HighestInstalledVCLibsVersion = Get-InstalledDependencyVersion -Name \$_.Name -ProcessorArchitecture \$ProcessorArchitecture; + If ( \$HighestInstalledVCLibsVersion -Lt \$_.MinVersion ) { + Add-AppxPackage -ForceApplicationShutdown -ForceUpdateFromAnyVersion -Path "Microsoft.VCLibs.\$ProcessorArchitecture.14.00.Desktop.appx" + } + } + ElseIf (\$_.Name -Match "Microsoft.UI.Xaml") { + \$HighestInstalledXamlVersion = Get-InstalledDependencyVersion -Name \$_.Name -ProcessorArchitecture \$ProcessorArchitecture; + If ( \$HighestInstalledXamlVersion -Lt \$_.MinVersion ) { + Add-AppxPackage -ForceApplicationShutdown -ForceUpdateFromAnyVersion -Path "Microsoft.UI.Xaml_\$ProcessorArchitecture.appx" + } + } +} \$Installed = \$null -\$Installed = Get-AppxPackage -Name 'MicrosoftCorporationII.WindowsSubsystemForAndroid' +\$Installed = Get-AppxPackage -Name \$Name If ((\$null -Ne \$Installed) -And (-Not (\$Installed.IsDevelopmentMode))) { Clear-Host diff --git a/scripts/generateWSALinks.py b/scripts/generateWSALinks.py index 3b5a928..8314a29 100644 --- a/scripts/generateWSALinks.py +++ b/scripts/generateWSALinks.py @@ -85,11 +85,11 @@ if not download_dir.is_dir(): tmpdownlist = open(download_dir/tempScript, 'a') for i, v, f in identities: if re.match(f"Microsoft\.UI\.Xaml\..*_{arch}_.*\.appx", f): - out_file_name = f"xaml-{arch}.appx" + out_file_name = f"Microsoft.UI.Xaml_{arch}.appx" out_file = download_dir / out_file_name # elif re.match(f"Microsoft\.VCLibs\..+\.UWPDesktop_.*_{arch}_.*\.appx", f): - # out_file = download_dir / "vclibs.appx" - # out_file_name = "vclibs.appx" + # out_file_name = f"Microsoft.VCLibs.140.00.UWPDesktop_{arch}.appx" + # out_file = download_dir / out_file_name elif re.match(f"MicrosoftCorporationII\.WindowsSubsystemForAndroid_.*\.msixbundle", f): out_file_name = f"wsa-{arch}-{release_type}.zip" out_file = download_dir / out_file_name @@ -111,5 +111,4 @@ for i, v, f in identities: tmpdownlist.writelines(f' out={out_file_name}\n') tmpdownlist.writelines(f'https://aka.ms/Microsoft.VCLibs.{arch}.14.00.Desktop.appx\n') tmpdownlist.writelines(f' dir={download_dir}\n') -tmpdownlist.writelines(f' out=vclibs-{arch}.appx\n') tmpdownlist.close() From b092bcefe1bdd42c785cbb0a2571323e0d8b62fb Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Wed, 5 Oct 2022 22:20:14 +0800 Subject: [PATCH 2/2] Update build.sh Unable to detect if it is in Windows terminal --- scripts/build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index ee30c0b..8b143f4 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -685,8 +685,6 @@ function Test-Administrator { } } -function Test-WindowsTerminal { test-path env:WT_SESSION } - function Get-InstalledDependencyVersion { param ( [string]\$Name, @@ -703,7 +701,7 @@ function Finish { Start-Process "wsa://com.android.vending" } -If (-Not (Test-Administrator) -Or (Test-WindowsTerminal)) { +If (-Not (Test-Administrator)) { Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Bypass -Force \$proc = Start-Process -PassThru -WindowStyle Hidden -Verb RunAs ConHost.exe -Args "powershell -ExecutionPolicy Bypass -Command Set-Location '\$PSScriptRoot'; &'\$PSCommandPath' EVAL" \$proc.WaitForExit()