WindyMadman/WimHelper
1
0
Fork 0
mirror of https://github.com/dragonflylee/WimHelper.git synced 2025-01-07 03:06:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix install msix

Browse Source
This commit is contained in:
dragonflylee 2023-04-14 13:54:15 +08:00
parent 11901d9a80
commit 78306acbce
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,7 @@ Pack/AAct*.exe
Pack/Appx/*.AppxBundle
Pack/Appx/*.MsixBundle
Pack/Appx/*.Appx
Pack/Appx/*.Msix
*.wim
*.esd
*.iso

6
MakeISO.cmd
View File

@ -25,11 +25,11 @@ if exist "%DVD%\sources" (
)>"%DVD%\sources\ei.cfg"
rem ÅжÏUEFIÒýµ¼
if exist "%UEFIBoot%" (
"%Oscdimg%" -bootdata:2#p0,e,b"%BIOSBoot%"#pEF,e,b"%UEFIBoot%" -o -h -m -u2 -l"%ISOLabel%" "%DVD%" "%ISOFileName%"
"%Oscdimg%" -bootdata:2#p0,e,b"%BIOSBoot%"#pEF,e,b"%UEFIBoot%" -o -h -m -u2 -t%date:~5,2%/%date:~8,2%/%date:~0,4%,12:00:00 -l"%ISOLabel%" "%DVD%" "%ISOFileName%"
) else if exist "%BIOSBoot%" (
"%Oscdimg%" -bootdata:1#p0,e,b"%BIOSBoot%" -o -h -m -u2 -l"%ISOLabel%" "%DVD%" "%ISOFileName%"
"%Oscdimg%" -bootdata:1#p0,e,b"%BIOSBoot%" -o -h -m -u2 -t%date:~5,2%/%date:~8,2%/%date:~0,4%,12:00:00 -l"%ISOLabel%" "%DVD%" "%ISOFileName%"
) else (
"%Oscdimg%" -o -h -m -u2 -l"%ISOLabel%" "%DVD%" "%ISOFileName%"
"%Oscdimg%" -o -h -m -u2 -t%date:~5,2%/%date:~8,2%/%date:~0,4%,12:00:00 -l"%ISOLabel%" "%DVD%" "%ISOFileName%"
)
goto :Exit

5
WimHelper.cmd
View File

@ -71,11 +71,13 @@ for /f %%f in ('type "%~dp0Pack\FeatureList.%ImageShortVersion%.txt" 2^>nul') do
for /f %%f in ('type "%~dp0Pack\RemoveList.%ImageVersion%.txt" 2^>nul') do call :RemoveComponent "%~1", "%%f"
rem call :IntRollupFix "%~1"
rem call :AddAppx "%~1", "DesktopAppInstaller", "VCLibs"
call :AddAppx "%~1", "WindowsStore", "VCLibs UI.Xaml Runtime Framework"
call :AddAppx "%~1", "WindowsStore", "VCLibs UI.Xaml.2.7 Runtime Framework"
call :AddAppx "%~1", "DesktopAppInstaller"
if "%ImageVersion%" geq "10.0.22000" (
call :AddAppx "%~1", "WindowsTerminal"
call :AddAppx "%~1", "Client.WebExperience"
call :AddAppx "%~1", "WindowsNotepad", "UI.Xaml.2.8"
call :AddAppx "%~1", "ScreenSketch", "WindowsAppRuntime"
)
call :ImportOptimize "%~1"
call :ImportUnattend "%~1"
@ -313,6 +315,7 @@ set LicPath=/SkipLicense
if "%ImageArch%" equ "x86" ( set "AppxArch=*x86*" ) else ( set "AppxArch=*" )
for /f %%f in ('"dir /b %Apps%\*%~2*.xml" 2^>nul') do ( set LicPath=/LicensePath:"%Apps%\%%f" )
for %%j in (%~3) do for /f %%i in ('"dir /b %Apps%\*%%j%AppxArch%.appx" 2^>nul') do ( set Dependency=!Dependency! /DependencyPackagePath:"%Apps%\%%i" )
for %%j in (%~3) do for /f %%i in ('"dir /b %Apps%\*%%j%AppxArch%.msix" 2^>nul') do ( set Dependency=!Dependency! /DependencyPackagePath:"%Apps%\%%i" )
for /f %%i in ('"dir /b %Apps%\*%~2*.*xbundle" 2^>nul') do (
echo.¼¯³ÉÓ¦Óà [%%~ni]
%Dism% /Image:"%~1" /Add-ProvisionedAppxPackage /PackagePath:"%Apps%\%%i" %LicPath% %Dependency% /Quiet