Snoooopy/winutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/winutil.git synced 2026-08-09 17:41:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix Win11 Creator product-key validation failures (#4791)

Browse Source 
* feat: Enhance Win11 Creator with edition ID handling and update autounattend.xml generation

* Strengthen Pester coverage for config and function files
This commit is contained in:
Chris Titus
2026-07-01 17:15:26 -05:00
committed by GitHub
parent 8062815655
commit 104c763132
6 changed files with 406 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/private/Invoke-WinUtilISO.ps1
+55 -1
View File
@@ -213,6 +213,59 @@ function Invoke-WinUtilISOModify {
})
}
function Get-WinUtilEditionIdFromName {
param([string]$EditionName)
$normalizedName = ($EditionName -replace '^Windows\s+11\s+', '').Trim()
switch -Regex ($normalizedName) {
'^Home Single Language$' { return 'CoreSingleLanguage' }
'^Home N$' { return 'CoreN' }
'^Home$' { return 'Core' }
'^Pro for Workstations N$' { return 'ProfessionalWorkstationN' }
'^Pro for Workstations$' { return 'ProfessionalWorkstation' }
'^Pro Education N$' { return 'ProfessionalEducationN' }
'^Pro Education$' { return 'ProfessionalEducation' }
'^Pro N$' { return 'ProfessionalN' }
'^Pro$' { return 'Professional' }
'^Education N$' { return 'EducationN' }
'^Education$' { return 'Education' }
'^Enterprise LTSC N$' { return 'EnterpriseSN' }
'^Enterprise LTSC$' { return 'EnterpriseS' }
'^Enterprise N$' { return 'EnterpriseN' }
'^Enterprise$' { return 'Enterprise' }
default { return '' }
}
}
function Get-WinUtilMountedImageEditionId {
param(
[Parameter(Mandatory)][string]$MountDir,
[string]$EditionName,
[scriptblock]$Logger
)
try {
$dismOutput = & dism /English "/Image:$MountDir" /Get-CurrentEdition 2>&1
foreach ($line in $dismOutput) {
if ($line -match '^\s*Current Edition\s*:\s*(.+?)\s*$') {
$editionId = $Matches[1].Trim()
if ($editionId) {
if ($Logger) { $null = $Logger.Invoke("Detected mounted image EditionID: $editionId") }
return $editionId
}
}
}
} catch {
if ($Logger) { $null = $Logger.Invoke("Warning: could not detect mounted image EditionID with DISM: $_") }
}
$fallbackEditionId = Get-WinUtilEditionIdFromName -EditionName $EditionName
if ($fallbackEditionId -and $Logger) {
$null = $Logger.Invoke("Using fallback EditionID '$fallbackEditionId' from selected edition name.")
}
return $fallbackEditionId
}
function Get-DismImageInfoMap {
param(
[Parameter(Mandatory)][string]$ImagePath,
@@ -322,9 +375,10 @@ function Invoke-WinUtilISOModify {
Log "Mounting install.wim (Index ${selectedWimIndex}: $selectedEditionName) at $mountDir..."
Mount-WindowsImage -ImagePath $localWim -Index $selectedWimIndex -Path $mountDir
SetProgress "Modifying install.wim..." 45
$selectedEditionId = Get-WinUtilMountedImageEditionId -MountDir $mountDir -EditionName $selectedEditionName -Logger ${function:Log}
Log "Applying WinUtil modifications to install.wim..."
Invoke-WinUtilISOScript -ScratchDir $mountDir -ISOContentsDir $isoContents -AutoUnattendXml $autounattendContent -InjectCurrentSystemDrivers $injectDrivers -Log { param($m) Log $m }
Invoke-WinUtilISOScript -ScratchDir $mountDir -ISOContentsDir $isoContents -AutoUnattendXml $autounattendContent -InjectCurrentSystemDrivers $injectDrivers -InstallEditionId $selectedEditionId -InstallImageIndex 1 -Log { param($m) Log $m }
SetProgress "Cleaning up component store (WinSxS)..." 56
Log "Running DISM component store cleanup (/ResetBase)..."