Skip to content

Commit

Permalink
Delete the bundled 32-bit arm Xaml package on 24H2 or later.
Browse files Browse the repository at this point in the history
Windows dropped support for 32-bit arm, and apparently DISM will error
out if the 32-bit arm package is specified to /DependencyPackagePath.
Rather than screw around with logic to exclude files matching a pattern
in the FOR loop, just delete the file.
  • Loading branch information
jeremyd2019 committed Nov 15, 2024
1 parent 2ccddf5 commit f768304
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions msys2-runner-setup/setupscripts/setup.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ GOTO :eof
:installterminal
SETLOCAL EnableDelayedExpansion

REM Windows 11 24H2 doesn't like the 32-bit arm Xaml package
CALL :getbuild
IF %BUILD% GEQ 26100 DEL term\*_arm_*.appx

FOR %%i IN (term\*.msixbundle) DO SET MSIX=%%i
FOR %%i IN (term\*_License1.xml) DO SET LIC=%%i
SET DEPS=
Expand All @@ -83,3 +87,8 @@ DISM /Online /Add-ProvisionedAppxPackage /PackagePath:%MSIX% /LicensePath:%LIC%
ENDLOCAL
GOTO :eof

:getbuild
SETLOCAL
FOR /F "tokens=6 delims=[]. " %%I IN ('ver') DO SET BUILD=%%I
ENDLOCAL & SET BUILD=%BUILD%
GOTO :eof

0 comments on commit f768304

Please sign in to comment.