From a5c38fd09befc2b62899ba2c3ff0572637321bf3 Mon Sep 17 00:00:00 2001 From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com> Date: Tue, 16 Jul 2024 18:48:43 -0700 Subject: [PATCH] modified VM deployment iso cmd scripts and fixed appx license file issue --- FFUDevelopment/Apps/InstallAppsandSysprep.cmd | 9 +++++--- .../BuildWinPEDeploymentMediaVM_ARM64.cmd | 2 +- .../BuildWinPEDeploymentMediaVM_amd64.cmd | 21 +++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 FFUDevelopment/BuildWinPEDeploymentMediaVM_amd64.cmd diff --git a/FFUDevelopment/Apps/InstallAppsandSysprep.cmd b/FFUDevelopment/Apps/InstallAppsandSysprep.cmd index 8b39b03..df50ea8 100644 --- a/FFUDevelopment/Apps/InstallAppsandSysprep.cmd +++ b/FFUDevelopment/Apps/InstallAppsandSysprep.cmd @@ -29,9 +29,9 @@ for /d %%D in ("%basepath%\*") do ( ) ) ) - for %%F in ("!appfolder!\*.xml") do ( - set "licensefile=%%F" - ) + @REM for %%F in ("!appfolder!\*.xml") do ( + @REM set "licensefile=%%F" + @REM ) if defined mainpackage ( set "dism_command=DISM /Online /Add-ProvisionedAppxPackage /PackagePath:"!mainpackage!"" if exist "!dependenciesfolder!" ( @@ -39,6 +39,9 @@ for /d %%D in ("%basepath%\*") do ( set "dism_command=!dism_command! /DependencyPackagePath:"%%G"" ) ) + for %%F in ("!appfolder!\*.xml") do ( + set "licensefile=%%F" + ) if defined licensefile ( set "dism_command=!dism_command! /LicensePath:"!licensefile!"" ) else ( diff --git a/FFUDevelopment/BuildWinPEDeploymentMediaVM_ARM64.cmd b/FFUDevelopment/BuildWinPEDeploymentMediaVM_ARM64.cmd index 2eee8b1..bcc7003 100644 --- a/FFUDevelopment/BuildWinPEDeploymentMediaVM_ARM64.cmd +++ b/FFUDevelopment/BuildWinPEDeploymentMediaVM_ARM64.cmd @@ -17,5 +17,5 @@ xcopy "C:\FFUDevelopment\WinPEDeployFFUFilesVM" c:\FFUDevelopment\WinPE\mount /Y REM If you need to add drivers, remove the REM from the below line and change the /Driver:Path to a folder of drivers REM dism /image:C:\FFUDevelopment\WinPE\mount /Add-Driver /Driver: /Recurse Dism /Unmount-Image /MountDir:c:\FFUDevelopment\WinPE\mount /Commit -MakeWinPEMedia /ISO /F c:\FFUDevelopment\WinPE "c:\FFUDevelopment\WinPE_FFU_Deploy_VM_ARM64.iso" +MakeWinPEMedia /ISO /F c:\FFUDevelopment\WinPE "c:\FFUDevelopment\WinPE_FFU_Deploy_VM_arm64.iso" rd c:\FFUDevelopment\WinPE /S /Q \ No newline at end of file diff --git a/FFUDevelopment/BuildWinPEDeploymentMediaVM_amd64.cmd b/FFUDevelopment/BuildWinPEDeploymentMediaVM_amd64.cmd new file mode 100644 index 0000000..8f490d4 --- /dev/null +++ b/FFUDevelopment/BuildWinPEDeploymentMediaVM_amd64.cmd @@ -0,0 +1,21 @@ +rd c:\FFUDevelopment\WinPE /S /Q +cmd /c copype amd64 c:\FFUDevelopment\WinPE +Dism /Mount-Image /ImageFile:"c:\FFUDevelopment\WinPE\media\sources\boot.wim" /Index:1 /MountDir:"c:\FFUDevelopment\WinPE\mount" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\WinPE-WMI.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\en-us\WinPE-WMI_en-us.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\WinPE-NetFX.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\en-us\WinPE-NetFX_en-us.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\WinPE-Scripting.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\en-us\WinPE-Scripting_en-us.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\WinPE-PowerShell.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\en-us\WinPE-PowerShell_en-us.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\WinPE-StorageWMI.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\en-us\WinPE-StorageWMI_en-us.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\WinPE-DismCmdlets.cab" +Dism /Add-Package /Image:"c:\FFUDevelopment\WinPE\mount" /PackagePath:"C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\en-us\WinPE-DismCmdlets_en-us.cab" +xcopy "C:\FFUDevelopment\WinPEDeployFFUFilesVM" c:\FFUDevelopment\WinPE\mount /Y /E +REM If you need to add drivers, remove the REM from the below line and change the /Driver:Path to a folder of drivers +REM dism /image:C:\FFUDevelopment\WinPE\mount /Add-Driver /Driver: /Recurse +Dism /Unmount-Image /MountDir:c:\FFUDevelopment\WinPE\mount /Commit +MakeWinPEMedia /ISO /F c:\FFUDevelopment\WinPE "c:\FFUDevelopment\WinPE_FFU_Deploy_VM_amd64.iso" +rd c:\FFUDevelopment\WinPE /S /Q \ No newline at end of file