diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1 index ee2bbca..f5fda1c 100644 --- a/FFUDevelopment/BuildFFUVM.ps1 +++ b/FFUDevelopment/BuildFFUVM.ps1 @@ -4731,6 +4731,8 @@ try { if ($WindowsRelease -in 2016, 2019, 2021 -and $WindowsSKU -like "*LTSC") { $Name = "Cumulative update for .net framework windows 10 $WindowsVersion $WindowsArch" $NETPath = Join-Path -Path $KBPath -ChildPath "NET" + # These LTSC editions include multiple .NET updates, so a separate directory is created and specified to allow DISM + # to install them all, instead of specifying each .NET update individually. if (-not (Test-Path -Path $NETPath)) { WriteLog "Creating $NETPath" New-Item -Path $NETPath -ItemType Directory -Force | Out-Null diff --git a/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1 b/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1 index 08be73a..2f77e74 100644 --- a/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1 +++ b/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1 @@ -12,10 +12,10 @@ reg load "HKLM\FFU" $Software $SKU = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'EditionID' [int]$CurrentBuild = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'CurrentBuild' -if ($CurrentBuild -notin 14393, 17763) { +$InstallationType = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'InstallationType' +if ($CurrentBuild -notin 14393, 17763 -and $InstallationType -ne "Server") { $WindowsVersion = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'DisplayVersion' } -$InstallationType = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'InstallationType' $BuildDate = Get-Date -uformat %b%Y $SKU = switch ($SKU) {