ewilliams28/FFU
1
0
Fork 0
mirror of https://github.com/rbalsleyMSFT/FFU.git synced 2026-06-14 02:09:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Standardizes .NET update cache layout

Browse Source 
Always stores .NET MSUs under a dedicated NET folder to keep cache structure consistent across OS variants

Migrates expected legacy root-stored .NET MSUs into the NET folder and prunes stale files from both locations to prevent buildup and mismatches
This commit is contained in:
rbalsleyMSFT
2026-02-12 13:19:05 -08:00
parent 27eebeb9cb
commit baa696b880
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FFUDevelopment/BuildFFUVM.ps1
+29 -29
View File
@@ -6431,22 +6431,27 @@ try {
} }
} }
# Prune older .NET MSUs from this OS cache root (non-LTSC stores .NET MSUs in the root) # Prune older .NET MSUs from NET folder (always store .NET updates under NET)
if ($expectedNetMsuNames.Count -gt 0 -and -not ($isLTSC -and $WindowsRelease -in 2016, 2019, 2021)) { if ($expectedNetMsuNames.Count -gt 0) {
WriteLog "Pruning older .NET MSU files in $kbCacheRootPath" $netFolder = Join-Path -Path $kbCacheRootPath -ChildPath 'NET'
$existingNetMsus = @(Get-ChildItem -Path $kbCacheRootPath -Filter '*.msu' -File -ErrorAction SilentlyContinue | Where-Object { $_.Name -match '(?i)ndp' })
foreach ($msu in $existingNetMsus) { # Ensure NET folder exists
if (-not $expectedNetMsuNames.Contains($msu.Name)) { if (-not (Test-Path -Path $netFolder)) {
WriteLog "Removing old .NET MSU: $($msu.FullName)" WriteLog "Creating .NET updates folder $netFolder"
Remove-Item -LiteralPath $msu.FullName -Force -ErrorAction SilentlyContinue New-Item -Path $netFolder -ItemType Directory -Force | Out-Null
} }
# Migrate legacy layout: move expected .NET MSUs from cache root into NET folder (if present)
$legacyRootNetMsus = @(Get-ChildItem -Path $kbCacheRootPath -Filter '*.msu' -File -ErrorAction SilentlyContinue | Where-Object { $_.Name -match '(?i)ndp' })
foreach ($msu in $legacyRootNetMsus) {
$destPath = Join-Path -Path $netFolder -ChildPath $msu.Name
if ($expectedNetMsuNames.Contains($msu.Name) -and -not (Test-Path -LiteralPath $destPath)) {
WriteLog "Moving .NET MSU into NET folder: $($msu.FullName) -> $destPath"
Move-Item -LiteralPath $msu.FullName -Destination $destPath -Force -ErrorAction SilentlyContinue
} }
} }
# Prune older .NET MSUs from NET folder (LTSC stores .NET updates under NET) # Prune any stale .NET MSUs from NET folder
if ($expectedNetMsuNames.Count -gt 0 -and ($isLTSC -and $WindowsRelease -in 2016, 2019, 2021)) {
$netFolder = Join-Path -Path $kbCacheRootPath -ChildPath 'NET'
if (Test-Path -Path $netFolder) {
WriteLog "Pruning older .NET MSU files in $netFolder" WriteLog "Pruning older .NET MSU files in $netFolder"
$existingNetMsus = @(Get-ChildItem -Path $netFolder -Filter '*.msu' -File -ErrorAction SilentlyContinue) $existingNetMsus = @(Get-ChildItem -Path $netFolder -Filter '*.msu' -File -ErrorAction SilentlyContinue)
foreach ($msu in $existingNetMsus) { foreach ($msu in $existingNetMsus) {
@@ -6455,6 +6460,14 @@ try {
Remove-Item -LiteralPath $msu.FullName -Force -ErrorAction SilentlyContinue Remove-Item -LiteralPath $msu.FullName -Force -ErrorAction SilentlyContinue
} }
} }
# Remove stale legacy .NET MSUs that may still exist in the cache root
$legacyRootNetMsus = @(Get-ChildItem -Path $kbCacheRootPath -Filter '*.msu' -File -ErrorAction SilentlyContinue | Where-Object { $_.Name -match '(?i)ndp' })
foreach ($msu in $legacyRootNetMsus) {
if (-not $expectedNetMsuNames.Contains($msu.Name)) {
WriteLog "Removing old .NET MSU: $($msu.FullName)"
Remove-Item -LiteralPath $msu.FullName -Force -ErrorAction SilentlyContinue
}
} }
} }
@@ -6481,10 +6494,8 @@ try {
$destinationPath = $kbCacheRootPath $destinationPath = $kbCacheRootPath
if (($netUpdateInfos -and ($netUpdateInfos.Name -contains $update.Name)) -or ` if (($netUpdateInfos -and ($netUpdateInfos.Name -contains $update.Name)) -or `
($netFeatureUpdateInfos -and ($netFeatureUpdateInfos.Name -contains $update.Name))) { ($netFeatureUpdateInfos -and ($netFeatureUpdateInfos.Name -contains $update.Name))) {
if ($isLTSC -and $WindowsRelease -in 2016, 2019, 2021) {
$destinationPath = Join-Path -Path $kbCacheRootPath -ChildPath "NET" $destinationPath = Join-Path -Path $kbCacheRootPath -ChildPath "NET"
} }
}
if ($microcodeUpdateInfos -and ($microcodeUpdateInfos.Name -contains $update.Name)) { if ($microcodeUpdateInfos -and ($microcodeUpdateInfos.Name -contains $update.Name)) {
$destinationPath = Join-Path -Path $kbCacheRootPath -ChildPath "Microcode" $destinationPath = Join-Path -Path $kbCacheRootPath -ChildPath "Microcode"
} }
@@ -6525,23 +6536,12 @@ try {
WriteLog "Latest Preview CU identified as $CUPPath" WriteLog "Latest Preview CU identified as $CUPPath"
} }
if ($netUpdateInfos.Count -gt 0 -or $netFeatureUpdateInfos.Count -gt 0) { if ($netUpdateInfos.Count -gt 0 -or $netFeatureUpdateInfos.Count -gt 0) {
if ($isLTSC -and $WindowsRelease -in 2016, 2019, 2021) {
$NETPath = Join-Path -Path $kbCacheRootPath -ChildPath "NET" $NETPath = Join-Path -Path $kbCacheRootPath -ChildPath "NET"
WriteLog ".NET updates for LTSC are in $NETPath" if (-not (Test-Path -Path $NETPath)) {
} WriteLog "Creating .NET updates folder $NETPath"
else { New-Item -Path $NETPath -ItemType Directory -Force | Out-Null
# Use the actual downloaded file name from the update info
$NETFileName = $netUpdateInfos[0].Name
$NETPath = (Get-ChildItem -Path $kbCacheRootPath -Filter $NETFileName -Recurse).FullName
if (-not $NETPath) {
# If exact match fails, try to find by KB article ID
$NETPath = (Get-ChildItem -Path $kbCacheRootPath -Filter "*$netKbArticleId*" -Recurse | Select-Object -First 1).FullName
if ($NETPath) {
$NETFileName = Split-Path $NETPath -Leaf
}
}
WriteLog "Latest .NET Framework identified as $NETPath"
} }
WriteLog ".NET updates are in $NETPath"
} }
if ($microcodeUpdateInfos.Count -gt 0) { if ($microcodeUpdateInfos.Count -gt 0) {
$MicrocodePath = Join-Path -Path $kbCacheRootPath -ChildPath "Microcode" $MicrocodePath = Join-Path -Path $kbCacheRootPath -ChildPath "Microcode"