From eac8be3d3110fad9f421919844ff76b1c14457ac Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Wed, 18 Mar 2026 18:59:28 -0700
Subject: [PATCH 01/34] Allow custom BYO app list file paths in UI
Updates the FFU UI and orchestration scripts to allow users to specify custom file paths for their Bring Your Own (BYO) app lists, rather than forcing the use of `UserAppList.json` in a specific directory.
Also modifies the orchestration to sync this custom path via `AppInstallConfig.json` so that the runtime orchestration phase resolves the correct file name and path during installation. Refreshes the Apps ISO if the custom BYO app list is updated.
---
.../Apps/Orchestration/Install-Win32Apps.ps1 | 25 +++---
.../Apps/Orchestration/Orchestrator.ps1 | 27 +++++-
FFUDevelopment/BuildFFUVM.ps1 | 84 +++++++++++++++++--
FFUDevelopment/BuildFFUVM_UI.xaml | 27 ++++--
.../FFU.Common/FFU.Common.Parallel.psm1 | 1 +
.../FFU.Common/FFU.Common.Winget.psm1 | 11 ++-
.../FFUUI.Core/FFUUI.Core.Applications.psm1 | 36 ++++++--
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 3 +-
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 33 ++++++--
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 4 +
.../FFUUI.Core/FFUUI.Core.Winget.psm1 | 43 ++++++----
FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 | 3 +
12 files changed, 237 insertions(+), 60 deletions(-)
diff --git a/FFUDevelopment/Apps/Orchestration/Install-Win32Apps.ps1 b/FFUDevelopment/Apps/Orchestration/Install-Win32Apps.ps1
index 6d4ab63..0316bb0 100644
--- a/FFUDevelopment/Apps/Orchestration/Install-Win32Apps.ps1
+++ b/FFUDevelopment/Apps/Orchestration/Install-Win32Apps.ps1
@@ -1,3 +1,11 @@
+# Allow Orchestrator.ps1 to override the app list file paths while preserving legacy defaults.
+param(
+ [Parameter()]
+ [string]$wingetAppsJsonFile = (Join-Path -Path $PSScriptRoot -ChildPath "WinGetWin32Apps.json"),
+ [Parameter()]
+ [string]$userAppsJsonFile = (Join-Path -Path (Split-Path -Parent $PSScriptRoot) -ChildPath "UserAppList.json")
+)
+
function Invoke-Process {
[CmdletBinding(SupportsShouldProcess)]
param
@@ -247,11 +255,6 @@ function Install-Applications {
}
}
-# Define paths for the JSON files
-$wingetAppsJsonFile = "$PSScriptRoot\WinGetWin32Apps.json"
-# Look for UserAppList.json one directory level up from the script's location. This keeps the user specific json files (AppList.json and UserAppList.json in the Apps dir)
-$userAppsJsonFile = Join-Path -Path (Split-Path -Parent $PSScriptRoot) -ChildPath "UserAppList.json"
-
# Initialize empty arrays for apps from each source
$wingetApps = @()
$userApps = @()
@@ -286,9 +289,9 @@ if ($wingetApps.Count -gt 0) {
Install-Applications -apps $wingetApps
}
-# Read the UserAppList.json file if it exists
+# Read the configured BYO app list file if it exists
if (Test-Path -Path $userAppsJsonFile) {
- Write-Host "Processing UserAppList.json..."
+ Write-Host "Processing $(Split-Path -Path $userAppsJsonFile -Leaf)..."
try {
$userContent = Get-Content -Path $userAppsJsonFile -Raw -ErrorAction Stop | ConvertFrom-Json
if ($userContent -is [array]) {
@@ -296,19 +299,19 @@ if (Test-Path -Path $userAppsJsonFile) {
Write-Host "Found $(($userApps | Measure-Object).Count) user-defined apps."
}
elseif ($userContent) {
- $userApps = @($userContent) # Ensure it's an array
+ $userApps = @($userContent)
Write-Host "Found 1 user-defined app."
}
else {
- Write-Host "UserAppList.json is empty or invalid."
+ Write-Host "$(Split-Path -Path $userAppsJsonFile -Leaf) is empty or invalid."
}
}
catch {
- Write-Error "Failed to read or parse UserAppList.json file: $_"
+ Write-Error "Failed to read or parse BYO app list file '$userAppsJsonFile': $_"
}
}
else {
- Write-Host "UserAppList.json file not found. Skipping."
+ Write-Host "BYO app list file not found at $userAppsJsonFile. Skipping."
}
# Install User apps if any were found
diff --git a/FFUDevelopment/Apps/Orchestration/Orchestrator.ps1 b/FFUDevelopment/Apps/Orchestration/Orchestrator.ps1
index 9f6bc68..88c23f1 100644
--- a/FFUDevelopment/Apps/Orchestration/Orchestrator.ps1
+++ b/FFUDevelopment/Apps/Orchestration/Orchestrator.ps1
@@ -28,6 +28,23 @@ Write-Host "---------------------------------------------------" -ForegroundColo
# Define the path to the scripts
$scriptPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
+# Resolve the configured BYO app list path for runtime orchestration.
+$appInstallConfigPath = Join-Path -Path $scriptPath -ChildPath "AppInstallConfig.json"
+$userAppsJsonFile = Join-Path -Path (Split-Path -Parent $scriptPath) -ChildPath "UserAppList.json"
+
+if (Test-Path -Path $appInstallConfigPath) {
+ try {
+ $appInstallConfig = Get-Content -Path $appInstallConfigPath -Raw | ConvertFrom-Json
+ if ($null -ne $appInstallConfig -and $appInstallConfig.PSObject.Properties.Match('UserAppListPath').Count -gt 0 -and -not [string]::IsNullOrWhiteSpace($appInstallConfig.UserAppListPath)) {
+ $userAppsJsonFile = $appInstallConfig.UserAppListPath
+ Write-Host "Using BYO app list path from AppInstallConfig.json: $userAppsJsonFile"
+ }
+ }
+ catch {
+ Write-Host "Failed to parse AppInstallConfig.json. Falling back to default BYO app list path."
+ }
+}
+
# Define the list of scripts to run
$scriptList = @(
"Install-LTSCUpdate.ps1",
@@ -51,7 +68,6 @@ foreach ($script in $scriptList) {
switch ($script) {
"Install-Win32Apps.ps1" {
$wingetAppsJsonFile = Join-Path -Path $scriptPath -ChildPath "WinGetWin32Apps.json"
- $userAppsJsonFile = Join-Path -Path (Split-Path -Parent $scriptPath) -ChildPath "UserAppList.json"
if (-not (Test-Path -Path $wingetAppsJsonFile) -and -not (Test-Path -Path $userAppsJsonFile)) {
$shouldRun = $false
}
@@ -69,8 +85,13 @@ foreach ($script in $scriptList) {
Write-Host "---------------------------------------------------" -ForegroundColor Yellow
Write-Host " Running script: $script " -ForegroundColor Yellow
Write-Host "---------------------------------------------------" -ForegroundColor Yellow
- # Run script and wait for it to finish
- & $scriptFile
+ # Run script and wait for it to finish.
+ if ($script -eq "Install-Win32Apps.ps1") {
+ & $scriptFile -UserAppsJsonFile $userAppsJsonFile
+ }
+ else {
+ & $scriptFile
+ }
}
}
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 6a197fb..1554d87 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -633,6 +633,7 @@ if (-not $AppsPath) { $AppsPath = "$FFUDevelopmentPath\Apps" }
if (-not $AppListPath) { $AppListPath = "$AppsPath\AppList.json" }
if (-not $UserAppListPath) { $UserAppListPath = "$AppsPath\UserAppList.json" }
if (-not $OrchestrationPath) { $OrchestrationPath = "$AppsPath\Orchestration" }
+if (-not $appInstallConfigPath) { $appInstallConfigPath = "$OrchestrationPath\AppInstallConfig.json" }
if (-not $wingetWin32jsonFile) { $wingetWin32jsonFile = "$OrchestrationPath\WinGetWin32Apps.json" }
if (-not $InstallOfficePath) { $InstallOfficePath = "$OrchestrationPath\Install-Office.ps1" }
if (-not $InstallDefenderPath) { $InstallDefenderPath = "$OrchestrationPath\Update-Defender.ps1" }
@@ -2437,6 +2438,54 @@ function Save-KB {
return $fileName
}
+function Sync-UserAppListForOrchestration {
+ param(
+ [Parameter(Mandatory)]
+ [string]$SourcePath,
+ [Parameter(Mandatory)]
+ [string]$AppsPath,
+ [Parameter(Mandatory)]
+ [string]$OrchestrationPath,
+ [Parameter(Mandatory)]
+ [string]$AppInstallConfigPath
+ )
+
+ # Ensure the orchestration folder exists before writing runtime configuration.
+ if (-not (Test-Path -Path $OrchestrationPath -PathType Container)) {
+ New-Item -Path $OrchestrationPath -ItemType Directory -Force | Out-Null
+ }
+
+ # Persist the runtime BYO app list path so Orchestrator can honor custom file names.
+ $appInstallConfig = [ordered]@{
+ UserAppListPath = $null
+ }
+
+ if (-not [string]::IsNullOrWhiteSpace($SourcePath) -and (Test-Path -Path $SourcePath -PathType Leaf)) {
+ $stagedUserAppListName = Split-Path -Path $SourcePath -Leaf
+ $stagedUserAppListPath = Join-Path -Path $AppsPath -ChildPath $stagedUserAppListName
+
+ if (-not [string]::Equals([System.IO.Path]::GetFullPath($SourcePath), [System.IO.Path]::GetFullPath($stagedUserAppListPath), [System.StringComparison]::OrdinalIgnoreCase)) {
+ Copy-Item -Path $SourcePath -Destination $stagedUserAppListPath -Force | Out-Null
+ WriteLog "Staged BYO app list for orchestration: $SourcePath -> $stagedUserAppListPath"
+ }
+ else {
+ WriteLog "Using BYO app list already staged at $stagedUserAppListPath"
+ }
+
+ $appInstallConfig.UserAppListPath = "D:\$stagedUserAppListName"
+ }
+ elseif (Test-Path -Path (Join-Path -Path $AppsPath -ChildPath 'UserAppList.json') -PathType Leaf) {
+ $appInstallConfig.UserAppListPath = "D:\UserAppList.json"
+ WriteLog "Using default BYO app list path for orchestration."
+ }
+ else {
+ WriteLog "No BYO app list found at configured path '$SourcePath'."
+ }
+
+ $appInstallConfig | ConvertTo-Json | Set-Content -Path $AppInstallConfigPath -Encoding UTF8
+ WriteLog "Wrote app install config to $AppInstallConfigPath"
+}
+
function New-AppsISO {
#Create Apps ISO file
$OSCDIMG = "$adkpath`Assessment and Deployment Kit\Deployment Tools\amd64\Oscdimg\oscdimg.exe"
@@ -6082,7 +6131,19 @@ if ($InstallApps) {
Set-Progress -Percentage 6 -Message "Downloading and preparing applications..."
if (Test-Path -Path $AppsISO) {
WriteLog "Apps ISO exists at: $AppsISO"
- WriteLog "Will use existing ISO"
+
+ # Refresh the Apps ISO when a BYO app list is present so the staged manifest
+ # and AppInstallConfig.json stay in sync with the current build inputs.
+ if (Test-Path -Path $UserAppListPath) {
+ WriteLog "Configured BYO app list detected. Refreshing Apps ISO to include the latest BYO app list data."
+ Sync-UserAppListForOrchestration -SourcePath $UserAppListPath -AppsPath $AppsPath -OrchestrationPath $OrchestrationPath -AppInstallConfigPath $appInstallConfigPath
+ Remove-Item -Path $AppsISO -Force -ErrorAction SilentlyContinue
+ New-AppsISO
+ WriteLog "Apps ISO refreshed to include the latest BYO app list data."
+ }
+ else {
+ WriteLog "Will use existing ISO"
+ }
}
else {
try {
@@ -6125,7 +6186,7 @@ if ($InstallApps) {
# If there are no existing apps, use the original AppList.json directly
if (-not $hasExistingApps) {
WriteLog "No existing applications found. Using original AppList.json for all apps."
- Get-Apps -AppList $AppListPath -AppsPath $AppsPath -WindowsArch $WindowsArch -OrchestrationPath $OrchestrationPath -LogFilePath $LogFile -ThrottleLimit $Threads
+ Get-Apps -AppList $AppListPath -AppsPath $AppsPath -UserAppListPath $UserAppListPath -WindowsArch $WindowsArch -OrchestrationPath $OrchestrationPath -LogFilePath $LogFile -ThrottleLimit $Threads
}
else {
# Compare apps in AppList.json with existing installations
@@ -6197,7 +6258,7 @@ if ($InstallApps) {
# Download missing apps
WriteLog "Downloading missing applications"
- Get-Apps -AppList $modifiedAppListPath -AppsPath $AppsPath -WindowsArch $WindowsArch -OrchestrationPath $OrchestrationPath -LogFilePath $LogFile -ThrottleLimit $Threads
+ Get-Apps -AppList $modifiedAppListPath -AppsPath $AppsPath -UserAppListPath $UserAppListPath -WindowsArch $WindowsArch -OrchestrationPath $OrchestrationPath -LogFilePath $LogFile -ThrottleLimit $Threads
# Cleanup modified app list
Remove-Item -Path $modifiedAppListPath -Force
@@ -6207,11 +6268,11 @@ if ($InstallApps) {
}
}
}
- # Check is UserAppList.json exists and output to the user which apps will be installed
- # It's expected that the user will have already copied the applications and created the UserAppList.json file
+ # Check if the configured BYO app list exists and output which apps will be installed.
+ # It is expected that the user will have already copied the applications and created the BYO app list file.
if (Test-Path -Path $UserAppListPath) {
$userAppList = Get-Content -Path $UserAppListPath -Raw | ConvertFrom-Json
- WriteLog "UserAppList.json found, the following apps will be installed:"
+ WriteLog "$(Split-Path -Path $UserAppListPath -Leaf) found, the following apps will be installed:"
foreach ($app in $userAppList) {
WriteLog "$($app.name)"
}
@@ -6525,6 +6586,9 @@ if ($InstallApps) {
WriteLog "InjectUnattend is true but source file missing: $unattendSource. Skipping unattend injection."
}
}
+ # Stage the configured BYO app list and runtime config before creating the Apps ISO.
+ Sync-UserAppListForOrchestration -SourcePath $UserAppListPath -AppsPath $AppsPath -OrchestrationPath $OrchestrationPath -AppInstallConfigPath $appInstallConfigPath
+
Set-Progress -Percentage 10 -Message "Creating Apps ISO..."
WriteLog "Creating $AppsISO file"
New-AppsISO
@@ -7434,6 +7498,7 @@ if ($InstallApps) {
Remove-Item -Path $AppsISO -Force -ErrorAction SilentlyContinue
WriteLog 'Removal complete'
}
+ Sync-UserAppListForOrchestration -SourcePath $UserAppListPath -AppsPath $AppsPath -OrchestrationPath $OrchestrationPath -AppInstallConfigPath $appInstallConfigPath
New-AppsISO
WriteLog "Apps ISO refreshed with LTSC CU assets"
}
@@ -7621,6 +7686,13 @@ if (Test-Path -Path $wingetWin32jsonFile -PathType Leaf) {
Remove-Item -Path $wingetWin32jsonFile -Force -ErrorAction SilentlyContinue
WriteLog "Removal complete"
}
+
+# Remove AppInstallConfig.json so it is always rebuilt next run
+if (Test-Path -Path $appInstallConfigPath -PathType Leaf) {
+ WriteLog "Removing $appInstallConfigPath"
+ Remove-Item -Path $appInstallConfigPath -Force -ErrorAction SilentlyContinue
+ WriteLog "Removal complete"
+}
#Set $LongPathsEnabled registry value back to original value. $LongPathsEnabled could be $null if the registry value was not found
if ($null -eq $LongPathsEnabled) {
Remove-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -ErrorAction SilentlyContinue
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index b12a5b6..ae13f82 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -270,19 +270,32 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -336,8 +349,8 @@
-
-
+
+
@@ -405,8 +418,8 @@
-
-
+
+
diff --git a/FFUDevelopment/FFU.Common/FFU.Common.Parallel.psm1 b/FFUDevelopment/FFU.Common/FFU.Common.Parallel.psm1
index dd982a8..ce2f475 100644
--- a/FFUDevelopment/FFU.Common/FFU.Common.Parallel.psm1
+++ b/FFUDevelopment/FFU.Common/FFU.Common.Parallel.psm1
@@ -161,6 +161,7 @@ function Invoke-ParallelProcessing {
ApplicationItemData = $currentItem
AppListJsonPath = $localJobArgs['AppListJsonPath']
AppsPath = $localJobArgs['AppsPath']
+ UserAppListPath = $localJobArgs['UserAppListPath']
OrchestrationPath = $localJobArgs['OrchestrationPath']
ProgressQueue = $localProgressQueue
WindowsArch = $localJobArgs['WindowsArch']
diff --git a/FFUDevelopment/FFU.Common/FFU.Common.Winget.psm1 b/FFUDevelopment/FFU.Common/FFU.Common.Winget.psm1
index 32a0e42..1e9aecb 100644
--- a/FFUDevelopment/FFU.Common/FFU.Common.Winget.psm1
+++ b/FFUDevelopment/FFU.Common/FFU.Common.Winget.psm1
@@ -358,6 +358,8 @@ function Start-WingetAppDownloadTask {
[string]$AppListJsonPath,
[Parameter(Mandatory = $true)]
[string]$AppsPath,
+ [Parameter()]
+ [string]$UserAppListPath,
[Parameter(Mandatory = $true)]
[string]$OrchestrationPath,
[Parameter(Mandatory = $true)]
@@ -379,11 +381,11 @@ function Start-WingetAppDownloadTask {
WriteLog "Starting download task for $($appName) with ID $($appId) from source $($source)."
try {
- # Define paths
- $userAppListPath = Join-Path -Path $AppsPath -ChildPath "UserAppList.json"
+ # Resolve the BYO app list path so duplicate checks honor custom file names.
+ $userAppListPath = if (-not [string]::IsNullOrWhiteSpace($UserAppListPath)) { $UserAppListPath } else { Join-Path -Path $AppsPath -ChildPath "UserAppList.json" }
$appFound = $false
- # 1. Check UserAppList.json and content
+ # 1. Check the configured BYO app list and content
if (Test-Path -Path $userAppListPath) {
try {
$userAppListContent = Get-Content -Path $userAppListPath -Raw | ConvertFrom-Json
@@ -724,6 +726,8 @@ function Get-Apps {
[string]$AppList,
[Parameter(Mandatory = $true)]
[string]$AppsPath,
+ [Parameter()]
+ [string]$UserAppListPath,
[Parameter(Mandatory = $true)]
[string]$WindowsArch,
[Parameter(Mandatory = $true)]
@@ -787,6 +791,7 @@ function Get-Apps {
# CLI builds should create WinGetWin32Apps.json, so SkipWin32Json is false
$taskArguments = @{
AppsPath = $AppsPath
+ UserAppListPath = $UserAppListPath
AppListJsonPath = $AppList
OrchestrationPath = $OrchestrationPath
WindowsArch = $WindowsArch
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Applications.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Applications.psm1
index a85a320..15fbdaa 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Applications.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Applications.psm1
@@ -27,6 +27,22 @@ function Update-BYOAppsActionButtonsState {
}
}
+# Function to resolve the configured BYO app list path
+function Get-BYOApplicationListPath {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory)]
+ [psobject]$State
+ )
+
+ # Fall back to the legacy default path when the textbox is empty.
+ if (-not [string]::IsNullOrWhiteSpace($State.Controls.txtUserAppListPath.Text)) {
+ return $State.Controls.txtUserAppListPath.Text
+ }
+
+ return (Join-Path -Path $State.Controls.txtApplicationPath.Text -ChildPath 'UserAppList.json')
+}
+
# Function to remove all selected BYO applications
function Remove-SelectedBYOApplications {
[CmdletBinding()]
@@ -76,10 +92,10 @@ function Remove-SelectedBYOApplications {
}
# Ask user if they want to save the changes
- $result = [System.Windows.MessageBox]::Show("The selected applications have been removed from the list. Do you want to save these changes to UserAppList.json now?", "Save Changes", [System.Windows.MessageBoxButton]::YesNo, [System.Windows.MessageBoxImage]::Question)
+ $result = [System.Windows.MessageBox]::Show("The selected applications have been removed from the list. Do you want to save these changes to the configured BYO app list now?", "Save Changes", [System.Windows.MessageBoxButton]::YesNo, [System.Windows.MessageBoxImage]::Question)
if ($result -eq 'Yes') {
- $userAppListPath = Join-Path -Path $State.Controls.txtApplicationPath.Text -ChildPath 'UserAppList.json'
+ $userAppListPath = Get-BYOApplicationListPath -State $State
Save-BYOApplicationList -Path $userAppListPath -State $State
}
}
@@ -391,18 +407,24 @@ function Invoke-CopyBYOApps {
)
$localAppsPath = $State.Controls.txtApplicationPath.Text
- $userAppListPath = Join-Path -Path $localAppsPath -ChildPath 'UserAppList.json'
+ $userAppListPath = Get-BYOApplicationListPath -State $State
$listView = $State.Controls.lstApplications
try {
- # Ensure items are sorted by current priority before saving
- # Exclude CopyStatus when saving and ensure Priority is an integer; include AdditionalExitCodes and IgnoreNonZeroExitCodes for parity with Save-BYOApplicationList
+ # Ensure the configured BYO app list folder exists before writing the manifest.
+ $userAppListDirectory = Split-Path -Path $userAppListPath -Parent
+ if (-not [string]::IsNullOrWhiteSpace($userAppListDirectory) -and -not (Test-Path -Path $userAppListDirectory -PathType Container)) {
+ New-Item -Path $userAppListDirectory -ItemType Directory -Force | Out-Null
+ }
+
+ # Ensure items are sorted by current priority before saving.
+ # Exclude CopyStatus when saving and ensure Priority is an integer; include AdditionalExitCodes and IgnoreNonZeroExitCodes for parity with Save-BYOApplicationList.
$applications = $listView.Items | Sort-Object Priority | Select-Object @{N = 'Priority'; E = { [int]$_.Priority } }, Name, CommandLine, Arguments, Source, AdditionalExitCodes, IgnoreNonZeroExitCodes
$applications | ConvertTo-Json -Depth 5 | Set-Content -Path $userAppListPath -Force -Encoding UTF8
- WriteLog "Successfully updated UserAppList.json with all applications from the UI."
+ WriteLog "Successfully updated BYO app list at $userAppListPath with all applications from the UI."
}
catch {
- $errorMessage = "Failed to update UserAppList.json: $_"
+ $errorMessage = "Failed to update BYO app list at $($userAppListPath): $_"
WriteLog $errorMessage
[System.Windows.MessageBox]::Show($errorMessage, "Error", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
return
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index befaed3..f3d7098 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -93,7 +93,7 @@ function Get-UIConfig {
UpdateLatestNet = $State.Controls.chkUpdateLatestNet.IsChecked
UpdateOneDrive = $State.Controls.chkUpdateOneDrive.IsChecked
UpdatePreviewCU = $State.Controls.chkUpdatePreviewCU.IsChecked
- UserAppListPath = "$($State.Controls.txtApplicationPath.Text)\UserAppList.json"
+ UserAppListPath = $State.Controls.txtUserAppListPath.Text
USBDriveList = @{}
Username = $State.Controls.txtUsername.Text
Threads = [int]$State.Controls.txtThreads.Text
@@ -585,6 +585,7 @@ function Update-UIFromConfig {
Set-UIValue -ControlName 'chkBringYourOwnApps' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'BringYourOwnApps' -State $State
Set-UIValue -ControlName 'txtApplicationPath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'AppsPath' -State $State
Set-UIValue -ControlName 'txtAppListJsonPath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'AppListPath' -State $State
+ Set-UIValue -ControlName 'txtUserAppListPath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'UserAppListPath' -State $State
# Handle AppsScriptVariables
$appsScriptVarsKeyExists = $false
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 1881c40..5446e7a 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -435,10 +435,18 @@ function Register-EventHandlers {
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
$localState = $window.Tag
- $selectedPath = Invoke-BrowseAction -Type 'OpenFile' -Title "Select AppList.json File" -Filter "JSON files (*.json)|*.json" -AllowNewFile
+ $selectedPath = Invoke-BrowseAction -Type 'OpenFile' -Title "Select Winget AppList File" -Filter "JSON files (*.json)|*.json" -AllowNewFile
if ($selectedPath) { $localState.Controls.txtAppListJsonPath.Text = $selectedPath }
})
+ $State.Controls.btnBrowseUserAppListPath.Add_Click({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ $selectedPath = Invoke-BrowseAction -Type 'OpenFile' -Title "Select BYO AppList File" -Filter "JSON files (*.json)|*.json" -AllowNewFile
+ if ($selectedPath) { $localState.Controls.txtUserAppListPath.Text = $selectedPath }
+ })
+
$State.Controls.btnBrowseAppSource.Add_Click({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
@@ -466,17 +474,23 @@ function Register-EventHandlers {
$window = [System.Windows.Window]::GetWindow($eventSource)
$localState = $window.Tag
- $initialDir = $localState.Controls.txtApplicationPath.Text
+ # Default the save dialog to the configured BYO app list path.
+ $currentPath = $localState.Controls.txtUserAppListPath.Text
+ $initialDir = if (-not [string]::IsNullOrWhiteSpace($currentPath)) { Split-Path -Path $currentPath -Parent } else { $localState.Controls.txtApplicationPath.Text }
if ([string]::IsNullOrWhiteSpace($initialDir) -or -not (Test-Path $initialDir)) { $initialDir = $localState.FFUDevelopmentPath }
+ $fileName = if (-not [string]::IsNullOrWhiteSpace($currentPath)) { Split-Path -Path $currentPath -Leaf } else { "UserAppList.json" }
$savePath = Invoke-BrowseAction -Type 'SaveFile' `
- -Title "Save Application List" `
+ -Title "Save BYO App List" `
-Filter "JSON files (*.json)|*.json|All files (*.*)|*.*" `
-InitialDirectory $initialDir `
- -FileName "UserAppList.json" `
+ -FileName $fileName `
-DefaultExt ".json"
- if ($savePath) { Save-BYOApplicationList -Path $savePath -State $localState }
+ if ($savePath) {
+ $localState.Controls.txtUserAppListPath.Text = $savePath
+ Save-BYOApplicationList -Path $savePath -State $localState
+ }
})
$State.Controls.btnLoadBYOApplications.Add_Click({
@@ -484,15 +498,18 @@ function Register-EventHandlers {
$window = [System.Windows.Window]::GetWindow($eventSource)
$localState = $window.Tag
- $initialDir = $localState.Controls.txtApplicationPath.Text
+ # Default the import dialog to the configured BYO app list path.
+ $currentPath = $localState.Controls.txtUserAppListPath.Text
+ $initialDir = if (-not [string]::IsNullOrWhiteSpace($currentPath)) { Split-Path -Path $currentPath -Parent } else { $localState.Controls.txtApplicationPath.Text }
if ([string]::IsNullOrWhiteSpace($initialDir) -or -not (Test-Path $initialDir)) { $initialDir = $localState.FFUDevelopmentPath }
$loadPath = Invoke-BrowseAction -Type 'OpenFile' `
- -Title "Import Application List" `
+ -Title "Import BYO App List" `
-Filter "JSON files (*.json)|*.json|All files (*.*)|*.*" `
-InitialDirectory $initialDir
- if ($loadPath) {
+ if ($loadPath) {
+ $localState.Controls.txtUserAppListPath.Text = $loadPath
Import-BYOApplicationList -Path $loadPath -State $localState
Update-CopyButtonState -State $localState
}
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index fc84a6c..5cd41fa 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -70,8 +70,10 @@ function Initialize-UIControls {
$State.Controls.txtWingetModuleVersion = $window.FindName('txtWingetModuleVersion')
$State.Controls.applicationPathPanel = $window.FindName('applicationPathPanel')
$State.Controls.appListJsonPathPanel = $window.FindName('appListJsonPathPanel')
+ $State.Controls.userAppListPathPanel = $window.FindName('userAppListPathPanel')
$State.Controls.btnBrowseApplicationPath = $window.FindName('btnBrowseApplicationPath')
$State.Controls.btnBrowseAppListJsonPath = $window.FindName('btnBrowseAppListJsonPath')
+ $State.Controls.btnBrowseUserAppListPath = $window.FindName('btnBrowseUserAppListPath')
$State.Controls.chkBringYourOwnApps = $window.FindName('chkBringYourOwnApps')
$State.Controls.byoApplicationPanel = $window.FindName('byoApplicationPanel')
$State.Controls.wingetSearchPanel = $window.FindName('wingetSearchPanel')
@@ -159,6 +161,7 @@ function Initialize-UIControls {
$State.Controls.chkUpdatePreviewCU = $window.FindName('chkUpdatePreviewCU')
$State.Controls.txtApplicationPath = $window.FindName('txtApplicationPath')
$State.Controls.txtAppListJsonPath = $window.FindName('txtAppListJsonPath')
+ $State.Controls.txtUserAppListPath = $window.FindName('txtUserAppListPath')
$State.Controls.chkInstallDrivers = $window.FindName('chkInstallDrivers')
$State.Controls.chkCopyDrivers = $window.FindName('chkCopyDrivers')
$State.Controls.chkCompressDriversToWIM = $window.FindName('chkCompressDriversToWIM')
@@ -305,6 +308,7 @@ function Initialize-UIDefaults {
$State.Controls.chkInstallApps.IsChecked = $State.Defaults.generalDefaults.InstallApps
$State.Controls.txtApplicationPath.Text = $State.Defaults.generalDefaults.ApplicationPath
$State.Controls.txtAppListJsonPath.Text = $State.Defaults.generalDefaults.AppListJsonPath
+ $State.Controls.txtUserAppListPath.Text = $State.Defaults.generalDefaults.UserAppListPath
$State.Controls.chkInstallWingetApps.IsChecked = $State.Defaults.generalDefaults.InstallWingetApps
$State.Controls.chkBringYourOwnApps.IsChecked = $State.Defaults.generalDefaults.BringYourOwnApps
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Winget.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Winget.psm1
index 7a8c8f9..3adc7af 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Winget.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Winget.psm1
@@ -108,20 +108,28 @@ function Save-WingetList {
})
}
+ # Default the save dialog to the configured Winget app list path.
+ $currentPath = $State.Controls.txtAppListJsonPath.Text
+ $initialDirectory = if (-not [string]::IsNullOrWhiteSpace($currentPath)) { Split-Path -Path $currentPath -Parent } else { $State.Controls.txtApplicationPath.Text }
+ if ([string]::IsNullOrWhiteSpace($initialDirectory) -or -not (Test-Path -Path $initialDirectory -PathType Container)) {
+ $initialDirectory = $State.Controls.txtApplicationPath.Text
+ }
+ $fileName = if (-not [string]::IsNullOrWhiteSpace($currentPath)) { Split-Path -Path $currentPath -Leaf } else { "AppList.json" }
+
$sfd = New-Object System.Windows.Forms.SaveFileDialog
$sfd.Filter = "JSON files (*.json)|*.json"
- $sfd.Title = "Save App List"
- # Correctly get the path from the UI control via the State object
- $sfd.InitialDirectory = $State.Controls.txtApplicationPath.Text
- $sfd.FileName = "AppList.json"
+ $sfd.Title = "Save Winget App List"
+ $sfd.InitialDirectory = $initialDirectory
+ $sfd.FileName = $fileName
if ($sfd.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK) {
$appList | ConvertTo-Json -Depth 10 | Set-Content $sfd.FileName -Encoding UTF8
- [System.Windows.MessageBox]::Show("App list saved successfully.", "Success", "OK", "Information")
+ $State.Controls.txtAppListJsonPath.Text = $sfd.FileName
+ [System.Windows.MessageBox]::Show("Winget app list saved successfully.", "Success", "OK", "Information")
}
}
catch {
- [System.Windows.MessageBox]::Show("Error saving app list: $_", "Error", "OK", "Error")
+ [System.Windows.MessageBox]::Show("Error saving Winget app list: $_", "Error", "OK", "Error")
}
}
@@ -132,11 +140,17 @@ function Import-WingetList {
[psobject]$State
)
try {
+ # Default the import dialog to the configured Winget app list path.
+ $currentPath = $State.Controls.txtAppListJsonPath.Text
+ $initialDirectory = if (-not [string]::IsNullOrWhiteSpace($currentPath)) { Split-Path -Path $currentPath -Parent } else { $State.Controls.txtApplicationPath.Text }
+ if ([string]::IsNullOrWhiteSpace($initialDirectory) -or -not (Test-Path -Path $initialDirectory -PathType Container)) {
+ $initialDirectory = $State.Controls.txtApplicationPath.Text
+ }
+
$ofd = New-Object System.Windows.Forms.OpenFileDialog
$ofd.Filter = "JSON files (*.json)|*.json"
- $ofd.Title = "Import App List"
- # Correctly get the path from the UI control via the State object
- $ofd.InitialDirectory = $State.Controls.txtApplicationPath.Text
+ $ofd.Title = "Import Winget App List"
+ $ofd.InitialDirectory = $initialDirectory
if ($ofd.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK) {
$importedAppsData = Get-Content $ofd.FileName -Raw | ConvertFrom-Json
@@ -144,16 +158,16 @@ function Import-WingetList {
$newAppListForItemsSource = [System.Collections.Generic.List[object]]::new()
if ($null -ne $importedAppsData.apps) {
- # Get default architecture from the UI for fallback
+ # Get default architecture from the UI for fallback.
$defaultArch = $State.Controls.cmbWindowsArch.SelectedItem
foreach ($appInfo in $importedAppsData.apps) {
$arch = if ($appInfo.source -eq 'msstore') { 'NA' } else { if ($appInfo.PSObject.Properties['architecture']) { $appInfo.architecture } else { $defaultArch } }
$newAppListForItemsSource.Add([PSCustomObject]@{
- IsSelected = $true # Imported apps are marked as selected
+ IsSelected = $true
Name = $appInfo.name
Id = $appInfo.id
- Version = "" # Will be populated when searching or if data exists
+ Version = ""
Source = $appInfo.source
Architecture = $arch
AdditionalExitCodes = if ($appInfo.PSObject.Properties['AdditionalExitCodes']) { $appInfo.AdditionalExitCodes } else { "" }
@@ -164,12 +178,13 @@ function Import-WingetList {
}
$State.Controls.lstWingetResults.ItemsSource = $newAppListForItemsSource.ToArray()
+ $State.Controls.txtAppListJsonPath.Text = $ofd.FileName
- [System.Windows.MessageBox]::Show("App list imported successfully.", "Success", "OK", "Information")
+ [System.Windows.MessageBox]::Show("Winget app list imported successfully.", "Success", "OK", "Information")
}
}
catch {
- [System.Windows.MessageBox]::Show("Error importing app list: $_", "Error", "OK", "Error")
+ [System.Windows.MessageBox]::Show("Error importing Winget app list: $_", "Error", "OK", "Error")
}
}
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
index a01c312..c9c2e10 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
@@ -108,6 +108,7 @@ function Get-GeneralDefaults {
$ffuCapturePath = Join-Path -Path $FFUDevelopmentPath -ChildPath "FFU"
$officePath = Join-Path -Path $appsPath -ChildPath "Office"
$appListJsonPath = Join-Path -Path $appsPath -ChildPath "AppList.json"
+ $userAppListPath = Join-Path -Path $appsPath -ChildPath "UserAppList.json"
$driversJsonPath = Join-Path -Path $driversPath -ChildPath "Drivers.json"
return [PSCustomObject]@{
@@ -163,6 +164,7 @@ function Get-GeneralDefaults {
InstallApps = $false
ApplicationPath = $appsPath
AppListJsonPath = $appListJsonPath
+ UserAppListPath = $userAppListPath
InstallWingetApps = $false
BringYourOwnApps = $false
# M365 Apps/Office Tab Defaults
@@ -305,6 +307,7 @@ function Update-ApplicationPanelVisibility {
$subOptionVisibility = if ($installAppsChecked) { 'Visible' } else { 'Collapsed' }
$State.Controls.applicationPathPanel.Visibility = $subOptionVisibility
$State.Controls.appListJsonPathPanel.Visibility = $subOptionVisibility
+ $State.Controls.userAppListPathPanel.Visibility = $subOptionVisibility
$State.Controls.chkInstallWingetApps.Visibility = $subOptionVisibility
$State.Controls.chkBringYourOwnApps.Visibility = $subOptionVisibility
$State.Controls.chkDefineAppsScriptVariables.Visibility = $subOptionVisibility
From 7678f61480a2fde2476bcfd20a9b081fc8628aca Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Fri, 20 Mar 2026 13:07:40 -0700
Subject: [PATCH 02/34] Updates UI layout to a modern navigation sidebar and
adds Fluent theme support
Refactors the main window layout to use a sidebar navigation model instead of a standard tab control, improving the overall organization of the application.
Introduces support for the Fluent theme (Light, Dark, and System) for users running PowerShell 7.5+ (.NET 9+), gracefully falling back to standard styling for older versions.
Adds a new Settings page that allows users to configure the application theme and access helpful documentation and repository links.
Standardizes margins, font sizes, and layout choices across all forms to closer match Windows design guidelines.
Updates configuration handling to save and restore user theme preferences.
---
FFUDevelopment/BuildFFUVM_UI.ps1 | 13 +-
FFUDevelopment/BuildFFUVM_UI.xaml | 996 ++++++++++--------
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 10 +
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 94 ++
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 168 ++-
FFUDevelopment/config/Sample_default.json | Bin 6254 -> 6310 bytes
6 files changed, 815 insertions(+), 466 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.ps1 b/FFUDevelopment/BuildFFUVM_UI.ps1
index 7cf7144..c282020 100644
--- a/FFUDevelopment/BuildFFUVM_UI.ps1
+++ b/FFUDevelopment/BuildFFUVM_UI.ps1
@@ -55,7 +55,8 @@ $script:uiState = [PSCustomObject]@{
lastSortProperty = $null;
lastSortAscending = $true;
isBuilding = $false;
- isCleanupRunning = $false
+ isCleanupRunning = $false;
+ isFluentSupported = $false
};
Defaults = @{};
LogFilePath = "$FFUDevelopmentPath\FFUDevelopment_UI.log"
@@ -120,6 +121,9 @@ $reader = New-Object System.IO.StringReader($xamlString)
$xmlReader = [System.Xml.XmlReader]::Create($reader)
$window = [Windows.Markup.XamlReader]::Load($xmlReader)
+# Apply Fluent theme before the window renders (requires PowerShell 7.5+ / .NET 9+)
+Initialize-FluentTheme -Window $window -ThemeMode "System" -State $script:uiState
+
$window.Add_Loaded({
# Pass the state object to all initialization functions
$script:uiState.Window = $window
@@ -390,8 +394,11 @@ $script:uiState.Controls.btnRun.Add_Click({
# Not currently building: start a new build
$btnRun.IsEnabled = $false
- # Switch to Monitor Tab
- $script:uiState.Controls.MainTabControl.SelectedItem = $script:uiState.Controls.MonitorTab
+ # Switch to Monitor page via navigation
+ $monitorIndex = 8 # Monitor is the 9th item (index 8) in the navigation list
+ if ($null -ne $script:uiState.Controls.lstNavigation) {
+ $script:uiState.Controls.lstNavigation.SelectedIndex = $monitorIndex
+ }
# Clear previous log data and reset autoscroll
if ($null -ne $script:uiState.Data.logData) {
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index ae13f82..42e8f37 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -1,59 +1,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ xmlns:sys="clr-namespace:System;assembly=mscorlib" Title="FFU Builder UI"
+ FontSize="14" FontFamily="Segoe UI Variable, Segoe UI"
+ WindowState="Maximized">
-
+
@@ -71,240 +22,327 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -324,126 +362,126 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
@@ -454,66 +492,54 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
+
+
+
-
+
+
-
+
-
+
-
+
-
-
-
-
+
+
@@ -548,112 +574,110 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
@@ -685,121 +709,103 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+ ForegroundHighNormalLow
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
+
@@ -810,23 +816,23 @@
-
-
-
+
+
+
-
+
-
-
+
+
-
+
@@ -841,39 +847,117 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Light
+ Dark
+ System
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GitHub Repository
+
+
+ GitHub Releases
+
+
+ Change Log
+
+
+ Documentation
+
+
+
+
+ FFU Builder Overview
+
+
+ FFU Builder Deep Dive
+
+
+ FFU Deployment Walkthrough
+
+
+
+
+
+
-
-
+
-
+
-
+
-
-
-
-
+
+
+
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index f3d7098..e540e31 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -99,6 +99,7 @@ function Get-UIConfig {
Threads = [int]$State.Controls.txtThreads.Text
BitsPriority = $State.Controls.cmbBitsPriority.SelectedItem
MaxUSBDrives = [int]$State.Controls.txtMaxUSBDrives.Text
+ ThemeMode = if ($null -ne $State.Controls.cmbThemeMode -and $null -ne $State.Controls.cmbThemeMode.SelectedItem) { $State.Controls.cmbThemeMode.SelectedItem } else { "System" }
Verbose = $State.Controls.chkVerbose.IsChecked
VMHostIPAddress = $State.Controls.txtVMHostIPAddress.Text
VMLocation = $State.Controls.txtVMLocation.Text
@@ -427,6 +428,15 @@ function Update-UIFromConfig {
WriteLog "Applying loaded configuration to the UI."
+ # Apply theme mode from config (must be done before other controls load for proper styling)
+ if ($null -ne $ConfigContent.PSObject.Properties.Item('ThemeMode') -and $State.Flags.isFluentSupported) {
+ $configTheme = $ConfigContent.ThemeMode
+ if ($configTheme -in @("Light", "Dark", "System")) {
+ Initialize-FluentTheme -Window $State.Window -ThemeMode $configTheme -State $State
+ Set-UIValue -ControlName 'cmbThemeMode' -PropertyName 'SelectedItem' -ConfigObject $ConfigContent -ConfigKey 'ThemeMode' -State $State
+ }
+ }
+
# Update Build tab values
Set-UIValue -ControlName 'txtFFUDevPath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'FFUDevelopmentPath' -State $State
Set-UIValue -ControlName 'txtCustomFFUNameTemplate' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'CustomFFUNameTemplate' -State $State
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 5446e7a..9e7acb4 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -87,6 +87,100 @@ function Register-EventHandlers {
})
}
+ # Navigation Sidebar Event Handlers
+ # Main navigation list - switches content pages based on selected nav item
+ if ($null -ne $State.Controls.lstNavigation) {
+ $State.Controls.lstNavigation.Add_SelectionChanged({
+ param($eventSource, $selectionChangedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ if ($null -eq $window -or $null -eq $window.Tag) {
+ return
+ }
+ $localState = $window.Tag
+ $selectedIndex = $eventSource.SelectedIndex
+ if ($selectedIndex -lt 0) { return }
+
+ # Clear Settings selection when main nav is used
+ if ($null -ne $localState.Controls.lstNavSettings) {
+ $localState.Controls.lstNavSettings.SelectedIndex = -1
+ }
+
+ # Hide all content pages
+ foreach ($page in $localState.Controls.navigationPages) {
+ if ($null -ne $page) { $page.Visibility = 'Collapsed' }
+ }
+ if ($null -ne $localState.Controls.pageSettings) {
+ $localState.Controls.pageSettings.Visibility = 'Collapsed'
+ }
+
+ # Show the selected page
+ if ($selectedIndex -lt $localState.Controls.navigationPages.Count) {
+ $localState.Controls.navigationPages[$selectedIndex].Visibility = 'Visible'
+ }
+ })
+ }
+
+ # Settings navigation item
+ if ($null -ne $State.Controls.lstNavSettings) {
+ $State.Controls.lstNavSettings.Add_SelectionChanged({
+ param($eventSource, $selectionChangedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ if ($null -eq $window -or $null -eq $window.Tag) {
+ return
+ }
+ $localState = $window.Tag
+ if ($eventSource.SelectedIndex -lt 0) { return }
+
+ # Clear main navigation selection
+ if ($null -ne $localState.Controls.lstNavigation) {
+ $localState.Controls.lstNavigation.SelectedIndex = -1
+ }
+
+ # Hide all content pages
+ foreach ($page in $localState.Controls.navigationPages) {
+ if ($null -ne $page) { $page.Visibility = 'Collapsed' }
+ }
+
+ # Show Settings page
+ if ($null -ne $localState.Controls.pageSettings) {
+ $localState.Controls.pageSettings.Visibility = 'Visible'
+ }
+ })
+ }
+
+ # Hyperlink navigation handlers for Settings page links
+ $hyperlinkNames = @('linkGitHub', 'linkReleases', 'linkChangelog', 'linkDocs', 'linkVideo1', 'linkVideo2', 'linkVideo3')
+ foreach ($linkName in $hyperlinkNames) {
+ $link = $State.Window.FindName($linkName)
+ if ($null -ne $link) {
+ $link.Add_RequestNavigate({
+ param($eventSource, $requestNavigateEventArgs)
+ Start-Process $requestNavigateEventArgs.Uri.AbsoluteUri
+ $requestNavigateEventArgs.Handled = $true
+ })
+ }
+ }
+
+ # Settings Page Event Handlers
+ # Theme mode selector - switches between Light, Dark, and System Fluent themes
+ if ($null -ne $State.Controls.cmbThemeMode) {
+ $State.Controls.cmbThemeMode.Add_SelectionChanged({
+ param($eventSource, $selectionChangedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ if ($null -eq $window -or $null -eq $window.Tag) {
+ return
+ }
+ $localState = $window.Tag
+ if (-not $localState.Flags.isFluentSupported) {
+ return
+ }
+ $selectedTheme = $eventSource.SelectedItem
+ if (-not [string]::IsNullOrWhiteSpace($selectedTheme)) {
+ Initialize-FluentTheme -Window $window -ThemeMode $selectedTheme -State $localState
+ }
+ })
+ }
+
# Build Tab Event Handlers
$State.Controls.btnBrowseFFUDevPath.Add_Click({
param($eventSource, $routedEventArgs)
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index 5cd41fa..47dd0ff 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -13,6 +13,97 @@
This module is critical for setting up the initial state of the application window when it first loads.
#>
+function Initialize-FluentTheme {
+ param(
+ [Parameter(Mandatory = $true)]
+ [System.Windows.Window]$Window,
+ [Parameter(Mandatory = $false)]
+ [string]$ThemeMode = "System",
+ [Parameter(Mandatory = $false)]
+ [PSCustomObject]$State
+ )
+
+ # Check if the current .NET runtime supports Window.ThemeMode (requires .NET 9+ / PowerShell 7.5+)
+ $themeModeProperty = [System.Windows.Window].GetProperty("ThemeMode")
+ if ($null -eq $themeModeProperty) {
+ WriteLog "Fluent theme not available. Window.ThemeMode requires PowerShell 7.5+ (.NET 9+). Using default Aero2 theme."
+ if ($null -ne $State) {
+ $State.Flags.isFluentSupported = $false
+ }
+ # Still create tooltip styles for non-Fluent mode so Tag-to-ToolTip binding works
+ $controlTypes = @(
+ [System.Windows.Controls.TextBox],
+ [System.Windows.Controls.TextBlock],
+ [System.Windows.Controls.CheckBox]
+ )
+ foreach ($controlType in $controlTypes) {
+ $newStyle = New-Object System.Windows.Style($controlType)
+ $toolTipBinding = New-Object System.Windows.Data.Binding("Tag")
+ $toolTipBinding.RelativeSource = [System.Windows.Data.RelativeSource]::new([System.Windows.Data.RelativeSourceMode]::Self)
+ $toolTipSetter = New-Object System.Windows.Setter([System.Windows.FrameworkElement]::ToolTipProperty, $toolTipBinding)
+ $newStyle.Setters.Add($toolTipSetter)
+ if ($Window.Resources.Contains($controlType)) {
+ $Window.Resources.Remove($controlType)
+ }
+ $Window.Resources.Add($controlType, $newStyle)
+ }
+ WriteLog "Tooltip styles created for non-Fluent mode."
+ return
+ }
+
+ # Mark Fluent as supported in state
+ if ($null -ne $State) {
+ $State.Flags.isFluentSupported = $true
+ }
+
+ # Resolve the ThemeMode enum value using reflection to avoid compile-time experimental attribute issues
+ $themeModeType = [System.Windows.Window].GetProperty("ThemeMode").PropertyType
+ $themeModeValue = $null
+ switch ($ThemeMode) {
+ "Light" { $themeModeValue = $themeModeType::Light }
+ "Dark" { $themeModeValue = $themeModeType::Dark }
+ "System" { $themeModeValue = $themeModeType::System }
+ default { $themeModeValue = $themeModeType::System }
+ }
+
+ # Apply the Fluent theme mode to the window
+ $themeModeProperty.SetValue($Window, $themeModeValue)
+ WriteLog "Applied Fluent theme: $ThemeMode"
+
+ # Re-create implicit tooltip styles with BasedOn pointing to the Fluent base style
+ # This preserves the Tag-to-ToolTip binding while inheriting Fluent visual styling
+ $controlTypes = @(
+ [System.Windows.Controls.TextBox],
+ [System.Windows.Controls.TextBlock],
+ [System.Windows.Controls.CheckBox]
+ )
+
+ foreach ($controlType in $controlTypes) {
+ # Get the Fluent base style that was loaded by ThemeMode
+ $fluentBaseStyle = $Window.TryFindResource($controlType)
+
+ # Create a new implicit style with ToolTip binding
+ $newStyle = New-Object System.Windows.Style($controlType)
+ if ($null -ne $fluentBaseStyle) {
+ $newStyle.BasedOn = $fluentBaseStyle
+ }
+
+ # Add the ToolTip setter that binds to the Tag property
+ $toolTipBinding = New-Object System.Windows.Data.Binding("Tag")
+ $toolTipBinding.RelativeSource = [System.Windows.Data.RelativeSource]::new([System.Windows.Data.RelativeSourceMode]::Self)
+ $toolTipSetter = New-Object System.Windows.Setter([System.Windows.FrameworkElement]::ToolTipProperty, $toolTipBinding)
+ $newStyle.Setters.Add($toolTipSetter)
+
+ # Remove any existing implicit style for this type before adding the new one
+ if ($Window.Resources.Contains($controlType)) {
+ $Window.Resources.Remove($controlType)
+ }
+ $Window.Resources.Add($controlType, $newStyle)
+ }
+
+ WriteLog "Tooltip styles updated with Fluent base styles."
+ }
+
function Initialize-UIControls {
param([PSCustomObject]$State)
WriteLog "Initializing UI control references..."
@@ -183,11 +274,28 @@ function Initialize-UIControls {
$State.Controls.btnRestoreDefaults = $window.FindName('btnRestoreDefaults')
$State.Controls.btnBuildConfig = $window.FindName('btnBuildConfig')
- # Monitor Tab
- $State.Controls.MainTabControl = $window.FindName('MainTabControl')
- $State.Controls.MonitorTab = $window.FindName('MonitorTab')
+ # Settings page
+ $State.Controls.cmbThemeMode = $window.FindName('cmbThemeMode')
+
+ # Navigation controls
+ $State.Controls.lstNavigation = $window.FindName('lstNavigation')
+ $State.Controls.lstNavSettings = $window.FindName('lstNavSettings')
$State.Controls.lstLogOutput = $window.FindName('lstLogOutput')
+ # Content pages (for navigation visibility toggling)
+ $State.Controls.navigationPages = @(
+ $window.FindName('pageHome'),
+ $window.FindName('pageHyperV'),
+ $window.FindName('pageWindows'),
+ $window.FindName('pageUpdates'),
+ $window.FindName('pageApplications'),
+ $window.FindName('pageOffice'),
+ $window.FindName('pageDrivers'),
+ $window.FindName('pageBuild'),
+ $window.FindName('pageMonitor')
+ )
+ $State.Controls.pageSettings = $window.FindName('pageSettings')
+
# Initialize and bind the log data collection
$State.Data.logData = New-Object System.Collections.ObjectModel.ObservableCollection[string]
$State.Controls.lstLogOutput.ItemsSource = $State.Data.logData
@@ -349,23 +457,62 @@ function Initialize-UIDefaults {
# Set initial state for InstallApps checkbox based on updates
Update-InstallAppsState -State $State
+ # Set default theme mode and disable if Fluent is not supported
+ if ($null -ne $State.Controls.cmbThemeMode) {
+ $State.Controls.cmbThemeMode.SelectedItem = "System"
+ if (-not $State.Flags.isFluentSupported) {
+ $State.Controls.cmbThemeMode.IsEnabled = $false
+ $State.Controls.cmbThemeMode.Tag = "Fluent theme requires PowerShell 7.5+ (.NET 9+). Best experience on PowerShell 7.6+ (.NET 10)."
+ }
+ }
+
+ # Set default navigation selection to Home and show the Home page
+ if ($null -ne $State.Controls.lstNavigation) {
+ $State.Controls.lstNavigation.SelectedIndex = 0
+ }
+
# Set initial state for Office panel visibility
Update-OfficePanelVisibility -State $State
# Set initial state for Application panel visibility
Update-ApplicationPanelVisibility -State $State
- # Set initial state for BYO Apps copy button
- Update-CopyButtonState -State $State
-}
+ # Set initial state for BYO Apps copy button
+ Update-CopyButtonState -State $State
+
+ # Apply accent color to primary action button only (per Windows design guidance)
+ if ($State.Flags.isFluentSupported) {
+ try {
+ $State.Controls.btnRun = $State.Window.FindName('btnRun')
+ if ($null -ne $State.Controls.btnRun) {
+ # Use SetResourceReference for live accent color updates when user changes Windows theme
+ $State.Controls.btnRun.SetResourceReference(
+ [System.Windows.Controls.Control]::BackgroundProperty,
+ [System.Windows.SystemColors]::AccentColorBrushKey
+ )
+ $State.Controls.btnRun.Foreground = [System.Windows.Media.Brushes]::White
+ }
+ }
+ catch {
+ WriteLog "Could not apply accent color to Build FFU button: $($_.Exception.Message)"
+ }
+ }
+ }
function Initialize-DynamicUIElements {
param([PSCustomObject]$State)
WriteLog "Initializing dynamic UI elements (Grids, Columns)..."
+ # Get the Fluent base style for ListViewItem in GridView mode
+ # Must use GridViewItemContainerStyleKey (not the generic ListViewItem type key) because the
+ # generic Fluent ListViewItem style has a template without GridViewRowPresenter, which breaks
+ # column-based rendering and causes items to display their ToString() representation.
+ $listViewItemBaseStyle = $State.Window.TryFindResource([System.Windows.Controls.GridView]::GridViewItemContainerStyleKey)
+
# Driver Models ListView setup
# Set ListViewItem style to stretch content horizontally so cell templates fill the cell
$itemStyleDriverModels = New-Object System.Windows.Style([System.Windows.Controls.ListViewItem])
+ if ($null -ne $listViewItemBaseStyle) { $itemStyleDriverModels.BasedOn = $listViewItemBaseStyle }
$itemStyleDriverModels.Setters.Add((New-Object System.Windows.Setter([System.Windows.Controls.ListViewItem]::HorizontalContentAlignmentProperty, [System.Windows.HorizontalAlignment]::Stretch)))
$State.Controls.lstDriverModels.ItemContainerStyle = $itemStyleDriverModels
@@ -401,6 +548,7 @@ function Initialize-DynamicUIElements {
# Set ListViewItem style to stretch content horizontally so cell templates fill the cell
$itemStyleWingetResults = New-Object System.Windows.Style([System.Windows.Controls.ListViewItem])
+ if ($null -ne $listViewItemBaseStyle) { $itemStyleWingetResults.BasedOn = $listViewItemBaseStyle }
$itemStyleWingetResults.Setters.Add((New-Object System.Windows.Setter([System.Windows.Controls.ListViewItem]::HorizontalContentAlignmentProperty, [System.Windows.HorizontalAlignment]::Stretch)))
$State.Controls.lstWingetResults.ItemContainerStyle = $itemStyleWingetResults
@@ -448,9 +596,11 @@ function Initialize-DynamicUIElements {
$binding.Mode = [System.Windows.Data.BindingMode]::TwoWay
$comboBoxFactory.SetBinding([System.Windows.Controls.ComboBox]::TextProperty, $binding)
- # Create a style to disable the ComboBox for 'msstore' source
+ # Create a style to disable the ComboBox for 'msstore' source, inheriting the Fluent base style
$comboBoxStyle = New-Object System.Windows.Style
$comboBoxStyle.TargetType = [System.Windows.Controls.ComboBox]
+ $comboBoxBaseStyle = $State.Window.TryFindResource([System.Windows.Controls.ComboBox])
+ if ($null -ne $comboBoxBaseStyle) { $comboBoxStyle.BasedOn = $comboBoxBaseStyle }
$dataTrigger = New-Object System.Windows.DataTrigger
$dataTrigger.Binding = New-Object System.Windows.Data.Binding("Source")
@@ -557,6 +707,7 @@ function Initialize-DynamicUIElements {
# Set ListViewItem style to stretch content horizontally
$itemStyleBYOApps = New-Object System.Windows.Style([System.Windows.Controls.ListViewItem])
+ if ($null -ne $listViewItemBaseStyle) { $itemStyleBYOApps.BasedOn = $listViewItemBaseStyle }
$itemStyleBYOApps.Setters.Add((New-Object System.Windows.Setter([System.Windows.Controls.ListViewItem]::HorizontalContentAlignmentProperty, [System.Windows.HorizontalAlignment]::Stretch)))
$State.Controls.lstApplications.ItemContainerStyle = $itemStyleBYOApps
@@ -579,6 +730,7 @@ function Initialize-DynamicUIElements {
# Set ListViewItem style to stretch content horizontally so cell templates fill the cell
$itemStyleAppsScriptVars = New-Object System.Windows.Style([System.Windows.Controls.ListViewItem])
+ if ($null -ne $listViewItemBaseStyle) { $itemStyleAppsScriptVars.BasedOn = $listViewItemBaseStyle }
$itemStyleAppsScriptVars.Setters.Add((New-Object System.Windows.Setter([System.Windows.Controls.ListViewItem]::HorizontalContentAlignmentProperty, [System.Windows.HorizontalAlignment]::Stretch)))
$State.Controls.lstAppsScriptVariables.ItemContainerStyle = $itemStyleAppsScriptVars
@@ -641,6 +793,7 @@ function Initialize-DynamicUIElements {
# USB Drives ListView setup
# Set ListViewItem style to stretch content horizontally so cell templates fill the cell
$itemStyleUSBDrives = New-Object System.Windows.Style([System.Windows.Controls.ListViewItem])
+ if ($null -ne $listViewItemBaseStyle) { $itemStyleUSBDrives.BasedOn = $listViewItemBaseStyle }
$itemStyleUSBDrives.Setters.Add((New-Object System.Windows.Setter([System.Windows.Controls.ListViewItem]::HorizontalContentAlignmentProperty, [System.Windows.HorizontalAlignment]::Stretch)))
$State.Controls.lstUSBDrives.ItemContainerStyle = $itemStyleUSBDrives
@@ -704,6 +857,7 @@ function Initialize-DynamicUIElements {
# Additional FFUs ListView setup
$itemStyleAdditionalFFUs = New-Object System.Windows.Style([System.Windows.Controls.ListViewItem])
+ if ($null -ne $listViewItemBaseStyle) { $itemStyleAdditionalFFUs.BasedOn = $listViewItemBaseStyle }
$itemStyleAdditionalFFUs.Setters.Add((New-Object System.Windows.Setter([System.Windows.Controls.ListViewItem]::HorizontalContentAlignmentProperty, [System.Windows.HorizontalAlignment]::Stretch)))
$State.Controls.lstAdditionalFFUs.ItemContainerStyle = $itemStyleAdditionalFFUs
diff --git a/FFUDevelopment/config/Sample_default.json b/FFUDevelopment/config/Sample_default.json
index cf5d7a6b4338b8b8954d802fb007d88c908726ee..dfe49aa4001780457d18a7af7b0c25a0334dc2b8 100644
GIT binary patch
delta 58
zcmaE7u*`77Bq7xhh75*OhFl=_Wyohp0n$ngRtyS2GMJ%~p_rirBs=*av+!g+VV=$N
Igf6fG0I{hKi~s-t
delta 16
YcmZ2x_|9O%B%#R#B0QU~30+_X06s1T-2eap
From b28344d272296cf74d3c86fa03af2eacab77d412 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Fri, 20 Mar 2026 14:18:46 -0700
Subject: [PATCH 03/34] Convert UI sections to expandable controls
Transitions the General Build Options, Build USB Drive Options, and Post-Build Cleanup settings panels into Expander controls to improve interface organization and space management. Removes dynamic visibility toggling for the USB settings section from the backend scripts, allowing the expander to remain visible while child settings are controlled by the primary enable checkbox.
---
FFUDevelopment/BuildFFUVM_UI.xaml | 77 +++++++++----------
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 3 +-
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 1 -
3 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 42e8f37..1d73906 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -764,34 +764,32 @@
Low
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
@@ -843,21 +841,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 9e7acb4..ec9229c 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -203,18 +203,17 @@ function Register-EventHandlers {
})
# Build USB Drive Settings Event Handlers
+ # The USB Expander is always visible; the checkbox controls child settings only
$State.Controls.chkBuildUSBDriveEnable.Add_Checked({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
$localState = $window.Tag
- $localState.Controls.usbSection.Visibility = 'Visible'
$localState.Controls.chkSelectSpecificUSBDrives.IsEnabled = $true
})
$State.Controls.chkBuildUSBDriveEnable.Add_Unchecked({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
$localState = $window.Tag
- $localState.Controls.usbSection.Visibility = 'Collapsed'
$localState.Controls.chkSelectSpecificUSBDrives.IsEnabled = $false
$localState.Controls.chkSelectSpecificUSBDrives.IsChecked = $false
$localState.Controls.lstUSBDrives.Items.Clear()
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index 47dd0ff..929165a 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -372,7 +372,6 @@ function Initialize-UIDefaults {
$State.Controls.chkRemoveUpdates.IsChecked = $State.Defaults.generalDefaults.RemoveUpdates
$State.Controls.chkRemoveDownloadedESD.IsChecked = $State.Defaults.generalDefaults.RemoveDownloadedESD
$State.Controls.chkVerbose.IsChecked = $State.Defaults.generalDefaults.Verbose
- $State.Controls.usbSection.Visibility = if ($State.Controls.chkBuildUSBDriveEnable.IsChecked) { 'Visible' } else { 'Collapsed' }
$State.Controls.usbSelectionPanel.Visibility = if ($State.Controls.chkSelectSpecificUSBDrives.IsChecked) { 'Visible' } else { 'Collapsed' }
$State.Controls.chkSelectSpecificUSBDrives.IsEnabled = $State.Controls.chkBuildUSBDriveEnable.IsChecked
$State.Controls.chkPromptExternalHardDiskMedia.IsEnabled = $State.Controls.chkAllowExternalHardDiskMedia.IsChecked
From 80147ed61b563e54f50415aca5e91a635f68f426 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Fri, 20 Mar 2026 15:25:23 -0700
Subject: [PATCH 04/34] Adds Windows Media Source selection options
Introduces radio buttons to choose between downloading a Windows ESD or providing a custom Windows ISO file, enhancing flexibility for media source selection. Updates configuration handling and event listeners to toggle visibility and appropriately populate combo boxes based on the selected media source.
---
FFUDevelopment/BuildFFUVM_UI.xaml | 28 ++++++++-----
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 10 +++++
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 39 ++++++++++++++----
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 10 ++++-
FFUDevelopment/config/Sample_default.json | Bin 6310 -> 6412 bytes
5 files changed, 69 insertions(+), 18 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 1d73906..8551fb0 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -223,16 +223,24 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index e540e31..4224a55 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -54,6 +54,7 @@ function Get-UIConfig {
InstallOffice = $State.Controls.chkInstallOffice.IsChecked
InstallWingetApps = $State.Controls.chkInstallWingetApps.IsChecked
ISOPath = $State.Controls.txtISOPath.Text
+ WindowsMediaSource = if ($null -ne $State.Controls.rbProvideISO -and $State.Controls.rbProvideISO.IsChecked) { "Provide Windows ISO" } else { "Download Windows ESD" }
LogicalSectorSizeBytes = [int]$State.Controls.cmbLogicalSectorSize.SelectedItem.Content
# Make = $null
MediaType = $State.Controls.cmbMediaType.SelectedItem
@@ -486,6 +487,15 @@ function Update-UIFromConfig {
# Windows Settings
Set-UIValue -ControlName 'txtISOPath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'ISOPath' -State $State
+ # Load Windows Media Source setting
+ if ($null -ne $ConfigContent.PSObject.Properties.Item('WindowsMediaSource')) {
+ if ($ConfigContent.WindowsMediaSource -eq 'Provide Windows ISO') {
+ $State.Controls.rbProvideISO.IsChecked = $true
+ }
+ else {
+ $State.Controls.rbDownloadESD.IsChecked = $true
+ }
+ }
# Special handling for Windows Release and SKU due to value collision (e.g., 2019 for Server and LTSC)
if (($null -ne $ConfigContent.PSObject.Properties.Item('WindowsRelease')) -and ($null -ne $ConfigContent.PSObject.Properties.Item('WindowsSKU'))) {
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index ec9229c..1e15417 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -392,12 +392,31 @@ function Register-EventHandlers {
})
# Windows Settings tab Event Handlers
- $State.Controls.txtISOPath.Add_TextChanged({
- param($eventSource, $textChangedEventArgs)
- $window = [System.Windows.Window]::GetWindow($eventSource)
- $localState = $window.Tag
- Get-WindowsSettingsCombos -isoPath $localState.Controls.txtISOPath.Text -State $localState
- })
+ # Windows Media Source radio buttons
+ if ($null -ne $State.Controls.rbProvideISO) {
+ $State.Controls.rbProvideISO.Add_Checked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ if ($null -eq $window -or $null -eq $window.Tag) { return }
+ $localState = $window.Tag
+ $localState.Controls.isoPathPanel.Visibility = 'Visible'
+ # Use a placeholder .iso path to trigger ISO mode even before a real path is provided
+ $isoPath = $localState.Controls.txtISOPath.Text
+ if ([string]::IsNullOrWhiteSpace($isoPath)) {
+ $isoPath = 'placeholder.iso'
+ }
+ Get-WindowsSettingsCombos -isoPath $isoPath -State $localState
+ })
+ $State.Controls.rbProvideISO.Add_Unchecked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ if ($null -eq $window -or $null -eq $window.Tag) { return }
+ $localState = $window.Tag
+ $localState.Controls.isoPathPanel.Visibility = 'Collapsed'
+ $localState.Controls.txtISOPath.Text = ''
+ Get-WindowsSettingsCombos -isoPath '' -State $localState
+ })
+ }
$State.Controls.cmbWindowsRelease.Add_SelectionChanged({
param($eventSource, $selectionChangedEventArgs)
@@ -407,7 +426,13 @@ function Register-EventHandlers {
if ($null -ne $localState.Controls.cmbWindowsRelease.SelectedItem) {
$selectedReleaseValue = $localState.Controls.cmbWindowsRelease.SelectedItem.Value
}
- Update-WindowsVersionCombo -selectedRelease $selectedReleaseValue -isoPath $localState.Controls.txtISOPath.Text -State $localState
+ # Determine ISO path based on radio button state
+ $isoPath = ''
+ if ($null -ne $localState.Controls.rbProvideISO -and $localState.Controls.rbProvideISO.IsChecked) {
+ $isoPath = $localState.Controls.txtISOPath.Text
+ if ([string]::IsNullOrWhiteSpace($isoPath)) { $isoPath = 'placeholder.iso' }
+ }
+ Update-WindowsVersionCombo -selectedRelease $selectedReleaseValue -isoPath $isoPath -State $localState
Update-WindowsSkuCombo -State $localState
Update-WindowsArchCombo -State $localState
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index 929165a..ed65029 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -112,6 +112,9 @@ function Initialize-UIControls {
$State.Controls.cmbWindowsRelease = $window.FindName('cmbWindowsRelease')
$State.Controls.cmbWindowsVersion = $window.FindName('cmbWindowsVersion')
$State.Controls.txtISOPath = $window.FindName('txtISOPath')
+ $State.Controls.rbDownloadESD = $window.FindName('rbDownloadESD')
+ $State.Controls.rbProvideISO = $window.FindName('rbProvideISO')
+ $State.Controls.isoPathPanel = $window.FindName('isoPathPanel')
$State.Controls.btnBrowseISO = $window.FindName('btnBrowseISO')
$State.Controls.cmbWindowsArch = $window.FindName('cmbWindowsArch')
$State.Controls.cmbWindowsLang = $window.FindName('cmbWindowsLang')
@@ -389,7 +392,12 @@ function Initialize-UIDefaults {
$State.Controls.cmbLogicalSectorSize.SelectedItem = ($State.Controls.cmbLogicalSectorSize.Items | Where-Object { $_.Content -eq $State.Defaults.generalDefaults.LogicalSectorSize.ToString() })
# Populate Windows Release, Version, and SKU comboboxes
- Get-WindowsSettingsCombos -isoPath $State.Defaults.windowsSettingsDefaults.DefaultISOPath -State $State
+ # Initialize Windows settings combos based on media source mode
+ $initIsoPath = $State.Defaults.windowsSettingsDefaults.DefaultISOPath
+ if ($null -ne $State.Controls.rbProvideISO -and -not $State.Controls.rbProvideISO.IsChecked) {
+ $initIsoPath = ''
+ }
+ Get-WindowsSettingsCombos -isoPath $initIsoPath -State $State
# Windows Settings tab defaults
$State.Controls.cmbWindowsLang.ItemsSource = $State.Defaults.windowsSettingsDefaults.AllowedLanguages
diff --git a/FFUDevelopment/config/Sample_default.json b/FFUDevelopment/config/Sample_default.json
index dfe49aa4001780457d18a7af7b0c25a0334dc2b8..e8b1e6a00dc90959d716f7536966fcccdc61eb96 100644
GIT binary patch
delta 89
zcmZ2x*kiO|nYgPjLn=cGLncEaLoh==Ln%WMLo!fAiNT6N0Z6(4#mX7-7;=DgB2b+I
gLpV@v9*_kRF9z~mf%;q~A7mDud`_Hi@iK8n0DI^Y#{d8T
delta 11
ScmeA%T4uOmnfPKJ2}S@LX#>ju
From 42ed2819b8574fc55cf0d35ad8c5390e752ce53c Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Fri, 20 Mar 2026 16:29:09 -0700
Subject: [PATCH 05/34] Fixes header checkbox alignment in grid view
Wraps the "Select All" header checkbox in a custom container to mirror the padding and layout used by data rows. Removes default padding and enforces strict vertical and horizontal centering, ensuring consistent visual alignment between the header and cell content.
---
.../FFUUI.Core/FFUUI.Core.Shared.psm1 | 27 +++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1
index a120d32..12425bc 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1
@@ -343,7 +343,8 @@ function Add-SelectableGridViewColumn {
# Create the "Select All" CheckBox for the header
$headerCheckBox = New-Object System.Windows.Controls.CheckBox
$headerCheckBox.HorizontalAlignment = [System.Windows.HorizontalAlignment]::Center
-
+ $headerCheckBox.VerticalAlignment = [System.Windows.VerticalAlignment]::Center
+
# Store header metadata, including whether select-all should only affect visible rows.
$headerTagObject = [PSCustomObject]@{
PropertyName = $IsSelectedPropertyName
@@ -412,11 +413,33 @@ function Add-SelectableGridViewColumn {
}
})
+ # Wrap the header checkbox in a stretched container so it centers the same way as row cells.
+ # Apply a small left inset to mirror the Fluent ListViewItem content padding used by data rows.
+ $headerBorder = New-Object System.Windows.Controls.Border
+ $headerBorder.Padding = New-Object System.Windows.Thickness(12, 0, 0, 0)
+ $headerBorder.HorizontalAlignment = [System.Windows.HorizontalAlignment]::Stretch
+ $headerBorder.VerticalAlignment = [System.Windows.VerticalAlignment]::Stretch
+
+ $headerGrid = New-Object System.Windows.Controls.Grid
+ $headerGrid.HorizontalAlignment = [System.Windows.HorizontalAlignment]::Stretch
+ $headerGrid.VerticalAlignment = [System.Windows.VerticalAlignment]::Stretch
+ $headerGrid.Children.Add($headerCheckBox) | Out-Null
+ $headerBorder.Child = $headerGrid
+
+ # Use an explicit GridViewColumnHeader so we can remove the default header padding
+ # and control the checkbox alignment explicitly.
+ $selectableHeader = New-Object System.Windows.Controls.GridViewColumnHeader
+ $selectableHeader.HorizontalContentAlignment = [System.Windows.HorizontalAlignment]::Stretch
+ $selectableHeader.VerticalContentAlignment = [System.Windows.VerticalAlignment]::Stretch
+ $selectableHeader.Padding = New-Object System.Windows.Thickness(0)
+ $selectableHeader.Margin = New-Object System.Windows.Thickness(0)
+ $selectableHeader.Content = $headerBorder
+
$State.Controls[$HeaderCheckBoxKeyName] = $headerCheckBox
WriteLog "Add-SelectableGridViewColumn: Stored header checkbox in State.Controls with key '$HeaderCheckBoxKeyName'."
$selectableColumn = New-Object System.Windows.Controls.GridViewColumn
- $selectableColumn.Header = $headerCheckBox
+ $selectableColumn.Header = $selectableHeader
$selectableColumn.Width = $ColumnWidth
$cellTemplate = New-Object System.Windows.DataTemplate
From 2d2ce495370cb0d97f25c60e0803fb6e41c13f07 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Fri, 20 Mar 2026 16:35:10 -0700
Subject: [PATCH 06/34] Increases width of threads input text box
Expands the text box width to improve visibility of the input value and enhance the user interface layout.
---
FFUDevelopment/BuildFFUVM_UI.xaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 8551fb0..3ec1b81 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -760,7 +760,7 @@
-
+
From 002017e5e64219000fb3ecb1e4d1914ea5f6fdbb Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Mon, 23 Mar 2026 11:14:30 -0700
Subject: [PATCH 07/34] Updates layout margins across UI pages
Reduces the top margin to zero for the primary layout containers across multiple tabs and pages, improving content alignment and visual spacing within the scroll viewers.
---
FFUDevelopment/BuildFFUVM_UI.xaml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 3ec1b81..dce6d63 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -176,7 +176,7 @@
-
+
@@ -187,7 +187,7 @@
-
+
@@ -222,7 +222,7 @@
-
+
@@ -279,7 +279,7 @@
-
+
@@ -293,7 +293,7 @@
-
+
@@ -511,7 +511,7 @@
-
+
@@ -547,7 +547,7 @@
-
+
@@ -685,7 +685,7 @@
-
+
@@ -869,13 +869,13 @@
-
+
-
+
From 98c1644d76784bff4973b85248c2f3a0a7863e20 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Mon, 23 Mar 2026 11:52:04 -0700
Subject: [PATCH 08/34] Improves UI structure with a shared page shell and
dynamic titles
Wraps the application's content area in a stylized border and introduces a centralized, dynamic page header to provide a more cohesive look.
- Adds `Tag` attributes to navigation list items to define each view's display title
- Implements event handlers to automatically update the header text based on user navigation
- Removes redundant embedded titles from individual content pages to streamline the layouts
---
FFUDevelopment/BuildFFUVM_UI.xaml | 1542 +++++++++--------
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 19 +
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 16 +-
3 files changed, 812 insertions(+), 765 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index dce6d63..14c7107 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -1,8 +1,6 @@
+ xmlns:sys="clr-namespace:System;assembly=mscorlib" Title="FFU Builder UI" FontSize="14" FontFamily="Segoe UI Variable, Segoe UI" WindowState="Maximized">
@@ -69,7 +67,7 @@
-
+
@@ -115,55 +113,55 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -173,787 +171,803 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Foreground
- High
- Normal
- Low
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- Light
- Dark
- System
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
- GitHub Repository
-
-
- GitHub Releases
-
-
- Change Log
-
-
- Documentation
-
-
-
-
- FFU Builder Overview
-
-
- FFU Builder Deep Dive
-
-
- FFU Deployment Walkthrough
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Foreground
+ High
+ Normal
+ Low
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Light
+ Dark
+ System
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GitHub Repository
+
+
+ GitHub Releases
+
+
+ Change Log
+
+
+ Documentation
+
+
+
+
+ FFU Builder Overview
+
+
+ FFU Builder Deep Dive
+
+
+ FFU Deployment Walkthrough
+
+
+
+
+
+
-
-
+
+
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 1e15417..1e0cba0 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -117,6 +117,14 @@ function Register-EventHandlers {
if ($selectedIndex -lt $localState.Controls.navigationPages.Count) {
$localState.Controls.navigationPages[$selectedIndex].Visibility = 'Visible'
}
+
+ # Update the shared page title to match the selected navigation item
+ if ($null -ne $localState.Controls.txtPageTitle) {
+ $selectedNavigationItem = $eventSource.SelectedItem
+ if ($null -ne $selectedNavigationItem -and -not [string]::IsNullOrWhiteSpace([string]$selectedNavigationItem.Tag)) {
+ $localState.Controls.txtPageTitle.Text = [string]$selectedNavigationItem.Tag
+ }
+ }
})
}
@@ -145,6 +153,17 @@ function Register-EventHandlers {
if ($null -ne $localState.Controls.pageSettings) {
$localState.Controls.pageSettings.Visibility = 'Visible'
}
+
+ # Update the shared page title to match the selected navigation item
+ if ($null -ne $localState.Controls.txtPageTitle) {
+ $selectedNavigationItem = $eventSource.SelectedItem
+ if ($null -ne $selectedNavigationItem -and -not [string]::IsNullOrWhiteSpace([string]$selectedNavigationItem.Tag)) {
+ $localState.Controls.txtPageTitle.Text = [string]$selectedNavigationItem.Tag
+ }
+ else {
+ $localState.Controls.txtPageTitle.Text = 'Settings'
+ }
+ }
})
}
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index ed65029..3f95b64 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -280,6 +280,9 @@ function Initialize-UIControls {
# Settings page
$State.Controls.cmbThemeMode = $window.FindName('cmbThemeMode')
+ # Shared page shell
+ $State.Controls.txtPageTitle = $window.FindName('txtPageTitle')
+
# Navigation controls
$State.Controls.lstNavigation = $window.FindName('lstNavigation')
$State.Controls.lstNavSettings = $window.FindName('lstNavSettings')
@@ -473,9 +476,20 @@ function Initialize-UIDefaults {
}
}
- # Set default navigation selection to Home and show the Home page
+ # Set default navigation selection to Home and initialize the shared page title
if ($null -ne $State.Controls.lstNavigation) {
$State.Controls.lstNavigation.SelectedIndex = 0
+
+ # Keep the shell header aligned with the selected navigation item on first render
+ if ($null -ne $State.Controls.txtPageTitle) {
+ $selectedNavigationItem = $State.Controls.lstNavigation.SelectedItem
+ if ($null -ne $selectedNavigationItem -and -not [string]::IsNullOrWhiteSpace([string]$selectedNavigationItem.Tag)) {
+ $State.Controls.txtPageTitle.Text = [string]$selectedNavigationItem.Tag
+ }
+ else {
+ $State.Controls.txtPageTitle.Text = 'Home'
+ }
+ }
}
# Set initial state for Office panel visibility
From d6e6287b56039f6d4d595b0bbf7ce62027a24dd2 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Mon, 23 Mar 2026 12:53:14 -0700
Subject: [PATCH 09/34] Updates UI styling for the shared page shell
Switches to the application background brush and removes the border to improve visual consistency and integrate more seamlessly with the overall application theme.
---
FFUDevelopment/BuildFFUVM_UI.xaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 14c7107..e849064 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -173,7 +173,7 @@
-
+
From cfdf0af8785df6695f21cafd33f5f045252bf2e7 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Mon, 23 Mar 2026 14:47:39 -0700
Subject: [PATCH 10/34] Updates Microsoft Surface driver model discovery
Transitions the Microsoft Surface driver model list retrieval to use a centralized Learn-based index. This change unifies the scraping logic between the CLI and UI components, ensuring consistency and simplified maintenance. Cached model lists now serve both interfaces efficiently, reducing unnecessary network requests while retaining fallback mechanisms.
---
FFUDevelopment/BuildFFUVM.ps1 | 75 +------
.../FFU.Common.Drivers.Microsoft.psm1 | 184 +++++++++++++++++-
.../FFUUI.Core.Drivers.Microsoft.psm1 | 96 +--------
3 files changed, 184 insertions(+), 171 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 1554d87..f7d16f8 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -816,78 +816,11 @@ function Get-MicrosoftDrivers {
[int]$WindowsRelease
)
- $url = "https://support.microsoft.com/en-us/surface/download-drivers-and-firmware-for-surface-09bb2e09-2a4b-cb69-0951-078a7739e120"
-
- ### DOWNLOAD DRIVER PAGE CONTENT
- WriteLog "Getting Surface driver information from $url"
- $OriginalVerbosePreference = $VerbosePreference
- $VerbosePreference = 'SilentlyContinue'
- $webContent = Invoke-WebRequest -Uri $url -UseBasicParsing -Headers $Headers -UserAgent $UserAgent
- $VerbosePreference = $OriginalVerbosePreference
+ # Use the shared Learn-based Microsoft model index so the CLI stays aligned with the UI.
+ WriteLog "Getting Surface driver information from the shared Microsoft model index"
+ $models = @(Get-SurfaceDriverModelIndex -DriversFolder $DriversFolder | Select-Object Model, Link)
WriteLog "Complete"
-
- ### PARSE THE DRIVER PAGE CONTENT FOR MODELS AND DOWNLOAD LINKS
- WriteLog "Parsing web content for models and download links"
- $html = $webContent.Content
-
- # Regex to match divs with selectable-content-options__option-content classes
- $divPattern = ']*class="selectable-content-options__option-content(?: ocHidden)?"[^>]*>(.*?)'
- $divMatches = [regex]::Matches($html, $divPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- $models = @()
-
- foreach ($divMatch in $divMatches) {
- $divContent = $divMatch.Groups[1].Value
-
- # Find all tables within the div
- $tablePattern = ']*>(.*?)'
- $tableMatches = [regex]::Matches($divContent, $tablePattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- foreach ($tableMatch in $tableMatches) {
- $tableContent = $tableMatch.Groups[1].Value
-
- # Find all rows in the table
- $rowPattern = ']*>(.*?)'
- $rowMatches = [regex]::Matches($tableContent, $rowPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- foreach ($rowMatch in $rowMatches) {
- $rowContent = $rowMatch.Groups[1].Value
-
- # Extract cells from the row
- $cellPattern = ']*>\s*(?:]*>)?(.*?)(?:)?\s*'
- $cellMatches = [regex]::Matches($rowContent, $cellPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- if ($cellMatches.Count -ge 2) {
- # Model name in the first TD
- $modelName = ($cellMatches[0].Groups[1].Value).Trim()
-
- # # Remove
and
tags if present
- # $modelName = $modelName -replace ']*>', '' -replace '', ''
- # $modelName = $modelName.Trim()
-
-
- # The second TD might contain a link or just text
- $secondTdContent = $cellMatches[1].Groups[1].Value.Trim()
-
- # Look for a link in the second TD
- $linkPattern = ']+href="([^"]+)"[^>]*>'
- $linkMatch = [regex]::Match($secondTdContent, $linkPattern, [System.Text.RegularExpressions.RegexOptions]::IgnoreCase)
-
- if ($linkMatch.Success) {
- $modelLink = $linkMatch.Groups[1].Value
- }
- else {
- # No link, just text instructions
- $modelLink = $secondTdContent
- }
-
- $models += [PSCustomObject]@{ Model = $modelName; Link = $modelLink }
- }
- }
- }
- }
-
- WriteLog "Parsing complete"
+ WriteLog "Loaded $($models.Count) Surface models from the shared Microsoft model index."
### FIND THE MODEL IN THE LIST OF MODELS
$selectedModel = $models | Where-Object { $_.Model -eq $Model }
diff --git a/FFUDevelopment/FFU.Common/FFU.Common.Drivers.Microsoft.psm1 b/FFUDevelopment/FFU.Common/FFU.Common.Drivers.Microsoft.psm1
index 2151752..60b76ff 100644
--- a/FFUDevelopment/FFU.Common/FFU.Common.Drivers.Microsoft.psm1
+++ b/FFUDevelopment/FFU.Common/FFU.Common.Drivers.Microsoft.psm1
@@ -161,12 +161,181 @@ function ConvertTo-SurfaceComparableName {
# Cleanup: remove orphaned "with" left behind by earlier removals (e.g., "Surface Pro 9 with Intel Processor")
$value = $value -replace '(?i)\bwith\b', ''
- $value = $value -replace '\s+', ' '
-
- return $value.Trim().ToUpperInvariant()
-}
-
-function Get-SurfaceSystemSkuReferenceIndex {
+ $value = $value -replace '\s+', ' '
+
+ return $value.Trim().ToUpperInvariant()
+ }
+
+ function ConvertTo-SurfaceHtmlText {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [AllowEmptyString()]
+ [string]$HtmlFragment
+ )
+
+ # Normalize HTML fragments from the Learn table into plain text values.
+ $textValue = $HtmlFragment -replace '', ' '
+ $textValue = $textValue -replace '<[^>]+>', ' '
+ $textValue = [System.Net.WebUtility]::HtmlDecode($textValue)
+ $textValue = $textValue -replace '\s+', ' '
+
+ return $textValue.Trim()
+ }
+
+ function ConvertTo-SurfaceDownloadCenterLink {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$LinkValue
+ )
+
+ # Normalize Learn links down to the canonical Download Center details URL.
+ $decodedLink = [System.Net.WebUtility]::HtmlDecode($LinkValue).Trim()
+ if ([string]::IsNullOrWhiteSpace($decodedLink)) {
+ return $null
+ }
+
+ if ($decodedLink.StartsWith('/')) {
+ $decodedLink = "https://www.microsoft.com$decodedLink"
+ }
+
+ $downloadCenterMatch = [regex]::Match(
+ $decodedLink,
+ 'https://www\.microsoft\.com(?:/en-us)?/download/details\.aspx\?id=\d+',
+ [System.Text.RegularExpressions.RegexOptions]::IgnoreCase
+ )
+
+ if (-not $downloadCenterMatch.Success) {
+ return $null
+ }
+
+ return ($downloadCenterMatch.Value -replace '/en-us/', '/')
+ }
+
+ function Get-SurfaceDriverModelIndex {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$DriversFolder
+ )
+
+ $url = 'https://learn.microsoft.com/en-us/surface/manage-surface-driver-and-firmware-updates'
+ $minimumExpectedModelCount = 10
+
+ # Load the cached model list first to keep Microsoft model discovery fast.
+ try {
+ $cache = Import-SurfaceDriverIndexCache -DriversFolder $DriversFolder
+ if (@($cache.ModelIndex).Count -gt 0) {
+ WriteLog "Surface cache: Using cached Microsoft model list ($(@($cache.ModelIndex).Count) models)."
+ return @($cache.ModelIndex)
+ }
+ }
+ catch {
+ WriteLog "Surface cache: Failed to load cached Microsoft model list. Falling back to the Learn source. Error: $($_.Exception.Message)"
+ }
+
+ try {
+ # Download the Learn article that now contains the authoritative Surface package table.
+ WriteLog "Surface cache: Downloading Microsoft model index from $url"
+ $headers = @{
+ 'User-Agent' = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)'
+ }
+ $webContent = Invoke-WebRequest -Uri $url -UseBasicParsing -Headers $headers
+ $html = $webContent.Content
+
+ # Parse each table row and keep only Download Center package links.
+ $rowMatches = [regex]::Matches($html, ']*>(.*?)', [System.Text.RegularExpressions.RegexOptions]::Singleline)
+ $models = [System.Collections.Generic.List[pscustomobject]]::new()
+ $seenModelKeys = [System.Collections.Generic.HashSet[string]]::new([System.StringComparer]::OrdinalIgnoreCase)
+
+ foreach ($rowMatch in $rowMatches) {
+ $rowContent = $rowMatch.Groups[1].Value
+ $cellMatches = [regex]::Matches($rowContent, ']*>\s*(.*?)\s*', [System.Text.RegularExpressions.RegexOptions]::Singleline)
+ if ($cellMatches.Count -lt 2) {
+ continue
+ }
+
+ $rowLabel = ConvertTo-SurfaceHtmlText -HtmlFragment $cellMatches[0].Groups[1].Value
+ if ([string]::IsNullOrWhiteSpace($rowLabel) -or $rowLabel -notmatch '(?i)^Surface') {
+ continue
+ }
+
+ $downloadCellContent = $cellMatches[1].Groups[1].Value
+ $linkMatches = [regex]::Matches(
+ $downloadCellContent,
+ ']+href="([^"]+)"[^>]*>(.*?)',
+ [System.Text.RegularExpressions.RegexOptions]::Singleline -bor [System.Text.RegularExpressions.RegexOptions]::IgnoreCase
+ )
+
+ foreach ($linkMatch in $linkMatches) {
+ $modelName = ConvertTo-SurfaceHtmlText -HtmlFragment $linkMatch.Groups[2].Value
+ $modelLink = ConvertTo-SurfaceDownloadCenterLink -LinkValue $linkMatch.Groups[1].Value
+
+ if ([string]::IsNullOrWhiteSpace($modelName) -or [string]::IsNullOrWhiteSpace($modelLink)) {
+ continue
+ }
+
+ $modelKey = "$modelName`n$modelLink"
+ if (-not $seenModelKeys.Add($modelKey)) {
+ continue
+ }
+
+ $models.Add([pscustomobject]@{
+ Make = 'Microsoft'
+ Model = $modelName
+ Link = $modelLink
+ })
+ }
+ }
+
+ if ($models.Count -eq 0) {
+ throw "No Microsoft driver models were found in the Learn table."
+ }
+
+ if ($models.Count -lt $minimumExpectedModelCount) {
+ WriteLog "Surface cache: Warning - Learn parsing returned only $($models.Count) Microsoft model entries."
+ }
+ else {
+ WriteLog "Surface cache: Parsed $($models.Count) Microsoft model entries from Learn."
+ }
+
+ # Save the refreshed model list into the shared cache for both UI and CLI use.
+ try {
+ $cache = Import-SurfaceDriverIndexCache -DriversFolder $DriversFolder
+ $cache.ModelIndex = @($models)
+ Save-SurfaceDriverIndexCache -Cache $cache -DriversFolder $DriversFolder
+ WriteLog "Surface cache: Saved Microsoft model list to cache."
+ }
+ catch {
+ WriteLog "Surface cache: Failed to save Microsoft model list. Error: $($_.Exception.Message)"
+ }
+
+ return @($models)
+ }
+ catch {
+ WriteLog "Surface cache: Failed to build Microsoft model list from Learn. Error: $($_.Exception.Message)"
+
+ # Fall back to the last cached model list even if it is stale when the live request fails.
+ try {
+ $cachePath = Get-SurfaceDriverIndexCachePath -DriversFolder $DriversFolder
+ if (Test-Path -Path $cachePath -PathType Leaf) {
+ $staleCache = Get-Content -Path $cachePath -Raw | ConvertFrom-Json -ErrorAction Stop
+ if (@($staleCache.ModelIndex).Count -gt 0) {
+ WriteLog "Surface cache: Using stale Microsoft model list ($(@($staleCache.ModelIndex).Count) models) because the live Learn request failed."
+ return @($staleCache.ModelIndex)
+ }
+ }
+ }
+ catch {
+ WriteLog "Surface cache: Failed to load stale Microsoft model list fallback. Error: $($_.Exception.Message)"
+ }
+
+ throw "Failed to retrieve Microsoft Surface models."
+ }
+ }
+
+ function Get-SurfaceSystemSkuReferenceIndex {
[CmdletBinding()]
param(
[Parameter(Mandatory = $true)]
@@ -586,6 +755,9 @@ Export-ModuleMember -Function `
Import-SurfaceDriverIndexCache, `
Save-SurfaceDriverIndexCache, `
ConvertTo-SurfaceComparableName, `
+ ConvertTo-SurfaceHtmlText, `
+ ConvertTo-SurfaceDownloadCenterLink, `
+ Get-SurfaceDriverModelIndex, `
Get-SurfaceSystemSkuReferenceIndex, `
Get-SurfaceDownloadCenterDetails, `
Get-SurfaceSystemSkuListForMicrosoftDriver
\ No newline at end of file
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Microsoft.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Microsoft.psm1
index 3fc216b..cce2a95 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Microsoft.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Microsoft.psm1
@@ -15,100 +15,8 @@ function Get-MicrosoftDriversModelList {
[string]$DriversFolder
)
- $url = "https://support.microsoft.com/en-us/surface/download-drivers-and-firmware-for-surface-09bb2e09-2a4b-cb69-0951-078a7739e120"
- $models = @()
-
- # Load cached model list first (Source B) to keep the UI fast.
- # The cache is refreshed automatically when missing or invalid.
- try {
- $cachePath = Get-SurfaceDriverIndexCachePath -DriversFolder $DriversFolder
- if (Test-Path -Path $cachePath -PathType Leaf) {
- $cacheAgeDays = ((Get-Date) - (Get-Item -Path $cachePath).LastWriteTime).TotalDays
- if ($cacheAgeDays -lt 7) {
- $cache = Import-SurfaceDriverIndexCache -DriversFolder $DriversFolder
- if ($cache.ModelIndex -and $cache.ModelIndex.Count -gt 0) {
- WriteLog "Surface cache: Using cached Microsoft model list ($($cache.ModelIndex.Count) models)."
- return @($cache.ModelIndex)
- }
- }
- }
- }
- catch {
- WriteLog "Surface cache: Failed to load cached Microsoft model list. Falling back to online parse. Error: $($_.Exception.Message)"
- }
-
- try {
- WriteLog "Getting Surface driver information from $url"
- $OriginalVerbosePreference = $VerbosePreference
- $VerbosePreference = 'SilentlyContinue'
- # Use passed-in UserAgent and Headers
- $webContent = Invoke-WebRequest -Uri $url -UseBasicParsing -Headers $Headers -UserAgent $UserAgent
- $VerbosePreference = $OriginalVerbosePreference
- WriteLog "Complete"
-
- WriteLog "Parsing web content for models and download links"
- $html = $webContent.Content
- $divPattern = ']*class="selectable-content-options__option-content(?: ocHidden)?"[^>]*>(.*?)'
- $divMatches = [regex]::Matches($html, $divPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- foreach ($divMatch in $divMatches) {
- $divContent = $divMatch.Groups[1].Value
- $tablePattern = ']*>(.*?)'
- $tableMatches = [regex]::Matches($divContent, $tablePattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- foreach ($tableMatch in $tableMatches) {
- $tableContent = $tableMatch.Groups[1].Value
- $rowPattern = ']*>(.*?)'
- $rowMatches = [regex]::Matches($tableContent, $rowPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- foreach ($rowMatch in $rowMatches) {
- $rowContent = $rowMatch.Groups[1].Value
- $cellPattern = ']*>\s*(?:]*>)?(.*?)(?:)?\s*'
- $cellMatches = [regex]::Matches($rowContent, $cellPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- if ($cellMatches.Count -ge 2) {
- $modelName = ([System.Net.WebUtility]::HtmlDecode(($cellMatches[0].Groups[1].Value).Trim()))
- $secondTdContent = $cellMatches[1].Groups[1].Value.Trim()
- # $linkPattern = ']+href="([^"]+)"[^>]*>'
- # Change linkPattern to match https://www.microsoft.com/download/details.aspx?id=
- $linkPattern = ']+href="(https://www\.microsoft\.com/download/details\.aspx\?id=\d+)"[^>]*>'
- $linkMatch = [regex]::Match($secondTdContent, $linkPattern, [System.Text.RegularExpressions.RegexOptions]::IgnoreCase)
-
- if ($linkMatch.Success) {
- $modelLink = $linkMatch.Groups[1].Value
- }
- else {
- continue
- }
-
- $models += [PSCustomObject]@{
- Make = 'Microsoft'
- Model = $modelName
- Link = $modelLink
- }
- }
- }
- }
- }
- WriteLog "Parsing complete. Found $($models.Count) models."
-
- # Persist model list (Source B) into the local cache for fast UI population.
- try {
- $cache = Import-SurfaceDriverIndexCache -DriversFolder $DriversFolder
- $cache.ModelIndex = @($models)
- Save-SurfaceDriverIndexCache -Cache $cache -DriversFolder $DriversFolder
- WriteLog "Surface cache: Saved Microsoft model list to cache."
- }
- catch {
- WriteLog "Surface cache: Failed to save Microsoft model list. Error: $($_.Exception.Message)"
- }
-
- return $models
- }
- catch {
- WriteLog "Error getting Microsoft models: $($_.Exception.Message)"
- throw "Failed to retrieve Microsoft Surface models."
- }
+ # Keep the UI signature unchanged while using the shared Learn-based source.
+ return @(Get-SurfaceDriverModelIndex -DriversFolder $DriversFolder)
}
# Function to download and extract drivers for a specific Microsoft model (Modified for ForEach-Object -Parallel)
function Save-MicrosoftDriversTask {
From db044551cc662eb4ccde3fa7826eac250fb853c3 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:07:23 -0700
Subject: [PATCH 11/34] Populates Home page with build and release status
Updates the Home page UI to display current build, latest release, and release status. Moves the resources section to the Home page and adds a new section to display the latest GitHub discussions. Add helper functions to query GitHub for the latest release and recent public discussions to keep users informed efficiently.
---
FFUDevelopment/BuildFFUVM_UI.ps1 | 3 +
FFUDevelopment/BuildFFUVM_UI.xaml | 152 +++-
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 17 +-
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 28 +
FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 | 771 ++++++++++++++++++
5 files changed, 935 insertions(+), 36 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.ps1 b/FFUDevelopment/BuildFFUVM_UI.ps1
index c282020..fc7eefb 100644
--- a/FFUDevelopment/BuildFFUVM_UI.ps1
+++ b/FFUDevelopment/BuildFFUVM_UI.ps1
@@ -133,6 +133,9 @@ $window.Add_Loaded({
Initialize-DynamicUIElements -State $script:uiState
Register-EventHandlers -State $script:uiState
+ # Populate the Home page build and release status after the window initializes
+ Start-HomeStatusRefresh -State $script:uiState
+
# Attempt automatic load of previous environment (silent)
try {
Invoke-AutoLoadPreviousEnvironment -State $script:uiState
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index e849064..373f668 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -190,9 +190,125 @@
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ View all discussions
+
+
+
+
+
+
+
+
+
+
+ FFU Builder Quick Start
+
+
+ Documentation Home
+
+
+ GitHub Repository
+
+
+ GitHub Releases
+
+
+ Change Log
+
+
+ FFU Builder Quick Start Video
+
+
+
+
@@ -929,38 +1045,6 @@
-
-
-
-
-
-
-
- GitHub Repository
-
-
- GitHub Releases
-
-
- Change Log
-
-
- Documentation
-
-
-
-
- FFU Builder Overview
-
-
- FFU Builder Deep Dive
-
-
- FFU Deployment Walkthrough
-
-
-
-
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 1e0cba0..71d57c7 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -167,8 +167,21 @@ function Register-EventHandlers {
})
}
- # Hyperlink navigation handlers for Settings page links
- $hyperlinkNames = @('linkGitHub', 'linkReleases', 'linkChangelog', 'linkDocs', 'linkVideo1', 'linkVideo2', 'linkVideo3')
+ # Hyperlink navigation handlers for Home page links
+ $hyperlinkNames = @(
+ 'linkQuickStart',
+ 'linkDocs',
+ 'linkGitHub',
+ 'linkReleases',
+ 'linkChangelog',
+ 'linkVideo1',
+ 'linkDiscussion1',
+ 'linkDiscussion2',
+ 'linkDiscussion3',
+ 'linkDiscussion4',
+ 'linkDiscussion5',
+ 'linkDiscussions'
+ )
foreach ($linkName in $hyperlinkNames) {
$link = $State.Window.FindName($linkName)
if ($null -ne $link) {
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index 3f95b64..b853cd9 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -277,6 +277,34 @@ function Initialize-UIControls {
$State.Controls.btnRestoreDefaults = $window.FindName('btnRestoreDefaults')
$State.Controls.btnBuildConfig = $window.FindName('btnBuildConfig')
+ # Home page
+ $State.Controls.txtHomeCurrentBuildValue = $window.FindName('txtHomeCurrentBuildValue')
+ $State.Controls.txtHomeLatestReleaseValue = $window.FindName('txtHomeLatestReleaseValue')
+ $State.Controls.txtHomeReleaseStatusValue = $window.FindName('txtHomeReleaseStatusValue')
+ $State.Controls.spHomeReleaseNotesSections = $window.FindName('spHomeReleaseNotesSections')
+ $State.Controls.ellipseHomeDiskSpaceStatus = $window.FindName('ellipseHomeDiskSpaceStatus')
+ $State.Controls.txtHomeDiskSpaceStatusValue = $window.FindName('txtHomeDiskSpaceStatusValue')
+ $State.Controls.ellipseHomeHyperVStatus = $window.FindName('ellipseHomeHyperVStatus')
+ $State.Controls.txtHomeHyperVStatusValue = $window.FindName('txtHomeHyperVStatusValue')
+ $State.Controls.txtHomeDiscussionsStatusValue = $window.FindName('txtHomeDiscussionsStatusValue')
+ $State.Controls.tbDiscussion1 = $window.FindName('tbDiscussion1')
+ $State.Controls.linkDiscussion1 = $window.FindName('linkDiscussion1')
+ $State.Controls.runDiscussion1 = $window.FindName('runDiscussion1')
+ $State.Controls.tbDiscussion2 = $window.FindName('tbDiscussion2')
+ $State.Controls.linkDiscussion2 = $window.FindName('linkDiscussion2')
+ $State.Controls.runDiscussion2 = $window.FindName('runDiscussion2')
+ $State.Controls.tbDiscussion3 = $window.FindName('tbDiscussion3')
+ $State.Controls.linkDiscussion3 = $window.FindName('linkDiscussion3')
+ $State.Controls.runDiscussion3 = $window.FindName('runDiscussion3')
+ $State.Controls.tbDiscussion4 = $window.FindName('tbDiscussion4')
+ $State.Controls.linkDiscussion4 = $window.FindName('linkDiscussion4')
+ $State.Controls.runDiscussion4 = $window.FindName('runDiscussion4')
+ $State.Controls.tbDiscussion5 = $window.FindName('tbDiscussion5')
+ $State.Controls.linkDiscussion5 = $window.FindName('linkDiscussion5')
+ $State.Controls.runDiscussion5 = $window.FindName('runDiscussion5')
+ $State.Controls.tbDiscussionsLink = $window.FindName('tbDiscussionsLink')
+ $State.Controls.linkDiscussions = $window.FindName('linkDiscussions')
+
# Settings page
$State.Controls.cmbThemeMode = $window.FindName('cmbThemeMode')
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
index c9c2e10..8cba575 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
@@ -471,6 +471,777 @@ function Update-DriverDownloadPanelVisibility {
}
}
+# --------------------------------------------------------------------------
+# SECTION: Home Page Build Status
+# --------------------------------------------------------------------------
+
+# Function to normalize release strings so local builds and GitHub tags compare consistently
+function ConvertTo-NormalizedReleaseVersion {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $false)]
+ [AllowNull()]
+ [string]$Version
+ )
+
+ if ([string]::IsNullOrWhiteSpace($Version)) {
+ return $null
+ }
+
+ $normalizedVersion = $Version.Trim().ToLowerInvariant()
+ $normalizedVersion = $normalizedVersion -replace '^[v]', ''
+ return $normalizedVersion
+}
+
+# Function to read the current FFU Builder build from the main build script
+function Get-FFUBuilderCurrentBuild {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$FFUDevelopmentPath
+ )
+
+ $buildScriptPath = Join-Path -Path $FFUDevelopmentPath -ChildPath 'BuildFFUVM.ps1'
+ if (-not (Test-Path -Path $buildScriptPath)) {
+ return 'Unknown'
+ }
+
+ try {
+ $buildScriptContent = Get-Content -Path $buildScriptPath -Raw -ErrorAction Stop
+ $versionMatch = [regex]::Match($buildScriptContent, '(?m)^\$version\s*=\s*''([^'']+)''')
+ if ($versionMatch.Success) {
+ return $versionMatch.Groups[1].Value
+ }
+ }
+ catch {
+ WriteLog "Unable to read the current FFU Builder build version: $($_.Exception.Message)"
+ }
+
+ return 'Unknown'
+}
+
+# Function to query GitHub for the latest published FFU Builder release
+function Get-FFUBuilderLatestRelease {
+ [CmdletBinding()]
+ param()
+
+ $releaseApiUri = 'https://api.github.com/repos/rbalsleyMSFT/FFU/releases/latest'
+ $releaseHeaders = @{
+ 'User-Agent' = 'FFUBuilderUI'
+ 'Accept' = 'application/vnd.github+json'
+ }
+
+ $releaseResponse = Invoke-RestMethod -Uri $releaseApiUri -Headers $releaseHeaders -TimeoutSec 5 -ErrorAction Stop
+ $releaseVersion = if (-not [string]::IsNullOrWhiteSpace([string]$releaseResponse.tag_name)) {
+ [string]$releaseResponse.tag_name
+ }
+ elseif (-not [string]::IsNullOrWhiteSpace([string]$releaseResponse.name)) {
+ [string]$releaseResponse.name
+ }
+ else {
+ $null
+ }
+
+ return [PSCustomObject]@{
+ Version = $releaseVersion
+ HtmlUrl = [string]$releaseResponse.html_url
+ Body = [string]$releaseResponse.body
+ }
+}
+
+# Function to build a user-friendly release status message for the Home page
+function Get-FFUBuilderReleaseStatusMessage {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$CurrentBuild,
+ [Parameter(Mandatory = $true)]
+ [string]$LatestRelease
+ )
+
+ # Format the release string for Home page display while keeping compare logic normalized
+ $displayLatestRelease = if ([string]::IsNullOrWhiteSpace($LatestRelease)) {
+ $LatestRelease
+ }
+ else {
+ $LatestRelease -replace '^[vV]', ''
+ }
+
+ $normalizedCurrentBuild = ConvertTo-NormalizedReleaseVersion -Version $CurrentBuild
+ $normalizedLatestRelease = ConvertTo-NormalizedReleaseVersion -Version $LatestRelease
+
+ if ([string]::IsNullOrWhiteSpace($normalizedCurrentBuild)) {
+ return 'Installed build information is unavailable.'
+ }
+
+ if ([string]::IsNullOrWhiteSpace($normalizedLatestRelease)) {
+ return 'Unable to compare the installed build with the latest release.'
+ }
+
+ if ($normalizedCurrentBuild -eq $normalizedLatestRelease) {
+ return 'You are running the latest published build.'
+ }
+
+ $currentVersionMatch = [regex]::Match($normalizedCurrentBuild, '^\d+(?:\.\d+){0,3}')
+ $latestVersionMatch = [regex]::Match($normalizedLatestRelease, '^\d+(?:\.\d+){0,3}')
+
+ if ($currentVersionMatch.Success -and $latestVersionMatch.Success) {
+ try {
+ $currentVersion = [version]$currentVersionMatch.Value
+ $latestVersion = [version]$latestVersionMatch.Value
+
+ if ($currentVersion -lt $latestVersion) {
+ return "A newer release is available: $displayLatestRelease."
+ }
+
+ if ($currentVersion -gt $latestVersion) {
+ return "This build is newer than the latest published release: $displayLatestRelease."
+ }
+ }
+ catch {
+ WriteLog "Unable to compare FFU Builder release versions numerically: $($_.Exception.Message)"
+ }
+ }
+
+ return "Installed build $CurrentBuild differs from the latest published release $displayLatestRelease."
+}
+
+# Function to normalize a markdown heading for release-notes display
+function ConvertTo-ReleaseNotesHeadingText {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $false)]
+ [AllowNull()]
+ [string]$Line
+ )
+
+ if ([string]::IsNullOrWhiteSpace($Line)) {
+ return ''
+ }
+
+ $cleanLine = $Line.Trim()
+ $cleanLine = $cleanLine -replace '^#+\s*', ''
+ $cleanLine = [regex]::Replace($cleanLine, '\[([^\]]+)\]\([^)]+\)', '$1')
+ $cleanLine = $cleanLine -replace '\*\*', ''
+ $cleanLine = $cleanLine -replace '`', ''
+ return $cleanLine.Trim()
+}
+
+# Function to clean plain text segments before rendering markdown-aware inlines
+function ConvertTo-ReleaseNotesPlainText {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $false)]
+ [AllowNull()]
+ [string]$Text
+ )
+
+ if ([string]::IsNullOrWhiteSpace($Text)) {
+ return ''
+ }
+
+ $cleanText = $Text
+ $cleanText = $cleanText -replace '\*\*', ''
+ $cleanText = $cleanText -replace '`', ''
+ return $cleanText
+}
+
+# Function to add markdown-aware inline content to a TextBlock
+function Add-ReleaseNotesInlinesToTextBlock {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [System.Windows.Controls.TextBlock]$TextBlock,
+ [Parameter(Mandatory = $false)]
+ [AllowNull()]
+ [string]$Text
+ )
+
+ if ([string]::IsNullOrWhiteSpace($Text)) {
+ return
+ }
+
+ $matchPattern = '(?\[(?[^\]]+)\]\((?https?://[^)\s]+)\))|(?https?://[^\s)]+)|(?\*\*(?.+?)\*\*)'
+ $currentIndex = 0
+
+ foreach ($match in [regex]::Matches($Text, $matchPattern)) {
+ if ($match.Index -gt $currentIndex) {
+ $plainText = ConvertTo-ReleaseNotesPlainText -Text $Text.Substring($currentIndex, $match.Index - $currentIndex)
+ if (-not [string]::IsNullOrWhiteSpace($plainText)) {
+ $TextBlock.Inlines.Add([System.Windows.Documents.Run]::new($plainText)) | Out-Null
+ }
+ }
+
+ if ($match.Groups['MarkdownLink'].Success) {
+ $hyperlink = [System.Windows.Documents.Hyperlink]::new()
+ $hyperlink.NavigateUri = [System.Uri]$match.Groups['LinkUrl'].Value
+ $hyperlink.ToolTip = $match.Groups['LinkUrl'].Value
+ $hyperlink.Inlines.Add([System.Windows.Documents.Run]::new($match.Groups['LinkText'].Value)) | Out-Null
+ $hyperlink.Add_RequestNavigate({
+ param($eventSource, $requestNavigateEventArgs)
+ Start-Process $requestNavigateEventArgs.Uri.AbsoluteUri
+ $requestNavigateEventArgs.Handled = $true
+ })
+ $TextBlock.Inlines.Add($hyperlink) | Out-Null
+ }
+ elseif ($match.Groups['BareUrl'].Success) {
+ $bareUrl = $match.Groups['BareUrl'].Value.TrimEnd('.', ',', ';', ':')
+ $hyperlink = [System.Windows.Documents.Hyperlink]::new()
+ $hyperlink.NavigateUri = [System.Uri]$bareUrl
+ $hyperlink.ToolTip = $bareUrl
+ $hyperlink.Inlines.Add([System.Windows.Documents.Run]::new($bareUrl)) | Out-Null
+ $hyperlink.Add_RequestNavigate({
+ param($eventSource, $requestNavigateEventArgs)
+ Start-Process $requestNavigateEventArgs.Uri.AbsoluteUri
+ $requestNavigateEventArgs.Handled = $true
+ })
+ $TextBlock.Inlines.Add($hyperlink) | Out-Null
+
+ $trailingCharactersLength = $match.Groups['BareUrl'].Value.Length - $bareUrl.Length
+ if ($trailingCharactersLength -gt 0) {
+ $trailingCharacters = $match.Groups['BareUrl'].Value.Substring($bareUrl.Length, $trailingCharactersLength)
+ $TextBlock.Inlines.Add([System.Windows.Documents.Run]::new($trailingCharacters)) | Out-Null
+ }
+ }
+ elseif ($match.Groups['Bold'].Success) {
+ $boldRun = [System.Windows.Documents.Run]::new((ConvertTo-ReleaseNotesPlainText -Text $match.Groups['BoldText'].Value))
+ $boldRun.FontWeight = 'SemiBold'
+ $TextBlock.Inlines.Add($boldRun) | Out-Null
+ }
+
+ $currentIndex = $match.Index + $match.Length
+ }
+
+ if ($currentIndex -lt $Text.Length) {
+ $remainingText = ConvertTo-ReleaseNotesPlainText -Text $Text.Substring($currentIndex)
+ if (-not [string]::IsNullOrWhiteSpace($remainingText)) {
+ $TextBlock.Inlines.Add([System.Windows.Documents.Run]::new($remainingText)) | Out-Null
+ }
+ }
+}
+
+# Function to build a formatted UI element for a release-notes section body
+function New-ReleaseNotesSectionContent {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $false)]
+ [AllowNull()]
+ [string]$Content
+ )
+
+ $contentPanel = New-Object System.Windows.Controls.StackPanel
+ $contentPanel.Margin = '0,2,0,2'
+
+ foreach ($contentLine in ($Content -split "`r?`n")) {
+ $trimmedLine = $contentLine.Trim()
+ if ([string]::IsNullOrWhiteSpace($trimmedLine)) {
+ continue
+ }
+
+ $isFirstRenderedLine = ($contentPanel.Children.Count -eq 0)
+
+ $textBlock = New-Object System.Windows.Controls.TextBlock
+ $textBlock.TextWrapping = 'Wrap'
+ $textBlock.Margin = if ($isFirstRenderedLine) { '0,2,0,0' } else { '0,12,0,0' }
+
+ $lineContent = $trimmedLine
+ $listItemMatch = [regex]::Match($trimmedLine, '^(?:[-*]|\d+\.)\s+(.+)$')
+ if ($listItemMatch.Success) {
+ $textBlock.Margin = if ($isFirstRenderedLine) { '0,2,0,0' } else { '0,10,0,0' }
+ $textBlock.Inlines.Add([System.Windows.Documents.Run]::new([string][char]0x2022 + ' ')) | Out-Null
+ $lineContent = $listItemMatch.Groups[1].Value
+ }
+
+ Add-ReleaseNotesInlinesToTextBlock -TextBlock $textBlock -Text $lineContent
+ $contentPanel.Children.Add($textBlock) | Out-Null
+ }
+
+ if ($contentPanel.Children.Count -eq 0) {
+ $fallbackTextBlock = New-Object System.Windows.Controls.TextBlock
+ $fallbackTextBlock.Text = 'No additional details were published for this section.'
+ $fallbackTextBlock.TextWrapping = 'Wrap'
+ $fallbackTextBlock.Margin = '0,2,0,0'
+ $contentPanel.Children.Add($fallbackTextBlock) | Out-Null
+ }
+
+ return $contentPanel
+}
+
+# Function to parse the full GitHub release notes into UI sections
+function Get-FFUBuilderReleaseNotesSections {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $false)]
+ [AllowNull()]
+ [string]$ReleaseNotesBody
+ )
+
+ $releaseNoteSections = [System.Collections.Generic.List[object]]::new()
+
+ if ([string]::IsNullOrWhiteSpace($ReleaseNotesBody)) {
+ $releaseNoteSections.Add([PSCustomObject]@{
+ Title = 'Release Notes'
+ Content = 'No release notes were published for this release.'
+ UseExpander = $false
+ IsExpanded = $true
+ })
+ return $releaseNoteSections
+ }
+
+ $currentTitle = 'Release Overview'
+ $currentLines = [System.Collections.Generic.List[string]]::new()
+
+ foreach ($releaseNotesLine in ($ReleaseNotesBody -split "`r?`n")) {
+ $trimmedLine = $releaseNotesLine.Trim()
+
+ if ($trimmedLine -match '^#+\s*(.+)$') {
+ $sectionContent = ($currentLines -join [Environment]::NewLine).Trim()
+ if (-not [string]::IsNullOrWhiteSpace($sectionContent)) {
+ $useExpander = (($sectionContent -split "`r?`n").Count -gt 2 -or $sectionContent.Length -gt 220)
+ $releaseNoteSections.Add([PSCustomObject]@{
+ Title = $currentTitle
+ Content = $sectionContent
+ UseExpander = $useExpander
+ IsExpanded = ($releaseNoteSections.Count -eq 0)
+ })
+ }
+
+ $currentTitle = ConvertTo-ReleaseNotesHeadingText -Line $matches[1]
+ $currentLines = [System.Collections.Generic.List[string]]::new()
+ continue
+ }
+
+ if ([string]::IsNullOrWhiteSpace($trimmedLine)) {
+ if ($currentLines.Count -gt 0 -and $currentLines[$currentLines.Count - 1] -ne '') {
+ $currentLines.Add('')
+ }
+ continue
+ }
+
+ $currentLines.Add($trimmedLine)
+ }
+
+ $finalSectionContent = ($currentLines -join [Environment]::NewLine).Trim()
+ if (-not [string]::IsNullOrWhiteSpace($finalSectionContent)) {
+ $useExpander = (($finalSectionContent -split "`r?`n").Count -gt 2 -or $finalSectionContent.Length -gt 220)
+ $releaseNoteSections.Add([PSCustomObject]@{
+ Title = $currentTitle
+ Content = $finalSectionContent
+ UseExpander = $useExpander
+ IsExpanded = ($releaseNoteSections.Count -eq 0)
+ })
+ }
+
+ if ($releaseNoteSections.Count -eq 0) {
+ $releaseNoteSections.Add([PSCustomObject]@{
+ Title = 'Release Notes'
+ Content = 'No release notes were published for this release.'
+ UseExpander = $false
+ IsExpanded = $true
+ })
+ }
+
+ return $releaseNoteSections
+}
+
+# Function to render formatted release notes into the Home page
+function Set-HomeReleaseNotesContent {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [PSCustomObject]$State,
+ [Parameter(Mandatory = $false)]
+ [AllowNull()]
+ [string]$ReleaseNotesBody
+ )
+
+ $releaseNotesPanel = $State.Controls.spHomeReleaseNotesSections
+ if ($null -eq $releaseNotesPanel) {
+ return
+ }
+
+ $releaseNotesPanel.Children.Clear()
+ $releaseNoteSections = @(Get-FFUBuilderReleaseNotesSections -ReleaseNotesBody $ReleaseNotesBody)
+
+ foreach ($releaseNoteSection in $releaseNoteSections) {
+ $sectionContent = New-ReleaseNotesSectionContent -Content $releaseNoteSection.Content
+
+ if ($releaseNoteSection.UseExpander) {
+ $headerTextBlock = New-Object System.Windows.Controls.TextBlock
+ $headerTextBlock.Text = $releaseNoteSection.Title
+ $headerTextBlock.TextWrapping = 'Wrap'
+ $headerTextBlock.FontWeight = 'SemiBold'
+
+ $releaseNotesExpander = New-Object System.Windows.Controls.Expander
+ $releaseNotesExpander.Header = $headerTextBlock
+ $releaseNotesExpander.IsExpanded = [bool]$releaseNoteSection.IsExpanded
+ $releaseNotesExpander.Margin = '0,0,0,8'
+ $releaseNotesExpander.Content = $sectionContent
+
+ $releaseNotesPanel.Children.Add($releaseNotesExpander) | Out-Null
+ }
+ else {
+ $releaseNotesSectionPanel = New-Object System.Windows.Controls.StackPanel
+ $releaseNotesSectionPanel.Margin = '0,0,0,8'
+
+ if (-not [string]::IsNullOrWhiteSpace($releaseNoteSection.Title)) {
+ $titleTextBlock = New-Object System.Windows.Controls.TextBlock
+ $titleTextBlock.Text = $releaseNoteSection.Title
+ $titleTextBlock.FontWeight = 'SemiBold'
+ $titleTextBlock.TextWrapping = 'Wrap'
+ $releaseNotesSectionPanel.Children.Add($titleTextBlock) | Out-Null
+ }
+
+ $releaseNotesSectionPanel.Children.Add($sectionContent) | Out-Null
+ $releaseNotesPanel.Children.Add($releaseNotesSectionPanel) | Out-Null
+ }
+ }
+}
+
+# Function to return a Home page status light brush for environment checks
+function Get-HomeStatusBrush {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [ValidateSet('Green', 'Yellow', 'Red')]
+ [string]$Level
+ )
+
+ switch ($Level) {
+ 'Green' { return [System.Windows.Media.Brushes]::LimeGreen }
+ 'Yellow' { return [System.Windows.Media.Brushes]::Gold }
+ 'Red' { return [System.Windows.Media.Brushes]::IndianRed }
+ }
+}
+
+# Function to evaluate free disk space on the drive hosting the FFU development path
+function Get-FFUBuilderDiskSpaceStatus {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$FFUDevelopmentPath
+ )
+
+ try {
+ $resolvedPath = if (Test-Path -Path $FFUDevelopmentPath) {
+ (Resolve-Path -Path $FFUDevelopmentPath -ErrorAction Stop).Path
+ }
+ else {
+ $FFUDevelopmentPath
+ }
+
+ $driveRoot = [System.IO.Path]::GetPathRoot($resolvedPath)
+ if ([string]::IsNullOrWhiteSpace($driveRoot)) {
+ throw "Unable to determine a drive root for path $FFUDevelopmentPath"
+ }
+
+ $driveInfo = [System.IO.DriveInfo]::new($driveRoot)
+ $freeSpaceGb = [math]::Round($driveInfo.AvailableFreeSpace / 1GB, 2)
+
+ if ($freeSpaceGb -lt 50) {
+ return [PSCustomObject]@{
+ Level = 'Red'
+ Message = "$freeSpaceGb GB free on $driveRoot. FFU Builder is likely to run out of disk space and should have at least 100 GB free."
+ }
+ }
+
+ if ($freeSpaceGb -lt 100) {
+ return [PSCustomObject]@{
+ Level = 'Yellow'
+ Message = "$freeSpaceGb GB free on $driveRoot. FFU Builder recommends at least 100 GB free space."
+ }
+ }
+
+ return [PSCustomObject]@{
+ Level = 'Green'
+ Message = "$freeSpaceGb GB free on $driveRoot. Free space is within the recommended range."
+ }
+ }
+ catch {
+ WriteLog "Unable to determine free disk space for FFUDevelopmentPath: $($_.Exception.Message)"
+ return [PSCustomObject]@{
+ Level = 'Red'
+ Message = 'Unable to determine free disk space for the FFUDevelopmentPath drive.'
+ }
+ }
+}
+
+# Function to evaluate the local Hyper-V installation state
+function Get-FFUBuilderHyperVStatus {
+ [CmdletBinding()]
+ param()
+
+ try {
+ $hyperVFeature = Get-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V-All -ErrorAction Stop
+ switch ([string]$hyperVFeature.State) {
+ 'Enabled' {
+ return [PSCustomObject]@{
+ Level = 'Green'
+ Message = 'Hyper-V is installed and ready.'
+ }
+ }
+ 'EnablePending' {
+ return [PSCustomObject]@{
+ Level = 'Yellow'
+ Message = 'Hyper-V is installed, but a reboot is required before it is ready.'
+ }
+ }
+ default {
+ return [PSCustomObject]@{
+ Level = 'Red'
+ Message = "Hyper-V is not installed. Current feature state: $($hyperVFeature.State)."
+ }
+ }
+ }
+ }
+ catch {
+ WriteLog "Unable to determine Hyper-V installation state: $($_.Exception.Message)"
+ return [PSCustomObject]@{
+ Level = 'Red'
+ Message = 'Unable to determine the Hyper-V installation state.'
+ }
+ }
+}
+
+# Function to update the Home page release status fields
+function Update-HomeReleaseStatus {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [PSCustomObject]$State,
+ [Parameter(Mandatory = $true)]
+ [string]$CurrentBuild,
+ [Parameter(Mandatory = $true)]
+ [string]$LatestRelease,
+ [Parameter(Mandatory = $true)]
+ [string]$StatusMessage,
+ [Parameter(Mandatory = $true)]
+ [string]$ReleaseNotesBody
+ )
+
+ if ($null -ne $State.Controls.txtHomeCurrentBuildValue) {
+ $State.Controls.txtHomeCurrentBuildValue.Text = $CurrentBuild
+ }
+
+ if ($null -ne $State.Controls.txtHomeLatestReleaseValue) {
+ $State.Controls.txtHomeLatestReleaseValue.Text = $LatestRelease
+ }
+
+ if ($null -ne $State.Controls.txtHomeReleaseStatusValue) {
+ $State.Controls.txtHomeReleaseStatusValue.Text = $StatusMessage
+ }
+
+ # Render the full release notes into structured sections on the Home page
+ Set-HomeReleaseNotesContent -State $State -ReleaseNotesBody $ReleaseNotesBody
+}
+
+# Function to update the Home page environment check fields
+function Update-HomeEnvironmentStatus {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [PSCustomObject]$State,
+ [Parameter(Mandatory = $true)]
+ [PSCustomObject]$DiskSpaceStatus,
+ [Parameter(Mandatory = $true)]
+ [PSCustomObject]$HyperVStatus
+ )
+
+ if ($null -ne $State.Controls.ellipseHomeDiskSpaceStatus) {
+ $State.Controls.ellipseHomeDiskSpaceStatus.Fill = Get-HomeStatusBrush -Level $DiskSpaceStatus.Level
+ }
+
+ if ($null -ne $State.Controls.txtHomeDiskSpaceStatusValue) {
+ $State.Controls.txtHomeDiskSpaceStatusValue.Text = $DiskSpaceStatus.Message
+ }
+
+ if ($null -ne $State.Controls.ellipseHomeHyperVStatus) {
+ $State.Controls.ellipseHomeHyperVStatus.Fill = Get-HomeStatusBrush -Level $HyperVStatus.Level
+ }
+
+ if ($null -ne $State.Controls.txtHomeHyperVStatusValue) {
+ $State.Controls.txtHomeHyperVStatusValue.Text = $HyperVStatus.Message
+ }
+}
+
+# Function to retrieve latest public GitHub discussions for Home page display
+function Get-FFUBuilderLatestDiscussions {
+ [CmdletBinding()]
+ param()
+
+ $discussionUri = 'https://github.com/rbalsleyMSFT/FFU/discussions'
+ $discussionHeaders = @{
+ 'User-Agent' = 'FFUBuilderUI'
+ 'Accept' = 'text/html,application/xhtml+xml'
+ }
+
+ $discussionResponse = Invoke-WebRequest -Uri $discussionUri -Headers $discussionHeaders -TimeoutSec 5 -ErrorAction Stop
+ $discussionContent = [string]$discussionResponse.Content
+ $latestDiscussions = New-Object System.Collections.Generic.List[PSCustomObject]
+ $seenDiscussionUrls = @{}
+
+ # Parse the raw HTML instead of Invoke-WebRequest Links because GitHub's page structure
+ # does not reliably surface the discussion topic anchors through the Links collection.
+ $discussionMatches = [regex]::Matches(
+ $discussionContent,
+ ']+href="(?/rbalsleyMSFT/FFU/discussions/(?\d+))"[^>]*>(?.*?)',
+ [System.Text.RegularExpressions.RegexOptions]::IgnoreCase -bor [System.Text.RegularExpressions.RegexOptions]::Singleline
+ )
+
+ foreach ($discussionMatch in $discussionMatches) {
+ $discussionHref = [string]$discussionMatch.Groups['Href'].Value
+ $discussionUrl = "https://github.com$discussionHref"
+
+ if ($seenDiscussionUrls.ContainsKey($discussionUrl)) {
+ continue
+ }
+
+ $discussionInnerHtml = [string]$discussionMatch.Groups['InnerHtml'].Value
+ $discussionTitle = [regex]::Replace($discussionInnerHtml, '<[^>]+>', ' ')
+ $discussionTitle = [System.Net.WebUtility]::HtmlDecode($discussionTitle)
+ $discussionTitle = [regex]::Replace($discussionTitle, '\s+', ' ').Trim()
+
+ if ([string]::IsNullOrWhiteSpace($discussionTitle)) {
+ continue
+ }
+
+ # Skip links that resolve to comment counts or other numeric-only link text.
+ if ($discussionTitle -match '^\d+$') {
+ continue
+ }
+
+ $seenDiscussionUrls[$discussionUrl] = $true
+ $latestDiscussions.Add([PSCustomObject]@{
+ Title = $discussionTitle
+ Url = $discussionUrl
+ })
+
+ if ($latestDiscussions.Count -ge 5) {
+ break
+ }
+ }
+
+ return $latestDiscussions
+}
+
+# Function to update the Home page discussions card
+function Update-HomeDiscussions {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [PSCustomObject]$State,
+ [Parameter(Mandatory = $true)]
+ [string]$StatusMessage,
+ [Parameter(Mandatory = $false)]
+ [AllowNull()]
+ [System.Collections.IEnumerable]$Discussions
+ )
+
+ if ($null -ne $State.Controls.txtHomeDiscussionsStatusValue) {
+ $State.Controls.txtHomeDiscussionsStatusValue.Text = $StatusMessage
+ }
+
+ $discussionItems = @($Discussions)
+ for ($index = 1; $index -le 5; $index++) {
+ $container = $State.Controls["tbDiscussion$index"]
+ $link = $State.Controls["linkDiscussion$index"]
+ $run = $State.Controls["runDiscussion$index"]
+
+ if ($null -eq $container -or $null -eq $link -or $null -eq $run) {
+ continue
+ }
+
+ if ($index -le $discussionItems.Count -and $null -ne $discussionItems[$index - 1]) {
+ $discussionItem = $discussionItems[$index - 1]
+ $run.Text = $discussionItem.Title
+ $link.NavigateUri = [System.Uri]$discussionItem.Url
+ $container.Visibility = 'Visible'
+ }
+ else {
+ $run.Text = ''
+ $link.NavigateUri = [System.Uri]'https://github.com/rbalsleyMSFT/FFU/discussions'
+ $container.Visibility = 'Collapsed'
+ }
+ }
+
+ if ($null -ne $State.Controls.tbDiscussionsLink) {
+ $State.Controls.tbDiscussionsLink.Visibility = 'Visible'
+ }
+}
+
+# Function to populate the Home page build status after the window has rendered
+function Start-HomeStatusRefresh {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [PSCustomObject]$State
+ )
+
+ # Populate local status checks immediately so Home is useful even before network requests complete
+ $currentBuild = Get-FFUBuilderCurrentBuild -FFUDevelopmentPath $State.FFUDevelopmentPath
+ $diskSpaceStatus = Get-FFUBuilderDiskSpaceStatus -FFUDevelopmentPath $State.FFUDevelopmentPath
+ $hyperVStatus = Get-FFUBuilderHyperVStatus
+
+ Update-HomeReleaseStatus -State $State -CurrentBuild $currentBuild -LatestRelease 'Checking GitHub...' -StatusMessage 'Checking whether this build is current...' -ReleaseNotesBody 'Checking latest release notes...'
+ Update-HomeEnvironmentStatus -State $State -DiskSpaceStatus $diskSpaceStatus -HyperVStatus $hyperVStatus
+ Update-HomeDiscussions -State $State -StatusMessage 'Checking latest discussions...' -Discussions @()
+
+ if ($null -eq $State.Window) {
+ return
+ }
+
+ # Capture the state values before dispatching to avoid losing them in the deferred callback
+ $refreshState = $State
+ $refreshCurrentBuild = $currentBuild
+ $refreshAction = {
+ $latestReleaseDisplay = 'Unable to check'
+ $statusMessage = 'Unable to check the latest release right now. Check GitHub Releases when you are back online.'
+ $releaseNotesBody = 'Unable to load the latest release notes right now.'
+ $discussionsStatusMessage = 'Unable to load the latest GitHub discussions right now.'
+ $latestDiscussions = @()
+
+ try {
+ $latestRelease = Get-FFUBuilderLatestRelease
+ if ($null -ne $latestRelease -and -not [string]::IsNullOrWhiteSpace($latestRelease.Version)) {
+ # Strip the GitHub tag prefix so Home shows the same style as the installed build
+ $latestReleaseDisplay = $latestRelease.Version -replace '^[vV]', ''
+ $statusMessage = Get-FFUBuilderReleaseStatusMessage -CurrentBuild $refreshCurrentBuild -LatestRelease $latestRelease.Version
+ $releaseNotesBody = if ([string]::IsNullOrWhiteSpace($latestRelease.Body)) {
+ 'No release notes were published for this release.'
+ }
+ else {
+ $latestRelease.Body
+ }
+ }
+ }
+ catch {
+ WriteLog "Unable to retrieve the latest FFU Builder release: $($_.Exception.Message)"
+ }
+
+ try {
+ $latestDiscussions = @(Get-FFUBuilderLatestDiscussions)
+ if ($latestDiscussions.Count -gt 0) {
+ $discussionsStatusMessage = 'Latest public GitHub discussions.'
+ }
+ else {
+ $discussionsStatusMessage = 'No recent public discussion topics were found.'
+ }
+ }
+ catch {
+ WriteLog "Unable to retrieve the latest FFU Builder discussions: $($_.Exception.Message)"
+ }
+
+ Update-HomeReleaseStatus -State $refreshState -CurrentBuild $refreshCurrentBuild -LatestRelease $latestReleaseDisplay -StatusMessage $statusMessage -ReleaseNotesBody $releaseNotesBody
+ Update-HomeDiscussions -State $refreshState -StatusMessage $discussionsStatusMessage -Discussions $latestDiscussions
+ }.GetNewClosure()
+
+ # Queue the network checks after the UI renders so startup remains responsive
+ $null = $State.Window.Dispatcher.BeginInvoke(
+ [System.Action]$refreshAction,
+ [System.Windows.Threading.DispatcherPriority]::Background
+ )
+}
+
# --------------------------------------------------------------------------
# SECTION: Module Export
# --------------------------------------------------------------------------
From aca968ccbdc22c2be4c40047c438455bfb3799f9 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Tue, 24 Mar 2026 10:46:12 -0700
Subject: [PATCH 12/34] Updates UI margins and alignments for consistency
Adjusts margins, padding, and alignments across multiple UI components in the XAML file to ensure a consistent and polished layout. Values for spacing have been standardized to improve the visual spacing between controls, enhancing overall readability and user experience.
---
FFUDevelopment/BuildFFUVM_UI.xaml | 660 +++++++++++++++---------------
1 file changed, 330 insertions(+), 330 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 373f668..672ca38 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -316,30 +316,30 @@
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -352,14 +352,14 @@
-
+
-
-
+
+
@@ -369,35 +369,35 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
@@ -420,257 +420,257 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -709,8 +709,8 @@
-
-
+
+
@@ -722,8 +722,8 @@
-
-
+
+
@@ -735,8 +735,8 @@
-
-
+
+
@@ -748,39 +748,39 @@
-
-
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
+
-
+
@@ -788,24 +788,24 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
@@ -846,8 +846,8 @@
-
-
+
+
@@ -858,13 +858,13 @@
-
-
+
+
-
-
+
+
@@ -875,23 +875,23 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+ ForegroundHigh
@@ -900,8 +900,8 @@
-
-
+
+
@@ -914,8 +914,8 @@
-
-
+
+
@@ -927,18 +927,18 @@
-
+
-
+
-
+
@@ -949,23 +949,23 @@
-
-
+
+
-
+
-
+
-
+
@@ -980,8 +980,8 @@
-
-
+
+
From bae29fd9c72561b45c043e79d7d0a635ecb7608b Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Mon, 23 Mar 2026 14:47:39 -0700
Subject: [PATCH 13/34] Updates Microsoft Surface driver model discovery
Transitions the Microsoft Surface driver model list retrieval to use a centralized Learn-based index. This change unifies the scraping logic between the CLI and UI components, ensuring consistency and simplified maintenance. Cached model lists now serve both interfaces efficiently, reducing unnecessary network requests while retaining fallback mechanisms.
---
FFUDevelopment/BuildFFUVM.ps1 | 75 +------
.../FFU.Common.Drivers.Microsoft.psm1 | 184 +++++++++++++++++-
.../FFUUI.Core.Drivers.Microsoft.psm1 | 96 +--------
3 files changed, 184 insertions(+), 171 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 1554d87..f7d16f8 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -816,78 +816,11 @@ function Get-MicrosoftDrivers {
[int]$WindowsRelease
)
- $url = "https://support.microsoft.com/en-us/surface/download-drivers-and-firmware-for-surface-09bb2e09-2a4b-cb69-0951-078a7739e120"
-
- ### DOWNLOAD DRIVER PAGE CONTENT
- WriteLog "Getting Surface driver information from $url"
- $OriginalVerbosePreference = $VerbosePreference
- $VerbosePreference = 'SilentlyContinue'
- $webContent = Invoke-WebRequest -Uri $url -UseBasicParsing -Headers $Headers -UserAgent $UserAgent
- $VerbosePreference = $OriginalVerbosePreference
+ # Use the shared Learn-based Microsoft model index so the CLI stays aligned with the UI.
+ WriteLog "Getting Surface driver information from the shared Microsoft model index"
+ $models = @(Get-SurfaceDriverModelIndex -DriversFolder $DriversFolder | Select-Object Model, Link)
WriteLog "Complete"
-
- ### PARSE THE DRIVER PAGE CONTENT FOR MODELS AND DOWNLOAD LINKS
- WriteLog "Parsing web content for models and download links"
- $html = $webContent.Content
-
- # Regex to match divs with selectable-content-options__option-content classes
- $divPattern = ']*class="selectable-content-options__option-content(?: ocHidden)?"[^>]*>(.*?)'
- $divMatches = [regex]::Matches($html, $divPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- $models = @()
-
- foreach ($divMatch in $divMatches) {
- $divContent = $divMatch.Groups[1].Value
-
- # Find all tables within the div
- $tablePattern = ']*>(.*?)'
- $tableMatches = [regex]::Matches($divContent, $tablePattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- foreach ($tableMatch in $tableMatches) {
- $tableContent = $tableMatch.Groups[1].Value
-
- # Find all rows in the table
- $rowPattern = ']*>(.*?)'
- $rowMatches = [regex]::Matches($tableContent, $rowPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- foreach ($rowMatch in $rowMatches) {
- $rowContent = $rowMatch.Groups[1].Value
-
- # Extract cells from the row
- $cellPattern = ']*>\s*(?:]*>)?(.*?)(?:)?\s*'
- $cellMatches = [regex]::Matches($rowContent, $cellPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- if ($cellMatches.Count -ge 2) {
- # Model name in the first TD
- $modelName = ($cellMatches[0].Groups[1].Value).Trim()
-
- # # Remove
and
tags if present
- # $modelName = $modelName -replace ']*>', '' -replace '', ''
- # $modelName = $modelName.Trim()
-
-
- # The second TD might contain a link or just text
- $secondTdContent = $cellMatches[1].Groups[1].Value.Trim()
-
- # Look for a link in the second TD
- $linkPattern = ']+href="([^"]+)"[^>]*>'
- $linkMatch = [regex]::Match($secondTdContent, $linkPattern, [System.Text.RegularExpressions.RegexOptions]::IgnoreCase)
-
- if ($linkMatch.Success) {
- $modelLink = $linkMatch.Groups[1].Value
- }
- else {
- # No link, just text instructions
- $modelLink = $secondTdContent
- }
-
- $models += [PSCustomObject]@{ Model = $modelName; Link = $modelLink }
- }
- }
- }
- }
-
- WriteLog "Parsing complete"
+ WriteLog "Loaded $($models.Count) Surface models from the shared Microsoft model index."
### FIND THE MODEL IN THE LIST OF MODELS
$selectedModel = $models | Where-Object { $_.Model -eq $Model }
diff --git a/FFUDevelopment/FFU.Common/FFU.Common.Drivers.Microsoft.psm1 b/FFUDevelopment/FFU.Common/FFU.Common.Drivers.Microsoft.psm1
index 2151752..60b76ff 100644
--- a/FFUDevelopment/FFU.Common/FFU.Common.Drivers.Microsoft.psm1
+++ b/FFUDevelopment/FFU.Common/FFU.Common.Drivers.Microsoft.psm1
@@ -161,12 +161,181 @@ function ConvertTo-SurfaceComparableName {
# Cleanup: remove orphaned "with" left behind by earlier removals (e.g., "Surface Pro 9 with Intel Processor")
$value = $value -replace '(?i)\bwith\b', ''
- $value = $value -replace '\s+', ' '
-
- return $value.Trim().ToUpperInvariant()
-}
-
-function Get-SurfaceSystemSkuReferenceIndex {
+ $value = $value -replace '\s+', ' '
+
+ return $value.Trim().ToUpperInvariant()
+ }
+
+ function ConvertTo-SurfaceHtmlText {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [AllowEmptyString()]
+ [string]$HtmlFragment
+ )
+
+ # Normalize HTML fragments from the Learn table into plain text values.
+ $textValue = $HtmlFragment -replace '', ' '
+ $textValue = $textValue -replace '<[^>]+>', ' '
+ $textValue = [System.Net.WebUtility]::HtmlDecode($textValue)
+ $textValue = $textValue -replace '\s+', ' '
+
+ return $textValue.Trim()
+ }
+
+ function ConvertTo-SurfaceDownloadCenterLink {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$LinkValue
+ )
+
+ # Normalize Learn links down to the canonical Download Center details URL.
+ $decodedLink = [System.Net.WebUtility]::HtmlDecode($LinkValue).Trim()
+ if ([string]::IsNullOrWhiteSpace($decodedLink)) {
+ return $null
+ }
+
+ if ($decodedLink.StartsWith('/')) {
+ $decodedLink = "https://www.microsoft.com$decodedLink"
+ }
+
+ $downloadCenterMatch = [regex]::Match(
+ $decodedLink,
+ 'https://www\.microsoft\.com(?:/en-us)?/download/details\.aspx\?id=\d+',
+ [System.Text.RegularExpressions.RegexOptions]::IgnoreCase
+ )
+
+ if (-not $downloadCenterMatch.Success) {
+ return $null
+ }
+
+ return ($downloadCenterMatch.Value -replace '/en-us/', '/')
+ }
+
+ function Get-SurfaceDriverModelIndex {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$DriversFolder
+ )
+
+ $url = 'https://learn.microsoft.com/en-us/surface/manage-surface-driver-and-firmware-updates'
+ $minimumExpectedModelCount = 10
+
+ # Load the cached model list first to keep Microsoft model discovery fast.
+ try {
+ $cache = Import-SurfaceDriverIndexCache -DriversFolder $DriversFolder
+ if (@($cache.ModelIndex).Count -gt 0) {
+ WriteLog "Surface cache: Using cached Microsoft model list ($(@($cache.ModelIndex).Count) models)."
+ return @($cache.ModelIndex)
+ }
+ }
+ catch {
+ WriteLog "Surface cache: Failed to load cached Microsoft model list. Falling back to the Learn source. Error: $($_.Exception.Message)"
+ }
+
+ try {
+ # Download the Learn article that now contains the authoritative Surface package table.
+ WriteLog "Surface cache: Downloading Microsoft model index from $url"
+ $headers = @{
+ 'User-Agent' = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)'
+ }
+ $webContent = Invoke-WebRequest -Uri $url -UseBasicParsing -Headers $headers
+ $html = $webContent.Content
+
+ # Parse each table row and keep only Download Center package links.
+ $rowMatches = [regex]::Matches($html, ']*>(.*?)', [System.Text.RegularExpressions.RegexOptions]::Singleline)
+ $models = [System.Collections.Generic.List[pscustomobject]]::new()
+ $seenModelKeys = [System.Collections.Generic.HashSet[string]]::new([System.StringComparer]::OrdinalIgnoreCase)
+
+ foreach ($rowMatch in $rowMatches) {
+ $rowContent = $rowMatch.Groups[1].Value
+ $cellMatches = [regex]::Matches($rowContent, ']*>\s*(.*?)\s*', [System.Text.RegularExpressions.RegexOptions]::Singleline)
+ if ($cellMatches.Count -lt 2) {
+ continue
+ }
+
+ $rowLabel = ConvertTo-SurfaceHtmlText -HtmlFragment $cellMatches[0].Groups[1].Value
+ if ([string]::IsNullOrWhiteSpace($rowLabel) -or $rowLabel -notmatch '(?i)^Surface') {
+ continue
+ }
+
+ $downloadCellContent = $cellMatches[1].Groups[1].Value
+ $linkMatches = [regex]::Matches(
+ $downloadCellContent,
+ ']+href="([^"]+)"[^>]*>(.*?)',
+ [System.Text.RegularExpressions.RegexOptions]::Singleline -bor [System.Text.RegularExpressions.RegexOptions]::IgnoreCase
+ )
+
+ foreach ($linkMatch in $linkMatches) {
+ $modelName = ConvertTo-SurfaceHtmlText -HtmlFragment $linkMatch.Groups[2].Value
+ $modelLink = ConvertTo-SurfaceDownloadCenterLink -LinkValue $linkMatch.Groups[1].Value
+
+ if ([string]::IsNullOrWhiteSpace($modelName) -or [string]::IsNullOrWhiteSpace($modelLink)) {
+ continue
+ }
+
+ $modelKey = "$modelName`n$modelLink"
+ if (-not $seenModelKeys.Add($modelKey)) {
+ continue
+ }
+
+ $models.Add([pscustomobject]@{
+ Make = 'Microsoft'
+ Model = $modelName
+ Link = $modelLink
+ })
+ }
+ }
+
+ if ($models.Count -eq 0) {
+ throw "No Microsoft driver models were found in the Learn table."
+ }
+
+ if ($models.Count -lt $minimumExpectedModelCount) {
+ WriteLog "Surface cache: Warning - Learn parsing returned only $($models.Count) Microsoft model entries."
+ }
+ else {
+ WriteLog "Surface cache: Parsed $($models.Count) Microsoft model entries from Learn."
+ }
+
+ # Save the refreshed model list into the shared cache for both UI and CLI use.
+ try {
+ $cache = Import-SurfaceDriverIndexCache -DriversFolder $DriversFolder
+ $cache.ModelIndex = @($models)
+ Save-SurfaceDriverIndexCache -Cache $cache -DriversFolder $DriversFolder
+ WriteLog "Surface cache: Saved Microsoft model list to cache."
+ }
+ catch {
+ WriteLog "Surface cache: Failed to save Microsoft model list. Error: $($_.Exception.Message)"
+ }
+
+ return @($models)
+ }
+ catch {
+ WriteLog "Surface cache: Failed to build Microsoft model list from Learn. Error: $($_.Exception.Message)"
+
+ # Fall back to the last cached model list even if it is stale when the live request fails.
+ try {
+ $cachePath = Get-SurfaceDriverIndexCachePath -DriversFolder $DriversFolder
+ if (Test-Path -Path $cachePath -PathType Leaf) {
+ $staleCache = Get-Content -Path $cachePath -Raw | ConvertFrom-Json -ErrorAction Stop
+ if (@($staleCache.ModelIndex).Count -gt 0) {
+ WriteLog "Surface cache: Using stale Microsoft model list ($(@($staleCache.ModelIndex).Count) models) because the live Learn request failed."
+ return @($staleCache.ModelIndex)
+ }
+ }
+ }
+ catch {
+ WriteLog "Surface cache: Failed to load stale Microsoft model list fallback. Error: $($_.Exception.Message)"
+ }
+
+ throw "Failed to retrieve Microsoft Surface models."
+ }
+ }
+
+ function Get-SurfaceSystemSkuReferenceIndex {
[CmdletBinding()]
param(
[Parameter(Mandatory = $true)]
@@ -586,6 +755,9 @@ Export-ModuleMember -Function `
Import-SurfaceDriverIndexCache, `
Save-SurfaceDriverIndexCache, `
ConvertTo-SurfaceComparableName, `
+ ConvertTo-SurfaceHtmlText, `
+ ConvertTo-SurfaceDownloadCenterLink, `
+ Get-SurfaceDriverModelIndex, `
Get-SurfaceSystemSkuReferenceIndex, `
Get-SurfaceDownloadCenterDetails, `
Get-SurfaceSystemSkuListForMicrosoftDriver
\ No newline at end of file
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Microsoft.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Microsoft.psm1
index 3fc216b..cce2a95 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Microsoft.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Microsoft.psm1
@@ -15,100 +15,8 @@ function Get-MicrosoftDriversModelList {
[string]$DriversFolder
)
- $url = "https://support.microsoft.com/en-us/surface/download-drivers-and-firmware-for-surface-09bb2e09-2a4b-cb69-0951-078a7739e120"
- $models = @()
-
- # Load cached model list first (Source B) to keep the UI fast.
- # The cache is refreshed automatically when missing or invalid.
- try {
- $cachePath = Get-SurfaceDriverIndexCachePath -DriversFolder $DriversFolder
- if (Test-Path -Path $cachePath -PathType Leaf) {
- $cacheAgeDays = ((Get-Date) - (Get-Item -Path $cachePath).LastWriteTime).TotalDays
- if ($cacheAgeDays -lt 7) {
- $cache = Import-SurfaceDriverIndexCache -DriversFolder $DriversFolder
- if ($cache.ModelIndex -and $cache.ModelIndex.Count -gt 0) {
- WriteLog "Surface cache: Using cached Microsoft model list ($($cache.ModelIndex.Count) models)."
- return @($cache.ModelIndex)
- }
- }
- }
- }
- catch {
- WriteLog "Surface cache: Failed to load cached Microsoft model list. Falling back to online parse. Error: $($_.Exception.Message)"
- }
-
- try {
- WriteLog "Getting Surface driver information from $url"
- $OriginalVerbosePreference = $VerbosePreference
- $VerbosePreference = 'SilentlyContinue'
- # Use passed-in UserAgent and Headers
- $webContent = Invoke-WebRequest -Uri $url -UseBasicParsing -Headers $Headers -UserAgent $UserAgent
- $VerbosePreference = $OriginalVerbosePreference
- WriteLog "Complete"
-
- WriteLog "Parsing web content for models and download links"
- $html = $webContent.Content
- $divPattern = ']*class="selectable-content-options__option-content(?: ocHidden)?"[^>]*>(.*?)'
- $divMatches = [regex]::Matches($html, $divPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- foreach ($divMatch in $divMatches) {
- $divContent = $divMatch.Groups[1].Value
- $tablePattern = ']*>(.*?)'
- $tableMatches = [regex]::Matches($divContent, $tablePattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- foreach ($tableMatch in $tableMatches) {
- $tableContent = $tableMatch.Groups[1].Value
- $rowPattern = ']*>(.*?)'
- $rowMatches = [regex]::Matches($tableContent, $rowPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- foreach ($rowMatch in $rowMatches) {
- $rowContent = $rowMatch.Groups[1].Value
- $cellPattern = ']*>\s*(?:]*>)?(.*?)(?:)?\s*'
- $cellMatches = [regex]::Matches($rowContent, $cellPattern, [System.Text.RegularExpressions.RegexOptions]::Singleline)
-
- if ($cellMatches.Count -ge 2) {
- $modelName = ([System.Net.WebUtility]::HtmlDecode(($cellMatches[0].Groups[1].Value).Trim()))
- $secondTdContent = $cellMatches[1].Groups[1].Value.Trim()
- # $linkPattern = ']+href="([^"]+)"[^>]*>'
- # Change linkPattern to match https://www.microsoft.com/download/details.aspx?id=
- $linkPattern = ']+href="(https://www\.microsoft\.com/download/details\.aspx\?id=\d+)"[^>]*>'
- $linkMatch = [regex]::Match($secondTdContent, $linkPattern, [System.Text.RegularExpressions.RegexOptions]::IgnoreCase)
-
- if ($linkMatch.Success) {
- $modelLink = $linkMatch.Groups[1].Value
- }
- else {
- continue
- }
-
- $models += [PSCustomObject]@{
- Make = 'Microsoft'
- Model = $modelName
- Link = $modelLink
- }
- }
- }
- }
- }
- WriteLog "Parsing complete. Found $($models.Count) models."
-
- # Persist model list (Source B) into the local cache for fast UI population.
- try {
- $cache = Import-SurfaceDriverIndexCache -DriversFolder $DriversFolder
- $cache.ModelIndex = @($models)
- Save-SurfaceDriverIndexCache -Cache $cache -DriversFolder $DriversFolder
- WriteLog "Surface cache: Saved Microsoft model list to cache."
- }
- catch {
- WriteLog "Surface cache: Failed to save Microsoft model list. Error: $($_.Exception.Message)"
- }
-
- return $models
- }
- catch {
- WriteLog "Error getting Microsoft models: $($_.Exception.Message)"
- throw "Failed to retrieve Microsoft Surface models."
- }
+ # Keep the UI signature unchanged while using the shared Learn-based source.
+ return @(Get-SurfaceDriverModelIndex -DriversFolder $DriversFolder)
}
# Function to download and extract drivers for a specific Microsoft model (Modified for ForEach-Object -Parallel)
function Save-MicrosoftDriversTask {
From d6361dac4d803c6b03f42f14edc12fe866d54563 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Tue, 24 Mar 2026 16:28:29 -0700
Subject: [PATCH 14/34] Adds automatic column resizing to ListViews
- Enables automatic horizontal and vertical scrollbars for ListViews in the UI to improve navigation.
- Introduces functions to dynamically calculate and apply column widths based on the visible content and header text.
- Triggers column auto-resizing across various modules whenever ListView data is updated or refreshed.
- Renames a path normalization function and updates an event handler parameter name for clarity.
---
FFUDevelopment/BuildFFUVM_UI.xaml | 8 +-
.../FFUUI.Core/FFUUI.Core.Applications.psm1 | 4 +
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 11 +-
.../FFUUI.Core/FFUUI.Core.Drivers.psm1 | 3 +
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 3 +-
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 18 ++
.../FFUUI.Core/FFUUI.Core.Shared.psm1 | 209 ++++++++++++++++++
.../FFUUI.Core/FFUUI.Core.Winget.psm1 | 2 +
FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 | 1 +
9 files changed, 251 insertions(+), 8 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 672ca38..4c0c842 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -576,7 +576,7 @@
-
+
@@ -616,7 +616,7 @@
-
+
@@ -938,7 +938,7 @@
-
+
@@ -965,7 +965,7 @@
-
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Applications.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Applications.psm1
index 15fbdaa..207be64 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Applications.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Applications.psm1
@@ -182,6 +182,7 @@ function Add-BYOApplication {
# Refresh the ListView to show the changes
$listView.Items.Refresh()
+ Request-ListViewColumnAutoResize -ListView $listView
# Reset state
$State.Data.editingBYOApplication = $null
@@ -212,6 +213,7 @@ function Add-BYOApplication {
CopyStatus = ""
}
$listView.Items.Add($application)
+ Request-ListViewColumnAutoResize -ListView $listView
}
# Clear form and update button states for both add and update operations
@@ -285,6 +287,7 @@ function Add-AppsScriptVariable {
}
$State.Data.appsScriptVariablesDataList.Add($newItem)
$State.Controls.lstAppsScriptVariables.ItemsSource = $State.Data.appsScriptVariablesDataList.ToArray()
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstAppsScriptVariables
$State.Controls.txtAppsScriptKey.Clear()
$State.Controls.txtAppsScriptValue.Clear()
# Update the header checkbox state
@@ -311,6 +314,7 @@ function Remove-SelectedAppsScriptVariable {
$State.Data.appsScriptVariablesDataList.Remove($itemToRemove)
}
$State.Controls.lstAppsScriptVariables.ItemsSource = $State.Data.appsScriptVariablesDataList.ToArray()
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstAppsScriptVariables
# Update the header checkbox state
if ($null -ne $State.Controls.chkSelectAllAppsScriptVariables) {
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index 4224a55..0ba666f 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -669,6 +669,7 @@ function Update-UIFromConfig {
}
# Update the ListView's ItemsSource after populating the data list
$lstAppsScriptVars.ItemsSource = $State.Data.appsScriptVariablesDataList.ToArray()
+ Request-ListViewColumnAutoResize -ListView $lstAppsScriptVars
# Update the header checkbox state
if ($null -ne $State.Controls.chkSelectAllAppsScriptVariables) {
Update-SelectAllHeaderCheckBoxState -ListView $lstAppsScriptVars -HeaderCheckBox $State.Controls.chkSelectAllAppsScriptVariables
@@ -737,6 +738,7 @@ function Update-UIFromConfig {
}
}
$State.Controls.lstUSBDrives.Items.Refresh()
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstUSBDrives
# Update the Select All header checkbox state
$headerChk = $State.Controls.chkSelectAllUSBDrivesHeader
@@ -797,6 +799,7 @@ function Update-UIFromConfig {
}
}
$State.Controls.lstAdditionalFFUs.Items.Refresh()
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstAdditionalFFUs
$headerChk = $State.Controls.chkSelectAllAdditionalFFUs
if ($null -ne $headerChk) {
Update-SelectAllHeaderCheckBoxState -ListView $State.Controls.lstAdditionalFFUs -HeaderCheckBox $headerChk
@@ -856,7 +859,7 @@ function Invoke-RestoreDefaults {
$rootPath = $State.FFUDevelopmentPath
# Normalize potential array values to single strings
- function Normalize-PathScalar {
+ function Get-PathScalar {
param([object]$value)
if ($null -eq $value) { return $null }
if ($value -is [System.Array]) {
@@ -871,14 +874,14 @@ function Invoke-RestoreDefaults {
}
$appsPath = Join-Path $rootPath 'Apps'
- $driversRaw = Normalize-PathScalar -value $State.Controls.txtDriversFolder.Text
+ $driversRaw = Get-PathScalar -value $State.Controls.txtDriversFolder.Text
if ([string]::IsNullOrWhiteSpace($driversRaw)) {
$driversPath = Join-Path $rootPath 'Drivers'
}
else {
$driversPath = $driversRaw
}
- $ffuCaptureRaw = Normalize-PathScalar -value $State.Controls.txtFFUCaptureLocation.Text
+ $ffuCaptureRaw = Get-PathScalar -value $State.Controls.txtFFUCaptureLocation.Text
$ffuCapturePath = if ([string]::IsNullOrWhiteSpace($ffuCaptureRaw)) { Join-Path $rootPath 'FFU' } else { $ffuCaptureRaw }
$captureISOPath = Join-Path $rootPath 'WinPECaptureFFUFiles\WinPE-Capture.iso'
@@ -1060,6 +1063,7 @@ function Import-ConfigSupplementalAssets {
})
}
$State.Controls.lstWingetResults.ItemsSource = $appsBuffer.ToArray()
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstWingetResults
$loadedWinget = $true
if ($null -ne $State.Controls.wingetSearchPanel) {
$State.Controls.wingetSearchPanel.Visibility = 'Visible'
@@ -1194,6 +1198,7 @@ function Import-ConfigSupplementalAssets {
}
}
$State.Controls.lstDriverModels.ItemsSource = $State.Data.allDriverModels
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstDriverModels
if (Get-Command -Name Update-SelectAllHeaderCheckBoxState -ErrorAction SilentlyContinue) {
$headerChk = $State.Controls.chkSelectAllDriverModels
if ($null -ne $headerChk) {
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.psm1
index 40c207d..7ebd440 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.psm1
@@ -373,6 +373,7 @@ function Search-DriverModels {
}
# The view will automatically refresh. No need to call .Refresh() explicitly for filtering.
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstDriverModels
$filteredCount = 0
if ($null -ne $collectionView) {
foreach ($item in $collectionView) { $filteredCount++ }
@@ -715,6 +716,7 @@ function Import-DriversJson {
# Update the UI and apply any existing filter
$State.Controls.lstDriverModels.ItemsSource = $State.Data.allDriverModels
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstDriverModels
Search-DriverModels -filterText $State.Controls.txtModelFilter.Text -State $State
$message = "Driver import complete.`nNew models added: $newModelsAdded`nExisting models updated: $existingModelsUpdated"
@@ -786,6 +788,7 @@ function Invoke-GetModels {
# Update the UI ItemsSource to point to the new list and clear the filter
$State.Controls.lstDriverModels.ItemsSource = $State.Data.allDriverModels
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstDriverModels
$State.Controls.txtModelFilter.Text = ""
if ($State.Data.allDriverModels.Count -gt 0) {
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 71d57c7..3d67c22 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -24,7 +24,7 @@ function Register-EventHandlers {
# Define a handler to validate pasted text, ensuring it's only integers
$integerPastingHandler = {
- param($sender, $pastingEventArgs)
+ param($eventSource, $pastingEventArgs)
if ($pastingEventArgs.DataObject.GetDataPresent([string])) {
$pastedText = $pastingEventArgs.DataObject.GetData([string])
# Check if the pasted text consists ONLY of one or more digits.
@@ -345,6 +345,7 @@ function Register-EventHandlers {
$driveObject | Add-Member -MemberType NoteProperty -Name 'IsSelected' -Value $false -Force
$localState.Controls.lstUSBDrives.Items.Add($driveObject)
}
+ Request-ListViewColumnAutoResize -ListView $localState.Controls.lstUSBDrives
if ($localState.Controls.lstUSBDrives.Items.Count -gt 0) {
$localState.Controls.lstUSBDrives.SelectedIndex = 0
}
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index b853cd9..94c89b9 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -591,6 +591,9 @@ function Initialize-DynamicUIElements {
}
)
+ # Keep driver model columns sized to the current visible content.
+ Enable-ListViewColumnAutoResize -ListView $State.Controls.lstDriverModels -FixedColumnIndexes @(0)
+
# Winget Search ListView setup
$wingetGridView = New-Object System.Windows.Controls.GridView
$State.Controls.lstWingetResults.View = $wingetGridView # Assign GridView to ListView first
@@ -750,6 +753,9 @@ function Initialize-DynamicUIElements {
}
)
+ # Keep Winget result columns sized to the current visible content.
+ Enable-ListViewColumnAutoResize -ListView $State.Controls.lstWingetResults -FixedColumnIndexes @(0)
+
# BYO Applications ListView setup
$byoAppsGridView = New-Object System.Windows.Controls.GridView
$State.Controls.lstApplications.View = $byoAppsGridView
@@ -773,6 +779,9 @@ function Initialize-DynamicUIElements {
Add-SortableColumn -gridView $byoAppsGridView -header "Ignore Exit Codes" -binding "IgnoreExitCodes" -width 120 -headerHorizontalAlignment Left
Add-SortableColumn -gridView $byoAppsGridView -header "Copy Status" -binding "CopyStatus" -width 150 -headerHorizontalAlignment Left
+ # Keep BYO application columns sized to the current visible content.
+ Enable-ListViewColumnAutoResize -ListView $State.Controls.lstApplications -FixedColumnIndexes @(0)
+
# Apps Script Variables ListView setup
# Bind ItemsSource to the data list
$State.Controls.lstAppsScriptVariables.ItemsSource = $State.Data.appsScriptVariablesDataList.ToArray()
@@ -826,6 +835,9 @@ function Initialize-DynamicUIElements {
}
}
)
+
+ # Keep apps script variable columns sized to the current visible content.
+ Enable-ListViewColumnAutoResize -ListView $State.Controls.lstAppsScriptVariables -FixedColumnIndexes @(0)
}
else {
WriteLog "Warning: lstAppsScriptVariables.View is not a GridView. Selectable column not added, and sorting cannot be enabled."
@@ -899,6 +911,9 @@ function Initialize-DynamicUIElements {
}
}
)
+
+ # Keep USB drive columns sized to the current visible content.
+ Enable-ListViewColumnAutoResize -ListView $State.Controls.lstUSBDrives -FixedColumnIndexes @(0)
}
else {
WriteLog "Warning: lstUSBDrives.View is not a GridView. Selectable column not added, and sorting cannot be enabled."
@@ -945,6 +960,9 @@ function Initialize-DynamicUIElements {
}
}
)
+
+ # Keep additional FFU columns sized to the current visible content.
+ Enable-ListViewColumnAutoResize -ListView $State.Controls.lstAdditionalFFUs -FixedColumnIndexes @(0)
}
else {
WriteLog "Warning: lstAdditionalFFUs.View is not a GridView. Selectable column not added, and sorting cannot be enabled."
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1
index 12425bc..2ccabde 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1
@@ -20,6 +20,7 @@ function Update-ListViewPriorities {
}
}
$ListView.Items.Refresh()
+ Request-ListViewColumnAutoResize -ListView $ListView
}
# Function to move selected item to the top
@@ -133,6 +134,7 @@ function Update-ListViewItemStatus {
if ($null -ne $itemToUpdate) {
$itemToUpdate.$StatusProperty = $StatusValue
$ListView.Items.Refresh() # Refresh the view to show the change
+ Request-ListViewColumnAutoResize -ListView $ListView
}
else {
# Log if item not found (for debugging)
@@ -494,6 +496,209 @@ function Add-SelectableGridViewColumn {
WriteLog "Add-SelectableGridViewColumn: Successfully added selectable column to '$($ListView.Name)'."
}
+# Function to request a deferred GridView column auto-size pass
+function Request-ListViewColumnAutoResize {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory)]
+ [System.Windows.Controls.ListView]$ListView
+ )
+
+ # Skip startup calls until the visual tree has finished loading.
+ if (-not $ListView.IsLoaded) {
+ return
+ }
+
+ # Ensure the ListView has registered auto-resize metadata before scheduling work.
+ $autoResizeStateKey = 'FFU.ListViewColumnAutoResizeState'
+ if (-not $ListView.Resources.Contains($autoResizeStateKey)) {
+ return
+ }
+
+ if (-not ($ListView.View -is [System.Windows.Controls.GridView])) {
+ return
+ }
+
+ $autoResizeState = $ListView.Resources[$autoResizeStateKey]
+ if ($autoResizeState.ResizePending) {
+ return
+ }
+
+ $autoResizeState.ResizePending = $true
+ $previousErrorActionPreference = $ErrorActionPreference
+
+ try {
+ $ErrorActionPreference = 'Stop'
+
+ $gridView = [System.Windows.Controls.GridView]$ListView.View
+ $fixedColumnIndexes = @($autoResizeState.FixedColumnIndexes)
+ $visibleItems = [System.Collections.Generic.List[object]]::new()
+
+ if ($null -ne $ListView.ItemsSource) {
+ $collectionView = [System.Windows.Data.CollectionViewSource]::GetDefaultView($ListView.ItemsSource)
+ if ($null -ne $collectionView) {
+ foreach ($visibleItem in $collectionView) {
+ $visibleItems.Add($visibleItem)
+ }
+ }
+ }
+ else {
+ foreach ($visibleItem in $ListView.Items) {
+ $visibleItems.Add($visibleItem)
+ }
+ }
+
+ $ListView.UpdateLayout()
+
+ $columnIndex = 0
+ foreach ($column in $gridView.Columns) {
+ if ($fixedColumnIndexes -contains $columnIndex) {
+ $columnIndex++
+ continue
+ }
+
+ if ($null -eq $column) {
+ $columnIndex++
+ continue
+ }
+
+ $headerText = ""
+ $propertyName = $null
+
+ if ($null -ne $column.DisplayMemberBinding -and $null -ne $column.DisplayMemberBinding.Path) {
+ $propertyName = [string]$column.DisplayMemberBinding.Path.Path
+ }
+
+ if ($column.Header -is [System.Windows.Controls.GridViewColumnHeader]) {
+ if (-not [string]::IsNullOrWhiteSpace([string]$column.Header.Content)) {
+ $headerText = [string]$column.Header.Content
+ }
+ if ([string]::IsNullOrWhiteSpace($propertyName) -and -not [string]::IsNullOrWhiteSpace([string]$column.Header.Tag)) {
+ $propertyName = [string]$column.Header.Tag
+ }
+ }
+ elseif (-not [string]::IsNullOrWhiteSpace([string]$column.Header)) {
+ $headerText = [string]$column.Header
+ }
+
+ if ([string]::IsNullOrWhiteSpace($headerText)) {
+ $headerText = $propertyName
+ }
+
+ $headerMeasureBlock = New-Object System.Windows.Controls.TextBlock
+ $headerMeasureBlock.Text = if ([string]::IsNullOrWhiteSpace($headerText)) { ' ' } else { $headerText }
+ $headerMeasureBlock.FontFamily = $ListView.FontFamily
+ $headerMeasureBlock.FontSize = $ListView.FontSize
+ $headerMeasureBlock.FontStyle = $ListView.FontStyle
+ $headerMeasureBlock.FontWeight = $ListView.FontWeight
+ $headerMeasureBlock.FontStretch = $ListView.FontStretch
+ $headerMeasureBlock.Measure([System.Windows.Size]::new([double]::PositiveInfinity, [double]::PositiveInfinity))
+
+ $calculatedWidth = [math]::Ceiling($headerMeasureBlock.DesiredSize.Width + 36)
+
+ foreach ($item in $visibleItems) {
+ if ($null -eq $item -or [string]::IsNullOrWhiteSpace($propertyName)) {
+ continue
+ }
+
+ $itemProperty = $null
+ if ($null -ne $item.PSObject -and $null -ne $item.PSObject.Properties) {
+ $matchedProperties = $item.PSObject.Properties.Match($propertyName)
+ if ($null -ne $matchedProperties -and $matchedProperties.Count -gt 0) {
+ $itemProperty = $matchedProperties | Select-Object -First 1
+ }
+ }
+
+ if ($null -eq $itemProperty) {
+ continue
+ }
+
+ $itemText = [string]$itemProperty.Value
+ $extraWidth = 28
+
+ switch ($propertyName) {
+ 'Architecture' {
+ $extraWidth = 52
+ }
+ 'AdditionalExitCodes' {
+ $extraWidth = 44
+ }
+ 'IgnoreNonZeroExitCodes' {
+ $itemText = ' '
+ $extraWidth = 48
+ }
+ 'IgnoreExitCodes' {
+ $extraWidth = 28
+ }
+ }
+
+ $itemMeasureBlock = New-Object System.Windows.Controls.TextBlock
+ $itemMeasureBlock.Text = if ([string]::IsNullOrWhiteSpace($itemText)) { ' ' } else { $itemText }
+ $itemMeasureBlock.FontFamily = $ListView.FontFamily
+ $itemMeasureBlock.FontSize = $ListView.FontSize
+ $itemMeasureBlock.FontStyle = $ListView.FontStyle
+ $itemMeasureBlock.FontWeight = $ListView.FontWeight
+ $itemMeasureBlock.FontStretch = $ListView.FontStretch
+ $itemMeasureBlock.Measure([System.Windows.Size]::new([double]::PositiveInfinity, [double]::PositiveInfinity))
+
+ $itemWidth = [math]::Ceiling($itemMeasureBlock.DesiredSize.Width + $extraWidth)
+ if ($itemWidth -gt $calculatedWidth) {
+ $calculatedWidth = $itemWidth
+ }
+ }
+
+ if ($propertyName -eq 'IgnoreNonZeroExitCodes') {
+ $calculatedWidth = [math]::Max($calculatedWidth, 120)
+ }
+
+ $column.Width = [math]::Max($calculatedWidth, 40)
+ $columnIndex++
+ }
+ }
+ catch {
+ WriteLog "Request-ListViewColumnAutoResize: Failed for '$($ListView.Name)': $($_.Exception.Message)"
+ if (-not [string]::IsNullOrWhiteSpace($_.InvocationInfo.PositionMessage)) {
+ WriteLog $_.InvocationInfo.PositionMessage
+ }
+ if (-not [string]::IsNullOrWhiteSpace($_.ScriptStackTrace)) {
+ WriteLog $_.ScriptStackTrace
+ }
+ }
+ finally {
+ $ErrorActionPreference = $previousErrorActionPreference
+ $autoResizeState.ResizePending = $false
+ }
+}
+
+# Function to enable reusable auto-resizing for GridView-backed ListViews
+function Enable-ListViewColumnAutoResize {
+ [CmdletBinding()]
+ param(
+ [Parameter(Mandatory)]
+ [System.Windows.Controls.ListView]$ListView,
+
+ [int[]]$FixedColumnIndexes = @()
+ )
+
+ $autoResizeStateKey = 'FFU.ListViewColumnAutoResizeState'
+
+ # Only GridView-backed lists can participate in column auto-sizing.
+ if (-not ($ListView.View -is [System.Windows.Controls.GridView])) {
+ WriteLog "Enable-ListViewColumnAutoResize: ListView '$($ListView.Name)' is not using a GridView. Skipping registration."
+ return
+ }
+
+ if ($ListView.Resources.Contains($autoResizeStateKey)) {
+ return
+ }
+
+ $autoResizeState = [PSCustomObject]@{
+ FixedColumnIndexes = @($FixedColumnIndexes)
+ ResizePending = $false
+ }
+ $ListView.Resources[$autoResizeStateKey] = $autoResizeState
+}
+
# Function to update the IsChecked state of a "Select All" header CheckBox
function Update-SelectAllHeaderCheckBoxState {
param(
@@ -573,6 +778,7 @@ function Invoke-ListViewItemToggle {
# Toggle the IsSelected property
$selectedItem.IsSelected = -not $selectedItem.IsSelected
$ListView.Items.Refresh()
+ Request-ListViewColumnAutoResize -ListView $ListView
# Update the 'Select All' header checkbox state
$headerChk = $State.Controls[$HeaderCheckBoxKeyName]
@@ -743,6 +949,8 @@ function Invoke-ListViewSort {
$newView.Filter = $existingFilter
}
}
+
+ Request-ListViewColumnAutoResize -ListView $listView
}
# --------------------------------------------------------------------------
@@ -1043,6 +1251,7 @@ function Clear-ListViewContent {
}
$ListViewControl.Items.Refresh()
+ Request-ListViewColumnAutoResize -ListView $ListViewControl
# Clear any specified textboxes
if ($null -ne $TextBoxesToClear) {
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Winget.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Winget.psm1
index 3adc7af..d96b286 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Winget.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Winget.psm1
@@ -59,6 +59,7 @@ function Search-WingetApps {
# Update the ListView's ItemsSource using the passed-in State object
$State.Controls.lstWingetResults.ItemsSource = $finalAppList.ToArray()
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstWingetResults
# Update status text
$statusText = ""
@@ -178,6 +179,7 @@ function Import-WingetList {
}
$State.Controls.lstWingetResults.ItemsSource = $newAppListForItemsSource.ToArray()
+ Request-ListViewColumnAutoResize -ListView $State.Controls.lstWingetResults
$State.Controls.txtAppListJsonPath.Text = $ofd.FileName
[System.Windows.MessageBox]::Show("Winget app list imported successfully.", "Success", "OK", "Information")
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
index 8cba575..8da5c59 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
@@ -268,6 +268,7 @@ function Update-AdditionalFFUList {
foreach ($it in $items) { $listView.Items.Add($it) | Out-Null }
WriteLog "Additional FFUs: Found $($listView.Items.Count) FFU files in $ffuFolder."
}
+ Request-ListViewColumnAutoResize -ListView $listView
$headerChk = $State.Controls.chkSelectAllAdditionalFFUs
if ($null -ne $headerChk) {
Update-SelectAllHeaderCheckBoxState -ListView $listView -HeaderCheckBox $headerChk
From 6db0f8c905bc60ff248b1daf83d49471e5786333 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Wed, 25 Mar 2026 10:39:57 -0700
Subject: [PATCH 15/34] Reverts to using hardcoded Lenovo PSREF token
Switches back to utilizing the static cookie for Lenovo PSREF requests, as the token has remained unchanged for months. The dynamic retrieval function call is bypassed to streamline the process but remains in the codebase as a fallback in case the token expires or changes in the future.
---
FFUDevelopment/BuildFFUVM.ps1 | 5 +++--
FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Lenovo.psm1 | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index f7d16f8..df4907e 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -1205,10 +1205,11 @@ function Get-LenovoDrivers {
# If anyone knows how to reliably get the the model and machine type information from Lenovo, let me know.
# https://download.lenovo.com/cdrt/td/catalogv2.xml only provides a subset of the information available from PSREF (e.g. it's missing 300w, 500w, and other consumer models).
- # $lenovoCookie = "X-PSREF-USER-TOKEN=eyJ0eXAiOiJKV1QifQ.bjVTdWk0YklZeUc2WnFzL0lXU0pTeU1JcFo0aExzRXl1UGxHN3lnS1BtckI0ZVU5WEJyVGkvaFE0NmVNU2U1ZjNrK3ZqTEVIZ29nTk1TNS9DQmIwQ0pTN1Q1VytlY1RpNzZTUldXbm4wZ1g2RGJuQWg4MXRkTmxKT2YrOW9LRjBzQUZzV05HM3NpcU92WFVTM0o0blM1SDQyUlVXNThIV1VBS2R0c1B2NjJyQjIrUGxNZ2x6RTRhUjY5UDZWclBX.ZDBmM2EyMWRjZTg2N2JmYWMxZDIxY2NiYjQzMWFhNjg1YjEzZTAxNmU2M2RmN2M5ZjIyZWJhMzZkOWI1OWJhZg"
+ $lenovoCookie = "X-PSREF-USER-TOKEN=eyJ0eXAiOiJKV1QifQ.bjVTdWk0YklZeUc2WnFzL0lXU0pTeU1JcFo0aExzRXl1UGxHN3lnS1BtckI0ZVU5WEJyVGkvaFE0NmVNU2U1ZjNrK3ZqTEVIZ29nTk1TNS9DQmIwQ0pTN1Q1VytlY1RpNzZTUldXbm4wZ1g2RGJuQWg4MXRkTmxKT2YrOW9LRjBzQUZzV05HM3NpcU92WFVTM0o0blM1SDQyUlVXNThIV1VBS2R0c1B2NjJyQjIrUGxNZ2x6RTRhUjY5UDZWclBX.ZDBmM2EyMWRjZTg2N2JmYWMxZDIxY2NiYjQzMWFhNjg1YjEzZTAxNmU2M2RmN2M5ZjIyZWJhMzZkOWI1OWJhZg"
# Wrote a separate function to grab the token. Check the function notes for more details. Keep the above comment for now to see if the cookie ever changes.
- $lenovoCookie = Get-LenovoPSREFToken
+ # 3/25/2026 - The cookie is still the same after 8 months, but we'll keep the retrieval function in case it changes in the future or if we need to get a new one.
+ # $lenovoCookie = Get-LenovoPSREFToken
# Add the cookie to the headers
$Headers["Cookie"] = $lenovoCookie
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Lenovo.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Lenovo.psm1
index bb08448..187cd38 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Lenovo.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Lenovo.psm1
@@ -23,10 +23,11 @@ function Get-LenovoDriversModelList {
# If anyone knows how to reliably get the the model and machine type information from Lenovo, let me know.
# https://download.lenovo.com/cdrt/td/catalogv2.xml only provides a subset of the information available from PSREF (e.g. it's missing 300w, 500w, and other consumer models).
- # $lenovoCookie = "X-PSREF-USER-TOKEN=eyJ0eXAiOiJKV1QifQ.bjVTdWk0YklZeUc2WnFzL0lXU0pTeU1JcFo0aExzRXl1UGxHN3lnS1BtckI0ZVU5WEJyVGkvaFE0NmVNU2U1ZjNrK3ZqTEVIZ29nTk1TNS9DQmIwQ0pTN1Q1VytlY1RpNzZTUldXbm4wZ1g2RGJuQWg4MXRkTmxKT2YrOW9LRjBzQUZzV05HM3NpcU92WFVTM0o0blM1SDQyUlVXNThIV1VBS2R0c1B2NjJyQjIrUGxNZ2x6RTRhUjY5UDZWclBX.ZDBmM2EyMWRjZTg2N2JmYWMxZDIxY2NiYjQzMWFhNjg1YjEzZTAxNmU2M2RmN2M5ZjIyZWJhMzZkOWI1OWJhZg"
+ $lenovoCookie = "X-PSREF-USER-TOKEN=eyJ0eXAiOiJKV1QifQ.bjVTdWk0YklZeUc2WnFzL0lXU0pTeU1JcFo0aExzRXl1UGxHN3lnS1BtckI0ZVU5WEJyVGkvaFE0NmVNU2U1ZjNrK3ZqTEVIZ29nTk1TNS9DQmIwQ0pTN1Q1VytlY1RpNzZTUldXbm4wZ1g2RGJuQWg4MXRkTmxKT2YrOW9LRjBzQUZzV05HM3NpcU92WFVTM0o0blM1SDQyUlVXNThIV1VBS2R0c1B2NjJyQjIrUGxNZ2x6RTRhUjY5UDZWclBX.ZDBmM2EyMWRjZTg2N2JmYWMxZDIxY2NiYjQzMWFhNjg1YjEzZTAxNmU2M2RmN2M5ZjIyZWJhMzZkOWI1OWJhZg"
# Wrote a separate function to grab the token. Check the function notes for more details. Keep the above comment for now to see if the cookie ever changes.
- $lenovoCookie = Get-LenovoPSREFToken
+ # 3/25/2026 - The cookie is still the same after 8 months, but we'll keep the retrieval function in case it changes in the future or if we need to get a new one.
+ # $lenovoCookie = Get-LenovoPSREFToken
# Add the cookie to the headers
$Headers["Cookie"] = $lenovoCookie
From a3a2bce652f9b53373e75955e9e1c9c09d5a4a0d Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Wed, 25 Mar 2026 10:39:57 -0700
Subject: [PATCH 16/34] Reverts to using hardcoded Lenovo PSREF token
Switches back to utilizing the static cookie for Lenovo PSREF requests, as the token has remained unchanged for months. The dynamic retrieval function call is bypassed to streamline the process but remains in the codebase as a fallback in case the token expires or changes in the future.
---
FFUDevelopment/BuildFFUVM.ps1 | 5 +++--
FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Lenovo.psm1 | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index f7d16f8..df4907e 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -1205,10 +1205,11 @@ function Get-LenovoDrivers {
# If anyone knows how to reliably get the the model and machine type information from Lenovo, let me know.
# https://download.lenovo.com/cdrt/td/catalogv2.xml only provides a subset of the information available from PSREF (e.g. it's missing 300w, 500w, and other consumer models).
- # $lenovoCookie = "X-PSREF-USER-TOKEN=eyJ0eXAiOiJKV1QifQ.bjVTdWk0YklZeUc2WnFzL0lXU0pTeU1JcFo0aExzRXl1UGxHN3lnS1BtckI0ZVU5WEJyVGkvaFE0NmVNU2U1ZjNrK3ZqTEVIZ29nTk1TNS9DQmIwQ0pTN1Q1VytlY1RpNzZTUldXbm4wZ1g2RGJuQWg4MXRkTmxKT2YrOW9LRjBzQUZzV05HM3NpcU92WFVTM0o0blM1SDQyUlVXNThIV1VBS2R0c1B2NjJyQjIrUGxNZ2x6RTRhUjY5UDZWclBX.ZDBmM2EyMWRjZTg2N2JmYWMxZDIxY2NiYjQzMWFhNjg1YjEzZTAxNmU2M2RmN2M5ZjIyZWJhMzZkOWI1OWJhZg"
+ $lenovoCookie = "X-PSREF-USER-TOKEN=eyJ0eXAiOiJKV1QifQ.bjVTdWk0YklZeUc2WnFzL0lXU0pTeU1JcFo0aExzRXl1UGxHN3lnS1BtckI0ZVU5WEJyVGkvaFE0NmVNU2U1ZjNrK3ZqTEVIZ29nTk1TNS9DQmIwQ0pTN1Q1VytlY1RpNzZTUldXbm4wZ1g2RGJuQWg4MXRkTmxKT2YrOW9LRjBzQUZzV05HM3NpcU92WFVTM0o0blM1SDQyUlVXNThIV1VBS2R0c1B2NjJyQjIrUGxNZ2x6RTRhUjY5UDZWclBX.ZDBmM2EyMWRjZTg2N2JmYWMxZDIxY2NiYjQzMWFhNjg1YjEzZTAxNmU2M2RmN2M5ZjIyZWJhMzZkOWI1OWJhZg"
# Wrote a separate function to grab the token. Check the function notes for more details. Keep the above comment for now to see if the cookie ever changes.
- $lenovoCookie = Get-LenovoPSREFToken
+ # 3/25/2026 - The cookie is still the same after 8 months, but we'll keep the retrieval function in case it changes in the future or if we need to get a new one.
+ # $lenovoCookie = Get-LenovoPSREFToken
# Add the cookie to the headers
$Headers["Cookie"] = $lenovoCookie
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Lenovo.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Lenovo.psm1
index bb08448..187cd38 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Lenovo.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Drivers.Lenovo.psm1
@@ -23,10 +23,11 @@ function Get-LenovoDriversModelList {
# If anyone knows how to reliably get the the model and machine type information from Lenovo, let me know.
# https://download.lenovo.com/cdrt/td/catalogv2.xml only provides a subset of the information available from PSREF (e.g. it's missing 300w, 500w, and other consumer models).
- # $lenovoCookie = "X-PSREF-USER-TOKEN=eyJ0eXAiOiJKV1QifQ.bjVTdWk0YklZeUc2WnFzL0lXU0pTeU1JcFo0aExzRXl1UGxHN3lnS1BtckI0ZVU5WEJyVGkvaFE0NmVNU2U1ZjNrK3ZqTEVIZ29nTk1TNS9DQmIwQ0pTN1Q1VytlY1RpNzZTUldXbm4wZ1g2RGJuQWg4MXRkTmxKT2YrOW9LRjBzQUZzV05HM3NpcU92WFVTM0o0blM1SDQyUlVXNThIV1VBS2R0c1B2NjJyQjIrUGxNZ2x6RTRhUjY5UDZWclBX.ZDBmM2EyMWRjZTg2N2JmYWMxZDIxY2NiYjQzMWFhNjg1YjEzZTAxNmU2M2RmN2M5ZjIyZWJhMzZkOWI1OWJhZg"
+ $lenovoCookie = "X-PSREF-USER-TOKEN=eyJ0eXAiOiJKV1QifQ.bjVTdWk0YklZeUc2WnFzL0lXU0pTeU1JcFo0aExzRXl1UGxHN3lnS1BtckI0ZVU5WEJyVGkvaFE0NmVNU2U1ZjNrK3ZqTEVIZ29nTk1TNS9DQmIwQ0pTN1Q1VytlY1RpNzZTUldXbm4wZ1g2RGJuQWg4MXRkTmxKT2YrOW9LRjBzQUZzV05HM3NpcU92WFVTM0o0blM1SDQyUlVXNThIV1VBS2R0c1B2NjJyQjIrUGxNZ2x6RTRhUjY5UDZWclBX.ZDBmM2EyMWRjZTg2N2JmYWMxZDIxY2NiYjQzMWFhNjg1YjEzZTAxNmU2M2RmN2M5ZjIyZWJhMzZkOWI1OWJhZg"
# Wrote a separate function to grab the token. Check the function notes for more details. Keep the above comment for now to see if the cookie ever changes.
- $lenovoCookie = Get-LenovoPSREFToken
+ # 3/25/2026 - The cookie is still the same after 8 months, but we'll keep the retrieval function in case it changes in the future or if we need to get a new one.
+ # $lenovoCookie = Get-LenovoPSREFToken
# Add the cookie to the headers
$Headers["Cookie"] = $lenovoCookie
From c135ad0fbac22fe98e940ccf43eef930c173db61 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Thu, 26 Mar 2026 22:31:08 -0700
Subject: [PATCH 17/34] Captures FFU directly from host-mounted VHDX
By optimizing and mounting the VHDX directly on the host for image capture, the build process no longer needs to boot the VM into WinPE, create SMB network shares, generate temporary local accounts, or rely on complex Hyper-V switch IP configurations. This streamlines the workflow and eliminates multiple networking and permission-related points of failure.
This change also removes the need to generate and attach WinPE capture media. All related parameters (`ShareName`, `Username`, `VMHostIPAddress`, `CreateCaptureMedia`, `CleanupCaptureISO`), UI controls, capture scripts, and documentation references have been removed or updated to reflect the simplified architecture.
---
FFUDevelopment/BuildFFUVM.ps1 | 478 +++++-------------
FFUDevelopment/BuildFFUVM_UI.xaml | 23 +-
FFUDevelopment/Create-PEMedia.ps1 | 75 +--
FFUDevelopment/Docs/BuildFFUVM_flowchart.md | 8 +-
.../FFU.Common/FFU.Common.Cleanup.psm1 | 13 +-
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 16 +-
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 19 +-
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 16 -
FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 | 5 -
.../AssignDriveLetter.txt | 4 -
.../WinPECaptureFFUFiles/CaptureFFU.ps1 | 237 ---------
.../Windows/System32/startnet.cmd | 5 -
FFUDevelopment/config/Sample_default.json | Bin 6412 -> 6094 bytes
docs/appsscriptvariables.md | 5 -
docs/build.md | 48 +-
docs/create_pemedia.md | 14 +-
docs/hyperv_settings.md | 6 +-
docs/parameters_reference.md | 7 +-
docs/quickstart.md | 2 +-
19 files changed, 170 insertions(+), 811 deletions(-)
delete mode 100644 FFUDevelopment/WinPECaptureFFUFiles/AssignDriveLetter.txt
delete mode 100644 FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1
delete mode 100644 FFUDevelopment/WinPECaptureFFUFiles/Windows/System32/startnet.cmd
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index df4907e..4eeb9f1 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -36,9 +36,6 @@ Switch to run cleanup-only mode. When specified, the script performs cleanup and
.PARAMETER CleanupAppsISO
When set to $true, will remove the Apps ISO after the FFU has been captured. Default is $true.
-.PARAMETER CleanupCaptureISO
-When set to $true, will remove the WinPE capture ISO after the FFU has been captured. Default is $true.
-
.PARAMETER CleanupCurrentRunDownloads
When set to $true, cleanup mode will remove downloads created during the current run and restore backed up run JSON files. Default is $false.
@@ -75,9 +72,6 @@ When set to $true, will copy the provisioning package from the $FFUDevelopmentPa
.PARAMETER CopyUnattend
When set to $true, will copy the $FFUDevelopmentPath\Unattend folder to the Deployment partition of the USB drive. Default is $false.
-.PARAMETER CreateCaptureMedia
-When set to $true, this will create WinPE capture media for use when $InstallApps is set to $true. This capture media will be automatically attached to the VM, and the boot order will be changed to automate the capture of the FFU.
-
.PARAMETER CreateDeploymentMedia
When set to $true, this will create WinPE deployment media for use when deploying to a physical device.
@@ -177,9 +171,6 @@ When set to $true, will remove the downloaded CU, MSRT, Defender, Edge, OneDrive
.PARAMETER RemoveDownloadedESD
When set to $true, will remove downloaded Windows ESD files after they have been applied. Default is $true.
-.PARAMETER ShareName
-Name of the shared folder for FFU capture. The default is FFUCaptureShare. This share will be created with rights for the user account. When finished, the share will be removed.
-
.PARAMETER Threads
Controls the throttle applied to parallel tasks inside the script. Default is 5, matching the UI Threads field, and applies to driver downloads invoked through Invoke-ParallelProcessing.
@@ -228,17 +219,11 @@ User agent string to use when downloading files.
.PARAMETER UserAppListPath
Path to a JSON file containing a list of user-defined applications to install. Default is $FFUDevelopmentPath\Apps\UserAppList.json.
-.PARAMETER Username
-Username for accessing the shared folder. The default is ffu_user. The script will auto-create the account and password. When finished, it will remove the account.
-
-.PARAMETER VMHostIPAddress
-IP address of the Hyper-V host for FFU capture. If $InstallApps is set to $true, this parameter must be configured. You must manually configure this, or use the UI to auto-detect.
-
.PARAMETER VMLocation
Default is $FFUDevelopmentPath\VM. This is the location of the VHDX that gets created where Windows will be installed to.
.PARAMETER VMSwitchName
-Name of the Hyper-V virtual switch. If $InstallApps is set to $true, this must be set to capture the FFU from the VM.
+Name of the Hyper-V virtual switch. Optional when building with InstallApps. Provide it only if the VM needs network connectivity during provisioning.
.PARAMETER WindowsArch
String value of 'x86', 'x64', or 'arm64'. This is used to identify which architecture of Windows to download. Default is 'x64'.
@@ -257,25 +242,25 @@ String value of the Windows version to download. This is used to identify which
.EXAMPLE
Command line for most people who want to download the latest Windows 11 Pro x64 media in English (US) with the latest Windows Cumulative Update, .NET Framework, Defender platform and definition updates, Edge, OneDrive, and Office/M365 Apps. It will also copy drivers to the FFU. This can take about 40 minutes to create the FFU due to the time it takes to download and install the updates.
-.\BuildFFUVM.ps1 -WindowsSKU 'Pro' -Installapps $true -InstallOffice $true -InstallDrivers $true -VMSwitchName 'Name of your VM Switch in Hyper-V' -VMHostIPAddress 'Your IP Address' -CreateCaptureMedia $true -CreateDeploymentMedia $true -BuildUSBDrive $true -UpdateLatestCU $true -UpdateLatestNet $true -UpdateLatestDefender $true -UpdateEdge $true -UpdateOneDrive $true -verbose
+.\BuildFFUVM.ps1 -WindowsSKU 'Pro' -Installapps $true -InstallOffice $true -InstallDrivers $true -CreateDeploymentMedia $true -BuildUSBDrive $true -UpdateLatestCU $true -UpdateLatestNet $true -UpdateLatestDefender $true -UpdateEdge $true -UpdateOneDrive $true -verbose
Command line for most people who want to create an FFU with Office and drivers and have downloaded their own ISO. This assumes you have copied this script and associated files to the C:\FFUDevelopment folder. If you need to use another drive or folder, change the -FFUDevelopment parameter (e.g. -FFUDevelopment 'D:\FFUDevelopment')
-.\BuildFFUVM.ps1 -ISOPath 'C:\path_to_iso\Windows.iso' -WindowsSKU 'Pro' -Installapps $true -InstallOffice $true -InstallDrivers $true -VMSwitchName 'Name of your VM Switch in Hyper-V' -VMHostIPAddress 'Your IP Address' -CreateCaptureMedia $true -CreateDeploymentMedia $true -BuildUSBDrive $true -verbose
+.\BuildFFUVM.ps1 -ISOPath 'C:\path_to_iso\Windows.iso' -WindowsSKU 'Pro' -Installapps $true -InstallOffice $true -InstallDrivers $true -CreateDeploymentMedia $true -BuildUSBDrive $true -verbose
Command line for those who just want a FFU with no drivers, apps, or Office and have downloaded their own ISO.
-.\BuildFFUVM.ps1 -ISOPath 'C:\path_to_iso\Windows.iso' -WindowsSKU 'Pro' -Installapps $false -InstallOffice $false -InstallDrivers $false -CreateCaptureMedia $false -CreateDeploymentMedia $true -BuildUSBDrive $true -verbose
+.\BuildFFUVM.ps1 -ISOPath 'C:\path_to_iso\Windows.iso' -WindowsSKU 'Pro' -Installapps $false -InstallOffice $false -InstallDrivers $false -CreateDeploymentMedia $true -BuildUSBDrive $true -verbose
Command line for those who just want a FFU with Apps and drivers, no Office and have downloaded their own ISO.
-.\BuildFFUVM.ps1 -ISOPath 'C:\path_to_iso\Windows.iso' -WindowsSKU 'Pro' -Installapps $true -InstallOffice $false -InstallDrivers $true -VMSwitchName 'Name of your VM Switch in Hyper-V' -VMHostIPAddress 'Your IP Address' -CreateCaptureMedia $true -CreateDeploymentMedia $true -BuildUSBDrive $true -verbose
+.\BuildFFUVM.ps1 -ISOPath 'C:\path_to_iso\Windows.iso' -WindowsSKU 'Pro' -Installapps $true -InstallOffice $false -InstallDrivers $true -CreateDeploymentMedia $true -BuildUSBDrive $true -verbose
Command line for those who want to download the latest Windows 11 Pro x64 media in English (US) and install the latest version of Office and drivers.
-.\BuildFFUVM.ps1 -WindowsSKU 'Pro' -Installapps $true -InstallOffice $true -InstallDrivers $true -VMSwitchName 'Name of your VM Switch in Hyper-V' -VMHostIPAddress 'Your IP Address' -CreateCaptureMedia $true -CreateDeploymentMedia $true -BuildUSBDrive $true -verbose
+.\BuildFFUVM.ps1 -WindowsSKU 'Pro' -Installapps $true -InstallOffice $true -InstallDrivers $true -CreateDeploymentMedia $true -BuildUSBDrive $true -verbose
Command line for those who want to download the latest Windows 11 Pro x64 media in French (CA) and install the latest version of Office and drivers.
-.\BuildFFUVM.ps1 -WindowsSKU 'Pro' -Installapps $true -InstallOffice $true -InstallDrivers $true -VMSwitchName 'Name of your VM Switch in Hyper-V' -VMHostIPAddress 'Your IP Address' -CreateCaptureMedia $true -CreateDeploymentMedia $true -BuildUSBDrive $true -WindowsRelease 11 -WindowsArch 'x64' -WindowsLang 'fr-ca' -MediaType 'consumer' -verbose
+.\BuildFFUVM.ps1 -WindowsSKU 'Pro' -Installapps $true -InstallOffice $true -InstallDrivers $true -CreateDeploymentMedia $true -BuildUSBDrive $true -WindowsRelease 11 -WindowsArch 'x64' -WindowsLang 'fr-ca' -MediaType 'consumer' -verbose
Command line for those who want to download the latest Windows 11 Pro x64 media in English (US) and install the latest version of Office and drivers.
-.\BuildFFUVM.ps1 -WindowsSKU 'Pro' -Installapps $true -InstallOffice $true -InstallDrivers $true -VMSwitchName 'Name of your VM Switch in Hyper-V' -VMHostIPAddress 'Your IP Address' -CreateCaptureMedia $true -CreateDeploymentMedia $true -BuildUSBDrive $true -verbose
+.\BuildFFUVM.ps1 -WindowsSKU 'Pro' -Installapps $true -InstallOffice $true -InstallDrivers $true -CreateDeploymentMedia $true -BuildUSBDrive $true -verbose
.NOTES
Additional notes about your script.
@@ -336,12 +321,7 @@ param(
[string]$VMLocation,
[string]$FFUPrefix = '_FFU',
[string]$FFUCaptureLocation,
- [string]$ShareName = "FFUCaptureShare",
- [string]$Username = "ffu_user",
[string]$CustomFFUNameTemplate,
- [Parameter(Mandatory = $false)]
- [string]$VMHostIPAddress,
- [bool]$CreateCaptureMedia = $true,
[bool]$CreateDeploymentMedia,
[ValidateScript({
$allowedFeatures = @("Windows-Defender-Default-Definitions", "Printing-PrintToPDFServices-Features", "Printing-XPSServices-Features", "TelnetClient", "TFTP",
@@ -425,7 +405,6 @@ param(
[bool]$CopyUnattend,
[bool]$CopyAutopilot,
[bool]$CompactOS = $true,
- [bool]$CleanupCaptureISO = $true,
[bool]$CleanupDeployISO = $true,
[bool]$CleanupAppsISO = $true,
[bool]$RemoveUpdates = $true,
@@ -647,7 +626,6 @@ if (-not $LtscCUStagePath) { $LtscCUStagePath = "$AppsPath\LTSCUpdate" }
if (-not $AppsScriptVarsJsonPath) { $AppsScriptVarsJsonPath = "$OrchestrationPath\AppsScriptVariables.json" }
if (-not $DeployISO) { $DeployISO = "$FFUDevelopmentPath\WinPE_FFU_Deploy_$WindowsArch.iso" }
-if (-not $CaptureISO) { $CaptureISO = "$FFUDevelopmentPath\WinPE_FFU_Capture_$WindowsArch.iso" }
if (-not $OfficePath) { $OfficePath = "$AppsPath\Office" }
if (-not $OfficeDownloadXML) { $OfficeDownloadXML = "$OfficePath\DownloadFFU.xml" }
if (-not $OfficeInstallXML) { $OfficeInstallXML = "DeployFFU.xml" }
@@ -2848,69 +2826,6 @@ function New-FFUVM {
return $VM
}
-Function Set-CaptureFFU {
- $CaptureFFUScriptPath = "$FFUDevelopmentPath\WinPECaptureFFUFiles\CaptureFFU.ps1"
-
- # Workaround for PowerShell 7 issue on Windows 11 23H2 and earlier
- # https://github.com/PowerShell/PowerShell/issues/21645
- $osBuild = (Get-CimInstance -ClassName Win32_OperatingSystem).BuildNumber
- if ($osBuild -le 22631) {
- WriteLog "Applying workaround for PowerShell 7 LocalAccounts module issue on Windows 11 build $osBuild"
- Import-Module Microsoft.PowerShell.LocalAccounts -UseWindowsPowerShell
- }
-
- If (-not (Test-Path -Path $FFUCaptureLocation)) {
- WriteLog "Creating FFU capture location at $FFUCaptureLocation"
- New-Item -Path $FFUCaptureLocation -ItemType Directory -Force
- WriteLog "Successfully created FFU capture location at $FFUCaptureLocation"
- }
-
- # Create a standard user
- $UserExists = Get-LocalUser -Name $UserName -ErrorAction SilentlyContinue
- if (-not $UserExists) {
- WriteLog "Creating FFU_User account as standard user"
- New-LocalUser -Name $UserName -AccountNeverExpires -NoPassword | Out-null
- WriteLog "Successfully created FFU_User account"
- }
-
- # Create a random password for the standard user
- $Password = New-Guid | Select-Object -ExpandProperty Guid
- $SecurePassword = ConvertTo-SecureString -String $Password -AsPlainText -Force
- Set-LocalUser -Name $UserName -Password $SecurePassword -PasswordNeverExpires:$true
-
- # Create a share of the $FFUCaptureLocation variable
- $ShareExists = Get-SmbShare -Name $ShareName -ErrorAction SilentlyContinue
- if (-not $ShareExists) {
- WriteLog "Creating $ShareName and giving access to $UserName"
- New-SmbShare -Name $ShareName -Path $FFUCaptureLocation -FullAccess $UserName | Out-Null
- WriteLog "Share created"
- }
-
- # Return the share path in the format of \\\ /user:
- $SharePath = "\\$VMHostIPAddress\$ShareName /user:$UserName $Password"
- $SharePath = "net use W: " + $SharePath + ' 2>&1'
-
- # Update CaptureFFU.ps1 script
- if (Test-Path -Path $CaptureFFUScriptPath) {
- $ScriptContent = Get-Content -Path $CaptureFFUScriptPath
- #Update variables in CaptureFFU.ps1 script ($VMHostIPAddress, $ShareName, $UserName, $Password)
- WriteLog 'Updating CaptureFFU.ps1 script with new share information'
- $ScriptContent = $ScriptContent -replace '(\$VMHostIPAddress = ).*', "`$1'$VMHostIPAddress'"
- $ScriptContent = $ScriptContent -replace '(\$ShareName = ).*', "`$1'$ShareName'"
- $ScriptContent = $ScriptContent -replace '(\$UserName = ).*', "`$1'$UserName'"
- $ScriptContent = $ScriptContent -replace '(\$Password = ).*', "`$1'$Password'"
- if (![string]::IsNullOrEmpty($CustomFFUNameTemplate)) {
- $ScriptContent = $ScriptContent -replace '(\$CustomFFUNameTemplate = ).*', "`$1'$CustomFFUNameTemplate'"
- WriteLog 'Updating CaptureFFU.ps1 script with new ffu name template information'
- }
- Set-Content -Path $CaptureFFUScriptPath -Value $ScriptContent
- WriteLog 'Update complete'
- }
- else {
- throw "CaptureFFU.ps1 script not found at $CaptureFFUScriptPath"
- }
-}
-
function Get-PrivateProfileString {
param (
[Parameter()]
@@ -3371,12 +3286,7 @@ function Copy-Drivers {
}
function New-PEMedia {
- param (
- [Parameter()]
- [bool]$Capture,
- [Parameter()]
- [bool]$Deploy
- )
+ param ()
#Need to use the Demployment and Imaging tools environment to create winPE media
$DandIEnv = "$adkPath`Assessment and Deployment Kit\Deployment Tools\DandISetEnv.bat"
$WinPEFFUPath = "$FFUDevelopmentPath\WinPE"
@@ -3431,64 +3341,49 @@ function New-PEMedia {
Add-WindowsPackage -Path "$WinPEFFUPath\mount" -PackagePath $PackagePath | Out-Null
WriteLog "Adding package complete"
}
- If ($Capture) {
- WriteLog "Copying $FFUDevelopmentPath\WinPECaptureFFUFiles\* to WinPE capture media"
- Copy-Item -Path "$FFUDevelopmentPath\WinPECaptureFFUFiles\*" -Destination "$WinPEFFUPath\mount" -Recurse -Force | out-null
- WriteLog "Copy complete"
- #Remove Bootfix.bin - for BIOS systems, shouldn't be needed, but doesn't hurt to remove for our purposes
- #Remove-Item -Path "$WinPEFFUPath\media\boot\bootfix.bin" -Force | Out-null
- # $WinPEISOName = 'WinPE_FFU_Capture.iso'
- $WinPEISOFile = $CaptureISO
- # $Capture = $false
- }
- If ($Deploy) {
- WriteLog "Copying $FFUDevelopmentPath\WinPEDeployFFUFiles\* to WinPE deploy media"
- Copy-Item -Path "$FFUDevelopmentPath\WinPEDeployFFUFiles\*" -Destination "$WinPEFFUPath\mount" -Recurse -Force | Out-Null
- WriteLog 'Copy complete'
- #If $CopyPEDrivers = $true, add drivers to WinPE media using dism
- if ($CopyPEDrivers) {
- if ($UseDriversAsPEDrivers) {
- WriteLog "UseDriversAsPEDrivers is set. Building WinPE driver set from Drivers folder (bypassing PEDrivers folder contents)."
- if (Test-Path -Path $PEDriversFolder) {
- try {
- Remove-Item -Path (Join-Path $PEDriversFolder '*') -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
- }
- catch {
- WriteLog "Warning: Failed clearing existing PEDriversFolder contents: $($_.Exception.Message)"
- }
+ WriteLog "Copying $FFUDevelopmentPath\WinPEDeployFFUFiles\* to WinPE deploy media"
+ Copy-Item -Path "$FFUDevelopmentPath\WinPEDeployFFUFiles\*" -Destination "$WinPEFFUPath\mount" -Recurse -Force | Out-Null
+ WriteLog 'Copy complete'
+ #If $CopyPEDrivers = $true, add drivers to WinPE media using dism
+ if ($CopyPEDrivers) {
+ if ($UseDriversAsPEDrivers) {
+ WriteLog "UseDriversAsPEDrivers is set. Building WinPE driver set from Drivers folder (bypassing PEDrivers folder contents)."
+ if (Test-Path -Path $PEDriversFolder) {
+ try {
+ Remove-Item -Path (Join-Path $PEDriversFolder '*') -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
}
- else {
- try {
- New-Item -Path $PEDriversFolder -ItemType Directory -Force | Out-Null
- }
- catch {
- WriteLog "Error: Failed to create PEDriversFolder at $PEDriversFolder - continuing may fail when adding drivers."
- }
+ catch {
+ WriteLog "Warning: Failed clearing existing PEDriversFolder contents: $($_.Exception.Message)"
}
- WriteLog "Copying required WinPE drivers from Drivers folder"
- Copy-Drivers -Path $DriversFolder -Output $PEDriversFolder
}
else {
- WriteLog "Copying PE drivers from PEDrivers folder"
+ try {
+ New-Item -Path $PEDriversFolder -ItemType Directory -Force | Out-Null
+ }
+ catch {
+ WriteLog "Error: Failed to create PEDriversFolder at $PEDriversFolder - continuing may fail when adding drivers."
+ }
}
-
- WriteLog "Adding drivers to WinPE media"
- try {
- $WinPEMount = "$WinPEFFUPath\Mount"
-
- # Inject drivers using deep SUBST mapping (reuse one drive letter and loop each INF folder)
- Invoke-DismDriverInjectionWithSubstLoop -ImagePath $WinPEMount -DriverRoot $PEDriversFolder
- }
- catch {
- WriteLog 'Some drivers failed to be added. This can be expected. Continuing.'
- }
- WriteLog "Adding drivers complete"
+ WriteLog "Copying required WinPE drivers from Drivers folder"
+ Copy-Drivers -Path $DriversFolder -Output $PEDriversFolder
}
- # $WinPEISOName = 'WinPE_FFU_Deploy.iso'
- $WinPEISOFile = $DeployISO
+ else {
+ WriteLog "Copying PE drivers from PEDrivers folder"
+ }
+
+ WriteLog "Adding drivers to WinPE media"
+ try {
+ $WinPEMount = "$WinPEFFUPath\Mount"
- # $Deploy = $false
+ # Inject drivers using deep SUBST mapping (reuse one drive letter and loop each INF folder)
+ Invoke-DismDriverInjectionWithSubstLoop -ImagePath $WinPEMount -DriverRoot $PEDriversFolder
+ }
+ catch {
+ WriteLog 'Some drivers failed to be added. This can be expected. Continuing.'
+ }
+ WriteLog "Adding drivers complete"
}
+ $WinPEISOFile = $DeployISO
WriteLog 'Dismounting WinPE media'
Dismount-WindowsImage -Path "$WinPEFFUPath\mount" -Save | Out-Null
WriteLog 'Dismount complete'
@@ -3503,21 +3398,10 @@ function New-PEMedia {
WriteLog "Creating WinPE ISO at $WinPEISOFile"
# & "$OSCDIMG" -m -o -u2 -udfver102 -bootdata:2`#p0,e,b$OSCDIMGPath\etfsboot.com`#pEF,e,b$OSCDIMGPath\Efisys_noprompt.bin $WinPEFFUPath\media $FFUDevelopmentPath\$WinPEISOName | Out-null
if ($WindowsArch -eq 'x64') {
- if ($Capture) {
- $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
- }
- if ($Deploy) {
- $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
- }
+ $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
}
elseif ($WindowsArch -eq 'arm64') {
- if ($Capture) {
- $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
- }
- if ($Deploy) {
- $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
- }
-
+ $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
}
Invoke-Process $OSCDIMG $OSCDIMGArgs | Out-Null
WriteLog "ISO created successfully"
@@ -3525,7 +3409,7 @@ function New-PEMedia {
Remove-Item -Path "$WinPEFFUPath" -Recurse -Force
WriteLog 'Cleanup complete'
# Deferred cleanup of preserved driver model folders (only after WinPE Deploy media is created)
- if ($UseDriversAsPEDrivers -and $CompressDownloadedDriversToWim -and $Deploy -and $CopyPEDrivers) {
+ if ($UseDriversAsPEDrivers -and $CompressDownloadedDriversToWim -and $CopyPEDrivers) {
WriteLog "Beginning deferred cleanup of preserved driver model folders (UseDriversAsPEDrivers + compression scenario)."
$removedCount = 0
$skippedCount = 0
@@ -3616,6 +3500,40 @@ function Optimize-FFUCaptureDrive {
}
}
+function Get-CaptureVhdContext {
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$VhdxPath
+ )
+
+ WriteLog 'Resolving VHDX context for host-side FFU capture'
+
+ $vhdInfo = Get-VHD -Path $VhdxPath
+ if ($vhdInfo.Attached) {
+ WriteLog 'VHDX is already mounted for capture'
+ $captureDisk = Get-Disk -Number $vhdInfo.DiskNumber
+ }
+ else {
+ WriteLog 'Mounting VHDX for capture'
+ $captureDisk = Mount-VHD -Path $VhdxPath -Passthru | Get-Disk
+ }
+
+ $captureOsPartition = $captureDisk | Get-Partition | Where-Object { $_.GptType -eq '{ebd0a0a2-b9e5-4433-87c0-68b6b72699c7}' } | Select-Object -First 1
+ if ($null -eq $captureOsPartition) {
+ throw 'Unable to resolve Windows partition for FFU capture.'
+ }
+ if ([string]::IsNullOrWhiteSpace($captureOsPartition.DriveLetter)) {
+ throw 'Unable to resolve Windows partition drive letter for FFU capture.'
+ }
+
+ return [pscustomobject]@{
+ Disk = $captureDisk
+ OsPartition = $captureOsPartition
+ OsPartitionDriveLetter = $captureOsPartition.DriveLetter
+ WindowsPartition = "$($captureOsPartition.DriveLetter):\"
+ }
+}
+
function Get-ShortenedWindowsSKU {
param (
[string]$WindowsSKU
@@ -3703,89 +3621,53 @@ function New-FFUFileName {
}
function New-FFU {
- param (
- [Parameter(Mandatory = $false)]
- [string]$VMName
- )
- #If $InstallApps = $true, configure the VM
- If ($InstallApps) {
- WriteLog 'Creating FFU from VM'
- WriteLog "Setting $CaptureISO as first boot device"
- $VMDVDDrive = Get-VMDvdDrive -VMName $VMName
- Set-VMFirmware -VMName $VMName -FirstBootDevice $VMDVDDrive
- Set-VMDvdDrive -VMName $VMName -Path $CaptureISO
- $VMSwitch = Get-VMSwitch -name $VMSwitchName
- WriteLog "Setting $($VMSwitch.Name) as VMSwitch"
- get-vm $VMName | Get-VMNetworkAdapter | Connect-VMNetworkAdapter -SwitchName $VMSwitch.Name
- WriteLog "Configuring VM complete"
+ $captureContext = Get-CaptureVhdContext -VhdxPath $VHDXPath
+ $captureDisk = $captureContext.Disk
+ $osPartitionDriveLetter = $captureContext.OsPartitionDriveLetter
+ $WindowsPartition = $captureContext.WindowsPartition
- #Start VM
- Set-Progress -Percentage 68 -Message "Capturing FFU from VM..."
- WriteLog "Starting VM"
- Start-VM -Name $VMName
-
- # Wait for the VM to turn off
- do {
- $FFUVM = Get-VM -Name $VMName
- Start-Sleep -Seconds 5
- } while ($FFUVM.State -ne 'Off')
- WriteLog "VM Shutdown"
- # Check for .ffu files in the FFUDevelopment folder
- WriteLog "Checking for FFU Files"
- $FFUFiles = Get-ChildItem -Path $FFUCaptureLocation -Filter "*.ffu" -File
-
- # If there's more than one .ffu file, get the most recent and store its path in $FFUFile
- if ($FFUFiles.Count -gt 0) {
- WriteLog 'Getting the most recent FFU file'
- $FFUFile = ($FFUFiles | Sort-Object -Property LastWriteTime -Descending | Select-Object -First 1).FullName
- WriteLog "Most recent .ffu file: $FFUFile"
- }
- else {
- WriteLog "No .ffu files found in $FFUCaptureLocation"
- throw $_
- }
- }
- elseif (-not $InstallApps -and (-not $AllowVHDXCaching)) {
- #Get Windows Version Information from the VHDX
- $winverinfo = Get-WindowsVersionInfo
- WriteLog 'Creating FFU File Name'
- if ($CustomFFUNameTemplate) {
- $FFUFileName = New-FFUFileName
- }
- else {
- $FFUFileName = "$($winverinfo.Name)`_$($winverinfo.DisplayVersion)`_$($shortenedWindowsSKU)`_$($winverinfo.BuildDate).ffu"
- }
- WriteLog "FFU file name: $FFUFileName"
- $FFUFile = "$FFUCaptureLocation\$FFUFileName"
- #Capture the FFU
+ try {
Set-Progress -Percentage 68 -Message "Capturing FFU from VHDX..."
- WriteLog 'Capturing FFU'
- Invoke-Process cmd "/c ""$DandIEnv"" && dism /Capture-FFU /ImageFile:$FFUFile /CaptureDrive:\\.\PhysicalDrive$($vhdxDisk.DiskNumber) /Name:$($winverinfo.Name)$($winverinfo.DisplayVersion)$($shortenedWindowsSKU) /Compress:Default" | Out-Null
- WriteLog 'FFU Capture complete'
- Dismount-ScratchVhdx -VhdxPath $VHDXPath
- }
- elseif (-not $InstallApps -and $AllowVHDXCaching) {
- # Make $FFUFileName based on values in the config.json file
- WriteLog 'Creating FFU File Name'
- if ($CustomFFUNameTemplate) {
- $FFUFileName = New-FFUFileName
- }
- else {
- $BuildDate = Get-Date -UFormat %b%Y
- # Get Windows Information to make the FFU file name from the cachedVHDXInfo file
- if ($installationType -eq 'Client') {
- $FFUFileName = "Win$($cachedVHDXInfo.WindowsRelease)`_$($cachedVHDXInfo.WindowsVersion)`_$($shortenedWindowsSKU)`_$BuildDate.ffu"
+
+ if ($InstallApps -or (-not $AllowVHDXCaching)) {
+ # Resolve live Windows metadata from the mounted VHDX when the image was customized in a VM.
+ $winverinfo = Get-WindowsVersionInfo
+ WriteLog 'Creating FFU File Name'
+ if ($CustomFFUNameTemplate) {
+ $FFUFileName = New-FFUFileName
}
else {
- $FFUFileName = "Server$($cachedVHDXInfo.WindowsRelease)`_$($cachedVHDXInfo.WindowsVersion)`_$($shortenedWindowsSKU)`_$BuildDate.ffu"
- }
+ $FFUFileName = "$($winverinfo.Name)`_$($winverinfo.DisplayVersion)`_$($shortenedWindowsSKU)`_$($winverinfo.BuildDate).ffu"
+ }
+ WriteLog "FFU file name: $FFUFileName"
+ $FFUFile = "$FFUCaptureLocation\$FFUFileName"
+ WriteLog 'Capturing FFU from mounted VHDX on host'
+ Invoke-Process cmd "/c ""$DandIEnv"" && dism /Capture-FFU /ImageFile:$FFUFile /CaptureDrive:\\.\PhysicalDrive$($captureDisk.DiskNumber) /Name:$($winverinfo.Name)$($winverinfo.DisplayVersion)$($shortenedWindowsSKU) /Compress:Default" | Out-Null
}
- WriteLog "FFU file name: $FFUFileName"
- $FFUFile = "$FFUCaptureLocation\$FFUFileName"
- #Capture the FFU
- WriteLog 'Capturing FFU'
- Invoke-Process cmd "/c ""$DandIEnv"" && dism /Capture-FFU /ImageFile:$FFUFile /CaptureDrive:\\.\PhysicalDrive$($vhdxDisk.DiskNumber) /Name:$($cachedVHDXInfo.WindowsRelease)$($cachedVHDXInfo.WindowsVersion)$($shortenedWindowsSKU) /Compress:Default" | Out-Null
+ else {
+ # Use cached Windows metadata only when the VHDX contents were reused without VM customization.
+ WriteLog 'Creating FFU File Name'
+ if ($CustomFFUNameTemplate) {
+ $FFUFileName = New-FFUFileName
+ }
+ else {
+ $BuildDate = Get-Date -UFormat %b%Y
+ if ($installationType -eq 'Client') {
+ $FFUFileName = "Win$($cachedVHDXInfo.WindowsRelease)`_$($cachedVHDXInfo.WindowsVersion)`_$($shortenedWindowsSKU)`_$BuildDate.ffu"
+ }
+ else {
+ $FFUFileName = "Server$($cachedVHDXInfo.WindowsRelease)`_$($cachedVHDXInfo.WindowsVersion)`_$($shortenedWindowsSKU)`_$BuildDate.ffu"
+ }
+ }
+ WriteLog "FFU file name: $FFUFileName"
+ $FFUFile = "$FFUCaptureLocation\$FFUFileName"
+ WriteLog 'Capturing FFU from mounted VHDX on host'
+ Invoke-Process cmd "/c ""$DandIEnv"" && dism /Capture-FFU /ImageFile:$FFUFile /CaptureDrive:\\.\PhysicalDrive$($captureDisk.DiskNumber) /Name:$($cachedVHDXInfo.WindowsRelease)$($cachedVHDXInfo.WindowsVersion)$($shortenedWindowsSKU) /Compress:Default" | Out-Null
+ }
+
WriteLog 'FFU Capture complete'
+ }
+ finally {
Dismount-ScratchVhdx -VhdxPath $VHDXPath
}
@@ -3893,15 +3775,6 @@ function Remove-FFUVM {
Invoke-Process cmd "/c mountvol /r" | Out-Null
WriteLog 'Removal complete'
}
-Function Remove-FFUUserShare {
- WriteLog "Removing $ShareName"
- Remove-SmbShare -Name $ShareName -Force | Out-null
- WriteLog 'Removal complete'
- WriteLog "Removing $Username"
- Remove-LocalUser -Name $Username | Out-Null
- WriteLog 'Removal complete'
-}
-
Function Get-WindowsVersionInfo {
#This sleep prevents CBS/CSI corruption which causes issues with Windows update after deployment. Capturing from very fast disks (NVME) can cause the capture to happen faster than Windows is ready for. This seems to affect VHDX-only captures, not VM captures.
WriteLog 'Sleep 60 seconds before opening registry to grab Windows version info '
@@ -4441,16 +4314,8 @@ function Get-FFUEnvironment {
Invoke-Process reg "unload HKLM\FFU" | Out-Null
}
- #Remove FFU User and Share
- $UserExists = Get-LocalUser -Name $UserName -ErrorAction SilentlyContinue
- if ($UserExists) {
- WriteLog "Removing FFU User and Share"
- Remove-FFUUserShare
- WriteLog 'Removal complete'
- }
-
#Run shared cleanup to avoid duplicated logic
- Invoke-FFUPostBuildCleanup -RootPath $FFUDevelopmentPath -AppsPath $AppsPath -DriversPath $DriversFolder -FFUCapturePath $FFUCaptureLocation -CaptureISOPath $CaptureISO -DeployISOPath $DeployISO -AppsISOPath $AppsISO -RemoveCaptureISO:$CleanupCaptureISO -RemoveDeployISO:$CleanupDeployISO -RemoveAppsISO:$CleanupAppsISO -RemoveDrivers:$CleanupDrivers -RemoveFFU:$RemoveFFU -RemoveApps:$RemoveApps -RemoveUpdates:$RemoveUpdates -RemoveDownloadedESD:$RemoveDownloadedESD -KBPath:$KBPath
+ Invoke-FFUPostBuildCleanup -RootPath $FFUDevelopmentPath -AppsPath $AppsPath -DriversPath $DriversFolder -FFUCapturePath $FFUCaptureLocation -DeployISOPath $DeployISO -AppsISOPath $AppsISO -RemoveDeployISO:$CleanupDeployISO -RemoveAppsISO:$CleanupAppsISO -RemoveDrivers:$CleanupDrivers -RemoveFFU:$RemoveFFU -RemoveApps:$RemoveApps -RemoveUpdates:$RemoveUpdates -RemoveDownloadedESD:$RemoveDownloadedESD -KBPath:$KBPath
# Remove existing Apps.iso
if (Test-Path -Path $AppsISO) {
@@ -5576,14 +5441,6 @@ if ($CopyUnattend) {
WriteLog 'Unattend validation complete'
}
-# If InstallApps is true, we need capture media.
-if ($InstallApps) {
- if (-not $CreateCaptureMedia) {
- WriteLog "InstallApps is true, but CreateCaptureMedia is false. Forcing to true to allow for VM capture to FFU."
- $CreateCaptureMedia = $true
- }
-}
-
#Override $InstallApps value if using ESD to build FFU. This is due to a strange issue where building the FFU
#from vhdx doesn't work (you get an older style OOBE screen and get stuck in an OOBE reboot loop when hitting next).
#This behavior doesn't happen with WIM files.
@@ -5595,45 +5452,14 @@ if ($InstallApps) {
if (($InstallOffice -eq $true) -and ($InstallApps -eq $false)) {
throw "If variable InstallOffice is set to `$true, InstallApps must also be set to `$true."
}
-if (($InstallApps -and ($VMSwitchName -eq ''))) {
- throw "If variable InstallApps is set to `$true, VMSwitchName must also be set to capture the FFU. Please set -VMSwitchName and try again."
-}
-
-if (($InstallApps -and ($VMHostIPAddress -eq ''))) {
- throw "If variable InstallApps is set to `$true, VMHostIPAddress must also be set to capture the FFU. Please set -VMHostIPAddress and try again."
-}
-
-if (($VMHostIPAddress) -and ($VMSwitchName)) {
- WriteLog "Validating -VMSwitchName $VMSwitchName and -VMHostIPAddress $VMHostIPAddress"
+if ($VMSwitchName) {
+ WriteLog "Validating -VMSwitchName $VMSwitchName"
#Check $VMSwitchName by using Get-VMSwitch
$VMSwitch = Get-VMSwitch -Name $VMSwitchName -ErrorAction SilentlyContinue
if (-not $VMSwitch) {
throw "-VMSwitchName $VMSwitchName not found. Please check the -VMSwitchName parameter and try again."
}
- #Find the IP address of $VMSwitch and check if it matches $VMHostIPAddress
- $interfaceAlias = "vEthernet ($VMSwitchName)"
- $VMSwitchIPAddress = (Get-NetIPAddress -InterfaceAlias $interfaceAlias -AddressFamily 'IPv4' -ErrorAction SilentlyContinue).IPAddress
- if (-not $VMSwitchIPAddress) {
- throw "IP address for -VMSwitchName $VMSwitchName not found. Please check the -VMSwitchName parameter and try again."
- }
- if ($VMSwitchIPAddress -ne $VMHostIPAddress) {
- try {
- # Bypass the check for systems that could have a Hyper-V NAT switch
- $null = Get-NetNat -ErrorAction Stop
- $NetNat = @(Get-NetNat -ErrorAction Stop)
- }
- catch {
- throw "IP address for -VMSwitchName $VMSwitchName is $VMSwitchIPAddress, which does not match the -VMHostIPAddress $VMHostIPAddress. Please check the -VMHostIPAddress parameter and try again."
- }
- if ($NetNat.Count -gt 0) {
- WriteLog "IP address for -VMSwitchName $VMSwitchName is $VMSwitchIPAddress, which does not match the -VMHostIPAddress $VMHostIPAddress!"
- WriteLog "NAT setup detected, remember to configure NATing if the FFU image can't be captured to the network share on the host."
- }
- else {
- throw "IP address for -VMSwitchName $VMSwitchName is $VMSwitchIPAddress, which does not match the -VMHostIPAddress $VMHostIPAddress. Please check the -VMHostIPAddress parameter and try again."
- }
- }
- WriteLog '-VMSwitchName and -VMHostIPAddress validation complete'
+ WriteLog '-VMSwitchName validation complete'
}
if (-not ($ISOPath) -and ($OptionalFeatures -like '*netfx3*')) {
@@ -7455,32 +7281,6 @@ if ($InstallApps) {
throw $_
}
- #Create ffu user and share to capture FFU to
- try {
- Set-CaptureFFU
- }
- catch {
- Write-Host 'Set-CaptureFFU function failed'
- WriteLog "Set-CaptureFFU function failed with error $_"
- Remove-FFUVM -VMName $VMName
- throw $_
-
- }
- If ($CreateCaptureMedia) {
- #Create Capture Media
- try {
- Set-Progress -Percentage 45 -Message "Creating WinPE capture media..."
- #This should happen while the FFUVM is building
- New-PEMedia -Capture $true
- }
- catch {
- Write-Host 'Creating capture media failed'
- WriteLog "Creating capture media failed with error $_"
- Remove-FFUVM -VMName $VMName
- throw $_
-
- }
- }
}
#Capture FFU file
try {
@@ -7490,6 +7290,10 @@ try {
New-Item -Path $FFUCaptureLocation -ItemType Directory -Force
WriteLog "Successfully created FFU capture location at $FFUCaptureLocation"
}
+ #Shorten Windows SKU for use in FFU file name to remove spaces and long names
+ WriteLog "Shortening Windows SKU: $WindowsSKU for FFU file name"
+ $shortenedWindowsSKU = Get-ShortenedWindowsSKU -WindowsSKU $WindowsSKU
+ WriteLog "Shortened Windows SKU: $shortenedWindowsSKU"
#Check if VM is done provisioning
If ($InstallApps) {
Set-Progress -Percentage 50 -Message "Installing applications in VM; please wait for VM to shut down..."
@@ -7502,13 +7306,9 @@ try {
Set-Progress -Percentage 65 -Message "Optimizing VHDX before capture..."
Optimize-FFUCaptureDrive -VhdxPath $VHDXPath
#Capture FFU file
- New-FFU $FFUVM.Name
+ New-FFU
}
else {
- #Shorten Windows SKU for use in FFU file name to remove spaces and long names
- WriteLog "Shortening Windows SKU: $WindowsSKU for FFU file name"
- $shortenedWindowsSKU = Get-ShortenedWindowsSKU -WindowsSKU $WindowsSKU
- WriteLog "Shortened Windows SKU: $shortenedWindowsSKU"
#Create FFU file
New-FFU
}
@@ -7526,18 +7326,6 @@ Catch {
throw $_
}
-#Clean up ffu_user and Share and clean up apps
-If ($InstallApps) {
- try {
- Remove-FFUUserShare
- }
- catch {
- Write-Host 'Cleaning up FFU User and/or share failed'
- WriteLog "Cleaning up FFU User and/or share failed with error $_"
- Remove-FFUVM -VMName $VMName
- throw $_
- }
-}
#Clean up VM or VHDX
try {
Remove-FFUVM
@@ -7554,7 +7342,7 @@ catch {
If ($CreateDeploymentMedia) {
Set-Progress -Percentage 91 -Message "Creating deployment media..."
try {
- New-PEMedia -Deploy $true
+ New-PEMedia
}
catch {
Write-Host 'Creating deployment media failed'
@@ -7611,7 +7399,7 @@ If ($BuildUSBDrive) {
Set-Progress -Percentage 99 -Message "Finalizing and cleaning up..."
# Delegated post-build cleanup to common module
-Invoke-FFUPostBuildCleanup -RootPath $FFUDevelopmentPath -AppsPath $AppsPath -DriversPath $DriversFolder -FFUCapturePath $FFUCaptureLocation -CaptureISOPath $CaptureISO -DeployISOPath $DeployISO -AppsISOPath $AppsISO -RemoveCaptureISO:$CleanupCaptureISO -RemoveDeployISO:$CleanupDeployISO -RemoveAppsISO:$CleanupAppsISO -RemoveDrivers:$CleanupDrivers -RemoveFFU:$RemoveFFU -RemoveApps:$RemoveApps -RemoveUpdates:$RemoveUpdates -RemoveDownloadedESD:$RemoveDownloadedESD -KBPath:$KBPath
+Invoke-FFUPostBuildCleanup -RootPath $FFUDevelopmentPath -AppsPath $AppsPath -DriversPath $DriversFolder -FFUCapturePath $FFUCaptureLocation -DeployISOPath $DeployISO -AppsISOPath $AppsISO -RemoveDeployISO:$CleanupDeployISO -RemoveAppsISO:$CleanupAppsISO -RemoveDrivers:$CleanupDrivers -RemoveFFU:$RemoveFFU -RemoveApps:$RemoveApps -RemoveUpdates:$RemoveUpdates -RemoveDownloadedESD:$RemoveDownloadedESD -KBPath:$KBPath
# Remove WinGetWin32Apps.json so it is always rebuilt next run
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 4c0c842..f645932 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -320,9 +320,6 @@
-
-
-
@@ -823,13 +820,13 @@
-
+
-
+
-
+
-
+
@@ -874,16 +871,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -906,7 +893,6 @@
-
@@ -983,7 +969,6 @@
-
diff --git a/FFUDevelopment/Create-PEMedia.ps1 b/FFUDevelopment/Create-PEMedia.ps1
index 2b641af..3ebbeee 100644
--- a/FFUDevelopment/Create-PEMedia.ps1
+++ b/FFUDevelopment/Create-PEMedia.ps1
@@ -3,11 +3,8 @@ param (
[string]$adkPath = 'C:\Program Files (x86)\Windows Kits\10\',
[string]$WindowsArch = 'x64',
[bool]$CopyPEDrivers = $false,
- [string]$CaptureISO = "$PSScriptRoot\WinPE_FFU_Capture_x64.iso",
[string]$DeployISO = "$PSScriptRoot\WinPE_FFU_Deploy_x64.iso",
- [string]$LogFile = "$PSScriptRoot\Create-PEMedia.log",
- [bool]$Capture,
- [bool]$Deploy = $true
+ [string]$LogFile = "$PSScriptRoot\Create-PEMedia.log"
)
function WriteLog($LogText) {
@@ -77,12 +74,7 @@ function Invoke-Process {
}
function New-PEMedia {
- param (
- [Parameter()]
- [bool]$Capture,
- [Parameter()]
- [bool]$Deploy
- )
+ param ()
#Need to use the Demployment and Imaging tools environment to create winPE media
$DandIEnv = "$adkPath`Assessment and Deployment Kit\Deployment Tools\DandISetEnv.bat"
$WinPEFFUPath = "$FFUDevelopmentPath\WinPE"
@@ -135,36 +127,21 @@ function New-PEMedia {
Add-WindowsPackage -Path "$WinPEFFUPath\mount" -PackagePath $PackagePath | Out-Null
WriteLog "Adding package complete"
}
- If ($Capture) {
- WriteLog "Copying $FFUDevelopmentPath\WinPECaptureFFUFiles\* to WinPE capture media"
- Copy-Item -Path "$FFUDevelopmentPath\WinPECaptureFFUFiles\*" -Destination "$WinPEFFUPath\mount" -Recurse -Force | out-null
- WriteLog "Copy complete"
- #Remove Bootfix.bin - for BIOS systems, shouldn't be needed, but doesn't hurt to remove for our purposes
- #Remove-Item -Path "$WinPEFFUPath\media\boot\bootfix.bin" -Force | Out-null
- # $WinPEISOName = 'WinPE_FFU_Capture.iso'
- $WinPEISOFile = $CaptureISO
- # $Capture = $false
- }
- If ($Deploy) {
- WriteLog "Copying $FFUDevelopmentPath\WinPEDeployFFUFiles\* to WinPE deploy media"
- Copy-Item -Path "$FFUDevelopmentPath\WinPEDeployFFUFiles\*" -Destination "$WinPEFFUPath\mount" -Recurse -Force | Out-Null
- WriteLog 'Copy complete'
- #If $CopyPEDrivers = $true, add drivers to WinPE media using dism
- if ($CopyPEDrivers) {
- WriteLog "Adding drivers to WinPE media"
- try {
- Add-WindowsDriver -Path "$WinPEFFUPath\Mount" -Driver "$FFUDevelopmentPath\PEDrivers" -Recurse -ErrorAction SilentlyContinue | Out-null
- }
- catch {
- WriteLog 'Some drivers failed to be added to the FFU. This can be expected. Continuing.'
- }
- WriteLog "Adding drivers complete"
+ WriteLog "Copying $FFUDevelopmentPath\WinPEDeployFFUFiles\* to WinPE deploy media"
+ Copy-Item -Path "$FFUDevelopmentPath\WinPEDeployFFUFiles\*" -Destination "$WinPEFFUPath\mount" -Recurse -Force | Out-Null
+ WriteLog 'Copy complete'
+ #If $CopyPEDrivers = $true, add drivers to WinPE media using dism
+ if ($CopyPEDrivers) {
+ WriteLog "Adding drivers to WinPE media"
+ try {
+ Add-WindowsDriver -Path "$WinPEFFUPath\Mount" -Driver "$FFUDevelopmentPath\PEDrivers" -Recurse -ErrorAction SilentlyContinue | Out-null
}
- # $WinPEISOName = 'WinPE_FFU_Deploy.iso'
- $WinPEISOFile = $DeployISO
-
- # $Deploy = $false
+ catch {
+ WriteLog 'Some drivers failed to be added to the FFU. This can be expected. Continuing.'
+ }
+ WriteLog "Adding drivers complete"
}
+ $WinPEISOFile = $DeployISO
WriteLog 'Dismounting WinPE media'
Dismount-WindowsImage -Path "$WinPEFFUPath\mount" -Save | Out-Null
WriteLog 'Dismount complete'
@@ -179,21 +156,10 @@ function New-PEMedia {
WriteLog "Creating WinPE ISO at $WinPEISOFile"
# & "$OSCDIMG" -m -o -u2 -udfver102 -bootdata:2`#p0,e,b$OSCDIMGPath\etfsboot.com`#pEF,e,b$OSCDIMGPath\Efisys_noprompt.bin $WinPEFFUPath\media $FFUDevelopmentPath\$WinPEISOName | Out-null
if($WindowsArch -eq 'x64'){
- if($Capture){
- $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
- }
- if($Deploy){
- $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
- }
+ $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:2`#p0,e,b`"$OSCDIMGPath\etfsboot.com`"`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
}
elseif($WindowsArch -eq 'arm64'){
- if($Capture){
- $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys_noprompt.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
- }
- if($Deploy){
- $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
- }
-
+ $OSCDIMGArgs = "-m -o -u2 -udfver102 -bootdata:1`#pEF,e,b`"$OSCDIMGPath\Efisys.bin`" `"$WinPEFFUPath\media`" `"$WinPEISOFile`""
}
Invoke-Process $OSCDIMG $OSCDIMGArgs
WriteLog "ISO created successfully"
@@ -201,9 +167,4 @@ function New-PEMedia {
Remove-Item -Path "$WinPEFFUPath" -Recurse -Force
WriteLog 'Cleanup complete'
}
-if($Capture){
- New-PEMedia -Capture $Capture
-}
-if($Deploy){
- New-PEMedia -Deploy $Deploy
-}
\ No newline at end of file
+New-PEMedia
\ No newline at end of file
diff --git a/FFUDevelopment/Docs/BuildFFUVM_flowchart.md b/FFUDevelopment/Docs/BuildFFUVM_flowchart.md
index e4d1691..6fd44fd 100644
--- a/FFUDevelopment/Docs/BuildFFUVM_flowchart.md
+++ b/FFUDevelopment/Docs/BuildFFUVM_flowchart.md
@@ -85,12 +85,10 @@ graph TD
subgraph "VM-Based Capture (-InstallApps)"
direction LR
BB[Create Hyper-V VM from VHDX];
- BB --> BC["Create WinPE Capture Media iso"];
- BC --> BD[Configure network share for capture];
- BD --> BE["Start VM: Boots to Audit Mode"];
+ BB --> BE["Start VM: Boots to Audit Mode"];
BE --> BF[Orchestrator runs: Installs apps, syspreps, shuts down];
- BF --> BG[VM reboots from Capture Media];
- BG --> BH["CaptureFFU.ps1 runs, saves FFU to share, shuts down"];
+ BF --> BG[Host optimizes and remounts VHDX];
+ BG --> BH["DISM captures FFU directly from host-mounted VHDX"];
end
subgraph "Direct VHDX Capture"
diff --git a/FFUDevelopment/FFU.Common/FFU.Common.Cleanup.psm1 b/FFUDevelopment/FFU.Common/FFU.Common.Cleanup.psm1
index 2a28a14..9afea0b 100644
--- a/FFUDevelopment/FFU.Common/FFU.Common.Cleanup.psm1
+++ b/FFUDevelopment/FFU.Common/FFU.Common.Cleanup.psm1
@@ -6,11 +6,9 @@ function Invoke-FFUPostBuildCleanup {
[string]$AppsPath,
[string]$DriversPath,
[string]$FFUCapturePath,
- [string]$CaptureISOPath,
[string]$DeployISOPath,
[string]$AppsISOPath,
[string]$KBPath,
- [bool]$RemoveCaptureISO = $false,
[bool]$RemoveDeployISO = $false,
[bool]$RemoveAppsISO = $false,
[bool]$RemoveDrivers = $false,
@@ -22,13 +20,9 @@ function Invoke-FFUPostBuildCleanup {
$originalProgressPreference = $ProgressPreference
$ProgressPreference = 'SilentlyContinue'
try {
- WriteLog "CommonCleanup: Starting cleanup (CaptureISO=$RemoveCaptureISO DeployISO=$RemoveDeployISO AppsISO=$RemoveAppsISO Drivers=$RemoveDrivers FFU=$RemoveFFU Apps=$RemoveApps Updates=$RemoveUpdates RemoveDownloadedESD=$RemoveDownloadedESD KBPath=$KBPath)."
+ WriteLog "CommonCleanup: Starting cleanup (DeployISO=$RemoveDeployISO AppsISO=$RemoveAppsISO Drivers=$RemoveDrivers FFU=$RemoveFFU Apps=$RemoveApps Updates=$RemoveUpdates RemoveDownloadedESD=$RemoveDownloadedESD KBPath=$KBPath)."
# Primary ISO paths (new naming/location)
- if ($RemoveCaptureISO -and -not [string]::IsNullOrWhiteSpace($CaptureISOPath) -and (Test-Path -LiteralPath $CaptureISOPath)) {
- WriteLog "CommonCleanup: Removing $CaptureISOPath"
- try { Remove-Item -LiteralPath $CaptureISOPath -Force -ErrorAction Stop } catch { WriteLog "CommonCleanup: Failed removing $CaptureISOPath : $($_.Exception.Message)" }
- }
if ($RemoveDeployISO -and -not [string]::IsNullOrWhiteSpace($DeployISOPath) -and (Test-Path -LiteralPath $DeployISOPath)) {
WriteLog "CommonCleanup: Removing $DeployISOPath"
try { Remove-Item -LiteralPath $DeployISOPath -Force -ErrorAction Stop } catch { WriteLog "CommonCleanup: Failed removing $DeployISOPath : $($_.Exception.Message)" }
@@ -39,11 +33,6 @@ function Invoke-FFUPostBuildCleanup {
}
# Legacy / root-level WinPE ISOs (pattern-based)
- if ($RemoveCaptureISO) {
- Get-ChildItem -LiteralPath $RootPath -Filter 'WinPE_FFU_Capture*.iso' -ErrorAction SilentlyContinue | ForEach-Object {
- try { WriteLog "CommonCleanup: Removing legacy capture ISO $($_.FullName)"; Remove-Item -LiteralPath $_.FullName -Force -ErrorAction Stop } catch { WriteLog "CommonCleanup: Failed removing legacy capture ISO $($_.FullName) : $($_.Exception.Message)" }
- }
- }
if ($RemoveDeployISO) {
Get-ChildItem -LiteralPath $RootPath -Filter 'WinPE_FFU_Deploy*.iso' -ErrorAction SilentlyContinue | ForEach-Object {
try { WriteLog "CommonCleanup: Removing legacy deploy ISO $($_.FullName)"; Remove-Item -LiteralPath $_.FullName -Force -ErrorAction Stop } catch { WriteLog "CommonCleanup: Failed removing legacy deploy ISO $($_.FullName) : $($_.Exception.Message)" }
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index 0ba666f..982b5c5 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -25,7 +25,6 @@ function Get-UIConfig {
else { $null }
BuildUSBDrive = $State.Controls.chkBuildUSBDriveEnable.IsChecked
CleanupAppsISO = $State.Controls.chkCleanupAppsISO.IsChecked
- CleanupCaptureISO = $State.Controls.chkCleanupCaptureISO.IsChecked
CleanupDeployISO = $State.Controls.chkCleanupDeployISO.IsChecked
CleanupDrivers = $State.Controls.chkCleanupDrivers.IsChecked
CompactOS = $State.Controls.chkCompactOS.IsChecked
@@ -38,7 +37,6 @@ function Get-UIConfig {
CopyPPKG = $State.Controls.chkCopyPPKG.IsChecked
CopyUnattend = $State.Controls.chkCopyUnattend.IsChecked
CopyAdditionalFFUFiles = $State.Controls.chkCopyAdditionalFFUFiles.IsChecked
- CreateCaptureMedia = $State.Controls.chkCreateCaptureMedia.IsChecked
CreateDeploymentMedia = $State.Controls.chkCreateDeploymentMedia.IsChecked
InjectUnattend = $State.Controls.chkInjectUnattend.IsChecked
CustomFFUNameTemplate = $State.Controls.txtCustomFFUNameTemplate.Text
@@ -84,7 +82,6 @@ function Get-UIConfig {
RemoveFFU = $State.Controls.chkRemoveFFU.IsChecked
RemoveUpdates = $State.Controls.chkRemoveUpdates.IsChecked
RemoveDownloadedESD = $State.Controls.chkRemoveDownloadedESD.IsChecked
- ShareName = $State.Controls.txtShareName.Text
UpdateADK = $State.Controls.chkUpdateADK.IsChecked
UpdateEdge = $State.Controls.chkUpdateEdge.IsChecked
UpdateLatestCU = $State.Controls.chkUpdateLatestCU.IsChecked
@@ -96,13 +93,11 @@ function Get-UIConfig {
UpdatePreviewCU = $State.Controls.chkUpdatePreviewCU.IsChecked
UserAppListPath = $State.Controls.txtUserAppListPath.Text
USBDriveList = @{}
- Username = $State.Controls.txtUsername.Text
Threads = [int]$State.Controls.txtThreads.Text
BitsPriority = $State.Controls.cmbBitsPriority.SelectedItem
MaxUSBDrives = [int]$State.Controls.txtMaxUSBDrives.Text
ThemeMode = if ($null -ne $State.Controls.cmbThemeMode -and $null -ne $State.Controls.cmbThemeMode.SelectedItem) { $State.Controls.cmbThemeMode.SelectedItem } else { "System" }
Verbose = $State.Controls.chkVerbose.IsChecked
- VMHostIPAddress = $State.Controls.txtVMHostIPAddress.Text
VMLocation = $State.Controls.txtVMLocation.Text
VMSwitchName = if ($State.Controls.cmbVMSwitchName.SelectedItem -eq 'Other') {
$State.Controls.txtCustomVMSwitchName.Text
@@ -414,7 +409,6 @@ function Select-VMSwitchFromConfig {
$State.Controls.txtCustomVMSwitchName.Visibility = 'Visible'
$State.Controls.txtCustomVMSwitchName.Text = $configSwitch
$State.Data.customVMSwitchName = $configSwitch
- $State.Data.customVMHostIP = $ConfigContent.VMHostIPAddress
WriteLog "LoadConfig: VMSwitchName '$configSwitch' not found. Selected 'Other' and populated custom VM Switch Name textbox."
}
}
@@ -442,8 +436,6 @@ function Update-UIFromConfig {
Set-UIValue -ControlName 'txtFFUDevPath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'FFUDevelopmentPath' -State $State
Set-UIValue -ControlName 'txtCustomFFUNameTemplate' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'CustomFFUNameTemplate' -State $State
Set-UIValue -ControlName 'txtFFUCaptureLocation' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'FFUCaptureLocation' -State $State
- Set-UIValue -ControlName 'txtShareName' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'ShareName' -State $State
- Set-UIValue -ControlName 'txtUsername' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'Username' -State $State
Set-UIValue -ControlName 'txtThreads' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'Threads' -State $State
Set-UIValue -ControlName 'cmbBitsPriority' -PropertyName 'SelectedItem' -ConfigObject $ConfigContent -ConfigKey 'BitsPriority' -State $State
Set-UIValue -ControlName 'txtMaxUSBDrives' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'MaxUSBDrives' -State $State
@@ -455,7 +447,6 @@ function Update-UIFromConfig {
Set-UIValue -ControlName 'chkAllowExternalHardDiskMedia' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'AllowExternalHardDiskMedia' -State $State
Set-UIValue -ControlName 'chkPromptExternalHardDiskMedia' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'PromptExternalHardDiskMedia' -State $State
Set-UIValue -ControlName 'chkCopyAdditionalFFUFiles' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CopyAdditionalFFUFiles' -State $State
- Set-UIValue -ControlName 'chkCreateCaptureMedia' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CreateCaptureMedia' -State $State
Set-UIValue -ControlName 'chkCreateDeploymentMedia' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CreateDeploymentMedia' -State $State
Set-UIValue -ControlName 'chkInjectUnattend' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'InjectUnattend' -State $State
Set-UIValue -ControlName 'chkVerbose' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'Verbose' -State $State
@@ -467,7 +458,6 @@ function Update-UIFromConfig {
# Post Build Cleanup group (Build Tab)
Set-UIValue -ControlName 'chkCleanupAppsISO' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CleanupAppsISO' -State $State
- Set-UIValue -ControlName 'chkCleanupCaptureISO' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CleanupCaptureISO' -State $State
Set-UIValue -ControlName 'chkCleanupDeployISO' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CleanupDeployISO' -State $State
Set-UIValue -ControlName 'chkCleanupDrivers' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CleanupDrivers' -State $State
Set-UIValue -ControlName 'chkRemoveFFU' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'RemoveFFU' -State $State
@@ -477,7 +467,6 @@ function Update-UIFromConfig {
# Hyper-V Settings
Select-VMSwitchFromConfig -State $State -ConfigContent $ConfigContent
- Set-UIValue -ControlName 'txtVMHostIPAddress' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'VMHostIPAddress' -State $State
Set-UIValue -ControlName 'txtDiskSize' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'Disksize' -TransformValue { param($val) $val / 1GB } -State $State
Set-UIValue -ControlName 'txtMemory' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'Memory' -TransformValue { param($val) $val / 1GB } -State $State
Set-UIValue -ControlName 'txtProcessors' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'Processors' -State $State
@@ -884,11 +873,10 @@ function Invoke-RestoreDefaults {
$ffuCaptureRaw = Get-PathScalar -value $State.Controls.txtFFUCaptureLocation.Text
$ffuCapturePath = if ([string]::IsNullOrWhiteSpace($ffuCaptureRaw)) { Join-Path $rootPath 'FFU' } else { $ffuCaptureRaw }
- $captureISOPath = Join-Path $rootPath 'WinPECaptureFFUFiles\WinPE-Capture.iso'
$deployISOPath = Join-Path $rootPath 'WinPEDeployFFUFiles\WinPE-Deploy.iso'
$appsISOPath = Join-Path $rootPath 'Apps.iso'
- $msg = "Restore Defaults will:`n`n- Delete generated config and app/driver list JSON files`n- Remove ISO files (Capture, Deploy, Apps) if present`n- Remove Apps/Update/downloaded artifacts`n- Remove driver folder contents (not the folder)`n- Remove FFU files in the capture folder`n`nSample/template files and VM/VHDX cache are NOT removed.`n`nProceed?"
+ $msg = "Restore Defaults will:`n`n- Delete generated config and app/driver list JSON files`n- Remove ISO files (Deploy, Apps) if present`n- Remove Apps/Update/downloaded artifacts`n- Remove driver folder contents (not the folder)`n- Remove FFU files in the capture folder`n`nSample/template files and VM/VHDX cache are NOT removed.`n`nProceed?"
$result = [System.Windows.MessageBox]::Show($msg, "Confirm Restore Defaults", "YesNo", "Warning")
if ($result -ne [System.Windows.MessageBoxResult]::Yes) {
WriteLog "RestoreDefaults: User cancelled."
@@ -924,11 +912,9 @@ function Invoke-RestoreDefaults {
-AppsPath $appsPath `
-DriversPath $driversPath `
-FFUCapturePath $ffuCapturePath `
- -CaptureISOPath $captureISOPath `
-DeployISOPath $deployISOPath `
-AppsISOPath $appsISOPath `
-KBPath (Join-Path $rootPath 'KB') `
- -RemoveCaptureISO:$true `
-RemoveDeployISO:$true `
-RemoveAppsISO:$true `
-RemoveDrivers:$true `
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 3d67c22..ef7c5cb 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -391,30 +391,13 @@ function Register-EventHandlers {
if ([string]::IsNullOrWhiteSpace($localState.Controls.txtCustomVMSwitchName.Text) -and $null -ne $localState.Data.customVMSwitchName) {
$localState.Controls.txtCustomVMSwitchName.Text = $localState.Data.customVMSwitchName
}
- if ($null -ne $localState.Data.customVMHostIP -and -not [string]::IsNullOrWhiteSpace($localState.Data.customVMHostIP)) {
- $localState.Controls.txtVMHostIPAddress.Text = $localState.Data.customVMHostIP
- }
}
else {
$localState.Controls.txtCustomVMSwitchName.Visibility = 'Collapsed'
- if ($null -ne $selectedItem -and $localState.Data.vmSwitchMap.ContainsKey($selectedItem)) {
- $localState.Controls.txtVMHostIPAddress.Text = $localState.Data.vmSwitchMap[$selectedItem]
- }
- else {
- $localState.Controls.txtVMHostIPAddress.Text = '' # Clear IP if not found or key null
- }
}
})
- # Persist custom VM switch name/IP when user edits them while 'Other' is selected
- $State.Controls.txtVMHostIPAddress.Add_LostFocus({
- param($eventSource, $routedEventArgs)
- $window = [System.Windows.Window]::GetWindow($eventSource)
- $localState = $window.Tag
- if ($localState.Controls.cmbVMSwitchName.SelectedItem -eq 'Other') {
- $localState.Data.customVMHostIP = $localState.Controls.txtVMHostIPAddress.Text
- }
- })
+ # Persist custom VM switch name when user edits it while 'Other' is selected
$State.Controls.txtCustomVMSwitchName.Add_LostFocus({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index 94c89b9..c58446d 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -206,20 +206,16 @@ function Initialize-UIControls {
$State.Controls.pbOverallProgress = $window.FindName('progressBar')
$State.Controls.txtOverallStatus = $window.FindName('txtStatus')
$State.Controls.cmbVMSwitchName = $window.FindName('cmbVMSwitchName')
- $State.Controls.txtVMHostIPAddress = $window.FindName('txtVMHostIPAddress')
$State.Controls.txtCustomVMSwitchName = $window.FindName('txtCustomVMSwitchName')
$State.Controls.txtFFUDevPath = $window.FindName('txtFFUDevPath')
$State.Controls.txtCustomFFUNameTemplate = $window.FindName('txtCustomFFUNameTemplate')
$State.Controls.txtFFUCaptureLocation = $window.FindName('txtFFUCaptureLocation')
- $State.Controls.txtShareName = $window.FindName('txtShareName')
- $State.Controls.txtUsername = $window.FindName('txtUsername')
$State.Controls.txtThreads = $window.FindName('txtThreads')
$State.Controls.cmbBitsPriority = $window.FindName('cmbBitsPriority')
$State.Controls.txtMaxUSBDrives = $window.FindName('txtMaxUSBDrives')
$State.Controls.chkCompactOS = $window.FindName('chkCompactOS')
$State.Controls.chkOptimize = $window.FindName('chkOptimize')
$State.Controls.chkAllowVHDXCaching = $window.FindName('chkAllowVHDXCaching')
- $State.Controls.chkCreateCaptureMedia = $window.FindName('chkCreateCaptureMedia')
$State.Controls.chkCreateDeploymentMedia = $window.FindName('chkCreateDeploymentMedia')
$State.Controls.chkInjectUnattend = $window.FindName('chkInjectUnattend')
$State.Controls.chkVerbose = $window.FindName('chkVerbose')
@@ -227,7 +223,6 @@ function Initialize-UIControls {
$State.Controls.chkCopyUnattend = $window.FindName('chkCopyUnattend')
$State.Controls.chkCopyPPKG = $window.FindName('chkCopyPPKG')
$State.Controls.chkCleanupAppsISO = $window.FindName('chkCleanupAppsISO')
- $State.Controls.chkCleanupCaptureISO = $window.FindName('chkCleanupCaptureISO')
$State.Controls.chkCleanupDeployISO = $window.FindName('chkCleanupDeployISO')
$State.Controls.chkCleanupDrivers = $window.FindName('chkCleanupDrivers')
$State.Controls.chkRemoveFFU = $window.FindName('chkRemoveFFU')
@@ -351,18 +346,11 @@ function Initialize-VMSwitchData {
if ($State.Controls.cmbVMSwitchName.Items.Count -gt 1) {
$State.Controls.cmbVMSwitchName.SelectedIndex = 0
$firstSwitch = $State.Controls.cmbVMSwitchName.SelectedItem
- if ($null -ne $firstSwitch -and $State.Data.vmSwitchMap.ContainsKey($firstSwitch)) {
- $State.Controls.txtVMHostIPAddress.Text = $State.Data.vmSwitchMap[$firstSwitch]
- }
- else {
- $State.Controls.txtVMHostIPAddress.Text = $State.Defaults.generalDefaults.VMHostIPAddress # Use default if IP not found or key null
- }
$State.Controls.txtCustomVMSwitchName.Visibility = 'Collapsed'
}
else {
$State.Controls.cmbVMSwitchName.SelectedItem = 'Other'
$State.Controls.txtCustomVMSwitchName.Visibility = 'Visible'
- $State.Controls.txtVMHostIPAddress.Text = $State.Defaults.generalDefaults.VMHostIPAddress # Use default
}
}
@@ -378,8 +366,6 @@ function Initialize-UIDefaults {
$State.Controls.txtFFUDevPath.Text = $State.FFUDevelopmentPath
$State.Controls.txtCustomFFUNameTemplate.Text = $State.Defaults.generalDefaults.CustomFFUNameTemplate
$State.Controls.txtFFUCaptureLocation.Text = $State.Defaults.generalDefaults.FFUCaptureLocation
- $State.Controls.txtShareName.Text = $State.Defaults.generalDefaults.ShareName
- $State.Controls.txtUsername.Text = $State.Defaults.generalDefaults.Username
$State.Controls.txtThreads.Text = $State.Defaults.generalDefaults.Threads
$State.Controls.cmbBitsPriority.SelectedItem = $State.Defaults.generalDefaults.BitsPriority
$State.Controls.txtMaxUSBDrives.Text = $State.Defaults.generalDefaults.MaxUSBDrives
@@ -389,7 +375,6 @@ function Initialize-UIDefaults {
$State.Controls.chkOptimize.IsChecked = $State.Defaults.generalDefaults.Optimize
$State.Controls.chkAllowVHDXCaching.IsChecked = $State.Defaults.generalDefaults.AllowVHDXCaching
$State.Controls.chkInjectUnattend.IsChecked = $State.Defaults.generalDefaults.InjectUnattend
- $State.Controls.chkCreateCaptureMedia.IsChecked = $State.Defaults.generalDefaults.CreateCaptureMedia
$State.Controls.chkCreateDeploymentMedia.IsChecked = $State.Defaults.generalDefaults.CreateDeploymentMedia
$State.Controls.chkAllowExternalHardDiskMedia.IsChecked = $State.Defaults.generalDefaults.AllowExternalHardDiskMedia
$State.Controls.chkPromptExternalHardDiskMedia.IsChecked = $State.Defaults.generalDefaults.PromptExternalHardDiskMedia
@@ -398,7 +383,6 @@ function Initialize-UIDefaults {
$State.Controls.chkCopyUnattend.IsChecked = $State.Defaults.generalDefaults.CopyUnattend
$State.Controls.chkCopyPPKG.IsChecked = $State.Defaults.generalDefaults.CopyPPKG
$State.Controls.chkCleanupAppsISO.IsChecked = $State.Defaults.generalDefaults.CleanupAppsISO
- $State.Controls.chkCleanupCaptureISO.IsChecked = $State.Defaults.generalDefaults.CleanupCaptureISO
$State.Controls.chkCleanupDeployISO.IsChecked = $State.Defaults.generalDefaults.CleanupDeployISO
$State.Controls.chkCleanupDrivers.IsChecked = $State.Defaults.generalDefaults.CleanupDrivers
$State.Controls.chkRemoveFFU.IsChecked = $State.Defaults.generalDefaults.RemoveFFU
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
index 8da5c59..4c1ecbc 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
@@ -115,8 +115,6 @@ function Get-GeneralDefaults {
# Build Tab Defaults
CustomFFUNameTemplate = "{WindowsRelease}_{WindowsVersion}_{SKU}_{yyyy}-{MM}-{dd}_{HH}{mm}"
FFUCaptureLocation = $ffuCapturePath
- ShareName = "FFUCaptureShare"
- Username = "ffu_user"
Threads = 5
BitsPriority = 'Normal'
MaxUSBDrives = 5
@@ -124,7 +122,6 @@ function Get-GeneralDefaults {
CompactOS = $true
Optimize = $true
AllowVHDXCaching = $false
- CreateCaptureMedia = $true
CreateDeploymentMedia = $true
Verbose = $false
AllowExternalHardDiskMedia = $false
@@ -136,7 +133,6 @@ function Get-GeneralDefaults {
CopyPPKG = $false
InjectUnattend = $false
CleanupAppsISO = $true
- CleanupCaptureISO = $true
CleanupDeployISO = $true
CleanupDrivers = $false
RemoveFFU = $false
@@ -144,7 +140,6 @@ function Get-GeneralDefaults {
RemoveUpdates = $false
RemoveDownloadedESD = $true
# Hyper-V Settings Defaults
- VMHostIPAddress = ""
DiskSizeGB = 50
MemoryGB = 4
Processors = 4
diff --git a/FFUDevelopment/WinPECaptureFFUFiles/AssignDriveLetter.txt b/FFUDevelopment/WinPECaptureFFUFiles/AssignDriveLetter.txt
deleted file mode 100644
index a18948f..0000000
--- a/FFUDevelopment/WinPECaptureFFUFiles/AssignDriveLetter.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-select disk 0
-select partition 3
-Assign letter="M"
-exit
diff --git a/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1 b/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1
deleted file mode 100644
index 9be00f4..0000000
--- a/FFUDevelopment/WinPECaptureFFUFiles/CaptureFFU.ps1
+++ /dev/null
@@ -1,237 +0,0 @@
-$VMHostIPAddress = '192.168.1.158'
-$ShareName = 'FFUCaptureShare'
-$UserName = 'ffu_user'
-$Password = '23202eb4-10c3-47e9-b389-f0c462663a23'
-$CustomFFUNameTemplate = '{WindowsRelease}_{WindowsVersion}_{SKU}_{yyyy}-{MM}-{dd}_{HH}{mm}'
-
-$netuseCommand = "net use W: \\$VMHostIPAddress\$ShareName /user:$UserName $Password 2>&1"
-
-# Connect to network share
-try {
- Write-Host "Connecting to network share via $netuseCommand"
- $netUseResult = net use W: "\\$VMHostIPAddress\$ShareName" "/user:$UserName" "$Password" 2>&1
-
- # Check if the result contains an error
- if ($LASTEXITCODE -ne 0) {
- # Extract the error code from the Exception Message
- # Example message format: "System error 53 has occurred."
- $message = $netUseResult.Exception.Message
- $regex = [regex]'System error (\d+)'
- $match = $regex.Match($message)
- if ($match.Success) {
- $errorCode = [int]$match.Groups[1].Value
-
- $errorMessage = switch ($errorCode) {
- 53 { "Network path not found. Verify the IP address is correct and the server is accessible." }
- 67 { "Network name cannot be found. Verify the share name exists on the server." }
- 86 { "Password is incorrect for the specified username." }
- 1219 { "Multiple connections to the share exist."}
- 1326 { "Logon failure: unknown username or bad password." }
- 1385 { "Logon failure: the user has not been granted the requested logon type at this computer.
- This is likely due to changes to the User Rights Assignment: Access this computer from the network local security policy
- See: https://github.com/rbalsleyMSFT/FFU/issues/122 for more info" }
- 1792 { "Unable to connect. Verify the server is running and accepting connections." }
- 2250 { "Network connection attempt timed out." }
- default { "Network connection failed with error code: $errorCode. Details: $message" }
- }
- # Write-Error $errorMessage
- throw $errorMessage
- }
- }
-} catch {
- Write-Error "Failed to connect to network share: Error code: $errorcode $_"
- Write-Host "Some things to try:"
- Write-Host '1. If not using an external switch, change to using an external switch'
- Write-Host '2. Make sure the VMHostIPAddress is correct for the VMSwitch that is being used'
- Write-Host '3. Try disabling the Windows Firewall on the host machine as a test only. If that helps, there is a Windows firewall rule that is blocking SMB 445 into the VM host'
- Write-Host '4. If this is a machine that is managed by your organization, try using another machine that is not managed. There could be security policies in place that are blocking the connection to the share.'
- Write-Host '5. You can also try disabling Hyper-V and re-enabling it. This has helped some users in the past.'
- Write-Host '6. If all else fails, open an issue on the github repo and attach screenshots of this message, your FFUDevelopment.log, your command line that you used to build the FFU, and/or the config file you used (if you used one).'
- pause
- throw
-}
-
-$AssignDriveLetter = 'x:\AssignDriveLetter.txt'
-try {
- Write-Host 'Assigning M: as Windows drive letter'
- Start-Process -FilePath diskpart.exe -ArgumentList "/S $AssignDriveLetter" -Wait -ErrorAction Stop | Out-Null
-}
-catch {
- Write-Error "Failed to assign drive letter using diskpart: $_"
-
-}
-
-#Load Registry Hive
-$Software = 'M:\Windows\System32\config\software'
-try {
- Write-Host "Loading software registry hive to $Software"
- if (-not (Test-Path -Path $Software)) {
- throw "Software registry hive not found at $Software"
- }
- $regResult = reg load "HKLM\FFU" $Software 2>&1
- if ($LASTEXITCODE -ne 0) {
- throw "Registry load failed with exit code $($LASTEXITCODE): $regResult"
- }
- Write-Host "Successfully loaded software registry hive."
-}
-catch {
- Write-Error "Failed to load registry hive: $_"
-
-}
-
-try {
- #Find Windows version values
- Write-Host "Retrieving Windows information from the registry..."
- $SKU = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'EditionID'
- Write-Host "SKU: $SKU"
- [int]$CurrentBuild = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'CurrentBuild'
- Write-Host "CurrentBuild: $CurrentBuild"
- if ($CurrentBuild -notin 14393, 17763) {
- Write-Host "CurrentBuild is not 14393 or 17763, retrieving WindowsVersion..."
- $WindowsVersion = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'DisplayVersion'
- Write-Host "WindowsVersion: $WindowsVersion"
- }
- $InstallationType = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'InstallationType'
- Write-Host "InstallationType: $InstallationType"
- $BuildDate = Get-Date -uformat %b%Y
- Write-Host "BuildDate: $BuildDate"
-
-$SKU = switch ($SKU) {
- Core { 'Home' }
- CoreN { 'Home_N' }
- CoreSingleLanguage { 'Home_SL' }
- Professional { 'Pro' }
- ProfessionalN { 'Pro_N' }
- ProfessionalEducation { 'Pro_Edu' }
- ProfessionalEducationN { 'Pro_Edu_N' }
- Enterprise { 'Ent' }
- EnterpriseN { 'Ent_N' }
- EnterpriseS { 'Ent_LTSC' }
- EnterpriseSN { 'Ent_N_LTSC' }
- IoTEnterpriseS { 'IoT_Ent_LTSC' }
- Education { 'Edu' }
- EducationN { 'Edu_N' }
- ProfessionalWorkstation { 'Pro_Wks' }
- ProfessionalWorkstationN { 'Pro_Wks_N' }
- ServerStandard { 'Srv_Std' }
- ServerDatacenter { 'Srv_Dtc' }
-}
-
- if ($InstallationType -eq "Client") {
- if ($CurrentBuild -ge 22000) {
- $WindowsRelease = 'Win11'
- Write-Host "WindowsRelease: $WindowsRelease"
- }
- else {
- $WindowsRelease = 'Win10'
- Write-Host "WindowsRelease: $WindowsRelease"
- }
- }
- else {
- $WindowsRelease = switch ($CurrentBuild) {
- 26100 { '2025' }
- 20348 { '2022' }
- 17763 { '2019' }
- 14393 { '2016' }
- Default { $WindowsVersion }
- }
- Write-Host "WindowsRelease: $WindowsRelease"
- if ($InstallationType -eq "Server Core") {
- $SKU += "_Core"
- Write-Host "InstallType is Server Core, changing SKU to: $SKU"
- }
- }
-
- if ($CustomFFUNameTemplate) {
- Write-Host 'Using custom FFU name template...'
- $FFUFileName = $CustomFFUNameTemplate
- $FFUFileName = $FFUFileName -replace '{WindowsRelease}', $WindowsRelease
- $FFUFileName = $FFUFileName -replace '{WindowsVersion}', $WindowsVersion
- $FFUFileName = $FFUFileName -replace '{SKU}', $SKU
- $FFUFileName = $FFUFileName -replace '{BuildDate}', $BuildDate
- $FFUFileName = $FFUFileName -replace '{yyyy}', (Get-Date -UFormat '%Y')
- $FFUFileName = $FFUFileName -creplace '{MM}', (Get-Date -UFormat '%m')
- $FFUFileName = $FFUFileName -replace '{dd}', (Get-Date -UFormat '%d')
- $FFUFileName = $FFUFileName -creplace '{HH}', (Get-Date -UFormat '%H')
- $FFUFileName = $FFUFileName -creplace '{hh}', (Get-Date -UFormat '%I')
- $FFUFileName = $FFUFileName -creplace '{mm}', (Get-Date -UFormat '%M')
- $FFUFileName = $FFUFileName -replace '{tt}', (Get-Date -UFormat '%p')
- Write-Host "FFU File Name: $FFUFileName"
- #If the custom FFU name template does not end with .ffu, append it
- if ($FFUFileName -notlike '*.ffu') {
- $FFUFileName += '.ffu'
- Write-Host "Appended .ffu to FFU file name: $FFUFileName"
- }
- $dismArgs = "/capture-ffu /imagefile=W:\$FFUFileName /capturedrive=\\.\PhysicalDrive0 /name:$WindowsRelease$WindowsVersion$SKU /Compress:Default"
- Write-Host "DISM arguments for capture: $dismArgs"
- }
- else {
- #If Office is installed, modify the file name of the FFU
- $Office = Get-ChildItem -Path 'M:\Program Files\Microsoft Office' -ErrorAction SilentlyContinue
- if ($Office) {
- $ffuFilePath = "W:\$WindowsRelease`_$WindowsVersion`_$SKU`_Office`_$BuildDate.ffu"
- Write-Host "Office is installed, using modified FFU file name: $ffuFilePath"
- }
- else {
- $ffuFilePath = "W:\$WindowsRelease`_$WindowsVersion`_$SKU`_Apps`_$BuildDate.ffu"
- Write-Host "Office is not installed, using modified FFU file name: $ffuFilePath"
- }
- $dismArgs = "/capture-ffu /imagefile=$ffuFilePath /capturedrive=\\.\PhysicalDrive0 /name:$WindowsRelease$WindowsVersion$SKU /Compress:Default"
- Write-Host "DISM arguments for capture: $dismArgs"
- }
-
- #Unload Registry
- Set-Location X:\
- Remove-Variable SKU
- Remove-Variable CurrentBuild
- if ($CurrentBuild -notin 14393, 17763) {
- Remove-Variable WindowsVersion
- }
- if ($Office) {
- Remove-Variable Office
- }
-
- try {
- Write-Host "Unloading registry hive HKLM\FFU..."
- $regUnloadResult = reg unload "HKLM\FFU" 2>&1
- if ($LASTEXITCODE -ne 0) {
- throw "Registry unload failed with exit code $($LASTEXITCODE): $regUnloadResult"
- }
- Write-Host "Successfully unloaded registry hive."
- }
- catch {
- Write-Error "Failed to unload registry hive: $_"
-
- }
-
- Write-Host "Sleeping for 60 seconds to allow registry to unload prior to capture"
- Start-sleep 60
-
- try {
- Write-Host "Starting DISM FFU capture..."
- $dismProcess = Start-Process -FilePath dism.exe -ArgumentList $dismArgs -Wait -PassThru -ErrorAction Stop
- if ($dismProcess.ExitCode -ne 0) {
- throw "DISM capture failed with exit code $($dismProcess.ExitCode)"
- }
- Write-Host "DISM FFU capture completed successfully."
- }
- catch {
- Write-Error "FFU capture failed: $_"
-
- }
-
- try {
- Write-Host "Copying DISM log to network share..."
- xcopy X:\Windows\logs\dism\dism.log W:\ /Y | Out-Null
- }
- catch {
- Write-Warning "Failed to copy DISM log: $_"
- }
- Write-Host "DISM log copied to network share, shutting down..."
- wpeutil Shutdown
-
-}
-catch {
- Write-Error "An unexpected error occurred: $_"
-
-}
diff --git a/FFUDevelopment/WinPECaptureFFUFiles/Windows/System32/startnet.cmd b/FFUDevelopment/WinPECaptureFFUFiles/Windows/System32/startnet.cmd
deleted file mode 100644
index ed54781..0000000
--- a/FFUDevelopment/WinPECaptureFFUFiles/Windows/System32/startnet.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-wpeinit
-powercfg /s 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c
-powershell -Noprofile -ExecutionPolicy Bypass -File x:\CaptureFFU.ps1
-exit
-
diff --git a/FFUDevelopment/config/Sample_default.json b/FFUDevelopment/config/Sample_default.json
index e8b1e6a00dc90959d716f7536966fcccdc61eb96..fff1a49346ba52d9a682469b35b85a93dba4a32e 100644
GIT binary patch
delta 26
icmeA%I;X!ufoXFB(
> To force a full rebuild, delete the contents of `$FFUDevelopmentPath\VHDXCache` (or disable **Allow VHDX Caching**) and run the build again.
-## Create Capture Media
-
-Controls the `-CreateCaptureMedia` parameter.
-
-When enabled, FFU Builder creates WinPE capture media that is used during VM-based builds (when apps are installed in the VM). FFU Builder attaches this media to the VM and adjusts boot order so the VM can reboot into WinPE and automatically capture the FFU to your **FFU Capture Location**.
-
-The capture media uses the parameter values from `VMHostIPAddress`, `ShareName`, `UserName`, and `CustomFFUNameTemplate` and inserts them into `CaptureFFU.ps1` which is what is responsible for capturing the FFU from the guest VM to the Host.
-
-**Default:** Enabled (`-CreateCaptureMedia $true`)
-
-{: .note-title}
-
-> Note
->
-> This option is only relevant when **Install Apps** is enabled. If **Install Apps** is enabled, the build forces `-CreateCaptureMedia` to `$true` because capture media is required to capture an FFU from the VM.
-
-{: .tip-title}
-
-> Tip
->
-> If you just need to re-create media, you can use the `Create-PEMedia.ps1` script to regenerate the capture or deploy ISO using `Create-PEMedia.ps1 -Capture $true` or `CreatePEMedia.ps1 -Deploy $true`.
-
## Create Deployment Media
Controls the `-CreateDeploymentMedia` parameter.
@@ -513,7 +475,7 @@ The deployment media is saved as an ISO file at `$FFUDevelopmentPath\WinPE_FFU_D
> Tip
>
-> If you just need to re-create media, you can use the `Create-PEMedia.ps1` script to regenerate the capture or deploy ISO using `Create-PEMedia.ps1 -Capture $true` or `CreatePEMedia.ps1 -Deploy $true`.
+> If you just need to re-create deployment media, you can use the `Create-PEMedia.ps1` script to regenerate the deploy ISO without running a full build.
## Inject Unattend.xml
@@ -604,12 +566,6 @@ You may want to disable Cleanup Apps ISO in the following scenarios:
>
> The Apps ISO is only created when applications are configured for installation. If no apps are being installed in the FFU, this option has no effect. Keeping this option enabled helps conserve disk space by removing temporary build artifacts.
-## Cleanup Capture ISO
-
-Controls the `-CleanupCaptureISO` parameter. When checked, the WinPE capture ISO file is automatically deleted after the FFU has been successfully captured. The default is **checked**.
-
-It's recommended to keep this checked as each new build re-creates the local username account (e.g. `ffu_user`) and its password. If you were to retain the capture ISO from a previous build, it'd be using an old password and the capture would fail.
-
## Cleanup Deploy ISO
Controls the `-CleanupDeployISO` parameter. When checked, the WinPE deployment ISO file is automatically deleted after the FFU has been successfully captured. The default is **checked**.
diff --git a/docs/create_pemedia.md b/docs/create_pemedia.md
index c7b7720..6110fc5 100644
--- a/docs/create_pemedia.md
+++ b/docs/create_pemedia.md
@@ -9,7 +9,7 @@ parent: Helper Scripts
---
# Create PE Media
-`Create-PEMedia.ps1` is a standalone helper script that creates WinPE capture or deployment ISO files outside the main build flow.
+`Create-PEMedia.ps1` is a standalone helper script that creates WinPE deployment ISO files outside the main build flow.
This is useful when admins need to quickly generate a deploy ISO for a share (or local staging folder) that technicians will use with `USBImagingToolCreator.ps1`.
@@ -40,25 +40,19 @@ Default output file:
Create deploy ISO for x64:
```powershell
-.\Create-PEMedia.ps1 -Deploy $true -WindowsArch 'x64'
+.\Create-PEMedia.ps1 -WindowsArch 'x64'
```
Create deploy ISO for ARM64:
```powershell
-.\Create-PEMedia.ps1 -Deploy $true -WindowsArch 'arm64' -DeployISO "$PSScriptRoot\WinPE_FFU_Deploy_arm64.iso"
-```
-
-Create capture ISO only:
-
-```powershell
-.\Create-PEMedia.ps1 -Capture $true -Deploy $false
+.\Create-PEMedia.ps1 -WindowsArch 'arm64' -DeployISO "$PSScriptRoot\WinPE_FFU_Deploy_arm64.iso"
```
Create deploy ISO and include PE drivers from `.\PEDrivers`:
```powershell
-.\Create-PEMedia.ps1 -Deploy $true -CopyPEDrivers $true
+.\Create-PEMedia.ps1 -CopyPEDrivers $true
```
## Stage output for USB imaging
diff --git a/docs/hyperv_settings.md b/docs/hyperv_settings.md
index 0887f1d..2e58bbd 100644
--- a/docs/hyperv_settings.md
+++ b/docs/hyperv_settings.md
@@ -15,11 +15,7 @@ parent: UI Overview
Drop down of detected VM Switches. There's also an **Other** option which allows you to specify a VM Switch Name. The other option is useful in scenarios where the machine you're running the UI from isn't going to be the machine where you plan to build the FFU from.
-## VM Host IP Address
-
-IP address of the selected Hyper-V switch that will be used for FFU capture. The UI will auto-detected this based on the VM Switch that was selected.
-
-If `$InstallApps` is set to `$true`, this parameter must be configured.
+This setting is now optional for FFU capture itself. VM-based builds still capture from the host-side VHDX after the VM shuts down, so you only need a switch when the VM requires network connectivity during provisioning.
## Disk Size (GB)
diff --git a/docs/parameters_reference.md b/docs/parameters_reference.md
index c3e0688..14277d1 100644
--- a/docs/parameters_reference.md
+++ b/docs/parameters_reference.md
@@ -27,7 +27,6 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -BuildUSBDrive | bool | Build USB Drive | When set to $true, will partition and format a USB drive and copy the captured FFU to the drive. |
| -Cleanup | switch | Monitor cancel build action (no direct control) | Switch to run cleanup-only mode. When specified, the script performs cleanup and exits without starting a new build. |
| -CleanupAppsISO | bool | Cleanup Apps ISO | When set to $true, will remove the Apps ISO after the FFU has been captured. Default is $true. |
-| -CleanupCaptureISO | bool | Cleanup Capture ISO | When set to $true, will remove the WinPE capture ISO after the FFU has been captured. Default is $true. |
| -CleanupCurrentRunDownloads | bool | Monitor cancel prompt option (no direct control) | When set to $true, cleanup mode will remove downloads created during the current run and restore backed up run JSON files. Default is $false. |
| -CleanupDeployISO | bool | Cleanup Deploy ISO | When set to $true, will remove the WinPE deployment ISO after the FFU has been captured. Default is $true. |
| -CleanupDrivers | bool | Cleanup Drivers | When set to $true, will remove the drivers folder after the FFU has been captured. Default is $true. |
@@ -40,7 +39,6 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -CopyPEDrivers | bool | Copy PE Drivers | When set to $true, enables adding WinPE drivers. By default copies drivers from $FFUDevelopmentPath\PEDrivers to the WinPE deployment media unless -UseDriversAsPEDrivers is also $true. |
| -CopyPPKG | bool | Copy Provisioning Package | When set to $true, will copy the provisioning package from the $FFUDevelopmentPath\PPKG folder to the Deployment partition of the USB drive. Default is $false. |
| -CopyUnattend | bool | Copy Unattend.xml | When set to $true, will copy the $FFUDevelopmentPath\Unattend folder to the Deployment partition of the USB drive. Default is $false. |
-| -CreateCaptureMedia | bool | Create Capture Media | When set to $true, this will create WinPE capture media for use when $InstallApps is set to $true. This capture media will be automatically attached to the VM, and the boot order will be changed to automate the capture of the FFU. |
| -CreateDeploymentMedia | bool | Create Deployment Media | When set to $true, this will create WinPE deployment media for use when deploying to a physical device. |
| -CustomFFUNameTemplate | string | Custom FFU Name Template | Sets a custom FFU output name with placeholders. Allowed placeholders are: {WindowsRelease}, {WindowsVersion}, {SKU}, {BuildDate}, {yyyy}, {MM}, {dd}, {H}, {hh}, {mm}, {tt}. |
| -Disksize | uint64 | Disk Size (GB) | Size of the virtual hard disk for the virtual machine. Default is a 50GB dynamic disk. |
@@ -73,7 +71,6 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -RemoveApps | bool | Remove Apps Folder Content | When set to $true, will remove the application content in the Apps folder after the FFU has been captured. Default is $true. |
| -RemoveFFU | bool | Remove FFU | When set to $true, will remove the FFU file from the $FFUDevelopmentPath\FFU folder after it has been copied to the USB drive. Default is $false. |
| -RemoveUpdates | bool | Remove Downloaded Update Files | When set to $true, will remove the downloaded CU, MSRT, Defender, Edge, OneDrive, and .NET files downloaded. Default is $true. |
-| -ShareName | string | Share Name | Name of the shared folder for FFU capture. The default is FFUCaptureShare. This share will be created with rights for the user account. When finished, the share will be removed. |
| -Threads | int | Threads | Controls the throttle applied to parallel tasks inside the script. Default is 5, matching the UI Threads field, and applies to driver downloads invoked through Invoke-ParallelProcessing. |
| -UpdateADK | bool | Update ADK | When set to $true, the script will check for and install the latest Windows ADK and WinPE add-on if they are not already installed or up-to-date. Default is $true. |
| -UpdateEdge | bool | Update Edge | When set to $true, will download and install the latest Microsoft Edge. Default is $false. |
@@ -88,10 +85,8 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -UseDriversAsPEDrivers | bool | Use Drivers Folder as PE Drivers Source | When set to $true (and -CopyPEDrivers is also $true), bypasses the contents of $FFUDevelopmentPath\PEDrivers and instead builds the WinPE driver set dynamically from the $DriversFolder path, copying only the required WinPE drivers. Has no effect if -CopyPEDrivers is not specified. Default is $false. |
| -UserAgent | string | CLI only (no UI control) | User agent string to use when downloading files. |
| -UserAppListPath | string | Application Path (derived UserAppList.json) | Path to a JSON file containing a list of user-defined applications to install. Default is $FFUDevelopmentPath\Apps\UserAppList.json. |
-| -Username | string | Username | Username for accessing the shared folder. The default is ffu_user. The script will auto-create the account and password. When finished, it will remove the account. |
-| -VMHostIPAddress | string | VM Host IP Address | IP address of the Hyper-V host for FFU capture. If $InstallApps is set to $true, this parameter must be configured. You must manually configure this, or use the UI to auto-detect. |
| -VMLocation | string | VM Location | Default is $FFUDevelopmentPath\VM. This is the location of the VHDX that gets created where Windows will be installed to. |
-| -VMSwitchName | string | VM Switch Name + Custom VM Switch Name (when Other selected) | Name of the Hyper-V virtual switch. If $InstallApps is set to $true, this must be set to capture the FFU from the VM. |
+| -VMSwitchName | string | VM Switch Name + Custom VM Switch Name (when Other selected) | Name of the Hyper-V virtual switch. Provide it when the VM needs network connectivity during provisioning. |
| -WindowsArch | string | Windows Architecture | String value of 'x86', 'x64', or 'arm64'. This is used to identify which architecture of Windows to download. Default is 'x64'. |
| -WindowsLang | string | Windows Language | String value in language-region format (e.g., 'en-us'). This is used to identify which language of media to download. Default is 'en-us'. |
| -WindowsRelease | int | Windows Release | Integer value of 10, 11, 2016, 2019, 2021, 2022, 2024, or 2025. This is used to identify which Windows client/LTSC/server release to use. Default is 11. |
diff --git a/docs/quickstart.md b/docs/quickstart.md
index ef62c7d..451b237 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -45,7 +45,7 @@ Follow the [prerequisites](/FFU/prerequisites.html) documentation before getting
Click the Hyper-V Settings tab
-You should be able to keep these settings at the defaults. For VM Switch Name and VM Host IP Address, you'll want to make sure the switch you created in the prerequisites section is listed. FFU Builder should automatically figure out the IP address of the swtich for you.
+You should be able to keep these settings at the defaults. If the VM needs network connectivity during provisioning, make sure the switch you created in the prerequisites section is listed under VM Switch Name. If the build does not need VM networking, you can leave the switch unset.
One setting you might need to set is the Logical Sector Size. 512 is the default and that's what most physical disks use today. However 4kn drives and UFS drives use 4k sector sizes, which would require you to select 4096. For now, select 512. If you have issues during deployment, there is error logging that will tell you if you need to set to 4096 on your device.
From 5aaa1ad7326969826c69116b897d38710b197f7e Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Mon, 30 Mar 2026 12:57:15 -0700
Subject: [PATCH 18/34] Refresh Windows SKU dynamically after fallback image
selection
Previously, when a requested Windows SKU was not found in the provided ISO/ESD and the user manually selected a fallback image, the script kept the original (stale) `$WindowsSKU`. This caused downstream features like FFU file naming, VHDX cache metadata, and cumulative update planning to enforce logic against the wrong edition.
- Refactored `Get-Index` into `Get-WindowsImageSelection` to return rich image metadata (including EditionId and InstallationType) instead of just the image index.
- Added `Get-ResolvedWindowsSKUFromImage` to resolve raw image metadata back into the repository's native friendly SKU vocabulary.
- Added `Get-WindowsTargetRuntimeState` to centralize and recalculate dependent variables (`installationType`, `WindowsVersion`, LTSC flags) after the SKU updates mid-flight.
---
FFUDevelopment/BuildFFUVM.ps1 | 227 ++++++++++++++++++++++++++--------
1 file changed, 178 insertions(+), 49 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 4eeb9f1..02d45a2 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -587,6 +587,55 @@ public static extern uint GetPrivateProfileSection(
'@
Add-Type -MemberDefinition $definition -Namespace Win32 -Name Kernel32 -PassThru | Out-Null
+function Get-WindowsTargetRuntimeState {
+ param(
+ [Parameter(Mandatory = $true)]
+ [int]$WindowsRelease,
+
+ [Parameter(Mandatory = $true)]
+ [string]$WindowsSKU,
+
+ [Parameter(Mandatory = $true)]
+ [string]$CurrentWindowsVersion,
+
+ [Parameter(Mandatory = $true)]
+ [bool]$UpdateLatestCU
+ )
+
+ $localInstallationType = if ($WindowsSKU -like 'Standard*' -or $WindowsSKU -like 'Datacenter*') { 'Server' } else { 'Client' }
+ $localWindowsVersion = $CurrentWindowsVersion
+ $localIsLTSC = $false
+
+ if ($localInstallationType -eq 'Server') {
+ switch ($WindowsRelease) {
+ 2016 { $localWindowsVersion = '1607' }
+ 2019 { $localWindowsVersion = '1809' }
+ 2022 { $localWindowsVersion = '21H2' }
+ 2025 { $localWindowsVersion = '24H2' }
+ }
+ }
+
+ if ($WindowsSKU -like '*LTS*') {
+ switch ($WindowsRelease) {
+ 2016 { $localWindowsVersion = '1607' }
+ 2019 { $localWindowsVersion = '1809' }
+ 2021 { $localWindowsVersion = '21H2' }
+ 2024 { $localWindowsVersion = '24H2' }
+ }
+ $localIsLTSC = $true
+ }
+
+ $localIsWindows10LtscClient = ($localInstallationType -eq 'Client') -and ($WindowsRelease -in 2016, 2019, 2021) -and $localIsLTSC
+
+ return [pscustomobject]@{
+ InstallationType = $localInstallationType
+ WindowsVersion = $localWindowsVersion
+ IsLTSC = $localIsLTSC
+ IsWindows10LtscClient = $localIsWindows10LtscClient
+ InstallLatestCuInVm = ($UpdateLatestCU -and $localIsWindows10LtscClient)
+ }
+}
+
#Check if Hyper-V feature is installed (requires only checks the module)
$osInfo = Get-CimInstance -ClassName win32_OperatingSystem
$isServer = $osInfo.Caption -match 'server'
@@ -648,31 +697,13 @@ if (-not $UnattendFolder) { $UnattendFolder = "$FFUDevelopmentPath\Unattend" }
if (-not $AutopilotFolder) { $AutopilotFolder = "$FFUDevelopmentPath\Autopilot" }
if (-not $PEDriversFolder) { $PEDriversFolder = "$FFUDevelopmentPath\PEDrivers" }
if (-not $VHDXCacheFolder) { $VHDXCacheFolder = "$FFUDevelopmentPath\VHDXCache" }
-if (-not $installationType) { $installationType = if ($WindowsSKU -like "Standard*" -or $WindowsSKU -like "Datacenter*") { 'Server' } else { 'Client' } }
-if ($installationType -eq 'Server') {
- #Map $WindowsRelease to $WindowsVersion for Windows Server
- switch ($WindowsRelease) {
- 2016 { $WindowsVersion = '1607' }
- 2019 { $WindowsVersion = '1809' }
- 2022 { $WindowsVersion = '21H2' }
- 2025 { $WindowsVersion = '24H2' }
- }
-}
if (-not $AppListPath) { $AppListPath = "$AppsPath\AppList.json" }
-
-if ($WindowsSKU -like "*LTS*") {
- switch ($WindowsRelease) {
- 2016 { $WindowsVersion = '1607' }
- 2019 { $WindowsVersion = '1809' }
- 2021 { $WindowsVersion = '21H2' }
- 2024 { $WindowsVersion = '24H2' }
- }
- $isLTSC = $true
-}
-
-# Determine runtime LTSC CU handling flags
-$isWindows10LtscClient = ($installationType -eq 'Client') -and ($WindowsRelease -in 2016, 2019, 2021) -and ($WindowsSKU -like '*LTS*')
-$installLatestCuInVm = ($UpdateLatestCU -and $isWindows10LtscClient)
+$windowsTargetRuntimeState = Get-WindowsTargetRuntimeState -WindowsRelease $WindowsRelease -WindowsSKU $WindowsSKU -CurrentWindowsVersion $WindowsVersion -UpdateLatestCU:$UpdateLatestCU
+$installationType = $windowsTargetRuntimeState.InstallationType
+$WindowsVersion = $windowsTargetRuntimeState.WindowsVersion
+$isLTSC = $windowsTargetRuntimeState.IsLTSC
+$isWindows10LtscClient = $windowsTargetRuntimeState.IsWindows10LtscClient
+$installLatestCuInVm = $windowsTargetRuntimeState.InstallLatestCuInVm
$refreshAppsIsoForLtscCu = $false
# Set the log path for the common logger
@@ -2423,13 +2454,76 @@ function Get-WimFromISO {
return $wimPath
}
-function Get-Index {
+function Get-ResolvedWindowsSKUFromImage {
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$EditionId,
+
+ [string]$InstallationType,
+
+ [string]$ImageName,
+
+ [Parameter(Mandatory = $true)]
+ [int]$WindowsRelease
+ )
+
+ $normalizedInstallationType = if ([string]::IsNullOrWhiteSpace($InstallationType)) { '' } else { $InstallationType.Trim() }
+
+ switch ($EditionId) {
+ 'Core' { return 'Home' }
+ 'CoreN' { return 'Home N' }
+ 'CoreSingleLanguage' { return 'Home Single Language' }
+ 'Education' { return 'Education' }
+ 'EducationN' { return 'Education N' }
+ 'Professional' { return 'Pro' }
+ 'ProfessionalN' { return 'Pro N' }
+ 'ProfessionalEducation' { return 'Pro Education' }
+ 'ProfessionalEducationN' { return 'Pro Education N' }
+ 'ProfessionalWorkstation' { return 'Pro for Workstations' }
+ 'ProfessionalWorkstationN' { return 'Pro N for Workstations' }
+ 'Enterprise' { return 'Enterprise' }
+ 'EnterpriseN' { return 'Enterprise N' }
+ 'EnterpriseS' {
+ if ($WindowsRelease -eq 2016 -or $ImageName -match 'LTSB') {
+ return 'Enterprise 2016 LTSB'
+ }
+ return 'Enterprise LTSC'
+ }
+ 'EnterpriseSN' {
+ if ($WindowsRelease -eq 2016 -or $ImageName -match 'LTSB') {
+ return 'Enterprise N 2016 LTSB'
+ }
+ return 'Enterprise N LTSC'
+ }
+ 'IoTEnterpriseS' { return 'IoT Enterprise LTSC' }
+ 'IoTEnterpriseSN' { return 'IoT Enterprise N LTSC' }
+ 'ServerStandard' {
+ if ($normalizedInstallationType -eq 'Server') {
+ return 'Standard (Desktop Experience)'
+ }
+ return 'Standard'
+ }
+ 'ServerDatacenter' {
+ if ($normalizedInstallationType -eq 'Server') {
+ return 'Datacenter (Desktop Experience)'
+ }
+ return 'Datacenter'
+ }
+ }
+
+ return $null
+}
+
+function Get-WindowsImageSelection {
param(
[Parameter(Mandatory = $true)]
[string]$WindowsImagePath,
[Parameter(Mandatory = $true)]
- [string]$WindowsSKU
+ [string]$WindowsSKU,
+
+ [Parameter(Mandatory = $true)]
+ [int]$WindowsRelease
)
# Get the available indexes in the WIM/ESD
@@ -2514,25 +2608,26 @@ function Get-Index {
}
}
+ # Build per-index metadata (EditionId, InstallationType, resolved SKU) once for deterministic matching and fallback prompts.
+ $imageMetadata = @(foreach ($imageIndex in $imageIndexes) {
+ try {
+ $details = Get-WindowsImage -ImagePath $WindowsImagePath -Index $imageIndex.ImageIndex
+ [pscustomobject]@{
+ ImageIndex = $details.ImageIndex
+ ImageName = $details.ImageName
+ ImageSize = $details.ImageSize
+ EditionId = $details.EditionId
+ InstallationType = $details.InstallationType
+ ResolvedWindowsSKU = Get-ResolvedWindowsSKUFromImage -EditionId $details.EditionId -InstallationType $details.InstallationType -ImageName $details.ImageName -WindowsRelease $WindowsRelease
+ }
+ }
+ catch {
+ $null
+ }
+ }) | Where-Object { $null -ne $_ }
+
# If we can map SKU -> EditionId, attempt a non-interactive match
if ($editionIdCandidates.Count -gt 0) {
- # Build per-index metadata (EditionId, InstallationType) to match deterministically
- $imageMetadata = @(foreach ($imageIndex in $imageIndexes) {
- try {
- $details = Get-WindowsImage -ImagePath $WindowsImagePath -Index $imageIndex.ImageIndex
- [pscustomobject]@{
- ImageIndex = $details.ImageIndex
- ImageName = $details.ImageName
- ImageSize = $details.ImageSize
- EditionId = $details.EditionId
- InstallationType = $details.InstallationType
- }
- }
- catch {
- $null
- }
- }) | Where-Object { $null -ne $_ }
-
# Match by EditionId first
$imageMatches = $imageMetadata | Where-Object { $_.EditionId -in $editionIdCandidates }
@@ -2547,14 +2642,17 @@ function Get-Index {
# If multiple matches remain, pick the largest image (Desktop Experience tends to be larger)
if ($imageMatches.Count -gt 0) {
$bestMatch = $imageMatches | Sort-Object -Property ImageSize -Descending | Select-Object -First 1
- WriteLog "Selected Windows image index $($bestMatch.ImageIndex) (SKU='$WindowsSKU', EditionId='$($bestMatch.EditionId)', InstallationType='$($bestMatch.InstallationType)'): $($bestMatch.ImageName)"
- return $bestMatch.ImageIndex
+ WriteLog "Selected Windows image index $($bestMatch.ImageIndex) (RequestedSKU='$WindowsSKU', ResolvedSKU='$($bestMatch.ResolvedWindowsSKU)', EditionId='$($bestMatch.EditionId)', InstallationType='$($bestMatch.InstallationType)'): $($bestMatch.ImageName)"
+ return $bestMatch
}
}
# Final fallback: prompt the user to select an ImageName
# Look for the numbers 10, 11, 2016, 2019, 2022+ in the ImageName
- $relevantImageIndexes = $imageIndexes | Where-Object { ($_.ImageName -match "(10|11|2016|2019|202\d)") }
+ $relevantImageIndexes = @($imageMetadata | Where-Object { $_.ImageName -match "(10|11|2016|2019|202\d)" })
+ if ($relevantImageIndexes.Count -eq 0) {
+ $relevantImageIndexes = $imageMetadata
+ }
WriteLog "No matching image index found for SKU '$WindowsSKU' in '$WindowsImagePath'. Prompting user to select an ImageName."
@@ -2575,8 +2673,8 @@ function Get-Index {
$selectedImage = $relevantImageIndexes[$inputValue - 1]
if ($selectedImage) {
- WriteLog "User selected Windows image index $($selectedImage.ImageIndex) (SKU='$WindowsSKU'): $($selectedImage.ImageName)"
- return $selectedImage.ImageIndex
+ WriteLog "User selected Windows image index $($selectedImage.ImageIndex) (RequestedSKU='$WindowsSKU', ResolvedSKU='$($selectedImage.ResolvedWindowsSKU)'): $($selectedImage.ImageName)"
+ return $selectedImage
}
else {
Write-Host "Invalid selection, please try again."
@@ -6844,7 +6942,38 @@ try {
}
#If index not specified by user, try and find based on WindowsSKU
if (-not($index) -and ($WindowsSKU)) {
- $index = Get-Index -WindowsImagePath $wimPath -WindowsSKU $WindowsSKU
+ $requestedWindowsSKU = $WindowsSKU
+ $previousInstallationType = $installationType
+ $previousWindowsVersion = $WindowsVersion
+ $previousIsLTSC = [bool]$isLTSC
+ $windowsImageSelection = Get-WindowsImageSelection -WindowsImagePath $wimPath -WindowsSKU $WindowsSKU -WindowsRelease $WindowsRelease
+ $index = $windowsImageSelection.ImageIndex
+
+ if (-not [string]::IsNullOrWhiteSpace($windowsImageSelection.ResolvedWindowsSKU)) {
+ $WindowsSKU = $windowsImageSelection.ResolvedWindowsSKU
+ $windowsTargetRuntimeState = Get-WindowsTargetRuntimeState -WindowsRelease $WindowsRelease -WindowsSKU $WindowsSKU -CurrentWindowsVersion $WindowsVersion -UpdateLatestCU:$UpdateLatestCU
+ $installationType = $windowsTargetRuntimeState.InstallationType
+ $WindowsVersion = $windowsTargetRuntimeState.WindowsVersion
+ $isLTSC = $windowsTargetRuntimeState.IsLTSC
+ $isWindows10LtscClient = $windowsTargetRuntimeState.IsWindows10LtscClient
+ $installLatestCuInVm = $windowsTargetRuntimeState.InstallLatestCuInVm
+
+ if ($requestedWindowsSKU -ne $WindowsSKU) {
+ WriteLog "Resolved WindowsSKU from '$requestedWindowsSKU' to '$WindowsSKU' based on image selection '$($windowsImageSelection.ImageName)'."
+ }
+
+ if (($previousInstallationType -ne $installationType) -or ($previousWindowsVersion -ne $WindowsVersion) -or ($previousIsLTSC -ne [bool]$isLTSC)) {
+ WriteLog "Updated Windows target state after image selection: InstallationType='$installationType', WindowsVersion='$WindowsVersion', IsLTSC='$isLTSC'."
+ }
+
+ if (($InstallApps -eq $false) -and ($installLatestCuInVm -eq $true)) {
+ WriteLog 'You have selected to update Defender, Malicious Software Removal Tool, OneDrive, Edge, or the latest Windows 10 LTSB/LTSC cumulative update, however you are setting InstallApps to false. These updates require the InstallApps variable to be set to true. Please set InstallApps to true and try again.'
+ throw "InstallApps variable must be set to `$true to update Defender, OneDrive, Edge, MSRT, or the latest Windows 10 LTSB/LTSC cumulative update"
+ }
+ }
+ else {
+ WriteLog "Could not resolve a friendly WindowsSKU for selected image '$($windowsImageSelection.ImageName)'. Continuing with requested SKU '$WindowsSKU'."
+ }
}
$vhdxDisk = New-ScratchVhdx -VhdxPath $VHDXPath -SizeBytes $disksize -LogicalSectorSizeBytes $LogicalSectorSizeBytes
From f838ef3779058cdfd9ba48e603739ac321230a4a Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Mon, 30 Mar 2026 14:49:17 -0700
Subject: [PATCH 19/34] Remove registry-based FFU file naming
Replace the Get-WindowsVersionInfo registry-interrogation step in the VHDX capture path with parameter-driven naming via Get-FFUCaptureNamingInfo. This eliminates the registry load/unload commands and two full minutes of registry sleep time during capture.
By deriving default file and DISM image names from already-resolved target state (WindowsRelease, WindowsVersion, and installationType), capture naming now naturally matches the rest of the script. This also unifies CustomFFUNameTemplate evaluation between live image servicing and cached VHDX reuse instances.
---
FFUDevelopment/BuildFFUVM.ps1 | 180 ++++++++++++----------------------
1 file changed, 65 insertions(+), 115 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 02d45a2..14e4e50 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -3680,88 +3680,97 @@ function Get-ShortenedWindowsSKU {
return $shortenedWindowsSKU
}
+function Get-FFUCaptureNamingInfo {
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$ShortenedWindowsSKU,
+
+ [Parameter(Mandatory = $true)]
+ [int]$WindowsRelease,
+
+ [Parameter(Mandatory = $true)]
+ [string]$WindowsVersion,
+
+ [Parameter(Mandatory = $true)]
+ [string]$InstallationType,
+
+ [bool]$IsWindows10LtscClient = $false
+ )
+
+ $windowsReleaseToken = [string]$WindowsRelease
+ if ($InstallationType -eq 'Client') {
+ if (($WindowsRelease -eq 10) -or $IsWindows10LtscClient) {
+ $windowsReleaseToken = 'Win10'
+ }
+ else {
+ $windowsReleaseToken = 'Win11'
+ }
+ }
+
+ $defaultFilePrefix = if ($InstallationType -eq 'Client') { $windowsReleaseToken } else { "Server$WindowsRelease" }
+ $buildDate = Get-Date -uformat %b%Y
+
+ return [pscustomobject]@{
+ WindowsReleaseToken = $windowsReleaseToken
+ WindowsVersion = $WindowsVersion
+ BuildDate = $buildDate
+ DefaultFileName = "$defaultFilePrefix`_$WindowsVersion`_$ShortenedWindowsSKU`_$buildDate.ffu"
+ CaptureName = "$windowsReleaseToken$WindowsVersion$ShortenedWindowsSKU"
+ }
+}
+
function New-FFUFileName {
- # $Winverinfo.name will be either Win10 or Win11 for client OSes
- # Since WindowsRelease now includes dates, it breaks default name template in the config file
- # This should keep in line with the naming that's done via VM Captures
- if ($installationType -eq 'Client' -and $winverinfo) {
- $WindowsRelease = $winverinfo.name
- }
-
- $BuildDate = Get-Date -uformat %b%Y
+ $ffuCaptureNamingInfo = Get-FFUCaptureNamingInfo -ShortenedWindowsSKU $shortenedWindowsSKU -WindowsRelease $WindowsRelease -WindowsVersion $WindowsVersion -InstallationType $installationType -IsWindows10LtscClient:$isWindows10LtscClient
+ $resolvedFFUNameTemplate = $CustomFFUNameTemplate
+
# Replace '{WindowsRelease}' with the Windows release (e.g., 10, 11, 2016, 2019, 2022, 2025)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{WindowsRelease}', $WindowsRelease
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -replace '{WindowsRelease}', $ffuCaptureNamingInfo.WindowsReleaseToken
# Replace '{WindowsVersion}' with the Windows version (e.g., 1607, 1809, 21h2, 22h2, 23h2, 24h2, etc)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{WindowsVersion}', $WindowsVersion
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -replace '{WindowsVersion}', $ffuCaptureNamingInfo.WindowsVersion
# Replace '{SKU}' with the SKU of the Windows image (e.g., Pro, Enterprise, etc.)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{SKU}', $shortenedWindowsSKU
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -replace '{SKU}', $shortenedWindowsSKU
# Replace '{BuildDate}' with the current month and year (e.g., Jan2023)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{BuildDate}', $BuildDate
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -replace '{BuildDate}', $ffuCaptureNamingInfo.BuildDate
# Replace '{yyyy}' with the current year in 4-digit format (e.g., 2023)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{yyyy}', (Get-Date -UFormat '%Y')
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -replace '{yyyy}', (Get-Date -UFormat '%Y')
# Replace '{MM}' with the current month in 2-digit format (e.g., 01 for January)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -creplace '{MM}', (Get-Date -UFormat '%m')
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -creplace '{MM}', (Get-Date -UFormat '%m')
# Replace '{dd}' with the current day of the month in 2-digit format (e.g., 05)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{dd}', (Get-Date -UFormat '%d')
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -replace '{dd}', (Get-Date -UFormat '%d')
# Replace '{HH}' with the current hour in 24-hour format (e.g., 14 for 2 PM)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -creplace '{HH}', (Get-Date -UFormat '%H')
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -creplace '{HH}', (Get-Date -UFormat '%H')
# Replace '{hh}' with the current hour in 12-hour format (e.g., 02 for 2 PM)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -creplace '{hh}', (Get-Date -UFormat '%I')
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -creplace '{hh}', (Get-Date -UFormat '%I')
# Replace '{mm}' with the current minute in 2-digit format (e.g., 09)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -creplace '{mm}', (Get-Date -UFormat '%M')
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -creplace '{mm}', (Get-Date -UFormat '%M')
# Replace '{tt}' with the current AM/PM designator (e.g., AM or PM)
- $CustomFFUNameTemplate = $CustomFFUNameTemplate -replace '{tt}', (Get-Date -UFormat '%p')
- if ($CustomFFUNameTemplate -notlike '*.ffu') {
- $CustomFFUNameTemplate += '.ffu'
+ $resolvedFFUNameTemplate = $resolvedFFUNameTemplate -replace '{tt}', (Get-Date -UFormat '%p')
+ if ($resolvedFFUNameTemplate -notlike '*.ffu') {
+ $resolvedFFUNameTemplate += '.ffu'
}
- return $CustomFFUNameTemplate
+ return $resolvedFFUNameTemplate
}
function New-FFU {
$captureContext = Get-CaptureVhdContext -VhdxPath $VHDXPath
$captureDisk = $captureContext.Disk
- $osPartitionDriveLetter = $captureContext.OsPartitionDriveLetter
- $WindowsPartition = $captureContext.WindowsPartition
+ $ffuCaptureNamingInfo = Get-FFUCaptureNamingInfo -ShortenedWindowsSKU $shortenedWindowsSKU -WindowsRelease $WindowsRelease -WindowsVersion $WindowsVersion -InstallationType $installationType -IsWindows10LtscClient:$isWindows10LtscClient
try {
Set-Progress -Percentage 68 -Message "Capturing FFU from VHDX..."
- if ($InstallApps -or (-not $AllowVHDXCaching)) {
- # Resolve live Windows metadata from the mounted VHDX when the image was customized in a VM.
- $winverinfo = Get-WindowsVersionInfo
- WriteLog 'Creating FFU File Name'
- if ($CustomFFUNameTemplate) {
- $FFUFileName = New-FFUFileName
- }
- else {
- $FFUFileName = "$($winverinfo.Name)`_$($winverinfo.DisplayVersion)`_$($shortenedWindowsSKU)`_$($winverinfo.BuildDate).ffu"
- }
- WriteLog "FFU file name: $FFUFileName"
- $FFUFile = "$FFUCaptureLocation\$FFUFileName"
- WriteLog 'Capturing FFU from mounted VHDX on host'
- Invoke-Process cmd "/c ""$DandIEnv"" && dism /Capture-FFU /ImageFile:$FFUFile /CaptureDrive:\\.\PhysicalDrive$($captureDisk.DiskNumber) /Name:$($winverinfo.Name)$($winverinfo.DisplayVersion)$($shortenedWindowsSKU) /Compress:Default" | Out-Null
+ WriteLog 'Creating FFU File Name'
+ if ($CustomFFUNameTemplate) {
+ $FFUFileName = New-FFUFileName
}
else {
- # Use cached Windows metadata only when the VHDX contents were reused without VM customization.
- WriteLog 'Creating FFU File Name'
- if ($CustomFFUNameTemplate) {
- $FFUFileName = New-FFUFileName
- }
- else {
- $BuildDate = Get-Date -UFormat %b%Y
- if ($installationType -eq 'Client') {
- $FFUFileName = "Win$($cachedVHDXInfo.WindowsRelease)`_$($cachedVHDXInfo.WindowsVersion)`_$($shortenedWindowsSKU)`_$BuildDate.ffu"
- }
- else {
- $FFUFileName = "Server$($cachedVHDXInfo.WindowsRelease)`_$($cachedVHDXInfo.WindowsVersion)`_$($shortenedWindowsSKU)`_$BuildDate.ffu"
- }
- }
- WriteLog "FFU file name: $FFUFileName"
- $FFUFile = "$FFUCaptureLocation\$FFUFileName"
- WriteLog 'Capturing FFU from mounted VHDX on host'
- Invoke-Process cmd "/c ""$DandIEnv"" && dism /Capture-FFU /ImageFile:$FFUFile /CaptureDrive:\\.\PhysicalDrive$($captureDisk.DiskNumber) /Name:$($cachedVHDXInfo.WindowsRelease)$($cachedVHDXInfo.WindowsVersion)$($shortenedWindowsSKU) /Compress:Default" | Out-Null
+ $FFUFileName = $ffuCaptureNamingInfo.DefaultFileName
}
+ WriteLog "FFU file name: $FFUFileName"
+ $FFUFile = "$FFUCaptureLocation\$FFUFileName"
+ WriteLog 'Capturing FFU from mounted VHDX on host'
+ Invoke-Process cmd "/c ""$DandIEnv"" && dism /Capture-FFU /ImageFile:$FFUFile /CaptureDrive:\\.\PhysicalDrive$($captureDisk.DiskNumber) /Name:$($ffuCaptureNamingInfo.CaptureName) /Compress:Default" | Out-Null
WriteLog 'FFU Capture complete'
}
@@ -3873,65 +3882,6 @@ function Remove-FFUVM {
Invoke-Process cmd "/c mountvol /r" | Out-Null
WriteLog 'Removal complete'
}
-Function Get-WindowsVersionInfo {
- #This sleep prevents CBS/CSI corruption which causes issues with Windows update after deployment. Capturing from very fast disks (NVME) can cause the capture to happen faster than Windows is ready for. This seems to affect VHDX-only captures, not VM captures.
- WriteLog 'Sleep 60 seconds before opening registry to grab Windows version info '
- Start-sleep 60
- WriteLog "Getting Windows Version info"
- #Load Registry Hive
- $Software = "$osPartitionDriveLetter`:\Windows\System32\config\software"
- WriteLog "Loading Software registry hive: $Software"
- Invoke-Process reg "load HKLM\FFU $Software" | Out-Null
-
- #Find Windows version values
- # $WindowsSKU = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'EditionID'
- # WriteLog "Windows SKU: $WindowsSKU"
- [int]$CurrentBuild = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'CurrentBuild'
- WriteLog "Windows Build: $CurrentBuild"
- #DisplayVersion does not exist for 1607 builds (RS1 and Server 2016) and Server 2019
- if ($CurrentBuild -notin (14393, 17763)) {
- $DisplayVersion = Get-ItemPropertyValue -Path 'HKLM:\FFU\Microsoft\Windows NT\CurrentVersion\' -Name 'DisplayVersion'
- WriteLog "Windows Version: $DisplayVersion"
- }
- # For Windows 10 LTSC 2019, set DisplayVersion to 2019
- if ($CurrentBuild -eq 17763 -and $InstallationType -eq "Client") {
- $DisplayVersion = '2019'
- }
-
- $BuildDate = Get-Date -uformat %b%Y
-
- if ($shortenedWindowsSKU -notmatch "Srv") {
- if ($CurrentBuild -ge 22000) {
- $Name = 'Win11'
- }
- else {
- $Name = 'Win10'
- }
- }
- else {
- $Name = switch ($CurrentBuild) {
- 26100 { '2025' }
- 20348 { '2022' }
- 17763 { '2019' }
- 14393 { '2016' }
- Default { $DisplayVersion }
- }
- }
-
- WriteLog "Unloading registry"
- Invoke-Process reg "unload HKLM\FFU" | Out-Null
- #This prevents Critical Process Died errors you can have during deployment of the FFU. Capturing from very fast disks (NVME) can cause the capture to happen faster than Windows is ready for.
- WriteLog 'Sleep 60 seconds to allow registry to completely unload'
- Start-sleep 60
-
- return @{
-
- DisplayVersion = $DisplayVersion
- BuildDate = $buildDate
- Name = $Name
- # SKU = $WindowsSKU
- }
-}
Function Get-USBDrive {
# Log the start of the USB drive check
WriteLog 'Checking for USB drives'
From 78212f06d7bb82405981ad17d0436c871c9d173e Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Mon, 30 Mar 2026 16:37:53 -0700
Subject: [PATCH 20/34] Add experimental VM networking opt-in for Hyper-V
builds
The Hyper-V switch selection in the UI previously did not connect the build VM to the network during provisioning. Since internet-connected Sysprep and capture flows are still experimental, this introduces an explicit "Enable VM Networking" checkbox to the Hyper-V Settings page that defaults to off.
- Adds the `-EnableVMNetworking` parameter to BuildFFUVM.ps1 to conditionally attach the Hyper-V network adapter during VM creation.
- Persists the setting through FFU config files and blocks UI execution if enabled without a valid switch.
- Refactors WPF event handlers in FFUUI.Core to fix dropdown scoping errors.
- Updates documentation and the sample configuration file to reflect the new behavior.
---
FFUDevelopment/BuildFFUVM.ps1 | 60 +++++++++++++++---
FFUDevelopment/BuildFFUVM_UI.ps1 | 7 ++
FFUDevelopment/BuildFFUVM_UI.xaml | 14 ++--
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 6 ++
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 47 +++++++++++---
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 5 +-
FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 | 1 +
FFUDevelopment/config/Sample_default.json | Bin 6094 -> 6162 bytes
docs/hyperv_settings.md | 8 ++-
docs/parameters_reference.md | 3 +-
docs/quickstart.md | 4 +-
11 files changed, 128 insertions(+), 27 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 14e4e50..5055dbb 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -90,6 +90,9 @@ Path to a JSON file that specifies which drivers to download.
.PARAMETER ExportConfigFile
Path to a JSON file to export the parameters used for the script.
+.PARAMETER EnableVMNetworking
+When set to $true, connects the build VM to the Hyper-V virtual switch named in -VMSwitchName during provisioning. Default is $false because internet-connected Sysprep is experimental.
+
.PARAMETER FFUCaptureLocation
Path to the folder where the captured FFU will be stored. Default is $FFUDevelopmentPath\FFU.
@@ -223,7 +226,7 @@ Path to a JSON file containing a list of user-defined applications to install. D
Default is $FFUDevelopmentPath\VM. This is the location of the VHDX that gets created where Windows will be installed to.
.PARAMETER VMSwitchName
-Name of the Hyper-V virtual switch. Optional when building with InstallApps. Provide it only if the VM needs network connectivity during provisioning.
+Name of the Hyper-V virtual switch used when -EnableVMNetworking is set to $true. Provide it only if the VM needs network connectivity during provisioning.
.PARAMETER WindowsArch
String value of 'x86', 'x64', or 'arm64'. This is used to identify which architecture of Windows to download. Default is 'x64'.
@@ -317,6 +320,7 @@ param(
[uint64]$Memory = 4GB,
[uint64]$Disksize = 50GB,
[int]$Processors = 4,
+ [bool]$EnableVMNetworking,
[string]$VMSwitchName,
[string]$VMLocation,
[string]$FFUPrefix = '_FFU',
@@ -501,6 +505,13 @@ if ($ConfigFile -and (Test-Path -Path $ConfigFile)) {
}
}
+$vmSwitchWasExplicitlyBound = $PSBoundParameters.ContainsKey('VMSwitchName')
+$enableVmNetworkingWasExplicitlyBound = $PSBoundParameters.ContainsKey('EnableVMNetworking')
+if (-not $EnableVMNetworking -and $vmSwitchWasExplicitlyBound -and -not $enableVmNetworkingWasExplicitlyBound) {
+ $EnableVMNetworking = $true
+ WriteLog 'EnableVMNetworking not explicitly set. Enabling VM networking because -VMSwitchName was supplied on the command line.'
+}
+
# Validate that the selected Windows SKU is compatible with the chosen Windows release and ensure an ISO is provided for unsupported releases
$clientSKUs = @(
'Home',
@@ -2899,6 +2910,27 @@ function New-FFUVM {
$VM = New-VM -Name $VMName -Path $VMPath -MemoryStartupBytes $memory -VHDPath $VHDXPath -Generation 2
Set-VMProcessor -VMName $VMName -Count $processors
+ # Connect the VM to the requested switch only when the experimental networking flag is enabled.
+ if ($EnableVMNetworking) {
+ $primaryVmNetworkAdapter = Get-VMNetworkAdapter -VMName $VMName -ErrorAction SilentlyContinue | Select-Object -First 1
+ if ($null -ne $primaryVmNetworkAdapter) {
+ if ($primaryVmNetworkAdapter.SwitchName -eq $VMSwitchName) {
+ WriteLog "VM '$VMName' is already connected to Hyper-V switch '$VMSwitchName'."
+ }
+ else {
+ Connect-VMNetworkAdapter -VMNetworkAdapter $primaryVmNetworkAdapter -SwitchName $VMSwitchName -ErrorAction Stop
+ WriteLog "Connected VM '$VMName' to Hyper-V switch '$VMSwitchName'."
+ }
+ }
+ else {
+ Add-VMNetworkAdapter -VMName $VMName -SwitchName $VMSwitchName -Name 'FFUNetworkAdapter' -ErrorAction Stop | Out-Null
+ WriteLog "Added VM network adapter for '$VMName' on Hyper-V switch '$VMSwitchName'."
+ }
+ }
+ else {
+ WriteLog "VM networking is disabled for '$VMName'."
+ }
+
#Mount AppsISO
Add-VMDvdDrive -VMName $VMName -Path $AppsISO
@@ -5500,14 +5532,26 @@ if ($CopyUnattend) {
if (($InstallOffice -eq $true) -and ($InstallApps -eq $false)) {
throw "If variable InstallOffice is set to `$true, InstallApps must also be set to `$true."
}
-if ($VMSwitchName) {
- WriteLog "Validating -VMSwitchName $VMSwitchName"
- #Check $VMSwitchName by using Get-VMSwitch
- $VMSwitch = Get-VMSwitch -Name $VMSwitchName -ErrorAction SilentlyContinue
- if (-not $VMSwitch) {
- throw "-VMSwitchName $VMSwitchName not found. Please check the -VMSwitchName parameter and try again."
+if ($EnableVMNetworking) {
+ if ($InstallApps -eq $false) {
+ WriteLog 'EnableVMNetworking is set to true, but InstallApps is false. No VM will be created, so VM networking will be ignored.'
}
- WriteLog '-VMSwitchName validation complete'
+ else {
+ if ([string]::IsNullOrWhiteSpace($VMSwitchName)) {
+ throw '-EnableVMNetworking requires -VMSwitchName. Select or enter a Hyper-V switch and try again.'
+ }
+
+ WriteLog "Experimental VM networking enabled. Validating -VMSwitchName $VMSwitchName"
+ #Check $VMSwitchName by using Get-VMSwitch
+ $VMSwitch = Get-VMSwitch -Name $VMSwitchName -ErrorAction SilentlyContinue
+ if (-not $VMSwitch) {
+ throw "-VMSwitchName $VMSwitchName not found. Please check the -VMSwitchName parameter and try again."
+ }
+ WriteLog '-EnableVMNetworking validation complete'
+ }
+}
+elseif ($VMSwitchName) {
+ WriteLog "VM networking is disabled. Stored -VMSwitchName $VMSwitchName will not be used unless -EnableVMNetworking is `$true."
}
if (-not ($ISOPath) -and ($OptionalFeatures -like '*netfx3*')) {
diff --git a/FFUDevelopment/BuildFFUVM_UI.ps1 b/FFUDevelopment/BuildFFUVM_UI.ps1
index fc7eefb..3bf3926 100644
--- a/FFUDevelopment/BuildFFUVM_UI.ps1
+++ b/FFUDevelopment/BuildFFUVM_UI.ps1
@@ -425,6 +425,13 @@ $script:uiState.Controls.btnRun.Add_Click({
return
}
+ if ($config.EnableVMNetworking -and $config.InstallApps -and [string]::IsNullOrWhiteSpace([string]$config.VMSwitchName)) {
+ [System.Windows.MessageBox]::Show("Select or enter a VM Switch Name before enabling VM networking.", "VM Switch Required", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: VM switch required for experimental networking."
+ return
+ }
+
$configFilePath = Join-Path $config.FFUDevelopmentPath "\config\FFUConfig.json"
# Sort top-level keys alphabetically for consistent output
$sortedConfig = [ordered]@{}
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index f645932..de8f077 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -315,11 +315,15 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index 982b5c5..f8791b0 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -44,6 +44,7 @@ function Get-UIConfig {
DownloadDrivers = $State.Controls.chkDownloadDrivers.IsChecked
DriversFolder = $State.Controls.txtDriversFolder.Text
DriversJsonPath = $State.Controls.txtDriversJsonPath.Text
+ EnableVMNetworking = $State.Controls.chkEnableVMNetworking.IsChecked
FFUCaptureLocation = $State.Controls.txtFFUCaptureLocation.Text
FFUDevelopmentPath = $State.Controls.txtFFUDevPath.Text
FFUPrefix = $State.Controls.txtVMNamePrefix.Text
@@ -466,6 +467,7 @@ function Update-UIFromConfig {
Set-UIValue -ControlName 'chkRemoveDownloadedESD' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'RemoveDownloadedESD' -State $State
# Hyper-V Settings
+ Set-UIValue -ControlName 'chkEnableVMNetworking' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'EnableVMNetworking' -State $State
Select-VMSwitchFromConfig -State $State -ConfigContent $ConfigContent
Set-UIValue -ControlName 'txtDiskSize' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'Disksize' -TransformValue { param($val) $val / 1GB } -State $State
Set-UIValue -ControlName 'txtMemory' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'Memory' -TransformValue { param($val) $val / 1GB } -State $State
@@ -473,6 +475,10 @@ function Update-UIFromConfig {
Set-UIValue -ControlName 'txtVMLocation' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'VMLocation' -State $State
Set-UIValue -ControlName 'txtVMNamePrefix' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'FFUPrefix' -State $State
Set-UIValue -ControlName 'cmbLogicalSectorSize' -PropertyName 'SelectedItem' -ConfigObject $ConfigContent -ConfigKey 'LogicalSectorSizeBytes' -TransformValue { param($val) $val.ToString() } -State $State
+ $State.Controls.spVMNetworkingSettings.IsEnabled = $true -eq $State.Controls.chkEnableVMNetworking.IsChecked
+ if (-not ($true -eq $State.Controls.chkEnableVMNetworking.IsChecked)) {
+ $State.Controls.txtCustomVMSwitchName.Visibility = 'Collapsed'
+ }
# Windows Settings
Set-UIValue -ControlName 'txtISOPath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'ISOPath' -State $State
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index ef7c5cb..32a13fb 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -5,6 +5,28 @@
This module is dedicated to managing user interactions within the FFU Builder UI. It contains the Register-EventHandlers function, which connects UI controls defined in the XAML to their corresponding actions in the PowerShell backend. This includes handling button clicks, text input validation, checkbox state changes, and list view interactions across all tabs, effectively wiring up the application's front-end to its core logic.
#>
+function Update-VMNetworkingControls {
+ param([PSCustomObject]$State)
+
+ $isVmNetworkingEnabled = $true -eq $State.Controls.chkEnableVMNetworking.IsChecked
+ $State.Controls.spVMNetworkingSettings.IsEnabled = $isVmNetworkingEnabled
+
+ if (-not $isVmNetworkingEnabled) {
+ $State.Controls.txtCustomVMSwitchName.Visibility = 'Collapsed'
+ return
+ }
+
+ if ($State.Controls.cmbVMSwitchName.SelectedItem -eq 'Other') {
+ $State.Controls.txtCustomVMSwitchName.Visibility = 'Visible'
+ if ([string]::IsNullOrWhiteSpace($State.Controls.txtCustomVMSwitchName.Text) -and $null -ne $State.Data.customVMSwitchName) {
+ $State.Controls.txtCustomVMSwitchName.Text = $State.Data.customVMSwitchName
+ }
+ }
+ else {
+ $State.Controls.txtCustomVMSwitchName.Visibility = 'Collapsed'
+ }
+}
+
function Register-EventHandlers {
param([PSCustomObject]$State)
WriteLog "Registering UI event handlers..."
@@ -379,22 +401,27 @@ function Register-EventHandlers {
})
# Hyper-V tab event handlers
+ $State.Controls.chkEnableVMNetworking.Add_Checked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ Update-VMNetworkingControls -State $localState
+ })
+
+ $State.Controls.chkEnableVMNetworking.Add_Unchecked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ Update-VMNetworkingControls -State $localState
+ })
+
$State.Controls.cmbVMSwitchName.Add_SelectionChanged({
param($eventSource, $selectionChangedEventArgs)
# The state object is available via the parent window's Tag property
$window = [System.Windows.Window]::GetWindow($eventSource)
$localState = $window.Tag
- $selectedItem = $eventSource.SelectedItem
- if ($selectedItem -eq 'Other') {
- $localState.Controls.txtCustomVMSwitchName.Visibility = 'Visible'
- if ([string]::IsNullOrWhiteSpace($localState.Controls.txtCustomVMSwitchName.Text) -and $null -ne $localState.Data.customVMSwitchName) {
- $localState.Controls.txtCustomVMSwitchName.Text = $localState.Data.customVMSwitchName
- }
- }
- else {
- $localState.Controls.txtCustomVMSwitchName.Visibility = 'Collapsed'
- }
+ Update-VMNetworkingControls -State $localState
})
# Persist custom VM switch name when user edits it while 'Other' is selected
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index c58446d..0d921af 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -205,6 +205,8 @@ function Initialize-UIControls {
$State.Controls.txtStatus = $window.FindName('txtStatus')
$State.Controls.pbOverallProgress = $window.FindName('progressBar')
$State.Controls.txtOverallStatus = $window.FindName('txtStatus')
+ $State.Controls.chkEnableVMNetworking = $window.FindName('chkEnableVMNetworking')
+ $State.Controls.spVMNetworkingSettings = $window.FindName('spVMNetworkingSettings')
$State.Controls.cmbVMSwitchName = $window.FindName('cmbVMSwitchName')
$State.Controls.txtCustomVMSwitchName = $window.FindName('txtCustomVMSwitchName')
$State.Controls.txtFFUDevPath = $window.FindName('txtFFUDevPath')
@@ -345,7 +347,6 @@ function Initialize-VMSwitchData {
$State.Controls.cmbVMSwitchName.Items.Add('Other') | Out-Null
if ($State.Controls.cmbVMSwitchName.Items.Count -gt 1) {
$State.Controls.cmbVMSwitchName.SelectedIndex = 0
- $firstSwitch = $State.Controls.cmbVMSwitchName.SelectedItem
$State.Controls.txtCustomVMSwitchName.Visibility = 'Collapsed'
}
else {
@@ -398,7 +399,9 @@ function Initialize-UIDefaults {
Update-BitsPrioritySetting -State $State
# Hyper-V Settings defaults from General Defaults
+ $State.Controls.chkEnableVMNetworking.IsChecked = $State.Defaults.generalDefaults.EnableVMNetworking
Initialize-VMSwitchData -State $State
+ $State.Controls.spVMNetworkingSettings.IsEnabled = $true -eq $State.Controls.chkEnableVMNetworking.IsChecked
$State.Controls.txtDiskSize.Text = $State.Defaults.generalDefaults.DiskSizeGB
$State.Controls.txtMemory.Text = $State.Defaults.generalDefaults.MemoryGB
$State.Controls.txtProcessors.Text = $State.Defaults.generalDefaults.Processors
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
index 4c1ecbc..6525348 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
@@ -140,6 +140,7 @@ function Get-GeneralDefaults {
RemoveUpdates = $false
RemoveDownloadedESD = $true
# Hyper-V Settings Defaults
+ EnableVMNetworking = $false
DiskSizeGB = 50
MemoryGB = 4
Processors = 4
diff --git a/FFUDevelopment/config/Sample_default.json b/FFUDevelopment/config/Sample_default.json
index fff1a49346ba52d9a682469b35b85a93dba4a32e..689ef22c1cee97af442d0eee7acbba66f5e39a4d 100644
GIT binary patch
delta 51
zcmX@7KgnRjIZ
Date: Tue, 7 Apr 2026 10:48:34 -0700
Subject: [PATCH 21/34] Add flexible device naming options to Unattend delivery
Introduces new parameters and UI controls to give users more choice over device naming when applying an Unattend.xml file.
Users can now specify a device name, use a static or template-based name with the `%serial%` variable, or continue using a list of prefixes.
The UI is updated with a new Device Naming expander to guide the user through the options and clearly indicate the requirements for each mode, ensuring that mutually exclusive options like Copy Unattend and Inject Unattend are not selected together.
Documentation is updated to reflect the new functionality.
---
FFUDevelopment/BuildFFUVM.ps1 | 224 +++++++++++++-
FFUDevelopment/BuildFFUVM_UI.ps1 | 54 ++++
FFUDevelopment/BuildFFUVM_UI.xaml | 46 ++-
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 22 ++
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 274 ++++++++++++++++++
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 16 +
.../FFUUI.Core/FFUUI.Core.Shared.psm1 | 3 +
FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 | 6 +
.../WinPEDeployFFUFiles/ApplyFFU.ps1 | 122 ++++++--
FFUDevelopment/config/Sample_default.json | Bin 6162 -> 6506 bytes
docs/build.md | 32 +-
docs/parameters_reference.md | 8 +-
docs/quickstart.md | 18 +-
13 files changed, 764 insertions(+), 61 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 5055dbb..bb61540 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -72,6 +72,18 @@ When set to $true, will copy the provisioning package from the $FFUDevelopmentPa
.PARAMETER CopyUnattend
When set to $true, will copy the $FFUDevelopmentPath\Unattend folder to the Deployment partition of the USB drive. Default is $false.
+.PARAMETER DeviceNamingMode
+Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Supported values are Legacy, None, Template, and Prefixes.
+
+.PARAMETER DeviceNameTemplate
+Sets the device name used when DeviceNamingMode is Template. Supports a static name or the %serial% token when CopyUnattend is used.
+
+.PARAMETER DeviceNamePrefixes
+Sets the prefixes used when DeviceNamingMode is Prefixes. Each entry becomes a line in prefixes.txt on the deployment media.
+
+.PARAMETER DeviceNamePrefixesPath
+Path to the source prefixes file used for legacy copy or when DeviceNamePrefixes is not supplied. Default is $FFUDevelopmentPath\Unattend\prefixes.txt.
+
.PARAMETER CreateDeploymentMedia
When set to $true, this will create WinPE deployment media for use when deploying to a physical device.
@@ -407,6 +419,11 @@ param(
[bool]$AllowVHDXCaching,
[bool]$CopyPPKG,
[bool]$CopyUnattend,
+ [ValidateSet('Legacy', 'None', 'Template', 'Prefixes')]
+ [string]$DeviceNamingMode = 'Legacy',
+ [string]$DeviceNameTemplate,
+ [string[]]$DeviceNamePrefixes,
+ [string]$DeviceNamePrefixesPath,
[bool]$CopyAutopilot,
[bool]$CompactOS = $true,
[bool]$CleanupDeployISO = $true,
@@ -505,6 +522,79 @@ if ($ConfigFile -and (Test-Path -Path $ConfigFile)) {
}
}
+function Get-UnattendSourcePath {
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$UnattendFolder,
+ [Parameter(Mandatory = $true)]
+ [string]$WindowsArch
+ )
+
+ $archSuffix = if ($WindowsArch -ieq 'arm64') { 'arm64' } else { 'x64' }
+ return Join-Path $UnattendFolder "unattend_$archSuffix.xml"
+}
+
+function Test-UnattendHasComputerNameElement {
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$Path
+ )
+
+ [xml]$unattendXml = Get-Content -Path $Path
+ foreach ($component in $unattendXml.unattend.settings.component) {
+ if ($component.ComputerName) {
+ return $true
+ }
+ }
+
+ return $false
+}
+
+function Save-StagedUnattendFile {
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$SourcePath,
+ [Parameter(Mandatory = $true)]
+ [string]$DestinationPath,
+ [Parameter(Mandatory = $true)]
+ [ValidateSet('Legacy', 'None', 'Template', 'Prefixes')]
+ [string]$DeviceNamingMode,
+ [string]$DeviceNameTemplate
+ )
+
+ if ($DeviceNamingMode -in @('Legacy', 'Prefixes')) {
+ Copy-Item -Path $SourcePath -Destination $DestinationPath -Force | Out-Null
+ return
+ }
+
+ [xml]$unattendXml = Get-Content -Path $SourcePath
+ $computerNameComponent = $null
+ foreach ($component in $unattendXml.unattend.settings.component) {
+ if ($component.ComputerName) {
+ $computerNameComponent = $component
+ break
+ }
+ }
+
+ if ($null -eq $computerNameComponent) {
+ if ($DeviceNamingMode -eq 'None') {
+ Copy-Item -Path $SourcePath -Destination $DestinationPath -Force | Out-Null
+ return
+ }
+
+ throw "ComputerName element not found in unattend source file: $SourcePath"
+ }
+
+ if ($DeviceNamingMode -eq 'None') {
+ $computerNameComponent.ComputerName = '*'
+ }
+ elseif ($DeviceNamingMode -eq 'Template') {
+ $computerNameComponent.ComputerName = $DeviceNameTemplate
+ }
+
+ $unattendXml.Save($DestinationPath)
+}
+
$vmSwitchWasExplicitlyBound = $PSBoundParameters.ContainsKey('VMSwitchName')
$enableVmNetworkingWasExplicitlyBound = $PSBoundParameters.ContainsKey('EnableVMNetworking')
if (-not $EnableVMNetworking -and $vmSwitchWasExplicitlyBound -and -not $enableVmNetworkingWasExplicitlyBound) {
@@ -512,6 +602,52 @@ if (-not $EnableVMNetworking -and $vmSwitchWasExplicitlyBound -and -not $enableV
WriteLog 'EnableVMNetworking not explicitly set. Enabling VM networking because -VMSwitchName was supplied on the command line.'
}
+$normalizedDeviceNameTemplate = if ($null -ne $DeviceNameTemplate) { $DeviceNameTemplate.Trim() } else { $null }
+$effectiveDeviceNamePrefixes = @($DeviceNamePrefixes | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | ForEach-Object { $_.Trim() })
+$resolvedDeviceNamePrefixesPath = if ([string]::IsNullOrWhiteSpace($DeviceNamePrefixesPath)) {
+ Join-Path (Join-Path $FFUDevelopmentPath 'Unattend') 'prefixes.txt'
+}
+else {
+ $DeviceNamePrefixesPath
+}
+
+if (($DeviceNamingMode -eq 'Prefixes') -and ($effectiveDeviceNamePrefixes.Count -eq 0) -and (Test-Path -Path $resolvedDeviceNamePrefixesPath -PathType Leaf)) {
+ $effectiveDeviceNamePrefixes = @(Get-Content -Path $resolvedDeviceNamePrefixesPath | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | ForEach-Object { $_.Trim() })
+ WriteLog "Loaded device name prefixes from $resolvedDeviceNamePrefixesPath"
+}
+
+if ($CopyUnattend -and $InjectUnattend) {
+ throw 'CopyUnattend and InjectUnattend cannot both be set to `$true. Select only one unattend delivery method.'
+}
+
+if ($DeviceNamingMode -eq 'Template') {
+ if ([string]::IsNullOrWhiteSpace($normalizedDeviceNameTemplate)) {
+ throw 'DeviceNamingMode Template requires DeviceNameTemplate.'
+ }
+
+ $templateWithoutSupportedVariables = $normalizedDeviceNameTemplate -replace '(?i)%serial%', ''
+ if ($templateWithoutSupportedVariables -match '%') {
+ throw 'Only the %serial% device name variable is supported.'
+ }
+
+ if (-not ($CopyUnattend -or $InjectUnattend)) {
+ throw 'DeviceNamingMode Template requires either CopyUnattend or InjectUnattend.'
+ }
+
+ if ($InjectUnattend -and (-not $CopyUnattend) -and $normalizedDeviceNameTemplate -match '(?i)%serial%') {
+ throw 'The %serial% device name variable is only supported when CopyUnattend is used.'
+ }
+}
+elseif ($DeviceNamingMode -eq 'Prefixes') {
+ if (-not $CopyUnattend) {
+ throw 'DeviceNamingMode Prefixes requires CopyUnattend. Prefix-based naming is not supported with InjectUnattend.'
+ }
+
+ if ($effectiveDeviceNamePrefixes.Count -eq 0) {
+ throw 'DeviceNamingMode Prefixes requires at least one DeviceNamePrefixes entry or a valid DeviceNamePrefixesPath.'
+ }
+}
+
# Validate that the selected Windows SKU is compatible with the chosen Windows release and ensure an ISO is provided for unsupported releases
$clientSKUs = @(
'Home',
@@ -4184,6 +4320,57 @@ Function New-DeploymentUSB {
Import-Module "$($using:PSScriptRoot)\FFU.Common" -Force
Set-CommonCoreLogPath -Path $using:LogFile
+ function Get-LocalUnattendSourcePath {
+ param(
+ [string]$UnattendFolder,
+ [string]$WindowsArch
+ )
+
+ $archSuffix = if ($WindowsArch -ieq 'arm64') { 'arm64' } else { 'x64' }
+ return Join-Path $UnattendFolder "unattend_$archSuffix.xml"
+ }
+
+ function Save-LocalStagedUnattendFile {
+ param(
+ [string]$SourcePath,
+ [string]$DestinationPath,
+ [string]$DeviceNamingMode,
+ [string]$DeviceNameTemplate
+ )
+
+ if ($DeviceNamingMode -in @('Legacy', 'Prefixes')) {
+ Copy-Item -Path $SourcePath -Destination $DestinationPath -Force | Out-Null
+ return
+ }
+
+ [xml]$unattendXml = Get-Content -Path $SourcePath
+ $computerNameComponent = $null
+ foreach ($component in $unattendXml.unattend.settings.component) {
+ if ($component.ComputerName) {
+ $computerNameComponent = $component
+ break
+ }
+ }
+
+ if ($null -eq $computerNameComponent) {
+ if ($DeviceNamingMode -eq 'None') {
+ Copy-Item -Path $SourcePath -Destination $DestinationPath -Force | Out-Null
+ return
+ }
+
+ throw "ComputerName element not found in unattend source file: $SourcePath"
+ }
+
+ if ($DeviceNamingMode -eq 'None') {
+ $computerNameComponent.ComputerName = '*'
+ }
+ elseif ($DeviceNamingMode -eq 'Template') {
+ $computerNameComponent.ComputerName = $DeviceNameTemplate
+ }
+
+ $unattendXml.Save($DestinationPath)
+ }
+
$DiskNumber = $USBDrive.DeviceID.Replace("\\.\PHYSICALDRIVE", "")
WriteLog "Thread $([System.Threading.Thread]::CurrentThread.ManagedThreadId) processing DiskNumber $DiskNumber ($($USBDrive.Model))"
@@ -4244,15 +4431,15 @@ Function New-DeploymentUSB {
$UnattendPathOnUSB = Join-Path $DeployPartitionDriveLetter "Unattend"
WriteLog "Copying unattend file to $UnattendPathOnUSB"
New-Item -Path $UnattendPathOnUSB -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
- if ($using:WindowsArch -eq 'x64') {
- Copy-Item -Path (Join-Path $using:UnattendFolder 'unattend_x64.xml') -Destination (Join-Path $UnattendPathOnUSB 'Unattend.xml') -Force | Out-Null
+ $unattendSource = Get-LocalUnattendSourcePath -UnattendFolder $using:UnattendFolder -WindowsArch $using:WindowsArch
+ Save-LocalStagedUnattendFile -SourcePath $unattendSource -DestinationPath (Join-Path $UnattendPathOnUSB 'Unattend.xml') -DeviceNamingMode $using:DeviceNamingMode -DeviceNameTemplate $using:normalizedDeviceNameTemplate
+ if ($using:DeviceNamingMode -eq 'Prefixes') {
+ WriteLog "Writing prefixes.txt file to $UnattendPathOnUSB"
+ $using:effectiveDeviceNamePrefixes | Set-Content -Path (Join-Path $UnattendPathOnUSB 'prefixes.txt') -Encoding UTF8
}
- elseif ($using:WindowsArch -eq 'arm64') {
- Copy-Item -Path (Join-Path $using:UnattendFolder 'unattend_arm64.xml') -Destination (Join-Path $UnattendPathOnUSB 'Unattend.xml') -Force | Out-Null
- }
- if (Test-Path (Join-Path $using:UnattendFolder 'prefixes.txt')) {
+ elseif (($using:DeviceNamingMode -eq 'Legacy') -and (Test-Path -Path $using:resolvedDeviceNamePrefixesPath -PathType Leaf)) {
WriteLog "Copying prefixes.txt file to $UnattendPathOnUSB"
- Copy-Item -Path (Join-Path $using:UnattendFolder 'prefixes.txt') -Destination (Join-Path $UnattendPathOnUSB 'prefixes.txt') -Force | Out-Null
+ Copy-Item -Path $using:resolvedDeviceNamePrefixesPath -Destination (Join-Path $UnattendPathOnUSB 'prefixes.txt') -Force | Out-Null
}
WriteLog 'Copy completed'
}
@@ -5518,9 +5705,26 @@ if ($CopyUnattend) {
WriteLog "-CopyUnattend is set to `$true, but the $UnattendFolder folder is missing a .XML file"
throw "-CopyUnattend is set to `$true, but the $UnattendFolder folder is missing a .XML file"
}
+
+ if ($DeviceNamingMode -eq 'Prefixes') {
+ $unattendSourcePath = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch
+ if (-not (Test-UnattendHasComputerNameElement -Path $unattendSourcePath)) {
+ throw "DeviceNamingMode Prefixes requires a ComputerName element in $unattendSourcePath"
+ }
+ }
+
WriteLog 'Unattend validation complete'
}
+if ($InjectUnattend -and $DeviceNamingMode -eq 'Template') {
+ $injectUnattendSourcePath = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch
+ if (Test-Path -Path $injectUnattendSourcePath -PathType Leaf) {
+ if (-not (Test-UnattendHasComputerNameElement -Path $injectUnattendSourcePath)) {
+ throw "DeviceNamingMode Template requires a ComputerName element in $injectUnattendSourcePath"
+ }
+ }
+}
+
#Override $InstallApps value if using ESD to build FFU. This is due to a strange issue where building the FFU
#from vhdx doesn't work (you get an older style OOBE screen and get stuck in an OOBE reboot loop when hitting next).
#This behavior doesn't happen with WIM files.
@@ -6418,9 +6622,7 @@ if ($InstallApps) {
#Create Apps ISO
# Inject Unattend.xml into Apps if requested and applicable
if ($InstallApps -and $InjectUnattend) {
- # Determine source unattend.xml based on architecture
- $archSuffix = if ($WindowsArch -ieq 'arm64') { 'arm64' } else { 'x64' }
- $unattendSource = Join-Path $UnattendFolder "unattend_$archSuffix.xml"
+ $unattendSource = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch
# Ensure target folder exists under Apps
$targetFolder = Join-Path $AppsPath 'Unattend'
@@ -6431,7 +6633,7 @@ if ($InstallApps) {
# Copy if source exists; otherwise log and skip
if (Test-Path -Path $unattendSource -PathType Leaf) {
$destination = Join-Path $targetFolder 'Unattend.xml'
- Copy-Item -Path $unattendSource -Destination $destination -Force | Out-Null
+ Save-StagedUnattendFile -SourcePath $unattendSource -DestinationPath $destination -DeviceNamingMode $DeviceNamingMode -DeviceNameTemplate $normalizedDeviceNameTemplate
WriteLog "Injected unattend file into Apps: $unattendSource -> $destination"
}
else {
diff --git a/FFUDevelopment/BuildFFUVM_UI.ps1 b/FFUDevelopment/BuildFFUVM_UI.ps1
index 3bf3926..90b8e32 100644
--- a/FFUDevelopment/BuildFFUVM_UI.ps1
+++ b/FFUDevelopment/BuildFFUVM_UI.ps1
@@ -432,6 +432,60 @@ $script:uiState.Controls.btnRun.Add_Click({
return
}
+ if ($config.CopyUnattend -and $config.InjectUnattend) {
+ [System.Windows.MessageBox]::Show("Copy Unattend.xml and Inject Unattend.xml cannot both be selected. Choose only one unattend delivery method.", "Unattend Selection Required", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: choose only one unattend delivery method."
+ return
+ }
+
+ if ($config.DeviceNamingMode -eq 'Template') {
+ if ([string]::IsNullOrWhiteSpace([string]$config.DeviceNameTemplate)) {
+ [System.Windows.MessageBox]::Show("Specify a device name before using 'Specify Device Name'.", "Device Name Required", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: device name required."
+ return
+ }
+
+ if (-not ($config.CopyUnattend -or $config.InjectUnattend)) {
+ [System.Windows.MessageBox]::Show("Select Copy Unattend.xml or Inject Unattend.xml before using 'Specify Device Name'.", "Unattend Selection Required", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: unattend delivery method required for device naming."
+ return
+ }
+
+ $templateWithoutSupportedVariables = ([string]$config.DeviceNameTemplate) -replace '(?i)%serial%', ''
+ if ($templateWithoutSupportedVariables -match '%') {
+ [System.Windows.MessageBox]::Show("Only the %serial% device name variable is supported.", "Unsupported Device Name Variable", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: unsupported device name variable."
+ return
+ }
+
+ if ($config.InjectUnattend -and (-not $config.CopyUnattend) -and ([string]$config.DeviceNameTemplate -match '(?i)%serial%')) {
+ [System.Windows.MessageBox]::Show("The %serial% device name variable is only supported when Copy Unattend.xml is selected.", "Unsupported Inject Unattend Setting", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: %serial% requires Copy Unattend.xml."
+ return
+ }
+ }
+ elseif ($config.DeviceNamingMode -eq 'Prefixes') {
+ if (-not $config.CopyUnattend) {
+ [System.Windows.MessageBox]::Show("Select Copy Unattend.xml before using 'Specify a list of Prefixes'.", "Copy Unattend Required", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: prefixes require Copy Unattend.xml."
+ return
+ }
+
+ $hasSavedPrefixesPath = -not [string]::IsNullOrWhiteSpace([string]$config.DeviceNamePrefixesPath) -and (Test-Path -Path $config.DeviceNamePrefixesPath -PathType Leaf)
+ if ((($null -eq $config.DeviceNamePrefixes) -or ($config.DeviceNamePrefixes.Count -eq 0)) -and -not $hasSavedPrefixesPath) {
+ [System.Windows.MessageBox]::Show("Enter at least one prefix or choose a valid prefixes file before using 'Specify a list of Prefixes'.", "Prefixes Required", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: prefixes required."
+ return
+ }
+ }
+
$configFilePath = Join-Path $config.FFUDevelopmentPath "\config\FFUConfig.json"
# Sort top-level keys alphabetically for consistent output
$sortedConfig = [ordered]@{}
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index de8f077..4d5f511 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -836,9 +836,11 @@
-
+
-
+
+
+
@@ -903,8 +905,40 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -969,8 +1003,8 @@
-
-
+
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index f8791b0..1d92654 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -36,6 +36,10 @@ function Get-UIConfig {
UseDriversAsPEDrivers = $State.Controls.chkUseDriversAsPEDrivers.IsChecked
CopyPPKG = $State.Controls.chkCopyPPKG.IsChecked
CopyUnattend = $State.Controls.chkCopyUnattend.IsChecked
+ DeviceNamingMode = Get-SelectedDeviceNamingMode -State $State
+ DeviceNameTemplate = $State.Controls.txtDeviceNameTemplate.Text
+ DeviceNamePrefixesPath = $State.Controls.txtDeviceNamePrefixesPath.Text
+ DeviceNamePrefixes = @(Get-DeviceNamePrefixes -State $State)
CopyAdditionalFFUFiles = $State.Controls.chkCopyAdditionalFFUFiles.IsChecked
CreateDeploymentMedia = $State.Controls.chkCreateDeploymentMedia.IsChecked
InjectUnattend = $State.Controls.chkInjectUnattend.IsChecked
@@ -456,6 +460,24 @@ function Update-UIFromConfig {
Set-UIValue -ControlName 'chkCopyAutopilot' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CopyAutopilot' -State $State
Set-UIValue -ControlName 'chkCopyUnattend' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CopyUnattend' -State $State
Set-UIValue -ControlName 'chkCopyPPKG' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CopyPPKG' -State $State
+ Set-UIValue -ControlName 'txtDeviceNamePrefixesPath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'DeviceNamePrefixesPath' -State $State
+ Set-UIValue -ControlName 'txtDeviceNameTemplate' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'DeviceNameTemplate' -State $State
+ Set-UIValue -ControlName 'txtDeviceNamePrefixes' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'DeviceNamePrefixes' -TransformValue { param($val) if ($val -is [System.Array]) { $val -join [System.Environment]::NewLine } else { [string]$val } } -State $State
+
+ if ([string]::IsNullOrWhiteSpace($State.Controls.txtDeviceNamePrefixesPath.Text)) {
+ $State.Controls.txtDeviceNamePrefixesPath.Text = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $State.Controls.txtFFUDevPath.Text
+ }
+
+ $deviceNamingMode = 'None'
+ if ($ConfigContent.PSObject.Properties.Name -contains 'DeviceNamingMode') {
+ $deviceNamingMode = [string]$ConfigContent.DeviceNamingMode
+ }
+ if ($deviceNamingMode -notin @('None', 'Template', 'Prefixes')) {
+ $deviceNamingMode = 'None'
+ }
+ Set-DeviceNamingMode -State $State -Mode $deviceNamingMode
+ Import-DeviceNamePrefixesFromConfiguredPath -State $State
+ Update-DeviceNamingControls -State $State
# Post Build Cleanup group (Build Tab)
Set-UIValue -ControlName 'chkCleanupAppsISO' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CleanupAppsISO' -State $State
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 32a13fb..5fa99e3 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -27,6 +27,172 @@ function Update-VMNetworkingControls {
}
}
+function Get-SelectedDeviceNamingMode {
+ param([PSCustomObject]$State)
+
+ if ($true -eq $State.Controls.rbDeviceNamingTemplate.IsChecked) {
+ return 'Template'
+ }
+
+ if ($true -eq $State.Controls.rbDeviceNamingPrefixes.IsChecked) {
+ return 'Prefixes'
+ }
+
+ return 'None'
+}
+
+function Set-DeviceNamingMode {
+ param(
+ [PSCustomObject]$State,
+ [ValidateSet('None', 'Template', 'Prefixes')]
+ [string]$Mode
+ )
+
+ $State.Controls.rbDeviceNamingNone.IsChecked = $Mode -eq 'None'
+ $State.Controls.rbDeviceNamingTemplate.IsChecked = $Mode -eq 'Template'
+ $State.Controls.rbDeviceNamingPrefixes.IsChecked = $Mode -eq 'Prefixes'
+}
+
+function Get-DeviceNamePrefixes {
+ param([PSCustomObject]$State)
+
+ if ($null -eq $State.Controls.txtDeviceNamePrefixes) {
+ return @()
+ }
+
+ return @(
+ $State.Controls.txtDeviceNamePrefixes.Text -split "\r?\n" |
+ Where-Object { -not [string]::IsNullOrWhiteSpace($_) } |
+ ForEach-Object { $_.Trim() }
+ )
+}
+
+function Import-DeviceNamePrefixesFile {
+ param(
+ [PSCustomObject]$State,
+ [string]$FilePath
+ )
+
+ if ([string]::IsNullOrWhiteSpace($FilePath) -or -not (Test-Path -Path $FilePath -PathType Leaf)) {
+ return $false
+ }
+
+ $prefixLines = @(Get-Content -Path $FilePath | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | ForEach-Object { $_.Trim() })
+ if ($null -ne $State.Controls.txtDeviceNamePrefixesPath) {
+ $State.Controls.txtDeviceNamePrefixesPath.Text = $FilePath
+ }
+ $State.Controls.txtDeviceNamePrefixes.Text = $prefixLines -join [System.Environment]::NewLine
+ WriteLog "Imported device name prefixes from $FilePath"
+ return $true
+}
+
+function Get-DefaultDeviceNamePrefixesPath {
+ param([string]$FFUDevelopmentPath)
+
+ if ([string]::IsNullOrWhiteSpace($FFUDevelopmentPath)) {
+ return $null
+ }
+
+ return Join-Path (Join-Path $FFUDevelopmentPath 'unattend') 'prefixes.txt'
+}
+
+function Import-DeviceNamePrefixesFromConfiguredPath {
+ param(
+ [PSCustomObject]$State,
+ [switch]$SkipIfTextPresent
+ )
+
+ if ($SkipIfTextPresent -and -not [string]::IsNullOrWhiteSpace($State.Controls.txtDeviceNamePrefixes.Text)) {
+ return
+ }
+
+ $prefixFilePath = $State.Controls.txtDeviceNamePrefixesPath.Text
+ if ([string]::IsNullOrWhiteSpace($prefixFilePath)) {
+ $prefixFilePath = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $State.Controls.txtFFUDevPath.Text
+ if (-not [string]::IsNullOrWhiteSpace($prefixFilePath) -and $null -ne $State.Controls.txtDeviceNamePrefixesPath) {
+ $State.Controls.txtDeviceNamePrefixesPath.Text = $prefixFilePath
+ }
+ }
+
+ if (Test-Path -Path $prefixFilePath -PathType Leaf) {
+ Import-DeviceNamePrefixesFile -State $State -FilePath $prefixFilePath | Out-Null
+ }
+}
+
+function Test-DeviceNameTemplateUsesSerialToken {
+ param([PSCustomObject]$State)
+
+ return ((Get-SelectedDeviceNamingMode -State $State) -eq 'Template') -and ($State.Controls.txtDeviceNameTemplate.Text -match '(?i)%serial%')
+}
+
+function Update-UnattendSelectionControls {
+ param([PSCustomObject]$State)
+
+ $selectedDeviceNamingMode = Get-SelectedDeviceNamingMode -State $State
+ $isCopyUnattendSelected = $true -eq $State.Controls.chkCopyUnattend.IsChecked
+ $isInjectUnattendSelected = $true -eq $State.Controls.chkInjectUnattend.IsChecked
+ $deviceNameTemplateUsesSerialToken = Test-DeviceNameTemplateUsesSerialToken -State $State
+
+ if ($isCopyUnattendSelected -and $isInjectUnattendSelected) {
+ if (($selectedDeviceNamingMode -eq 'Prefixes') -or $deviceNameTemplateUsesSerialToken) {
+ $State.Controls.chkInjectUnattend.IsChecked = $false
+ $isInjectUnattendSelected = $false
+ }
+ else {
+ $State.Controls.chkCopyUnattend.IsChecked = $false
+ $isCopyUnattendSelected = $false
+ }
+ }
+
+ if (($selectedDeviceNamingMode -eq 'Prefixes') -or $deviceNameTemplateUsesSerialToken) {
+ if (-not $isCopyUnattendSelected) {
+ $State.Controls.chkCopyUnattend.IsChecked = $true
+ $isCopyUnattendSelected = $true
+ }
+
+ if ($isInjectUnattendSelected) {
+ $State.Controls.chkInjectUnattend.IsChecked = $false
+ $isInjectUnattendSelected = $false
+ }
+
+ $State.Controls.chkCopyUnattend.IsEnabled = $false
+ $State.Controls.chkInjectUnattend.IsEnabled = $false
+ return
+ }
+
+ if ($isCopyUnattendSelected) {
+ $State.Controls.chkCopyUnattend.IsEnabled = $true
+ $State.Controls.chkInjectUnattend.IsEnabled = $false
+ }
+ elseif ($isInjectUnattendSelected) {
+ $State.Controls.chkCopyUnattend.IsEnabled = $false
+ $State.Controls.chkInjectUnattend.IsEnabled = $true
+ }
+ else {
+ $State.Controls.chkCopyUnattend.IsEnabled = $true
+ $State.Controls.chkInjectUnattend.IsEnabled = $true
+ }
+}
+
+function Update-DeviceNamingControls {
+ param([PSCustomObject]$State)
+
+ if (($true -eq $State.Controls.chkInjectUnattend.IsChecked) -and ($true -eq $State.Controls.rbDeviceNamingPrefixes.IsChecked)) {
+ $State.Controls.rbDeviceNamingNone.IsChecked = $true
+ }
+
+ $selectedDeviceNamingMode = Get-SelectedDeviceNamingMode -State $State
+ $State.Controls.deviceNameTemplatePanel.Visibility = if ($selectedDeviceNamingMode -eq 'Template') { 'Visible' } else { 'Collapsed' }
+ $State.Controls.deviceNamePrefixesPanel.Visibility = if ($selectedDeviceNamingMode -eq 'Prefixes') { 'Visible' } else { 'Collapsed' }
+ $State.Controls.rbDeviceNamingPrefixes.IsEnabled = -not ($true -eq $State.Controls.chkInjectUnattend.IsChecked)
+
+ if ($selectedDeviceNamingMode -eq 'Prefixes') {
+ Import-DeviceNamePrefixesFromConfiguredPath -State $State -SkipIfTextPresent
+ }
+
+ Update-UnattendSelectionControls -State $State
+}
+
function Register-EventHandlers {
param([PSCustomObject]$State)
WriteLog "Registering UI event handlers..."
@@ -242,7 +408,15 @@ function Register-EventHandlers {
$localState = $window.Tag
$selectedPath = Invoke-BrowseAction -Type 'Folder' -Title "Select FFU Development Path"
if ($selectedPath) {
+ $currentPrefixesPath = $localState.Controls.txtDeviceNamePrefixesPath.Text
+ $previousDefaultPrefixesPath = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text
$localState.Controls.txtFFUDevPath.Text = $selectedPath
+ $newDefaultPrefixesPath = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $selectedPath
+ if ([string]::IsNullOrWhiteSpace($currentPrefixesPath) -or $currentPrefixesPath -ieq $previousDefaultPrefixesPath) {
+ $localState.Controls.txtDeviceNamePrefixesPath.Text = $newDefaultPrefixesPath
+ }
+ Import-DeviceNamePrefixesFromConfiguredPath -State $localState
+ Update-DeviceNamingControls -State $localState
}
})
@@ -256,6 +430,106 @@ function Register-EventHandlers {
}
})
+ $State.Controls.rbDeviceNamingNone.Add_Checked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ Update-DeviceNamingControls -State $window.Tag
+ })
+ $State.Controls.rbDeviceNamingTemplate.Add_Checked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ Update-DeviceNamingControls -State $window.Tag
+ })
+ $State.Controls.txtDeviceNameTemplate.Add_TextChanged({
+ param($eventSource, $textChangedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ if ($null -ne $window -and $null -ne $window.Tag) {
+ Update-DeviceNamingControls -State $window.Tag
+ }
+ })
+ $State.Controls.rbDeviceNamingPrefixes.Add_Checked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ Update-DeviceNamingControls -State $window.Tag
+ })
+ $State.Controls.btnBrowseDeviceNamePrefixesPath.Add_Click({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ $currentPrefixesPath = $localState.Controls.txtDeviceNamePrefixesPath.Text
+ if ([string]::IsNullOrWhiteSpace($currentPrefixesPath)) {
+ $currentPrefixesPath = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text
+ }
+ $initialDirectory = if ([string]::IsNullOrWhiteSpace($currentPrefixesPath)) {
+ $null
+ }
+ else {
+ Split-Path $currentPrefixesPath -Parent
+ }
+ $fileName = if ([string]::IsNullOrWhiteSpace($currentPrefixesPath)) { 'prefixes.txt' } else { Split-Path $currentPrefixesPath -Leaf }
+ $selectedPath = Invoke-BrowseAction -Type 'OpenFile' -Title 'Select prefixes file path' -Filter 'Text files (*.txt)|*.txt|All files (*.*)|*.*' -InitialDirectory $initialDirectory -FileName $fileName
+ if (Import-DeviceNamePrefixesFile -State $localState -FilePath $selectedPath) {
+ Update-DeviceNamingControls -State $localState
+ }
+ })
+ $State.Controls.btnSaveDeviceNamePrefixes.Add_Click({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ $prefixLines = @(Get-DeviceNamePrefixes -State $localState)
+
+ if ($prefixLines.Count -eq 0) {
+ [System.Windows.MessageBox]::Show("Enter at least one prefix before saving the prefixes file.", "Prefixes Required", "OK", "Warning") | Out-Null
+ return
+ }
+
+ $currentPrefixesPath = $localState.Controls.txtDeviceNamePrefixesPath.Text
+ if ([string]::IsNullOrWhiteSpace($currentPrefixesPath)) {
+ $currentPrefixesPath = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text
+ if (-not [string]::IsNullOrWhiteSpace($currentPrefixesPath)) {
+ $localState.Controls.txtDeviceNamePrefixesPath.Text = $currentPrefixesPath
+ }
+ }
+
+ if ([string]::IsNullOrWhiteSpace($currentPrefixesPath)) {
+ [System.Windows.MessageBox]::Show("Select a valid Prefixes File Path before saving prefixes.", "Prefixes File Path Required", "OK", "Warning") | Out-Null
+ return
+ }
+
+ try {
+ $prefixLines | Set-Content -Path $currentPrefixesPath -Encoding UTF8
+ $localState.Controls.txtDeviceNamePrefixesPath.Text = $currentPrefixesPath
+ WriteLog "Saved device name prefixes to $currentPrefixesPath"
+ }
+ catch {
+ [System.Windows.MessageBox]::Show("Saving prefixes failed for '$currentPrefixesPath'. $($_.Exception.Message)", "Save Prefixes Failed", "OK", "Error") | Out-Null
+ }
+ })
+ $State.Controls.chkCopyUnattend.Add_Checked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ $localState.Controls.chkInjectUnattend.IsChecked = $false
+ Update-DeviceNamingControls -State $localState
+ })
+ $State.Controls.chkCopyUnattend.Add_Unchecked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ Update-DeviceNamingControls -State $window.Tag
+ })
+ $State.Controls.chkInjectUnattend.Add_Checked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ $localState.Controls.chkCopyUnattend.IsChecked = $false
+ Update-DeviceNamingControls -State $localState
+ })
+ $State.Controls.chkInjectUnattend.Add_Unchecked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ Update-DeviceNamingControls -State $window.Tag
+ })
+
# Build USB Drive Settings Event Handlers
# The USB Expander is always visible; the checkbox controls child settings only
$State.Controls.chkBuildUSBDriveEnable.Add_Checked({
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index 0d921af..e84e1f5 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -220,6 +220,16 @@ function Initialize-UIControls {
$State.Controls.chkAllowVHDXCaching = $window.FindName('chkAllowVHDXCaching')
$State.Controls.chkCreateDeploymentMedia = $window.FindName('chkCreateDeploymentMedia')
$State.Controls.chkInjectUnattend = $window.FindName('chkInjectUnattend')
+ $State.Controls.rbDeviceNamingNone = $window.FindName('rbDeviceNamingNone')
+ $State.Controls.rbDeviceNamingTemplate = $window.FindName('rbDeviceNamingTemplate')
+ $State.Controls.rbDeviceNamingPrefixes = $window.FindName('rbDeviceNamingPrefixes')
+ $State.Controls.deviceNameTemplatePanel = $window.FindName('deviceNameTemplatePanel')
+ $State.Controls.deviceNamePrefixesPanel = $window.FindName('deviceNamePrefixesPanel')
+ $State.Controls.txtDeviceNameTemplate = $window.FindName('txtDeviceNameTemplate')
+ $State.Controls.txtDeviceNamePrefixesPath = $window.FindName('txtDeviceNamePrefixesPath')
+ $State.Controls.btnBrowseDeviceNamePrefixesPath = $window.FindName('btnBrowseDeviceNamePrefixesPath')
+ $State.Controls.txtDeviceNamePrefixes = $window.FindName('txtDeviceNamePrefixes')
+ $State.Controls.btnSaveDeviceNamePrefixes = $window.FindName('btnSaveDeviceNamePrefixes')
$State.Controls.chkVerbose = $window.FindName('chkVerbose')
$State.Controls.chkCopyAutopilot = $window.FindName('chkCopyAutopilot')
$State.Controls.chkCopyUnattend = $window.FindName('chkCopyUnattend')
@@ -383,6 +393,12 @@ function Initialize-UIDefaults {
$State.Controls.chkCopyAutopilot.IsChecked = $State.Defaults.generalDefaults.CopyAutopilot
$State.Controls.chkCopyUnattend.IsChecked = $State.Defaults.generalDefaults.CopyUnattend
$State.Controls.chkCopyPPKG.IsChecked = $State.Defaults.generalDefaults.CopyPPKG
+ Set-DeviceNamingMode -State $State -Mode $State.Defaults.generalDefaults.DeviceNamingMode
+ $State.Controls.txtDeviceNameTemplate.Text = $State.Defaults.generalDefaults.DeviceNameTemplate
+ $State.Controls.txtDeviceNamePrefixesPath.Text = $State.Defaults.generalDefaults.DeviceNamePrefixesPath
+ $State.Controls.txtDeviceNamePrefixes.Text = ($State.Defaults.generalDefaults.DeviceNamePrefixes -join [System.Environment]::NewLine)
+ Import-DeviceNamePrefixesFromConfiguredPath -State $State
+ Update-DeviceNamingControls -State $State
$State.Controls.chkCleanupAppsISO.IsChecked = $State.Defaults.generalDefaults.CleanupAppsISO
$State.Controls.chkCleanupDeployISO.IsChecked = $State.Defaults.generalDefaults.CleanupDeployISO
$State.Controls.chkCleanupDrivers.IsChecked = $State.Defaults.generalDefaults.CleanupDrivers
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1
index 2ccabde..3aef928 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Shared.psm1
@@ -1173,6 +1173,9 @@ function Invoke-BrowseAction {
if (-not [string]::IsNullOrWhiteSpace($InitialDirectory)) {
$dialog.InitialDirectory = $InitialDirectory
}
+ if (-not [string]::IsNullOrWhiteSpace($FileName)) {
+ $dialog.FileName = $FileName
+ }
if ($dialog.ShowDialog()) {
return $dialog.FileName
}
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
index 6525348..a841359 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
@@ -106,10 +106,12 @@ function Get-GeneralDefaults {
$peDriversPath = Join-Path -Path $FFUDevelopmentPath -ChildPath "PEDrivers"
$vmLocationPath = Join-Path -Path $FFUDevelopmentPath -ChildPath "VM"
$ffuCapturePath = Join-Path -Path $FFUDevelopmentPath -ChildPath "FFU"
+ $unattendPath = Join-Path -Path $FFUDevelopmentPath -ChildPath "unattend"
$officePath = Join-Path -Path $appsPath -ChildPath "Office"
$appListJsonPath = Join-Path -Path $appsPath -ChildPath "AppList.json"
$userAppListPath = Join-Path -Path $appsPath -ChildPath "UserAppList.json"
$driversJsonPath = Join-Path -Path $driversPath -ChildPath "Drivers.json"
+ $deviceNamePrefixesPath = Join-Path -Path $unattendPath -ChildPath "prefixes.txt"
return [PSCustomObject]@{
# Build Tab Defaults
@@ -132,6 +134,10 @@ function Get-GeneralDefaults {
CopyUnattend = $false
CopyPPKG = $false
InjectUnattend = $false
+ DeviceNamingMode = 'None'
+ DeviceNameTemplate = ''
+ DeviceNamePrefixesPath = $deviceNamePrefixesPath
+ DeviceNamePrefixes = @()
CleanupAppsISO = $true
CleanupDeployISO = $true
CleanupDrivers = $false
diff --git a/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1 b/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1
index 77b5878..ba94899 100644
--- a/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1
+++ b/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1
@@ -64,6 +64,68 @@ function Set-Computername($computername) {
return $computername
}
+function Get-UnattendComputerNameValue {
+ if ($null -eq $UnattendFile) {
+ return $null
+ }
+
+ [xml]$xml = Get-Content $UnattendFile
+ foreach ($component in $xml.unattend.settings.component) {
+ if ($component.ComputerName) {
+ return [string]$component.ComputerName
+ }
+ }
+
+ return $null
+}
+
+function Test-LegacyPromptComputerName($computername) {
+ if ([string]::IsNullOrWhiteSpace($computername)) {
+ return $false
+ }
+
+ $normalizedName = $computername.Trim().ToLowerInvariant()
+ return $normalizedName -in @('mycomputer', 'default')
+}
+
+function Get-NormalizedComputerName($computername) {
+ if ([string]::IsNullOrWhiteSpace($computername)) {
+ throw 'Computer name cannot be empty.'
+ }
+
+ $normalizedName = ($computername -replace "\s", '').Trim()
+ if ([string]::IsNullOrWhiteSpace($normalizedName)) {
+ throw 'Computer name cannot be empty after removing spaces.'
+ }
+
+ if ($normalizedName.Length -gt 15) {
+ $normalizedName = $normalizedName.Substring(0, 15)
+ }
+
+ return $normalizedName
+}
+
+function Resolve-ComputerNameTemplate($computerNameTemplate, $serialNumber) {
+ if ([string]::IsNullOrWhiteSpace($computerNameTemplate)) {
+ throw 'Computer name template cannot be empty.'
+ }
+
+ $resolvedName = $computerNameTemplate -replace '(?i)%serial%', $serialNumber
+ if ($resolvedName -match '%') {
+ throw 'Unsupported device name variable found. Only %serial% is supported.'
+ }
+
+ return Get-NormalizedComputerName($resolvedName)
+}
+
+function Set-ConfiguredComputerName($computername) {
+ $normalizedName = Get-NormalizedComputerName($computername)
+ $normalizedName = Set-Computername($normalizedName)
+ Writelog "Computer name will be set to $normalizedName"
+ Write-Host "Computer name will be set to $normalizedName"
+ return $normalizedName
+}
+
function Invoke-Process {
[CmdletBinding(SupportsShouldProcess)]
param
@@ -1023,8 +1085,19 @@ If (Test-Path -Path $UnattendComputerNamePath) {
}
}
-#Ask for device name if unattend exists
-If ($Unattend -or $UnattendPrefix -or $UnattendComputerName) {
+$UnattendConfiguredComputerName = $null
+$RequiresLegacyDeviceNamePrompt = $false
+$RequiresTemplateDeviceName = $false
+if ($Unattend) {
+ $UnattendConfiguredComputerName = Get-UnattendComputerNameValue
+ $RequiresLegacyDeviceNamePrompt = Test-LegacyPromptComputerName($UnattendConfiguredComputerName)
+ if (-not [string]::IsNullOrWhiteSpace($UnattendConfiguredComputerName) -and $UnattendConfiguredComputerName -match '(?i)%serial%') {
+ $RequiresTemplateDeviceName = $true
+ }
+}
+
+#Ask for device name if naming is explicitly required
+If ($UnattendPrefix -or $UnattendComputerName -or $RequiresTemplateDeviceName -or $RequiresLegacyDeviceNamePrompt) {
Write-SectionHeader 'Device Name Selection'
if ($Unattend -and $UnattendPrefix) {
Writelog 'Unattend file found with prefixes.txt. Getting prefixes.'
@@ -1060,17 +1133,8 @@ If ($Unattend -or $UnattendPrefix -or $UnattendComputerName) {
WriteLog "Will use $PrefixToUse as device name prefix"
Write-Host "Will use $PrefixToUse as device name prefix"
}
- #Get serial number to append. This can make names longer than 15 characters. Trim any leading or trailing whitespace
$serial = (Get-CimInstance -ClassName win32_bios).SerialNumber.Trim()
- #Combine prefix with serial
- $computername = ($PrefixToUse + $serial) -replace "\s", "" # Remove spaces because windows does not support spaces in the computer names
- #If computername is longer than 15 characters, reduce to 15. Sysprep/unattend doesn't like ComputerName being longer than 15 characters even though Windows accepts it
- If ($computername.Length -gt 15) {
- $computername = $computername.substring(0, 15)
- }
- $computername = Set-Computername($computername)
- Writelog "Computer name will be set to $computername"
- Write-Host "Computer name will be set to $computername"
+ $computername = Set-ConfiguredComputerName($PrefixToUse + $serial)
}
elseif ($Unattend -and $UnattendComputerName) {
Writelog 'Unattend file found with SerialComputerNames.csv. Getting name for current computer.'
@@ -1080,32 +1144,31 @@ If ($Unattend -or $UnattendPrefix -or $UnattendComputerName) {
$SCName = $SerialComputerNames | Where-Object { $_.SerialNumber -eq $SerialNumber }
If ($SCName) {
- [string]$computername = $SCName.ComputerName
- $computername = Set-Computername($computername)
- Writelog "Computer name will be set to $computername"
- Write-Host "Computer name will be set to $computername"
+ [string]$computername = Set-ConfiguredComputerName($SCName.ComputerName)
}
else {
Writelog 'No matching serial number found in SerialComputerNames.csv. Setting random computer name to complete setup.'
Write-Host 'No matching serial number found in SerialComputerNames.csv. Setting random computer name to complete setup.'
- [string]$computername = ("FFU-" + ( -join ((48..57) + (65..90) + (97..122) | Get-Random -Count 11 | ForEach-Object { [char]$_ })))
- $computername = Set-Computername($computername)
- Writelog "Computer name will be set to $computername"
- Write-Host "Computer name will be set to $computername"
+ [string]$computername = Set-ConfiguredComputerName(("FFU-" + ( -join ((48..57) + (65..90) + (97..122) | Get-Random -Count 11 | ForEach-Object { [char]$_ }))))
}
}
- elseif ($Unattend) {
+ elseif ($Unattend -and $RequiresTemplateDeviceName) {
+ Writelog 'Unattend file found with a %serial% computer name template. Resolving the template.'
+ $serialNumber = (Get-CimInstance -ClassName Win32_Bios).SerialNumber.Trim()
+ [string]$computername = Set-ConfiguredComputerName((Resolve-ComputerNameTemplate -computerNameTemplate $UnattendConfiguredComputerName -serialNumber $serialNumber))
+ }
+ elseif ($Unattend -and $RequiresLegacyDeviceNamePrompt) {
Writelog 'Unattend file found with no prefixes.txt, asking for name'
Write-Host 'Unattend file found but no prefixes.txt. Please enter a device name.'
- [string]$computername = Read-Host 'Enter device name'
- $computername = Set-Computername($computername)
- Writelog "Computer name will be set to $computername"
- Write-Host "Computer name will be set to $computername"
+ [string]$computername = Set-ConfiguredComputerName((Read-Host 'Enter device name'))
}
else {
WriteLog 'Device naming assets detected without unattend.xml. Skipping device naming prompts.'
}
}
+elseif ($Unattend) {
+ WriteLog 'Unattend file found. Device naming is not required, but unattend settings will still be applied.'
+}
else {
WriteLog 'No unattend folder found. Device name will be set via PPKG, AP JSON, or default OS name.'
}
@@ -1568,8 +1631,9 @@ If ($PPKGFileToInstall) {
}
}
#Set DeviceName
-If ($computername) {
- Write-SectionHeader -Title 'Applying Computer Name and Unattend Configuration'
+If ($Unattend) {
+ $unattendSectionTitle = if ($computername) { 'Applying Computer Name and Unattend Configuration' } else { 'Applying Unattend Configuration' }
+ Write-SectionHeader -Title $unattendSectionTitle
try {
$PantherDir = 'w:\windows\panther'
If (Test-Path -Path $PantherDir) {
@@ -1590,8 +1654,8 @@ If ($computername) {
}
}
catch {
- WriteLog "Copying Unattend.xml to name device failed"
- Stop-Script -Message "Copying Unattend.xml to name device failed with error: $_"
+ WriteLog 'Copying Unattend.xml to Panther failed'
+ Stop-Script -Message "Copying Unattend.xml to Panther failed with error: $_"
}
}
diff --git a/FFUDevelopment/config/Sample_default.json b/FFUDevelopment/config/Sample_default.json
index 689ef22c1cee97af442d0eee7acbba66f5e39a4d..af3cdb33d447449dc337a675b20442b2136b4d21 100644
GIT binary patch
delta 217
zcmbPa@XBbzG8TOohE#?!hD?TJAnnJH$dC(U=P{%+_%h@(qyWW~7_1l+fTSOgpU03o
zc_FJPCtSzm|164=d&Gp4F-=Kj2w*4z>Q4ijR{^ApC$6{DE(IEq$WQ`=sX$f=LktiW
mpekd~1Ikt~lz=SKhFb)68it`z=S4HbPG)2h-n@b(OBetJY%mxA
delta 12
TcmaE5G|6DYGM3H%SaXB{Cm{uH
diff --git a/docs/build.md b/docs/build.md
index b80c65f..b19fc83 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -199,24 +199,34 @@ This option is only available when **Build USB Drive** is checked.
When enabled, the build process copies:
- **unattend_x64.xml** (for x64 builds) or **unattend_arm64.xml** (for arm64 builds) → renamed to **Unattend.xml** on the USB drive
-- **prefixes.txt** (if present) → copied alongside the unattend file
+- **prefixes.txt** → created from the **Device Naming** prefixes list when that mode is selected
-During deployment, `ApplyFFU.ps1` detects the `Unattend` folder and uses these files to customize the device name and apply other Windows settings during OOBE.
+During deployment, `ApplyFFU.ps1` applies `Unattend.xml` whenever it is present. Device naming only happens when the **Device Naming** setting requires it, or when older media still uses the legacy prompt-based workflow.
#### Device Naming
-Device naming can be done from PE. The way this works is by leveraging an unattend.xml file to either take input from the user at imaging time or read a list of prefix values and append the serial number of the device. There are some major benefits to doing this:
+Use the **Device Naming** expander to decide whether `ComputerName` should be set at deployment time. There are some major benefits to doing this:
1. Total deployment time is reduced if naming is set at FFU deployment time since there is no additional reboot done during OOBE.
2. Reduces the need for multiple provisioning packages or autopilot profiles. This means you can use a single PPKG or autopilot profile.
-#### Prompt for Device Name
+#### No Device Name
-If you want to be prompted for the device name, simply check **Copy Unattend.xml.** This tells the build script to copy the appropriate architecture unattend_arch.xml file from the `C:\FFUDevelopment\Unattend` folder to the `.\unattend` folder on the deploy partition of the USB drive.
+This is the default option. The unattend file is still applied, but Windows generates a random computer name instead of forcing a prompt or a fixed name.
-#### Device Naming with prefixes.txt
+#### Specify Device Name
-If a `prefixes.txt` file exists in the `Unattend` folder and there are multiple prefixes in the file, the deployment script prompts the technician to select a prefix from the file. The prefix is combined with the device's serial number to create the computer name. If there is a single prefix, the technician is not prompted and the script will automatically select that prefix.
+Use this option when you want a static device name or a template such as `Comp-%serial%`.
+
+- With **Copy Unattend.xml**, `%serial%` is resolved during deployment in PE.
+- With **Inject Unattend.xml**, only static names are supported.
+- **Copy Unattend.xml** and **Inject Unattend.xml** are mutually exclusive. Select only one.
+
+#### Specify a list of Prefixes
+
+This option writes `prefixes.txt` from the list in the UI. Enter one prefix per line or import an existing prefixes file. The source file can use any name because the UI now tracks the path separately.
+
+If there is a single prefix, deployment uses it automatically. If there are multiple prefixes, the technician is prompted to select one. The selected prefix is combined with the device serial number to create the computer name.
For example, with a prefix of `CORP-` and a serial number of `ABC123`, the resulting computer name would be `CORP-ABC123` (truncated to 15 characters if necessary).
@@ -228,6 +238,10 @@ STORE-
KIOSK-
```
+#### Legacy Prompt Behavior
+
+Older deployment media that still has an unattend file with `ComputerName` set to the legacy placeholder value and no `prefixes.txt` file will still prompt for a device name during deployment.
+
{: .warning-title}
> Warning
@@ -483,6 +497,8 @@ Controls the `-InjectUnattend` parameter. When checked, copies the architecture-
This option is only available when **Install Apps** is checked.
+`Copy Unattend.xml` and `Inject Unattend.xml` are mutually exclusive. Select only one.
+
### How It Works
When enabled, the build process:
@@ -522,7 +538,7 @@ This option is primarily intended for scenarios where:
| Limitation | Description |
| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **No prefixes.txt support** | Unlike the**Copy Unattend** option for USB drives, this method does not support `prefixes.txt` for dynamic device naming based on serial numbers |
+| **No prefixes.txt or %serial% support** | Unlike **Copy Unattend.xml**, this method does not support `prefixes.txt` or the `%serial%` variable for deployment-time device naming |
| **Fixed configuration** | The unattend settings are baked into the FFU at build time and cannot be changed at deployment time |
| **Requires VM to be built** | This option only works when**Install Apps** is `$true` because the unattend file is included in the Apps ISO |
diff --git a/docs/parameters_reference.md b/docs/parameters_reference.md
index 6daff1e..67912f0 100644
--- a/docs/parameters_reference.md
+++ b/docs/parameters_reference.md
@@ -38,9 +38,13 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -CopyDrivers | bool | Copy Drivers to USB drive | When set to $true, will copy the drivers from the $FFUDevelopmentPath\Drivers folder to the Drivers folder on the deploy partition of the USB drive. Default is $false. |
| -CopyPEDrivers | bool | Copy PE Drivers | When set to $true, enables adding WinPE drivers. By default copies drivers from $FFUDevelopmentPath\PEDrivers to the WinPE deployment media unless -UseDriversAsPEDrivers is also $true. |
| -CopyPPKG | bool | Copy Provisioning Package | When set to $true, will copy the provisioning package from the $FFUDevelopmentPath\PPKG folder to the Deployment partition of the USB drive. Default is $false. |
-| -CopyUnattend | bool | Copy Unattend.xml | When set to $true, will copy the $FFUDevelopmentPath\Unattend folder to the Deployment partition of the USB drive. Default is $false. |
+| -CopyUnattend | bool | Copy Unattend.xml | When set to $true, will copy the $FFUDevelopmentPath\Unattend folder to the Deployment partition of the USB drive. Cannot be used together with -InjectUnattend. Default is $false. |
| -CreateDeploymentMedia | bool | Create Deployment Media | When set to $true, this will create WinPE deployment media for use when deploying to a physical device. |
| -CustomFFUNameTemplate | string | Custom FFU Name Template | Sets a custom FFU output name with placeholders. Allowed placeholders are: {WindowsRelease}, {WindowsVersion}, {SKU}, {BuildDate}, {yyyy}, {MM}, {dd}, {H}, {hh}, {mm}, {tt}. |
+| -DeviceNamingMode | string | Device Naming expander | Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Accepted values are Legacy, None, Template, and Prefixes. The UI uses None, Template, and Prefixes. |
+| -DeviceNameTemplate | string | Specify Device Name | Sets the device name used when DeviceNamingMode is Template. Supports a static name or the %serial% token when -CopyUnattend is used. |
+| -DeviceNamePrefixesPath | string | Prefixes File Path | Path to the source prefixes file used for legacy copy or when -DeviceNamePrefixes is not supplied. Default is $FFUDevelopmentPath\Unattend\prefixes.txt. |
+| -DeviceNamePrefixes | string[] | Specify a list of Prefixes | Sets the prefixes used when DeviceNamingMode is Prefixes. Each entry becomes a line in prefixes.txt on the deployment media. |
| -Disksize | uint64 | Disk Size (GB) | Size of the virtual hard disk for the virtual machine. Default is a 50GB dynamic disk. |
| -DriversFolder | string | Drivers Folder | Path to the drivers folder. Default is $FFUDevelopmentPath\Drivers. |
| -DriversJsonPath | string | Drivers.json Path | Path to a JSON file that specifies which drivers to download. |
@@ -50,7 +54,7 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -FFUDevelopmentPath | string | FFU Development Path | Path to the FFU development folder. Default is $PSScriptRoot. |
| -FFUPrefix | string | VM Name Prefix | Prefix for the generated FFU file. Default is _FFU. |
| -Headers | hashtable | CLI only (no UI control) | Headers to use when downloading files. Not recommended to modify. |
-| -InjectUnattend | bool | Inject Unattend.xml | When set to $true and InstallApps is also $true, copies unattend_[arch].xml from $FFUDevelopmentPath\unattend to $FFUDevelopmentPath\Apps\Unattend\Unattend.xml so sysprep can use it inside the VM. Default is $false. |
+| -InjectUnattend | bool | Inject Unattend.xml | When set to $true and InstallApps is also $true, copies unattend_[arch].xml from $FFUDevelopmentPath\unattend to $FFUDevelopmentPath\Apps\Unattend\Unattend.xml so sysprep can use it inside the VM. Cannot be used together with -CopyUnattend. Default is $false. |
| -InstallApps | bool | Install Applications | When set to $true, the script will create an Apps.iso file from the $FFUDevelopmentPath\Apps folder. It will also create a VM, mount the Apps.iso, install the apps, sysprep, and capture the VM. When set to $false, the FFU is created from a VHDX file, and no VM is created. |
| -InstallDrivers | bool | Install Drivers to FFU | Install device drivers from the specified $FFUDevelopmentPath\Drivers folder if set to $true. Download the drivers and put them in the Drivers folder. The script will recurse the drivers folder and add the drivers to the FFU. |
| -InstallOffice | bool | Install Office | Install Microsoft Office if set to $true. The script will download the latest ODT and Office files in the $FFUDevelopmentPath\Apps\Office folder and install Office in the FFU via VM. |
diff --git a/docs/quickstart.md b/docs/quickstart.md
index add63bb..c1f5e29 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -186,18 +186,26 @@ Another safety measure is **Select Specific USB Drives**. When you check **Selec
**Device Naming**
-Device naming can be done from PE. The way this works is by leveraging an unattend.xml file to either take input from the user at imaging time or read a list of prefix values and append the serial number of the device. There are some major benefits to doing this:
+Use the **Device Naming** expander on the Build page to decide whether `ComputerName` should be set during deployment. There are some major benefits to doing this:
1. Total deployment time is reduced if naming is set at FFU deployment time since there is no additional reboot done during OOBE.
2. Reduces the need for multiple provisioning packages or autopilot profiles. This means you can use a single PPKG or autopilot profile.
-**Prompt for Device Name**
+**No Device Name**
-If you want to be prompted for the device name, simply check **Copy Unattend.xml.** This tells the build script to copy the appropriate architecture unattend_arch.xml file from the `C:\FFUDevelopment\Unattend` folder to the `.\unattend` folder on the deploy partition of the USB drive.
+This is the default option. The unattend file is still applied, but Windows generates a random computer name.
-**Specifying Multiple Name Prefixes**
+**Specify Device Name**
-If you have multiple device name prefixes for different locations or device use cases, or even a single prefix, you can specify a prefixes.txt file in the `C:\FFUDevelopment\unattend` folder. If the prefixes.txt file is detected and a single prefix is listed, the device will just use that prefix and append the serial number of the device. If there are multiple prefixes listed in the prefixes.txt file, you will be prompted to select which prefix you want to name the device and the serial number will be appended to that prefix. If you want a dash in the name, include the dash in the prefix (e.g. if ABCD- is in the prefixes.txt file, the device name will be ABCD-SerialNumber).
+Use this option when you want a static device name or a template such as `Comp-%serial%`.
+
+- With **Copy Unattend.xml**, `%serial%` is resolved during deployment in PE.
+- With **Inject Unattend.xml**, only static names are supported.
+- **Copy Unattend.xml** and **Inject Unattend.xml** are mutually exclusive. Select only one.
+
+**Specify a list of Prefixes**
+
+This option writes `prefixes.txt` from the list in the UI. Enter one prefix per line or import an existing prefixes file. The source file can use any name because the UI tracks the prefixes path separately. If there is one prefix, deployment uses it automatically. If there are multiple prefixes, the technician is prompted to select one and the serial number is appended to that prefix.
{: .warning-title}
From 5ca5312c521610865a2e5b0d2b76ad81d959435f Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Tue, 7 Apr 2026 10:50:47 -0700
Subject: [PATCH 22/34] Allows Office installation on ARM64 VMs
Comments out the restriction that previously prevented Microsoft 365 Apps and Office from installing on ARM64 virtual machines. This enables users to attempt or perform Office installations on ARM64 architectures where it was previously blocked.
---
FFUDevelopment/BuildFFUVM.ps1 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 5055dbb..4309a06 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -5571,10 +5571,10 @@ if (($InstallApps -eq $false) -and (($UpdateLatestDefender -eq $true) -or ($Upda
WriteLog 'You have selected to update Defender, Malicious Software Removal Tool, OneDrive, Edge, or the latest Windows 10 LTSB/LTSC cumulative update, however you are setting InstallApps to false. These updates require the InstallApps variable to be set to true. Please set InstallApps to true and try again.'
throw "InstallApps variable must be set to `$true to update Defender, OneDrive, Edge, MSRT, or the latest Windows 10 LTSB/LTSC cumulative update"
}
-if (($WindowsArch -eq 'ARM64') -and ($InstallOffice -eq $true)) {
- $InstallOffice = $false
- WriteLog 'M365 Apps/Office currently fails to install on ARM64 VMs without an internet connection. Setting InstallOffice to false'
-}
+# if (($WindowsArch -eq 'ARM64') -and ($InstallOffice -eq $true)) {
+# $InstallOffice = $false
+# WriteLog 'M365 Apps/Office currently fails to install on ARM64 VMs without an internet connection. Setting InstallOffice to false'
+# }
if (($WindowsArch -eq 'ARM64') -and ($UpdateOneDrive -eq $true)) {
$UpdateOneDrive = $false
From 1ea1ef6fd0594caeee47c4ef825a9465b119992c Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Wed, 8 Apr 2026 17:58:25 -0700
Subject: [PATCH 23/34] Improves FFU deployment menu selections and device
naming
Refactors the `ApplyFFU.ps1` script to use a new `Read-MenuSelection` function for standardized user prompts, improving input validation and allowing users to skip optional prompts (like prefix selection, AP JSON, and PPKG files). Updates sample unattend XML files to use `*` for the computer name, falling back to default Windows naming if not specified. Updates the documentation to reflect the new UI and script behaviors.
---
FFUDevelopment/BuildFFUVM_UI.xaml | 2 +-
.../WinPEDeployFFUFiles/ApplyFFU.ps1 | 212 ++---
.../unattend/SampleUnattend_x64.xml | 2 +-
FFUDevelopment/unattend/unattend_arm64.xml | 2 +-
FFUDevelopment/unattend/unattend_x64.xml | 2 +-
docs/build.md | 772 ++++++++++--------
docs/quickstart.md | 6 +
7 files changed, 535 insertions(+), 463 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 4d5f511..7ed2603 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -913,7 +913,7 @@
-
+
diff --git a/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1 b/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1
index ba94899..9fd106a 100644
--- a/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1
+++ b/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1
@@ -41,6 +41,59 @@ function WriteLog($LogText) {
Add-Content -path $LogFile -value "$((Get-Date).ToString()) $LogText"
}
+function Read-MenuSelection {
+ param(
+ [Parameter(Mandatory = $true)]
+ [string]$Prompt,
+
+ [Parameter(Mandatory = $true)]
+ [string]$InvalidInputMessage,
+
+ [Parameter()]
+ [int[]]$ValidSelections,
+
+ [Parameter()]
+ [int]$Minimum = [int]::MinValue,
+
+ [Parameter()]
+ [int]$Maximum = [int]::MaxValue,
+
+ [Parameter()]
+ [switch]$AllowSkip
+ )
+
+ do {
+ $userInput = Read-Host $Prompt
+ if ([string]::IsNullOrWhiteSpace($userInput)) {
+ Write-Host $InvalidInputMessage
+ continue
+ }
+
+ $selection = 0
+ if (-not [int]::TryParse($userInput, [ref]$selection)) {
+ Write-Host $InvalidInputMessage
+ continue
+ }
+
+ if ($AllowSkip -and $selection -eq 0) {
+ return 0
+ }
+
+ if ($PSBoundParameters.ContainsKey('ValidSelections')) {
+ if ($ValidSelections -notcontains $selection) {
+ Write-Host $InvalidInputMessage
+ continue
+ }
+ }
+ elseif ($selection -lt $Minimum -or $selection -gt $Maximum) {
+ Write-Host $InvalidInputMessage
+ continue
+ }
+
+ return $selection
+ } until ($false)
+}
+
function Set-DiskpartAnswerFiles($DiskpartFile, $DiskID) {
(Get-Content $DiskpartFile).Replace('disk 0', "disk $DiskID") | Set-Content -Path $DiskpartFile
}
@@ -953,21 +1006,7 @@ else {
}
$displayList | Format-Table -AutoSize -Property Disk, 'Size (GB)', Sector, 'Bus Type', Model
- do {
- try {
- $var = $true
- [int]$diskSelection = Read-Host 'Enter the disk number to apply the FFU to'
- }
- catch {
- Write-Host 'Input was not in correct format. Please enter a valid disk number'
- $var = $false
- }
- # Validate selected disk is in the list of available disks
- if ($var -and $validDiskIndexes -notcontains $diskSelection) {
- Write-Host "Invalid disk number. Please select from the available disks."
- $var = $false
- }
- } until ($var)
+ $diskSelection = Read-MenuSelection -Prompt 'Enter the disk number to apply the FFU to' -InvalidInputMessage 'Invalid disk number. Please select from the available disks.' -ValidSelections $validDiskIndexes
$selectedDisk = $diskDriveCandidates | Where-Object { $_.Index -eq $diskSelection }
WriteLog "Disk selection: DiskNumber=$($selectedDisk.Index), Model=$($selectedDisk.Model), SizeGB=$([math]::Round(($selectedDisk.Size / 1GB), 2)), BusType=$($selectedDisk.InterfaceType)"
@@ -1011,18 +1050,8 @@ If ($FFUCount -gt 1) {
$array += New-Object PSObject -Property $Properties
}
$array | Format-Table -AutoSize -Property Number, FFUFile | Out-Host
- do {
- try {
- $var = $true
- [int]$FFUSelected = Read-Host 'Enter the FFU number to install'
- $FFUSelected = $FFUSelected - 1
- }
-
- catch {
- Write-Host 'Input was not in correct format. Please enter a valid FFU number'
- $var = $false
- }
- } until (($FFUSelected -le $FFUCount - 1) -and $var)
+ $FFUSelected = Read-MenuSelection -Prompt 'Enter the FFU number to install' -InvalidInputMessage 'Input was not in correct format. Please enter a valid FFU number.' -Minimum 1 -Maximum $FFUCount
+ $FFUSelected = $FFUSelected - 1
$FFUFileToInstall = $array[$FFUSelected].FFUFile
WriteLog "$FFUFileToInstall was selected"
@@ -1103,6 +1132,8 @@ If ($UnattendPrefix -or $UnattendComputerName -or $RequiresTemplateDeviceName -o
Writelog 'Unattend file found with prefixes.txt. Getting prefixes.'
$UnattendPrefixes = @(Get-content $UnattendPrefixFile)
$UnattendPrefixCount = $UnattendPrefixes.Count
+ $skipPrefixSelection = $false
+ $PrefixToUse = $null
If ($UnattendPrefixCount -gt 1) {
WriteLog "Found $UnattendPrefixCount Prefixes"
$array = @()
@@ -1111,20 +1142,18 @@ If ($UnattendPrefix -or $UnattendComputerName -or $RequiresTemplateDeviceName -o
$array += New-Object PSObject -Property $Properties
}
$array | Format-Table -AutoSize -Property Number, DeviceNamePrefix
- do {
- try {
- $var = $true
- [int]$PrefixSelected = Read-Host 'Enter the prefix number to use for the device name'
- $PrefixSelected = $PrefixSelected - 1
- }
- catch {
- Write-Host 'Input was not in correct format. Please enter a valid prefix number'
- $var = $false
- }
- } until (($PrefixSelected -le $UnattendPrefixCount - 1) -and $var)
- $PrefixToUse = $array[$PrefixSelected].DeviceNamePrefix
- WriteLog "$PrefixToUse was selected"
- Write-Host "`n$PrefixToUse was selected as device name prefix"
+ $prefixSelection = Read-MenuSelection -Prompt 'Enter the prefix number to use for the device name (0 to skip)' -InvalidInputMessage 'Input was not in correct format. Please enter 0 to skip or a valid prefix number.' -Minimum 1 -Maximum $UnattendPrefixCount -AllowSkip
+ if ($prefixSelection -eq 0) {
+ $skipPrefixSelection = $true
+ WriteLog 'User chose to skip device name prefix selection. Existing unattend computer name will remain unchanged.'
+ Write-Host "`nDevice name prefix selection was skipped. The existing unattend computer name will remain unchanged."
+ }
+ else {
+ $PrefixSelected = $prefixSelection - 1
+ $PrefixToUse = $array[$PrefixSelected].DeviceNamePrefix
+ WriteLog "$PrefixToUse was selected"
+ Write-Host "`n$PrefixToUse was selected as device name prefix"
+ }
}
elseif ($UnattendPrefixCount -eq 1) {
WriteLog "Found $UnattendPrefixCount Prefix"
@@ -1133,8 +1162,10 @@ If ($UnattendPrefix -or $UnattendComputerName -or $RequiresTemplateDeviceName -o
WriteLog "Will use $PrefixToUse as device name prefix"
Write-Host "Will use $PrefixToUse as device name prefix"
}
- $serial = (Get-CimInstance -ClassName win32_bios).SerialNumber.Trim()
- $computername = Set-ConfiguredComputerName($PrefixToUse + $serial)
+ if (-not $skipPrefixSelection) {
+ $serial = (Get-CimInstance -ClassName win32_bios).SerialNumber.Trim()
+ $computername = Set-ConfiguredComputerName($PrefixToUse + $serial)
+ }
}
elseif ($Unattend -and $UnattendComputerName) {
Writelog 'Unattend file found with SerialComputerNames.csv. Getting name for current computer.'
@@ -1177,17 +1208,7 @@ else {
If ($autopilot -eq $true -and $PPKG -eq $true) {
WriteLog 'Both PPKG and Autopilot json files found'
Write-Host 'Both Autopilot JSON files and Provisioning packages were found.'
- do {
- try {
- $var = $true
- [int]$APorPPKG = Read-Host 'Enter 1 for Autopilot or 2 for Provisioning Package'
- }
-
- catch {
- Write-Host 'Incorrect value. Please enter 1 for Autopilot or 2 for Provisioning Package'
- $var = $false
- }
- } until (($APorPPKG -gt 0 -and $APorPPKG -lt 3) -and $var)
+ $APorPPKG = Read-MenuSelection -Prompt 'Enter 1 for Autopilot or 2 for Provisioning Package' -InvalidInputMessage 'Incorrect value. Please enter 1 for Autopilot or 2 for Provisioning Package.' -Minimum 1 -Maximum 2
If ($APorPPKG -eq 1) {
$PPKG = $false
}
@@ -1206,22 +1227,20 @@ If ($APFilesCount -gt 1 -and $autopilot -eq $true) {
$array += New-Object PSObject -Property $Properties
}
$array | Format-Table -AutoSize -Property Number, APFileName
- do {
- try {
- $var = $true
- [int]$APFileSelected = Read-Host 'Enter the AP json file number to install'
- $APFileSelected = $APFileSelected - 1
- }
+ $APFileSelection = Read-MenuSelection -Prompt 'Enter the AP json file number to install (0 to skip)' -InvalidInputMessage 'Input was not in correct format. Please enter 0 to skip or a valid AP json file number.' -Minimum 1 -Maximum $APFilesCount -AllowSkip
- catch {
- Write-Host 'Input was not in correct format. Please enter a valid AP json file number'
- $var = $false
- }
- } until (($APFileSelected -le $APFilesCount - 1) -and $var)
-
- $APFileToInstall = $array[$APFileSelected].APFile
- $APFileName = $array[$APFileSelected].APFileName
- WriteLog "$APFileToInstall was selected"
+ if ($APFileSelection -eq 0) {
+ $APFileToInstall = $null
+ $APFileName = $null
+ WriteLog 'User chose to skip Autopilot JSON selection.'
+ Write-Host "`nAutopilot JSON selection was skipped."
+ }
+ else {
+ $APFileSelected = $APFileSelection - 1
+ $APFileToInstall = $array[$APFileSelected].APFile
+ $APFileName = $array[$APFileSelected].APFileName
+ WriteLog "$APFileToInstall was selected"
+ }
}
elseif ($APFilesCount -eq 1 -and $autopilot -eq $true) {
WriteLog "Found $APFilesCount AP File"
@@ -1244,22 +1263,19 @@ If ($PPKGFilesCount -gt 1 -and $PPKG -eq $true) {
$array += New-Object PSObject -Property $Properties
}
$array | Format-Table -AutoSize -Property Number, PPKGFileName
- do {
- try {
- $var = $true
- [int]$PPKGFileSelected = Read-Host 'Enter the PPKG file number to install'
- $PPKGFileSelected = $PPKGFileSelected - 1
- }
+ $PPKGFileSelection = Read-MenuSelection -Prompt 'Enter the PPKG file number to install (0 to skip)' -InvalidInputMessage 'Input was not in correct format. Please enter 0 to skip or a valid PPKG file number.' -Minimum 1 -Maximum $PPKGFilesCount -AllowSkip
- catch {
- Write-Host 'Input was not in correct format. Please enter a valid PPKG file number'
- $var = $false
- }
- } until (($PPKGFileSelected -le $PPKGFilesCount - 1) -and $var)
-
- $PPKGFileToInstall = $array[$PPKGFileSelected].PPKGFile
- WriteLog "$PPKGFileToInstall was selected"
- Write-Host "`n$PPKGFileToInstall will be used"
+ if ($PPKGFileSelection -eq 0) {
+ $PPKGFileToInstall = $null
+ WriteLog 'User chose to skip Provisioning Package selection.'
+ Write-Host "`nProvisioning Package selection was skipped."
+ }
+ else {
+ $PPKGFileSelected = $PPKGFileSelection - 1
+ $PPKGFileToInstall = $array[$PPKGFileSelected].PPKGFile
+ WriteLog "$PPKGFileToInstall was selected"
+ Write-Host "`n$PPKGFileToInstall will be used"
+ }
}
elseif ($PPKGFilesCount -eq 1 -and $PPKG -eq $true) {
Write-SectionHeader -Title 'Provisioning Package Selection'
@@ -1375,7 +1391,7 @@ if ($null -eq $DriverSourcePath) {
if ([string]::IsNullOrWhiteSpace($relativeSegment)) {
return Split-Path -Path $normalizedPath -Leaf
}
- return $relativePath = $relativeSegment
+ return $relativeSegment
}
return $normalizedPath
}
@@ -1451,25 +1467,17 @@ if ($null -eq $DriverSourcePath) {
}
}
$displayArray | Format-Table -Property Number, Type, RelativePath -AutoSize
-
+
$DriverSelected = -1
$skipDriverInstall = $false
- do {
- try {
- $var = $true
- [int]$userSelection = Read-Host 'Enter the number of the driver source to install (0 to skip)'
- if ($userSelection -eq 0) {
- $skipDriverInstall = $true
- break
- }
- $DriverSelected = $userSelection - 1
- }
- catch {
- Write-Host 'Input was not in correct format. Please enter a valid number.'
- $var = $false
- }
- } until ((($DriverSelected -ge 0 -and $DriverSelected -lt $DriverSourcesCount) -or $skipDriverInstall) -and $var)
-
+ $userSelection = Read-MenuSelection -Prompt 'Enter the number of the driver source to install (0 to skip)' -InvalidInputMessage 'Input was not in correct format. Please enter 0 to skip or a valid number.' -Minimum 1 -Maximum $DriverSourcesCount -AllowSkip
+ if ($userSelection -eq 0) {
+ $skipDriverInstall = $true
+ }
+ else {
+ $DriverSelected = $userSelection - 1
+ }
+
if ($skipDriverInstall) {
$DriverSourcePath = $null
$DriverSourceType = $null
diff --git a/FFUDevelopment/unattend/SampleUnattend_x64.xml b/FFUDevelopment/unattend/SampleUnattend_x64.xml
index 0a85e64..b601ce5 100644
--- a/FFUDevelopment/unattend/SampleUnattend_x64.xml
+++ b/FFUDevelopment/unattend/SampleUnattend_x64.xml
@@ -3,7 +3,7 @@
- MYCOMPUTER
+ *Eastern Standard Time
diff --git a/FFUDevelopment/unattend/unattend_arm64.xml b/FFUDevelopment/unattend/unattend_arm64.xml
index ae61894..a9c2043 100644
--- a/FFUDevelopment/unattend/unattend_arm64.xml
+++ b/FFUDevelopment/unattend/unattend_arm64.xml
@@ -3,7 +3,7 @@
- MyComputer
+ *
diff --git a/FFUDevelopment/unattend/unattend_x64.xml b/FFUDevelopment/unattend/unattend_x64.xml
index 4023587..4f5014c 100644
--- a/FFUDevelopment/unattend/unattend_x64.xml
+++ b/FFUDevelopment/unattend/unattend_x64.xml
@@ -3,7 +3,7 @@
- MyComputer
+ *
diff --git a/docs/build.md b/docs/build.md
index b19fc83..abaad01 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -121,9 +121,322 @@ Controls the `-BitsPriority` parameter, which determines the priority level for
If you want faster downloads, change the priority to Foreground. Normal priority will significantly slow down downloads since BITS treats non-Foreground downloads as synchronous and queues each download. This means multiple driver or winget application downloads will go much slower than using Foreground. Normal is default as per Microsoft best practice guidance for using BITS.
-## Build USB Drive
+## General Build Options Expander
-The following sub-options control how the USB drive is created
+This expander groups the core build behaviors that affect how the FFU is created, optimized, cached, and prepared for deployment.
+
+### Compact OS
+
+Controls the `-CompactOS` parameter. When checked, the Windows image is applied using compressed files. The default is **checked**.
+
+#### How It Works
+
+When enabled, the build script uses the `-Compact` switch with `Expand-WindowsImage` when applying the Windows image to the OS partition. This compresses Windows system files using Compact OS compression, which reduces the disk footprint of the operating system. On an x64 image, space savings is ~3.5-4GB.
+
+#### Benefits
+
+| Benefit | Description |
+| ------------------------------- | ---------------------------------------------------------------------------------------------------- |
+| **Reduced Disk Space** | Windows files are stored in a compressed state, saving several gigabytes of storage |
+| **Smaller FFU Size** | The captured FFU file is smaller because the OS partition contains compressed files |
+| **Faster Deployment** | Smaller FFU files transfer more quickly to USB drives and deploy faster to target devices |
+| **No Performance Impact** | Modern CPUs decompress files faster than they can be read from storage, so performance is maintained |
+
+#### When to Disable
+
+You may want to disable Compact OS in the following scenarios:
+
+- **Windows Server builds**: The script automatically disables Compact OS for Windows Server operating systems because the Windows Overlay Filter (wof.sys) is not included in Server SKUs
+- **Troubleshooting**: If you experience issues with specific applications that are incompatible with compressed files
+- **Maximum performance requirements**: In rare cases where every CPU cycle matters
+
+{: .note-title}
+
+> Note
+>
+> Compact OS is automatically disabled when building Windows Server images, regardless of this setting. The script detects Server operating systems and applies the Windows image without compression.
+
+### Update ADK
+
+Controls the `-UpdateADK` parameter. When checked, the script checks for and installs or updates to the latest Windows ADK and WinPE add-on before starting the build. The default is **checked**.
+
+#### How It Works
+
+When enabled, the build process performs the following checks before starting:
+
+1. **Version Check**: Queries the [Microsoft ADK installation page](https://learn.microsoft.com/en-us/windows-hardware/get-started/adk-install) to determine the latest available ADK version
+2. **Compare Versions**: Compares the installed ADK and WinPE add-on versions (if present) against the latest available version
+3. **Update if Needed**: If an older version is detected:
+ - Uninstalls the existing Windows ADK
+ - Uninstalls the existing WinPE add-on
+ - Downloads and installs the latest Windows ADK with Deployment Tools feature
+ - Downloads and installs the latest WinPE add-on
+
+#### Features Installed
+
+When installing or updating the ADK, the following features are included:
+
+| Component | Feature ID | Description |
+| ---------------------------------- | ---------------------------------------------- | --------------------------------------------------------------- |
+| **Windows Deployment Tools** | `OptionId.DeploymentTools` | Includes DISM, Oscdimg, and other deployment-related tools |
+| **WinPE Environment** | `OptionId.WindowsPreinstallationEnvironment` | Windows Preinstallation Environment used for capture and deploy |
+
+#### Installation Location
+
+The ADK is installed to the default location: `C:\Program Files (x86)\Windows Kits\10`
+
+#### When to Disable
+
+You may want to disable Update ADK in the following scenarios:
+
+- **Offline or air-gapped environments**: When internet access is not available to download the latest ADK
+- **Controlled ADK versions**: When you need to maintain a specific ADK version for compatibility or compliance reasons
+- **Faster builds**: When you have already verified you are running the latest ADK version and want to skip the version check
+
+{: .warning-title}
+
+> Warning
+>
+> If Update ADK is disabled and the Windows ADK or WinPE add-on is not installed, the build will fail. Ensure you have manually installed the required components before disabling this option.
+
+#### Manual ADK Installation
+
+If you prefer to manually install the ADK, visit:
+
+[Download and install the Windows ADK](https://learn.microsoft.com/en-us/windows-hardware/get-started/adk-install)
+
+You must install both:
+
+- Windows Assessment and Deployment Kit (with Deployment Tools feature)
+- Windows PE add-on for the Windows ADK
+
+### Optimize
+
+Controls the `-Optimize` parameter. When enabled, FFU Builder runs the Windows ADK version of DISM to optimize the captured `.ffu` file:
+
+- `DISM /Optimize-FFU /ImageFile:`
+
+This post-processing step typically takes a few minutes and is intended to make FFU images faster to deploy and easier to deploy to differently-sized disks (by allowing the Windows partition to expand or shrink during apply).
+
+**Default:** Enabled (`-Optimize $true`)
+
+#### When to Disable
+
+You may want to disable Optimize (`-Optimize $false`) if you are troubleshooting, or if you want to skip the extra post-processing time.
+
+{: .warning-title}
+
+> Warning
+>
+> If you plan to deploy the same FFU to devices with different storage sizes (especially smaller disks), keep `-Optimize` enabled. Non-optimized FFUs are more likely to require additional partition management during deployment.
+
+{: .note-title}
+
+> Note
+>
+> FFU Builder also performs a separate “optimize VHDX before capture” step. That VHDX optimization is independent of `-Optimize`, so you may still see “Optimizing VHDX before capture…” even when `-Optimize` is disabled.
+
+### Allow VHDX Caching
+
+Controls the `-AllowVHDXCaching` parameter. When enabled, FFU Builder caches the base VHDX it creates in `$FFUDevelopmentPath\VHDXCache` and writes a matching `*_config.json` file alongside it. On later builds, if a cached VHDX exists that matches your selected Windows settings and update set, the script reuses it to avoid re-applying the base image and integrating updates again.
+
+**Default:** Disabled (`-AllowVHDXCaching $false`)
+
+#### Cache Matching
+
+A cached VHDX is reused only when the cache metadata matches your current build inputs, including:
+
+- Windows release, version, and SKU
+- Logical sector size (512 vs 4096)
+- Optional features selection
+- The exact set of update payload file names downloaded for that run (SSU/CU/.NET/etc.)
+
+#### Disk Usage and Cleanup
+
+VHDX caching trades disk space for speed. The `VHDXCache` folder can grow over time as you build different combinations. Periodically check the folder and remove old cached vhdx and config json files as necessary.
+
+{: .note-title}
+
+> Note
+>
+> To force a full rebuild, delete the contents of `$FFUDevelopmentPath\VHDXCache` (or disable **Allow VHDX Caching**) and run the build again.
+
+### Create Deployment Media
+
+Controls the `-CreateDeploymentMedia` parameter.
+
+When enabled, FFU Builder creates WinPE deployment media that is used to deploy an FFU image to a physical device. This media contains the WinPE environment and deployment scripts needed to boot a target machine and apply the FFU image.
+
+The deployment media is saved as an ISO file at `$FFUDevelopmentPath\WinPE_FFU_Deploy_x64.iso` (or `WinPE_FFU_Deploy_arm64.iso` for ARM64 builds). This ISO can then be used with the **Build USB Drive** option to create bootable USB media for physical deployments.
+
+**Default:** Enabled (`-CreateDeploymentMedia $true`)
+
+{: .note-title}
+
+> Note
+>
+> If you only need to capture FFUs from VMs and do not plan to deploy to physical devices, you can disable this option to save time during the build process. However, most scenarios require deployment media for the final step of applying the FFU to target hardware.
+
+{: .tip-title}
+
+> Tip
+>
+> If you just need to re-create deployment media, you can use the `Create-PEMedia.ps1` script to regenerate the deploy ISO without running a full build.
+
+### Inject Unattend.xml
+
+Controls the `-InjectUnattend` parameter. When checked, copies the architecture-specific unattend XML file from `.\FFUDevelopment\unattend` into the Apps ISO so it's baked into the FFU during the VM build process. The default is **unchecked**.
+
+This option is only available when **Install Apps** is checked.
+
+`Copy Unattend.xml` and `Inject Unattend.xml` are mutually exclusive. Select only one.
+
+#### How It Works
+
+When enabled, the build process:
+
+1. Determines the correct unattend file based on the target architecture:
+ * **unattend_x64.xml** for x64 builds
+ * **unattend_arm64.xml** for arm64 builds
+2. Creates an `Unattend` folder inside `.\FFUDevelopment\Apps` if it doesn't exist
+3. Copies the architecture-specific unattend file to `.\FFUDevelopment\Apps\Unattend\Unattend.xml`
+4. Includes the unattend file in the Apps ISO, making it available to sysprep during the VM build
+
+The unattend file is then used by sysprep during the specialize phase and/or other OOBE phases when the FFU is deployed.
+
+#### Creating Your Unattend Files
+
+Modify the architecture-specific unattend file in the `.\FFUDevelopment\unattend` folder:
+
+| File | Description |
+| ---------------------------- | ----------------------------------- |
+| **unattend_x64.xml** | Unattend file used for x64 builds |
+| **unattend_arm64.xml** | Unattend file used for arm64 builds |
+
+{: .warning-title}
+
+> Important
+>
+> Keep the file names with the architecture suffix (e.g., unattend_x64.xml). The script handles renaming the file to `Unattend.xml` when copying it to the Apps folder.
+
+#### When to Use This Option
+
+This option is primarily intended for scenarios where:
+
+* You are **not using the USB drive** to deploy the FFU and use other deployment methods (e.g., network deployment, disk cloning, etc)
+* You want the unattend configuration **baked directly into the FFU** rather than applied at deployment time
+
+#### Limitations
+
+| Limitation | Description |
+| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **No prefixes.txt or %serial% support** | Unlike **Copy Unattend.xml**, this method does not support `prefixes.txt` or the `%serial%` variable for deployment-time device naming |
+| **Fixed configuration** | The unattend settings are baked into the FFU at build time and cannot be changed at deployment time |
+| **Requires VM to be built** | This option only works when**Install Apps** is `$true` because the unattend file is included in the Apps ISO |
+
+{: .note-title}
+
+> Note
+>
+> Most users should continue using the **Copy Unattend** option via the USB drive, which provides more flexibility including support for `prefixes.txt` device naming. Use **Inject Unattend.xml** only when you won't be using the USB drive for deployment.
+
+{: .tip-title}
+
+> Tip
+>
+> If you're using this option, you can disable **Build Deploy ISO** to save time during the build process since the deployment ISO is not needed when you're not using the USB drive method.
+
+### Verbose
+
+Controls the `-Verbose` common parameter. When checked, enables detailed verbose output during the build process. The default is **unchecked**.
+
+In prior builds it was necessary to enable `-verbose` output to track in real-time the build process if you didn't have `cmtrace.exe` or some other log-monitoring tool. With the UI, you can now watch the build in real-time using the monitor tab. Enabling verbose shouldn't be necessary but is available for those who wish to use it.
+
+## Device Naming Expander
+
+Use the **Device Naming** expander to decide whether `ComputerName` should be set at deployment time when unattend is applied. There are some major benefits to doing this:
+
+1. Total deployment time is reduced if naming is set at FFU deployment time since there is no additional reboot done during OOBE.
+2. Reduces the need for multiple provisioning packages or autopilot profiles. This means you can use a single PPKG or autopilot profile.
+
+### No Device Name
+
+This is the default option. The unattend file is still applied, but Windows generates a random computer name instead of forcing a prompt or a fixed name.
+
+### Specify Device Name
+
+Use this option when you want a static device name or a template such as `Comp-%serial%`.
+
+- With **Copy Unattend.xml**, `%serial%` is resolved during deployment in PE.
+- With **Inject Unattend.xml**, only static names are supported.
+- **Copy Unattend.xml** and **Inject Unattend.xml** are mutually exclusive. Select only one.
+
+### Specify a list of Prefixes
+
+This option writes `prefixes.txt` from the list in the UI. Enter one prefix per line in the multiline prefixes box. If there is a single prefix, deployment uses it automatically. If there are multiple prefixes, the technician is prompted to select one. The selected prefix is combined with the device serial number to create the computer name.
+
+For example, with a prefix of `CORP-` and a serial number of `ABC123`, the resulting computer name would be `CORP-ABC123` (truncated to 15 characters if necessary).
+
+Sample `prefixes.txt` content:
+
+```plaintext
+CORP-
+STORE-
+KIOSK-
+```
+
+{: .note-title}
+
+> Note
+>
+> If the technician skips prefix selection when multiple prefixes are available, `ApplyFFU.ps1` leaves the existing unattend `ComputerName` value unchanged. With the current unattend samples set to `*`, Windows falls back to its default random computer-name behavior, typically resulting in a name such as `WIN-*`.
+
+### Prefixes File Path
+
+Use **Prefixes File Path** to point the UI at the source text file for the prefixes list. The file can use any name. When you browse to a prefixes file in the UI, or when a saved configuration references a valid prefixes path, the UI loads that file and populates the multiline prefixes box from its contents.
+
+### Save Prefixes
+
+Use **Save Prefixes** to write the current multiline prefixes list back to the file specified in **Prefixes File Path**.
+
+### Legacy Prompt Behavior
+
+Older deployment media that still has an unattend file with `ComputerName` set to the legacy placeholder value and no `prefixes.txt` file will still prompt for a device name during deployment.
+
+{: .warning-title}
+
+> Warning
+>
+> If using a provisioning package or autopilot json file, DO NOT specify a name in either of these. They will overwrite the name you have specified in the unattend.xml.
+
+### Creating Your Unattend Files
+
+The `.\FFUDevelopment\Unattend` folder includes sample files you can customize:
+
+| File | Description |
+| -------------------------------- | ------------------------------------------ |
+| **SampleUnattend_x64.xml** | Example unattend file for x64 systems |
+| **unattend_x64.xml** | Active unattend file used for x64 builds |
+| **unattend_arm64.xml** | Active unattend file used for arm64 builds |
+| **SamplePrefixes.txt** | Example prefixes file for device naming |
+
+Copy and customize the sample files to create your own `unattend_x64.xml`, `unattend_arm64.xml`, and `prefixes.txt` files.
+
+{: .note-title}
+
+> Note
+>
+> The unattend file must contain a `` element in the `Microsoft-Windows-Shell-Setup` component for device naming to work. See the sample files for the correct structure.
+
+## Build USB Drive Options Expander
+
+This expander groups the settings used to create deployment USB drives after the FFU and deployment media are ready.
+
+### Build USB Drive
+
+Controls the `-BuildUSBDrive` parameter. When checked, FFU Builder partitions and formats selected USB drives and copies the captured FFU plus the enabled deployment assets to them. The default is **unchecked**.
+
+The remaining settings in this expander apply only when **Build USB Drive** is enabled.
### Allow External Hard Disk Media
@@ -184,7 +497,7 @@ Use the **Select All** checkbox in the column header to quickly select or desele
### Copy Autopilot Profile
-Controls the `-CopyAutopilot` parameter. When checked, copies the contents of the `.\FFUDevelopment\Autopilot` folder to the `Autopilot` folder on the Deployment partition of the USB drive. The default is **unchecked**.
+Controls the `-CopyAutopilot` parameter. When checked, copies the contents of `.\FFUDevelopment\Autopilot` to the `Autopilot` folder on the Deployment partition of the USB drive. The default is **unchecked**.
This option is only available when **Build USB Drive** is checked.
@@ -203,73 +516,11 @@ When enabled, the build process copies:
During deployment, `ApplyFFU.ps1` applies `Unattend.xml` whenever it is present. Device naming only happens when the **Device Naming** setting requires it, or when older media still uses the legacy prompt-based workflow.
-#### Device Naming
-
-Use the **Device Naming** expander to decide whether `ComputerName` should be set at deployment time. There are some major benefits to doing this:
-
-1. Total deployment time is reduced if naming is set at FFU deployment time since there is no additional reboot done during OOBE.
-2. Reduces the need for multiple provisioning packages or autopilot profiles. This means you can use a single PPKG or autopilot profile.
-
-#### No Device Name
-
-This is the default option. The unattend file is still applied, but Windows generates a random computer name instead of forcing a prompt or a fixed name.
-
-#### Specify Device Name
-
-Use this option when you want a static device name or a template such as `Comp-%serial%`.
-
-- With **Copy Unattend.xml**, `%serial%` is resolved during deployment in PE.
-- With **Inject Unattend.xml**, only static names are supported.
-- **Copy Unattend.xml** and **Inject Unattend.xml** are mutually exclusive. Select only one.
-
-#### Specify a list of Prefixes
-
-This option writes `prefixes.txt` from the list in the UI. Enter one prefix per line or import an existing prefixes file. The source file can use any name because the UI now tracks the path separately.
-
-If there is a single prefix, deployment uses it automatically. If there are multiple prefixes, the technician is prompted to select one. The selected prefix is combined with the device serial number to create the computer name.
-
-For example, with a prefix of `CORP-` and a serial number of `ABC123`, the resulting computer name would be `CORP-ABC123` (truncated to 15 characters if necessary).
-
-Sample `prefixes.txt` content:
-
-```plaintext
-CORP-
-STORE-
-KIOSK-
-```
-
-#### Legacy Prompt Behavior
-
-Older deployment media that still has an unattend file with `ComputerName` set to the legacy placeholder value and no `prefixes.txt` file will still prompt for a device name during deployment.
-
-{: .warning-title}
-
-> Warning
->
-> If using a provisioning package or autopilot json file, DO NOT specify a name in either of these. They will overwrite the name you have specified in the unattend.xml.
-
-#### Creating Your Unattend Files
-
-The `.\FFUDevelopment\Unattend` folder includes sample files you can customize:
-
-| File | Description |
-| -------------------------------- | ------------------------------------------ |
-| **SampleUnattend_x64.xml** | Example unattend file for x64 systems |
-| **unattend_x64.xml** | Active unattend file used for x64 builds |
-| **unattend_arm64.xml** | Active unattend file used for arm64 builds |
-| **SamplePrefixes.txt** | Example prefixes file for device naming |
-
-Copy and customize the sample files to create your own `unattend_x64.xml`, `unattend_arm64.xml`, and `prefixes.txt` files.
-
-{: .note-title}
-
-> Note
->
-> The unattend file must contain a `` element in the `Microsoft-Windows-Shell-Setup` component for device naming to work. See the sample files for the correct structure.
+See **Device Naming Expander** above for the available computer-name modes and prefixes-file behavior.
### Copy Provisioning Package
-Controls the `-CopyPPKG` parameter. When checked, copies the contents of the `.\FFUDevelopment\PPKG` folder to the `PPKG` folder on the Deployment partition of the USB drive. The default is **unchecked**.
+Controls the `-CopyPPKG` parameter. When checked, copies the contents of `.\FFUDevelopment\PPKG` to the `PPKG` folder on the Deployment partition of the USB drive. The default is **unchecked**.
This option is only available when **Build USB Drive** is checked.
@@ -333,248 +584,23 @@ This option is only available when **Build USB Drive** is checked.
When building USB drives, the script processes multiple drives concurrently to speed up imaging. This setting controls how many drives are formatted and copied to simultaneously.
-## Compact OS
+## Post-Build Cleanup Expander
-Controls the `-CompactOS` parameter. When checked, the Windows image is applied using compressed files. The default is **checked**.
+This expander groups the cleanup settings that run after a successful build completes.
-### How It Works
-
-When enabled, the build script uses the `-Compact` switch with `Expand-WindowsImage` when applying the Windows image to the OS partition. This compresses Windows system files using Compact OS compression, which reduces the disk footprint of the operating system. On an x64 image, space savings is ~3.5-4GB.
-
-### Benefits
-
-| Benefit | Description |
-| ------------------------------- | ---------------------------------------------------------------------------------------------------- |
-| **Reduced Disk Space** | Windows files are stored in a compressed state, saving several gigabytes of storage |
-| **Smaller FFU Size** | The captured FFU file is smaller because the OS partition contains compressed files |
-| **Faster Deployment** | Smaller FFU files transfer more quickly to USB drives and deploy faster to target devices |
-| **No Performance Impact** | Modern CPUs decompress files faster than they can be read from storage, so performance is maintained |
-
-### When to Disable
-
-You may want to disable Compact OS in the following scenarios:
-
-- **Windows Server builds**: The script automatically disables Compact OS for Windows Server operating systems because the Windows Overlay Filter (wof.sys) is not included in Server SKUs
-- **Troubleshooting**: If you experience issues with specific applications that are incompatible with compressed files
-- **Maximum performance requirements**: In rare cases where every CPU cycle matters
-
-{: .note-title}
-
-> Note
->
-> Compact OS is automatically disabled when building Windows Server images, regardless of this setting. The script detects Server operating systems and applies the Windows image without compression.
-
-## Update ADK
-
-Controls the `-UpdateADK` parameter. When checked, the script checks for and installs or updates to the latest Windows ADK and WinPE add-on before starting the build. The default is **checked**.
-
-### How It Works
-
-When enabled, the build process performs the following checks before starting:
-
-1. **Version Check**: Queries the [Microsoft ADK installation page](https://learn.microsoft.com/en-us/windows-hardware/get-started/adk-install) to determine the latest available ADK version
-2. **Compare Versions**: Compares the installed ADK and WinPE add-on versions (if present) against the latest available version
-3. **Update if Needed**: If an older version is detected:
- - Uninstalls the existing Windows ADK
- - Uninstalls the existing WinPE add-on
- - Downloads and installs the latest Windows ADK with Deployment Tools feature
- - Downloads and installs the latest WinPE add-on
-
-### Features Installed
-
-When installing or updating the ADK, the following features are included:
-
-| Component | Feature ID | Description |
-| ---------------------------------- | ---------------------------------------------- | --------------------------------------------------------------- |
-| **Windows Deployment Tools** | `OptionId.DeploymentTools` | Includes DISM, Oscdimg, and other deployment-related tools |
-| **WinPE Environment** | `OptionId.WindowsPreinstallationEnvironment` | Windows Preinstallation Environment used for capture and deploy |
-
-### Installation Location
-
-The ADK is installed to the default location: `C:\Program Files (x86)\Windows Kits\10`
-
-### When to Disable
-
-You may want to disable Update ADK in the following scenarios:
-
-- **Offline or air-gapped environments**: When internet access is not available to download the latest ADK
-- **Controlled ADK versions**: When you need to maintain a specific ADK version for compatibility or compliance reasons
-- **Faster builds**: When you have already verified you are running the latest ADK version and want to skip the version check
-
-{: .warning-title}
-
-> Warning
->
-> If Update ADK is disabled and the Windows ADK or WinPE add-on is not installed, the build will fail. Ensure you have manually installed the required components before disabling this option.
-
-### Manual ADK Installation
-
-If you prefer to manually install the ADK, visit:
-
-[Download and install the Windows ADK](https://learn.microsoft.com/en-us/windows-hardware/get-started/adk-install)
-
-You must install both:
-
-- Windows Assessment and Deployment Kit (with Deployment Tools feature)
-- Windows PE add-on for the Windows ADK
-
-## Optimize
-
-Controls the `-Optimize` parameter. When enabled, FFU Builder runs the Windows ADK version of DISM to optimize the captured `.ffu` file:
-
-- `DISM /Optimize-FFU /ImageFile:`
-
-This post-processing step typically takes a few minutes and is intended to make FFU images faster to deploy and easier to deploy to differently-sized disks (by allowing the Windows partition to expand or shrink during apply).
-
-**Default:** Enabled (`-Optimize $true`)
-
-### When to Disable
-
-You may want to disable Optimize (`-Optimize $false`) if you are troubleshooting, or if you want to skip the extra post-processing time.
-
-{: .warning-title}
-
-> Warning
->
-> If you plan to deploy the same FFU to devices with different storage sizes (especially smaller disks), keep `-Optimize` enabled. Non-optimized FFUs are more likely to require additional partition management during deployment.
-
-{: .note-title}
-
-> Note
->
-> FFU Builder also performs a separate “optimize VHDX before capture” step. That VHDX optimization is independent of `-Optimize`, so you may still see “Optimizing VHDX before capture…” even when `-Optimize` is disabled.
-
-## Allow VHDX Caching
-
-Controls the `-AllowVHDXCaching` parameter. When enabled, FFU Builder caches the base VHDX it creates in `$FFUDevelopmentPath\VHDXCache` and writes a matching `*_config.json` file alongside it. On later builds, if a cached VHDX exists that matches your selected Windows settings and update set, the script reuses it to avoid re-applying the base image and integrating updates again.
-
-**Default:** Disabled (`-AllowVHDXCaching $false`)
-
-### Cache Matching
-
-A cached VHDX is reused only when the cache metadata matches your current build inputs, including:
-
-- Windows release, version, and SKU
-- Logical sector size (512 vs 4096)
-- Optional features selection
-- The exact set of update payload file names downloaded for that run (SSU/CU/.NET/etc.)
-
-### Disk Usage and Cleanup
-
-VHDX caching trades disk space for speed. The `VHDXCache` folder can grow over time as you build different combinations. Periodically check the folder and remove old cached vhdx and config json files as necessary.
-
-{: .note-title}
-
-> Note
->
-> To force a full rebuild, delete the contents of `$FFUDevelopmentPath\VHDXCache` (or disable **Allow VHDX Caching**) and run the build again.
-
-## Create Deployment Media
-
-Controls the `-CreateDeploymentMedia` parameter.
-
-When enabled, FFU Builder creates WinPE deployment media that is used to deploy an FFU image to a physical device. This media contains the WinPE environment and deployment scripts needed to boot a target machine and apply the FFU image.
-
-The deployment media is saved as an ISO file at `$FFUDevelopmentPath\WinPE_FFU_Deploy_x64.iso` (or `WinPE_FFU_Deploy_arm64.iso` for ARM64 builds). This ISO can then be used with the **Build USB Drive** option to create bootable USB media for physical deployments.
-
-**Default:** Enabled (`-CreateDeploymentMedia $true`)
-
-{: .note-title}
-
-> Note
->
-> If you only need to capture FFUs from VMs and do not plan to deploy to physical devices, you can disable this option to save time during the build process. However, most scenarios require deployment media for the final step of applying the FFU to target hardware.
-
-{: .tip-title}
-
-> Tip
->
-> If you just need to re-create deployment media, you can use the `Create-PEMedia.ps1` script to regenerate the deploy ISO without running a full build.
-
-## Inject Unattend.xml
-
-Controls the `-InjectUnattend` parameter. When checked, copies the architecture-specific unattend XML file from `.\FFUDevelopment\unattend` into the Apps ISO so it's baked into the FFU during the VM build process. The default is **unchecked**.
-
-This option is only available when **Install Apps** is checked.
-
-`Copy Unattend.xml` and `Inject Unattend.xml` are mutually exclusive. Select only one.
-
-### How It Works
-
-When enabled, the build process:
-
-1. Determines the correct unattend file based on the target architecture:
- * **unattend_x64.xml** for x64 builds
- * **unattend_arm64.xml** for arm64 builds
-2. Creates an `Unattend` folder inside `.\FFUDevelopment\Apps` if it doesn't exist
-3. Copies the architecture-specific unattend file to `.\FFUDevelopment\Apps\Unattend\Unattend.xml`
-4. Includes the unattend file in the Apps ISO, making it available to sysprep during the VM build
-
-The unattend file is then used by sysprep during the specialize phase and/or other OOBE phases when the FFU is deployed.
-
-### Creating Your Unattend Files
-
-Modify the architecture-specific unattend file in the `.\FFUDevelopment\unattend` folder:
-
-| File | Description |
-| ---------------------------- | ----------------------------------- |
-| **unattend_x64.xml** | Unattend file used for x64 builds |
-| **unattend_arm64.xml** | Unattend file used for arm64 builds |
-
-{: .warning-title}
-
-> Important
->
-> Keep the file names with the architecture suffix (e.g., unattend_x64.xml). The script handles renaming the file to `Unattend.xml` when copying it to the Apps folder.
-
-### When to Use This Option
-
-This option is primarily intended for scenarios where:
-
-* You are **not using the USB drive** to deploy the FFU and use other deployment methods (e.g., network deployment, disk cloning, etc)
-* You want the unattend configuration **baked directly into the FFU** rather than applied at deployment time
-
-### Limitations
-
-| Limitation | Description |
-| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **No prefixes.txt or %serial% support** | Unlike **Copy Unattend.xml**, this method does not support `prefixes.txt` or the `%serial%` variable for deployment-time device naming |
-| **Fixed configuration** | The unattend settings are baked into the FFU at build time and cannot be changed at deployment time |
-| **Requires VM to be built** | This option only works when**Install Apps** is `$true` because the unattend file is included in the Apps ISO |
-
-{: .note-title}
-
-> Note
->
-> Most users should continue using the **Copy Unattend** option via the USB drive, which provides more flexibility including support for `prefixes.txt` device naming. Use **Inject Unattend.xml** only when you won't be using the USB drive for deployment.
-
-{: .tip-title}
-
-> Tip
->
-> If you're using this option, you can disable **Build Deploy ISO** to save time during the build process since the deployment ISO is not needed when you're not using the USB drive method.
-
-## Verbose
-
-Controls the `-Verbose` common parameter. When checked, enables detailed verbose output during the build process. The default is **unchecked**.
-
-In prior builds it was necessary to enable `-verbose` output to track in real-time the build process if you didn't have `cmtrace.exe` or some other log-monitoring tool. With the UI, you can now watch the build in real-time using the monitor tab. Enabling verbose shouldn't be necessary but is available for those who wish to use it.
-
-# Post-Build Cleanup
-
-## Cleanup Apps ISO
+### Cleanup Apps ISO
Controls the `-CleanupAppsISO` parameter. When checked, the Apps ISO file is automatically deleted after the FFU has been successfully captured. The default is **checked**.
-During the build process, when apps are being installed, the script creates an `Apps.iso` file in the FFU Development Path (e.g., `.\FFUDevelopment\Apps.iso`). This ISO contains the contents of the `.\FFUDevelopment\Apps` folder—including application installers, Office deployment files, and orchestration scripts—and is mounted to the VM during the build to install applications.
+During the build process, when apps are being installed, the script creates an `Apps.iso` file in the FFU Development Path (for example, `.\FFUDevelopment\Apps.iso`). This ISO contains the contents of the `.\FFUDevelopment\Apps` folder, including application installers, Office deployment files, and orchestration scripts, and is mounted to the VM during the build to install applications.
-### When to Disable
+#### When to Disable
You may want to disable Cleanup Apps ISO in the following scenarios:
-* **Debugging app installations**: When troubleshooting application installation issues and you want to manually inspect the ISO contents
-* **Multiple builds with same apps**: If you're running consecutive builds with identical app configurations and want to reuse the existing ISO to save time (the script will recreate it if missing)
-* **Archival purposes**: When you need to retain a copy of the exact Apps ISO used for a specific FFU build
+- **Debugging app installations**: When troubleshooting application installation issues and you want to manually inspect the ISO contents
+- **Multiple builds with same apps**: If you're running consecutive builds with identical app configurations and want to reuse the existing ISO to save time (the script will recreate it if missing)
+- **Archival purposes**: When you need to retain a copy of the exact Apps ISO used for a specific FFU build
{: .note-title}
@@ -582,69 +608,69 @@ You may want to disable Cleanup Apps ISO in the following scenarios:
>
> The Apps ISO is only created when applications are configured for installation. If no apps are being installed in the FFU, this option has no effect. Keeping this option enabled helps conserve disk space by removing temporary build artifacts.
-## Cleanup Deploy ISO
+### Cleanup Deploy ISO
Controls the `-CleanupDeployISO` parameter. When checked, the WinPE deployment ISO file is automatically deleted after the FFU has been successfully captured. The default is **checked**.
-During the build process, when **Build Deploy ISO** is enabled, the script creates a `WinPE_FFU_Deploy.iso` file (e.g., `.\FFUDevelopment\WinPE_FFU_Deploy.iso`). This ISO contains a customized Windows PE environment used to deploy captured FFU images to target devices. The deployment ISO is typically copied to a bootable USB drive along with the FFU files for field deployment.
+During the build process, when **Build Deploy ISO** is enabled, the script creates a `WinPE_FFU_Deploy.iso` file (for example, `.\FFUDevelopment\WinPE_FFU_Deploy.iso`). This ISO contains a customized Windows PE environment used to deploy captured FFU images to target devices. The deployment ISO is typically copied to a bootable USB drive along with the FFU files for field deployment.
-### When to Disable
+#### When to Disable
You may want to disable Cleanup Deploy ISO in the following scenarios:
-* **Creating deployment media separately**: When you want to create USB deployment drives at a later time, see [USB Imaging Tool Creator](/FFU/usb_imaging_tool_creator.html) for a staged workflow using `USBImagingToolCreator.ps1` with a deploy ISO, `FFU`, and `Drivers` folder (local path or network share).
-* **Testing in Hyper-V**: When deploying FFU images to Hyper-V VMs for testing, you can attach the deploy ISO directly to a VM as a DVD drive
+- **Creating deployment media separately**: When you want to create USB deployment drives at a later time, see [USB Imaging Tool Creator](/FFU/usb_imaging_tool_creator.html) for a staged workflow using `USBImagingToolCreator.ps1` with a deploy ISO, `FFU`, and `Drivers` folder (local path or network share)
+- **Testing in Hyper-V**: When deploying FFU images to Hyper-V VMs for testing, you can attach the deploy ISO directly to a VM as a DVD drive
-## Cleanup Drivers
+### Cleanup Drivers
Controls the `-CleanupDrivers` parameter. When checked, the contents of the Drivers folder are automatically deleted after the FFU has been successfully captured. The default is **unchecked**.
-During the build process, when drivers are configured for installation, the script downloads and extracts driver packages into manufacturer-specific subfolders within the Drivers folder (e.g., `.\FFUDevelopment\Drivers\HP`, `.\FFUDevelopment\Drivers\Dell`). These drivers are then injected into the FFU during the build.
+During the build process, when drivers are configured for installation, the script downloads and extracts driver packages into manufacturer-specific subfolders within the Drivers folder (for example, `.\FFUDevelopment\Drivers\HP`, `.\FFUDevelopment\Drivers\Dell`). These drivers are then injected into the FFU during the build.
-### When to Enable
+#### When to Enable
You may want to enable Cleanup Drivers in the following scenarios:
-* **Conserving disk space**: Driver packages can be large (several gigabytes per manufacturer), and removing them after a successful build frees up storage
-* **Ensuring fresh drivers**: When you want each build to download the latest available drivers rather than reusing previously downloaded versions
-* **Single-use builds**: When building an FFU for a one-time deployment and you don't need to retain the driver files
+- **Conserving disk space**: Driver packages can be large (several gigabytes per manufacturer), and removing them after a successful build frees up storage
+- **Ensuring fresh drivers**: When you want each build to download the latest available drivers rather than reusing previously downloaded versions
+- **Single-use builds**: When building an FFU for a one-time deployment and you don't need to retain the driver files
-### When to Disable
+#### When to Disable
You may want to keep Cleanup Drivers disabled in the following scenarios:
-* **Multiple builds with same drivers**: If you're running consecutive builds targeting the same hardware models, keeping drivers avoids re-downloading them each time
-* **Debugging driver issues**: When troubleshooting driver injection problems and you want to manually inspect the downloaded driver contents
-* **Offline builds**: When building in an environment with limited or no internet access, retaining drivers allows reuse across builds
-* **Bring Your Own Drivers:** When you download and bring your own set of drivers from another source and don't want FFU Builder to remove them
+- **Multiple builds with same drivers**: If you're running consecutive builds targeting the same hardware models, keeping drivers avoids re-downloading them each time
+- **Debugging driver issues**: When troubleshooting driver injection problems and you want to manually inspect the downloaded driver contents
+- **Offline builds**: When building in an environment with limited or no internet access, retaining drivers allows reuse across builds
+- **Bring Your Own Drivers**: When you download and bring your own set of drivers from another source and don't want FFU Builder to remove them
{: .note-title}
> Note
>
-> Only the contents within the Drivers folder are removed—the folder itself is preserved. If no drivers were downloaded during the build, this option has no effect.
+> Only the contents within the Drivers folder are removed. The folder itself is preserved. If no drivers were downloaded during the build, this option has no effect.
-## Remove FFU
+### Remove FFU
Controls the `-RemoveFFU` parameter. When checked, all FFU files in the FFU Capture Location are automatically deleted after the build completes successfully. The default is **unchecked**.
-During the build process, the captured FFU image is written to the FFU Capture Location (e.g., `.\FFUDevelopment\FFU`). This option removes all `.ffu` files from that folder after the build finishes, including any previously captured FFU files that may exist in the folder.
+During the build process, the captured FFU image is written to the FFU Capture Location (for example, `.\FFUDevelopment\FFU`). This option removes all `.ffu` files from that folder after the build finishes, including any previously captured FFU files that may exist in the folder.
-### When to Enable
+#### When to Enable
You may want to enable Remove FFU in the following scenarios:
-* **USB-only workflow**: When you're using **Build USB Drive** to copy the FFU directly to a USB drive and don't need to retain the FFU file on the host machine
-* **Conserving disk space**: FFU files can be very large depending on what you're installing, and removing them after copying to USB frees up storage
-* **Automated build pipelines**: When running automated builds where the FFU is immediately transferred to another location (such as a network share or deployment server) and no longer needed locally
+- **USB-only workflow**: When you're using **Build USB Drive** to copy the FFU directly to a USB drive and don't need to retain the FFU file on the host machine
+- **Conserving disk space**: FFU files can be very large depending on what you're installing, and removing them after copying to USB frees up storage
+- **Automated build pipelines**: When running automated builds where the FFU is immediately transferred to another location (such as a network share or deployment server) and no longer needed locally
-### When to Disable
+#### When to Disable
You may want to keep Remove FFU disabled in the following scenarios:
-* **Archival purposes**: When you want to retain captured FFU images for future deployments or as a backup
-* **Multiple USB drives**: When you need to create additional USB deployment drives at a later time
-* **Testing and validation**: When you want to test the FFU in Hyper-V or other environments before deploying to physical hardware
+- **Archival purposes**: When you want to retain captured FFU images for future deployments or as a backup
+- **Multiple USB drives**: When you need to create additional USB deployment drives at a later time
+- **Testing and validation**: When you want to test the FFU in Hyper-V or other environments before deploying to physical hardware
{: .warning-title}
@@ -652,15 +678,15 @@ You may want to keep Remove FFU disabled in the following scenarios:
>
> This option removes **all** FFU files in the FFU Capture Location folder, not just the FFU from the current build. If you have previously captured FFU files stored in this folder that you want to keep, do not enable this option or move those files to a different location before building.
-## Remove Apps Folder Content
+### Remove Apps Folder Content
-Controls the `-RemoveApps` parameter. When checked, application content in the Apps folder is automatically deleted after the FFU has been successfully captured. The default is **un****checked**.
+Controls the `-RemoveApps` parameter. When checked, application content in the Apps folder is automatically deleted after the FFU has been successfully captured. The default is **unchecked**.
-During the build process, application content accumulates in several subfolders within the Apps folder (e.g., `.\FFUDevelopment\Apps`):
+During the build process, application content accumulates in several subfolders within the Apps folder (for example, `.\FFUDevelopment\Apps`):
| Folder | Contents |
| ----------- | ------------------------------------------------------------------------------------------------------------------------ |
-| `Win32` | Winget source applications and Bring Your Own Apps content copied using the**Copy Apps** button or manually copied |
+| `Win32` | Winget source applications and Bring Your Own Apps content copied using the **Copy Apps** button or manually copied |
| `MSStore` | Microsoft Store applications downloaded via Winget |
| `Office` | Microsoft 365 Apps installer files downloaded by the Office Deployment Tool |
@@ -668,34 +694,34 @@ Additionally, the `WinGetWin32Apps.json` orchestration file in `.\FFUDevelopment
When this option is enabled, the cleanup process removes:
-* The entire `Win32` folder and its contents
-* The entire `MSStore` folder and its contents
-* The Office download subfolder (`Office\Office`) and the `setup.exe` file within the `Office` folder
+- The entire `Win32` folder and its contents
+- The entire `MSStore` folder and its contents
+- The Office download subfolder (`Office\Office`) and the `setup.exe` file within the `Office` folder
-### When to Enable
+#### When to Enable
You may want to keep Remove Apps Folder Content enabled in the following scenarios:
-* **Conserving disk space**: Downloaded application installers can consume significant storage, and removing them after a successful build frees up space
-* **Ensuring fresh downloads**: When you want each build to download the latest available application versions rather than reusing previously downloaded content
-* **Single-use builds**: When building an FFU for a one-time deployment and you don't need to retain the application files
+- **Conserving disk space**: Downloaded application installers can consume significant storage, and removing them after a successful build frees up space
+- **Ensuring fresh downloads**: When you want each build to download the latest available application versions rather than reusing previously downloaded content
+- **Single-use builds**: When building an FFU for a one-time deployment and you don't need to retain the application files
-### When to Disable
+#### When to Disable
You may want to disable Remove Apps Folder Content in the following scenarios:
-* **Multiple builds with same apps**: If you're running consecutive builds with identical application configurations, keeping the downloaded content avoids re-downloading applications each time
-* **Debugging app installations**: When troubleshooting application installation issues and you want to manually inspect the downloaded content
-* **Offline builds**: When building in an environment with limited or no internet access, retaining downloaded applications allows reuse across builds
-* **Preserving Bring Your Own Apps**: When you've manually copied application content into the `Win32` folder and don't want FFU Builder to remove it
+- **Multiple builds with same apps**: If you're running consecutive builds with identical application configurations, keeping the downloaded content avoids re-downloading applications each time
+- **Debugging app installations**: When troubleshooting application installation issues and you want to manually inspect the downloaded content
+- **Offline builds**: When building in an environment with limited or no internet access, retaining downloaded applications allows reuse across builds
+- **Preserving Bring Your Own Apps**: When you've manually copied application content into the `Win32` folder and don't want FFU Builder to remove it
{: .note-title}
> Note
>
-> Only the application content subfolders are removed—the `Apps` folder itself and configuration files such as `AppList.json` and `UserAppList.json` are preserved. If no applications were configured for the build, this option has no effect.
+> Only the application content subfolders are removed. The `Apps` folder itself and configuration files such as `AppList.json` and `UserAppList.json` are preserved. If no applications were configured for the build, this option has no effect.
-## Remove Downloaded Update Files
+### Remove Downloaded Update Files
Controls the `-RemoveUpdates` parameter. When checked, downloaded Windows updates and application update payloads are automatically deleted after the FFU has been successfully captured. The default is **unchecked**.
@@ -711,28 +737,60 @@ During the build process, update files are downloaded to specific locations with
When this option is enabled, the cleanup process removes the entire `KB` folder and the specific update subfolders within the `Apps` directory.
-### When to Enable
+#### When to Enable
You may want to keep Remove Downloaded Update Files enabled in the following scenarios:
-* **Conserving disk space**: Windows Cumulative Updates can be several gigabytes in size, and removing them after a successful build frees up significant storage
-* **Ensuring latest updates**: When you want each build to download the absolute latest available updates rather than potentially reusing older cached versions
+- **Conserving disk space**: Windows Cumulative Updates can be several gigabytes in size, and removing them after a successful build frees up significant storage
+- **Ensuring latest updates**: When you want each build to download the absolute latest available updates rather than potentially reusing older cached versions
-### When to Disable
+#### When to Disable
You may want to disable Remove Downloaded Update Files in the following scenarios:
-* **Multiple builds**: If you're running consecutive builds, keeping the downloaded updates avoids re-downloading large Cumulative Update files each time
-* **Offline builds**: When building in an environment with limited or no internet access, retaining downloaded updates allows reuse across builds
-* **Testing and validation**: When you want to manually inspect the update files that were included in the build
+- **Multiple builds**: If you're running consecutive builds, keeping the downloaded updates avoids re-downloading large Cumulative Update files each time
+- **Offline builds**: When building in an environment with limited or no internet access, retaining downloaded updates allows reuse across builds
+- **Testing and validation**: When you want to manually inspect the update files that were included in the build
{: .note-title}
> Note
>
-> Only the update-specific subfolders are removed-the `Apps` folder itself and other application content (unless **Remove Apps Folder Content** is also selected) are preserved.
+> Only the update-specific subfolders are removed. The `Apps` folder itself and other application content, unless **Remove Apps Folder Content** is also selected, are preserved.
-## Restore Defaults
+### Remove Downloaded ESD file(s)
+
+Controls the `-RemoveDownloadedESD` parameter. When checked, downloaded Windows ESD files are automatically deleted after they have been applied. The default is **checked**.
+
+This setting applies to builds that use downloaded Windows ESD media instead of a provided ISO. When enabled, the build removes the downloaded `.esd` file after it has been used. When disabled, the downloaded `.esd` is kept for reuse on later builds.
+
+#### When to Enable
+
+You may want to keep Remove Downloaded ESD file(s) enabled in the following scenarios:
+
+- **Conserving disk space**: Downloaded ESD files can be large, and removing them after a successful build frees up storage
+- **Ensuring fresh media**: When you want each build to download the latest available ESD for the selected release and version
+- **Single-use builds**: When you do not expect to reuse the same downloaded source media again
+
+#### When to Disable
+
+You may want to disable Remove Downloaded ESD file(s) in the following scenarios:
+
+- **Multiple builds with the same source media**: Keeping the ESD avoids re-downloading it each time
+- **Offline or bandwidth-constrained environments**: Retaining the ESD allows reuse across builds
+- **Troubleshooting source-media issues**: When you want to preserve the downloaded ESD for inspection or repeat testing
+
+{: .note-title}
+
+> Note
+>
+> This option only applies when the build used a downloaded `.esd` file. If you provide a Windows ISO instead, this setting has no effect.
+
+## Build Page Actions
+
+These buttons sit below the Build tab expanders and operate on the overall page state rather than a single expander.
+
+### Restore Defaults
Use this to restore FFU Builder to its default state. When clicked:
@@ -750,7 +808,7 @@ Use this to restore FFU Builder to its default state. When clicked:
>
> If you want to keep any content prior to restoring defaults, copy it out first.
-## Save Config File
+### Save Config File
Saves all current UI selections to a JSON file so you can reload the same settings later or run `BuildFFUVM.ps1` from the command line with `-configFile` (e.g. `BuildFFUVM.ps1 -configFile C:\FFUDevelopment\config\FFUConfig.json`)
@@ -760,7 +818,7 @@ Saves all current UI selections to a JSON file so you can reload the same settin
- Defaults the save location to `FFUDevelopmentPath\config` and suggests `FFUConfig.json` as the file name. You can browse and pick a different file name or folder.
- Creates the `config` folder if it does not exist and confirms the save when finished.
-## Load Config File
+### Load Config File
Loads a previously saved configuration JSON and repopulates the UI.
@@ -771,7 +829,7 @@ Loads a previously saved configuration JSON and repopulates the UI.
- Supplemental files referenced in the config (Winget `AppList.json`, BYO `UserAppList.json`, `Drivers.json`) are also imported if they exist. Missing helper files are treated as optional and noted for you.
- If the file is empty, unreadable, or invalid JSON, the load is stopped and an error message is shown.
-## Build FFU
+### Build FFU
Use **Build FFU** to run `BuildFFUVM.ps1` with the current UI selections.
diff --git a/docs/quickstart.md b/docs/quickstart.md
index c1f5e29..5bd292d 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -207,6 +207,12 @@ Use this option when you want a static device name or a template such as `Comp-%
This option writes `prefixes.txt` from the list in the UI. Enter one prefix per line or import an existing prefixes file. The source file can use any name because the UI tracks the prefixes path separately. If there is one prefix, deployment uses it automatically. If there are multiple prefixes, the technician is prompted to select one and the serial number is appended to that prefix.
+{: .note-title}
+
+> Note
+>
+> If the technician skips prefix selection when multiple prefixes are available, `ApplyFFU.ps1` leaves the existing unattend `ComputerName` value unchanged. With the current unattend samples set to `*`, Windows falls back to its default random computer-name behavior, typically resulting in a name such as `WIN-*`.
+
{: .warning-title}
> Warning
From 82bac17b38fefd2c3a49cdac6d9aaaaff6dc7133 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Thu, 9 Apr 2026 13:33:37 -0700
Subject: [PATCH 24/34] Adds Prompt option to device naming mode
Introduces an explicit "Prompt" option for device naming to allow technicians to enter the device name during deployment. This replaces the implicit legacy behavior, providing clear UI controls and validation to ensure that Unattend.xml is copied, which is required for prompt-based naming. Relevant documentation is updated to reflect this new workflow capability.
---
FFUDevelopment/BuildFFUVM.ps1 | 21 ++++++++++++++-----
FFUDevelopment/BuildFFUVM_UI.ps1 | 10 ++++++++-
FFUDevelopment/BuildFFUVM_UI.xaml | 1 +
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 5 ++++-
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 20 ++++++++++++++----
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 1 +
docs/build.md | 15 +++++++++++--
docs/parameters_reference.md | 2 +-
docs/quickstart.md | 8 +++++--
9 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index bb61540..ba73768 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -73,7 +73,7 @@ When set to $true, will copy the provisioning package from the $FFUDevelopmentPa
When set to $true, will copy the $FFUDevelopmentPath\Unattend folder to the Deployment partition of the USB drive. Default is $false.
.PARAMETER DeviceNamingMode
-Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Supported values are Legacy, None, Template, and Prefixes.
+Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Supported values are Legacy, None, Prompt, Template, and Prefixes.
.PARAMETER DeviceNameTemplate
Sets the device name used when DeviceNamingMode is Template. Supports a static name or the %serial% token when CopyUnattend is used.
@@ -419,7 +419,7 @@ param(
[bool]$AllowVHDXCaching,
[bool]$CopyPPKG,
[bool]$CopyUnattend,
- [ValidateSet('Legacy', 'None', 'Template', 'Prefixes')]
+ [ValidateSet('Legacy', 'None', 'Prompt', 'Template', 'Prefixes')]
[string]$DeviceNamingMode = 'Legacy',
[string]$DeviceNameTemplate,
[string[]]$DeviceNamePrefixes,
@@ -557,7 +557,7 @@ function Save-StagedUnattendFile {
[Parameter(Mandatory = $true)]
[string]$DestinationPath,
[Parameter(Mandatory = $true)]
- [ValidateSet('Legacy', 'None', 'Template', 'Prefixes')]
+ [ValidateSet('Legacy', 'None', 'Prompt', 'Template', 'Prefixes')]
[string]$DeviceNamingMode,
[string]$DeviceNameTemplate
)
@@ -588,6 +588,9 @@ function Save-StagedUnattendFile {
if ($DeviceNamingMode -eq 'None') {
$computerNameComponent.ComputerName = '*'
}
+ elseif ($DeviceNamingMode -eq 'Prompt') {
+ $computerNameComponent.ComputerName = 'MyComputer'
+ }
elseif ($DeviceNamingMode -eq 'Template') {
$computerNameComponent.ComputerName = $DeviceNameTemplate
}
@@ -638,6 +641,11 @@ if ($DeviceNamingMode -eq 'Template') {
throw 'The %serial% device name variable is only supported when CopyUnattend is used.'
}
}
+elseif ($DeviceNamingMode -eq 'Prompt') {
+ if (-not $CopyUnattend) {
+ throw 'DeviceNamingMode Prompt requires CopyUnattend. Prompt-based naming is not supported with InjectUnattend.'
+ }
+}
elseif ($DeviceNamingMode -eq 'Prefixes') {
if (-not $CopyUnattend) {
throw 'DeviceNamingMode Prefixes requires CopyUnattend. Prefix-based naming is not supported with InjectUnattend.'
@@ -4364,6 +4372,9 @@ Function New-DeploymentUSB {
if ($DeviceNamingMode -eq 'None') {
$computerNameComponent.ComputerName = '*'
}
+ elseif ($DeviceNamingMode -eq 'Prompt') {
+ $computerNameComponent.ComputerName = 'MyComputer'
+ }
elseif ($DeviceNamingMode -eq 'Template') {
$computerNameComponent.ComputerName = $DeviceNameTemplate
}
@@ -5706,10 +5717,10 @@ if ($CopyUnattend) {
throw "-CopyUnattend is set to `$true, but the $UnattendFolder folder is missing a .XML file"
}
- if ($DeviceNamingMode -eq 'Prefixes') {
+ if ($DeviceNamingMode -in @('Prompt', 'Prefixes')) {
$unattendSourcePath = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch
if (-not (Test-UnattendHasComputerNameElement -Path $unattendSourcePath)) {
- throw "DeviceNamingMode Prefixes requires a ComputerName element in $unattendSourcePath"
+ throw "DeviceNamingMode $DeviceNamingMode requires a ComputerName element in $unattendSourcePath"
}
}
diff --git a/FFUDevelopment/BuildFFUVM_UI.ps1 b/FFUDevelopment/BuildFFUVM_UI.ps1
index 90b8e32..b0771cc 100644
--- a/FFUDevelopment/BuildFFUVM_UI.ps1
+++ b/FFUDevelopment/BuildFFUVM_UI.ps1
@@ -439,7 +439,15 @@ $script:uiState.Controls.btnRun.Add_Click({
return
}
- if ($config.DeviceNamingMode -eq 'Template') {
+ if ($config.DeviceNamingMode -eq 'Prompt') {
+ if (-not $config.CopyUnattend) {
+ [System.Windows.MessageBox]::Show("Select Copy Unattend.xml before using 'Prompt for Device Name'.", "Copy Unattend Required", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: prompt naming requires Copy Unattend.xml."
+ return
+ }
+ }
+ elseif ($config.DeviceNamingMode -eq 'Template') {
if ([string]::IsNullOrWhiteSpace([string]$config.DeviceNameTemplate)) {
[System.Windows.MessageBox]::Show("Specify a device name before using 'Specify Device Name'.", "Device Name Required", "OK", "Warning") | Out-Null
$btnRun.IsEnabled = $true
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 7ed2603..038e261 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -910,6 +910,7 @@
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index 1d92654..f31c69f 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -472,7 +472,10 @@ function Update-UIFromConfig {
if ($ConfigContent.PSObject.Properties.Name -contains 'DeviceNamingMode') {
$deviceNamingMode = [string]$ConfigContent.DeviceNamingMode
}
- if ($deviceNamingMode -notin @('None', 'Template', 'Prefixes')) {
+ if ($deviceNamingMode -eq 'Legacy') {
+ $deviceNamingMode = 'Prompt'
+ }
+ if ($deviceNamingMode -notin @('None', 'Prompt', 'Template', 'Prefixes')) {
$deviceNamingMode = 'None'
}
Set-DeviceNamingMode -State $State -Mode $deviceNamingMode
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 5fa99e3..0fe70fc 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -30,6 +30,10 @@ function Update-VMNetworkingControls {
function Get-SelectedDeviceNamingMode {
param([PSCustomObject]$State)
+ if ($true -eq $State.Controls.rbDeviceNamingPrompt.IsChecked) {
+ return 'Prompt'
+ }
+
if ($true -eq $State.Controls.rbDeviceNamingTemplate.IsChecked) {
return 'Template'
}
@@ -44,11 +48,12 @@ function Get-SelectedDeviceNamingMode {
function Set-DeviceNamingMode {
param(
[PSCustomObject]$State,
- [ValidateSet('None', 'Template', 'Prefixes')]
+ [ValidateSet('None', 'Prompt', 'Template', 'Prefixes')]
[string]$Mode
)
$State.Controls.rbDeviceNamingNone.IsChecked = $Mode -eq 'None'
+ $State.Controls.rbDeviceNamingPrompt.IsChecked = $Mode -eq 'Prompt'
$State.Controls.rbDeviceNamingTemplate.IsChecked = $Mode -eq 'Template'
$State.Controls.rbDeviceNamingPrefixes.IsChecked = $Mode -eq 'Prefixes'
}
@@ -132,9 +137,10 @@ function Update-UnattendSelectionControls {
$isCopyUnattendSelected = $true -eq $State.Controls.chkCopyUnattend.IsChecked
$isInjectUnattendSelected = $true -eq $State.Controls.chkInjectUnattend.IsChecked
$deviceNameTemplateUsesSerialToken = Test-DeviceNameTemplateUsesSerialToken -State $State
+ $requiresCopiedUnattend = ($selectedDeviceNamingMode -in @('Prompt', 'Prefixes')) -or $deviceNameTemplateUsesSerialToken
if ($isCopyUnattendSelected -and $isInjectUnattendSelected) {
- if (($selectedDeviceNamingMode -eq 'Prefixes') -or $deviceNameTemplateUsesSerialToken) {
+ if ($requiresCopiedUnattend) {
$State.Controls.chkInjectUnattend.IsChecked = $false
$isInjectUnattendSelected = $false
}
@@ -144,7 +150,7 @@ function Update-UnattendSelectionControls {
}
}
- if (($selectedDeviceNamingMode -eq 'Prefixes') -or $deviceNameTemplateUsesSerialToken) {
+ if ($requiresCopiedUnattend) {
if (-not $isCopyUnattendSelected) {
$State.Controls.chkCopyUnattend.IsChecked = $true
$isCopyUnattendSelected = $true
@@ -177,13 +183,14 @@ function Update-UnattendSelectionControls {
function Update-DeviceNamingControls {
param([PSCustomObject]$State)
- if (($true -eq $State.Controls.chkInjectUnattend.IsChecked) -and ($true -eq $State.Controls.rbDeviceNamingPrefixes.IsChecked)) {
+ if (($true -eq $State.Controls.chkInjectUnattend.IsChecked) -and (($true -eq $State.Controls.rbDeviceNamingPrompt.IsChecked) -or ($true -eq $State.Controls.rbDeviceNamingPrefixes.IsChecked))) {
$State.Controls.rbDeviceNamingNone.IsChecked = $true
}
$selectedDeviceNamingMode = Get-SelectedDeviceNamingMode -State $State
$State.Controls.deviceNameTemplatePanel.Visibility = if ($selectedDeviceNamingMode -eq 'Template') { 'Visible' } else { 'Collapsed' }
$State.Controls.deviceNamePrefixesPanel.Visibility = if ($selectedDeviceNamingMode -eq 'Prefixes') { 'Visible' } else { 'Collapsed' }
+ $State.Controls.rbDeviceNamingPrompt.IsEnabled = -not ($true -eq $State.Controls.chkInjectUnattend.IsChecked)
$State.Controls.rbDeviceNamingPrefixes.IsEnabled = -not ($true -eq $State.Controls.chkInjectUnattend.IsChecked)
if ($selectedDeviceNamingMode -eq 'Prefixes') {
@@ -435,6 +442,11 @@ function Register-EventHandlers {
$window = [System.Windows.Window]::GetWindow($eventSource)
Update-DeviceNamingControls -State $window.Tag
})
+ $State.Controls.rbDeviceNamingPrompt.Add_Checked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ Update-DeviceNamingControls -State $window.Tag
+ })
$State.Controls.rbDeviceNamingTemplate.Add_Checked({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index e84e1f5..62cac40 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -221,6 +221,7 @@ function Initialize-UIControls {
$State.Controls.chkCreateDeploymentMedia = $window.FindName('chkCreateDeploymentMedia')
$State.Controls.chkInjectUnattend = $window.FindName('chkInjectUnattend')
$State.Controls.rbDeviceNamingNone = $window.FindName('rbDeviceNamingNone')
+ $State.Controls.rbDeviceNamingPrompt = $window.FindName('rbDeviceNamingPrompt')
$State.Controls.rbDeviceNamingTemplate = $window.FindName('rbDeviceNamingTemplate')
$State.Controls.rbDeviceNamingPrefixes = $window.FindName('rbDeviceNamingPrefixes')
$State.Controls.deviceNameTemplatePanel = $window.FindName('deviceNameTemplatePanel')
diff --git a/docs/build.md b/docs/build.md
index abaad01..3c5849a 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -363,6 +363,17 @@ Use the **Device Naming** expander to decide whether `ComputerName` should be se
This is the default option. The unattend file is still applied, but Windows generates a random computer name instead of forcing a prompt or a fixed name.
+The active `unattend_*.xml` files in `FFUDevelopment\Unattend` use `*` for this default behavior.
+
+### Prompt for Device Name
+
+Use this option when you want the technician to enter the computer name during deployment.
+
+- This option requires **Copy Unattend.xml**.
+- The source `unattend_*.xml` files can stay at `*`.
+- During the build, FFU Builder rewrites only the staged deployment copy of `Unattend.xml` to the legacy prompt placeholder that `ApplyFFU.ps1` already recognizes.
+- **Inject Unattend.xml** is not supported with this option.
+
### Specify Device Name
Use this option when you want a static device name or a template such as `Comp-%serial%`.
@@ -399,9 +410,9 @@ Use **Prefixes File Path** to point the UI at the source text file for the prefi
Use **Save Prefixes** to write the current multiline prefixes list back to the file specified in **Prefixes File Path**.
-### Legacy Prompt Behavior
+### Deployment Prompt Compatibility
-Older deployment media that still has an unattend file with `ComputerName` set to the legacy placeholder value and no `prefixes.txt` file will still prompt for a device name during deployment.
+Older deployment media that already has an unattend file with `ComputerName` set to the legacy placeholder value and no `prefixes.txt` file will still prompt for a device name during deployment.
{: .warning-title}
diff --git a/docs/parameters_reference.md b/docs/parameters_reference.md
index 67912f0..661c20b 100644
--- a/docs/parameters_reference.md
+++ b/docs/parameters_reference.md
@@ -41,7 +41,7 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -CopyUnattend | bool | Copy Unattend.xml | When set to $true, will copy the $FFUDevelopmentPath\Unattend folder to the Deployment partition of the USB drive. Cannot be used together with -InjectUnattend. Default is $false. |
| -CreateDeploymentMedia | bool | Create Deployment Media | When set to $true, this will create WinPE deployment media for use when deploying to a physical device. |
| -CustomFFUNameTemplate | string | Custom FFU Name Template | Sets a custom FFU output name with placeholders. Allowed placeholders are: {WindowsRelease}, {WindowsVersion}, {SKU}, {BuildDate}, {yyyy}, {MM}, {dd}, {H}, {hh}, {mm}, {tt}. |
-| -DeviceNamingMode | string | Device Naming expander | Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Accepted values are Legacy, None, Template, and Prefixes. The UI uses None, Template, and Prefixes. |
+| -DeviceNamingMode | string | Device Naming expander | Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Accepted values are Legacy, None, Prompt, Template, and Prefixes. The UI uses None, Prompt, Template, and Prefixes. Prompt rewrites the staged deployment unattend to the existing manual prompt placeholder and requires -CopyUnattend. |
| -DeviceNameTemplate | string | Specify Device Name | Sets the device name used when DeviceNamingMode is Template. Supports a static name or the %serial% token when -CopyUnattend is used. |
| -DeviceNamePrefixesPath | string | Prefixes File Path | Path to the source prefixes file used for legacy copy or when -DeviceNamePrefixes is not supplied. Default is $FFUDevelopmentPath\Unattend\prefixes.txt. |
| -DeviceNamePrefixes | string[] | Specify a list of Prefixes | Sets the prefixes used when DeviceNamingMode is Prefixes. Each entry becomes a line in prefixes.txt on the deployment media. |
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 5bd292d..8ed8fe7 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -286,18 +286,22 @@ And the Unattend folder should have an unattend.xml file with the following cont
- MyComputer
+ *
```
+Keep `*` if you want Windows to generate a random device name by default.
+
+If you want the technician to be prompted for the device name during deployment, select **Prompt for Device Name** in the Build tab and enable **Copy Unattend.xml**. FFU Builder will rewrite only the staged deployment copy of `Unattend.xml` for that workflow.
+
Now you're ready to deploy the FFU to your device.
## Deployment
-Deployment should be fairly straight forward: boot off the USB device, get prompted for a device name, and the deployment of the FFU and drivers should happen automatically.
+Deployment should be fairly straight forward: boot off the USB device and the deployment of the FFU and drivers should happen automatically. If you selected **Prompt for Device Name** or another supported device naming option, that naming step will happen during deployment.
If you have any questions or run into any issues, [open a discussion in the Github repo](https://github.com/rbalsleyMSFT/FFU/discussions).
From f1f1957c4352ee397683ad580066b223b0850ebd Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Thu, 9 Apr 2026 15:14:00 -0700
Subject: [PATCH 25/34] Auto-generate ComputerName in Unattend XML
Replaces the strict validation for an existing ComputerName element with dynamic XML initialization. Automatically creates the specialize settings block, the Microsoft-Windows-Shell-Setup component, and the ComputerName element if they are missing from the provided Unattend XML file. This improves script robustness and simplifies the requirements for custom unattended setup templates by patching in the necessary device naming structure on the fly.
---
FFUDevelopment/BuildFFUVM.ps1 | 272 ++++++++++++++++++++++++++--------
1 file changed, 213 insertions(+), 59 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index ba73768..dfe1b92 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -534,20 +534,79 @@ function Get-UnattendSourcePath {
return Join-Path $UnattendFolder "unattend_$archSuffix.xml"
}
-function Test-UnattendHasComputerNameElement {
+function Initialize-UnattendComputerNamePath {
param(
[Parameter(Mandatory = $true)]
- [string]$Path
+ [xml]$UnattendXml,
+ [Parameter(Mandatory = $true)]
+ [string]$WindowsArch
)
- [xml]$unattendXml = Get-Content -Path $Path
- foreach ($component in $unattendXml.unattend.settings.component) {
- if ($component.ComputerName) {
- return $true
- }
+ $unattendRoot = $UnattendXml.DocumentElement
+ if (($null -eq $unattendRoot) -or ($unattendRoot.LocalName -ne 'unattend')) {
+ throw 'Unattend XML is missing the unattend root element.'
}
- return $false
+ $unattendNamespace = $unattendRoot.NamespaceURI
+ if ([string]::IsNullOrWhiteSpace($unattendNamespace)) {
+ throw 'Unattend XML is missing the default unattend namespace.'
+ }
+
+ $namespaceManager = New-Object System.Xml.XmlNamespaceManager($UnattendXml.NameTable)
+ $namespaceManager.AddNamespace('un', $unattendNamespace)
+
+ $specializeSettings = $unattendRoot.SelectSingleNode("un:settings[@pass='specialize']", $namespaceManager)
+ $createdSpecializeSettings = $false
+ if ($null -eq $specializeSettings) {
+ $specializeSettings = $UnattendXml.CreateElement('settings', $unattendNamespace)
+ $null = $specializeSettings.SetAttribute('pass', 'specialize')
+ $firstSettingsNode = $unattendRoot.SelectSingleNode('un:settings', $namespaceManager)
+ if ($null -ne $firstSettingsNode) {
+ $null = $unattendRoot.InsertBefore($specializeSettings, $firstSettingsNode)
+ }
+ else {
+ $null = $unattendRoot.AppendChild($specializeSettings)
+ }
+ $createdSpecializeSettings = $true
+ }
+
+ $shellSetupComponent = $specializeSettings.SelectSingleNode("un:component[@name='Microsoft-Windows-Shell-Setup']", $namespaceManager)
+ $createdShellSetupComponent = $false
+ if ($null -eq $shellSetupComponent) {
+ $processorArchitecture = if ($WindowsArch -ieq 'arm64') { 'arm64' } else { 'amd64' }
+ $shellSetupComponent = $UnattendXml.CreateElement('component', $unattendNamespace)
+ $null = $shellSetupComponent.SetAttribute('name', 'Microsoft-Windows-Shell-Setup')
+ $null = $shellSetupComponent.SetAttribute('processorArchitecture', $processorArchitecture)
+ $null = $shellSetupComponent.SetAttribute('publicKeyToken', '31bf3856ad364e35')
+ $null = $shellSetupComponent.SetAttribute('language', 'neutral')
+ $null = $shellSetupComponent.SetAttribute('versionScope', 'nonSxS')
+ $null = $shellSetupComponent.SetAttribute('xmlns:wcm', 'http://www.w3.org/2000/xmlns/', 'http://schemas.microsoft.com/WMIConfig/2002/State')
+ $null = $shellSetupComponent.SetAttribute('xmlns:xsi', 'http://www.w3.org/2000/xmlns/', 'http://www.w3.org/2001/XMLSchema-instance')
+
+ $firstComponentNode = $specializeSettings.SelectSingleNode('un:component', $namespaceManager)
+ if ($null -ne $firstComponentNode) {
+ $null = $specializeSettings.InsertBefore($shellSetupComponent, $firstComponentNode)
+ }
+ else {
+ $null = $specializeSettings.AppendChild($shellSetupComponent)
+ }
+ $createdShellSetupComponent = $true
+ }
+
+ $computerNameElement = $shellSetupComponent.SelectSingleNode('un:ComputerName', $namespaceManager)
+ $createdComputerNameElement = $false
+ if ($null -eq $computerNameElement) {
+ $computerNameElement = $UnattendXml.CreateElement('ComputerName', $unattendNamespace)
+ $null = $shellSetupComponent.AppendChild($computerNameElement)
+ $createdComputerNameElement = $true
+ }
+
+ return [PSCustomObject]@{
+ ComputerNameElement = $computerNameElement
+ CreatedSpecializeSettings = $createdSpecializeSettings
+ CreatedShellSetupComponent = $createdShellSetupComponent
+ CreatedComputerNameElement = $createdComputerNameElement
+ }
}
function Save-StagedUnattendFile {
@@ -559,40 +618,47 @@ function Save-StagedUnattendFile {
[Parameter(Mandatory = $true)]
[ValidateSet('Legacy', 'None', 'Prompt', 'Template', 'Prefixes')]
[string]$DeviceNamingMode,
- [string]$DeviceNameTemplate
+ [string]$DeviceNameTemplate,
+ [Parameter(Mandatory = $true)]
+ [string]$WindowsArch,
+ [bool]$LegacyPrefixesWillBeStaged = $false
)
- if ($DeviceNamingMode -in @('Legacy', 'Prefixes')) {
+ if ($DeviceNamingMode -eq 'None') {
Copy-Item -Path $SourcePath -Destination $DestinationPath -Force | Out-Null
return
}
[xml]$unattendXml = Get-Content -Path $SourcePath
- $computerNameComponent = $null
- foreach ($component in $unattendXml.unattend.settings.component) {
- if ($component.ComputerName) {
- $computerNameComponent = $component
- break
+ $computerNamePath = Initialize-UnattendComputerNamePath -UnattendXml $unattendXml -WindowsArch $WindowsArch
+
+ if ($computerNamePath.CreatedSpecializeSettings -or $computerNamePath.CreatedShellSetupComponent -or $computerNamePath.CreatedComputerNameElement) {
+ $createdParts = @()
+ if ($computerNamePath.CreatedSpecializeSettings) {
+ $createdParts += 'specialize settings'
}
- }
-
- if ($null -eq $computerNameComponent) {
- if ($DeviceNamingMode -eq 'None') {
- Copy-Item -Path $SourcePath -Destination $DestinationPath -Force | Out-Null
- return
+ if ($computerNamePath.CreatedShellSetupComponent) {
+ $createdParts += 'Microsoft-Windows-Shell-Setup component'
}
-
- throw "ComputerName element not found in unattend source file: $SourcePath"
+ if ($computerNamePath.CreatedComputerNameElement) {
+ $createdParts += 'ComputerName element'
+ }
+ WriteLog "Created $($createdParts -join ', ') while staging unattend file $DestinationPath"
}
- if ($DeviceNamingMode -eq 'None') {
- $computerNameComponent.ComputerName = '*'
- }
- elseif ($DeviceNamingMode -eq 'Prompt') {
- $computerNameComponent.ComputerName = 'MyComputer'
+ if ($DeviceNamingMode -eq 'Prompt') {
+ $computerNamePath.ComputerNameElement.InnerText = 'MyComputer'
}
elseif ($DeviceNamingMode -eq 'Template') {
- $computerNameComponent.ComputerName = $DeviceNameTemplate
+ $computerNamePath.ComputerNameElement.InnerText = $DeviceNameTemplate
+ }
+ elseif ($DeviceNamingMode -eq 'Prefixes') {
+ if ($computerNamePath.CreatedComputerNameElement) {
+ $computerNamePath.ComputerNameElement.InnerText = '*'
+ }
+ }
+ elseif (($DeviceNamingMode -eq 'Legacy') -and $computerNamePath.CreatedComputerNameElement) {
+ $computerNamePath.ComputerNameElement.InnerText = if ($LegacyPrefixesWillBeStaged) { '*' } else { 'MyComputer' }
}
$unattendXml.Save($DestinationPath)
@@ -4338,45 +4404,124 @@ Function New-DeploymentUSB {
return Join-Path $UnattendFolder "unattend_$archSuffix.xml"
}
+ function Initialize-UnattendComputerNamePath {
+ param(
+ [xml]$UnattendXml,
+ [string]$WindowsArch
+ )
+
+ $unattendRoot = $UnattendXml.DocumentElement
+ if (($null -eq $unattendRoot) -or ($unattendRoot.LocalName -ne 'unattend')) {
+ throw 'Unattend XML is missing the unattend root element.'
+ }
+
+ $unattendNamespace = $unattendRoot.NamespaceURI
+ if ([string]::IsNullOrWhiteSpace($unattendNamespace)) {
+ throw 'Unattend XML is missing the default unattend namespace.'
+ }
+
+ $namespaceManager = New-Object System.Xml.XmlNamespaceManager($UnattendXml.NameTable)
+ $namespaceManager.AddNamespace('un', $unattendNamespace)
+
+ $specializeSettings = $unattendRoot.SelectSingleNode("un:settings[@pass='specialize']", $namespaceManager)
+ $createdSpecializeSettings = $false
+ if ($null -eq $specializeSettings) {
+ $specializeSettings = $UnattendXml.CreateElement('settings', $unattendNamespace)
+ $null = $specializeSettings.SetAttribute('pass', 'specialize')
+ $firstSettingsNode = $unattendRoot.SelectSingleNode('un:settings', $namespaceManager)
+ if ($null -ne $firstSettingsNode) {
+ $null = $unattendRoot.InsertBefore($specializeSettings, $firstSettingsNode)
+ }
+ else {
+ $null = $unattendRoot.AppendChild($specializeSettings)
+ }
+ $createdSpecializeSettings = $true
+ }
+
+ $shellSetupComponent = $specializeSettings.SelectSingleNode("un:component[@name='Microsoft-Windows-Shell-Setup']", $namespaceManager)
+ $createdShellSetupComponent = $false
+ if ($null -eq $shellSetupComponent) {
+ $processorArchitecture = if ($WindowsArch -ieq 'arm64') { 'arm64' } else { 'amd64' }
+ $shellSetupComponent = $UnattendXml.CreateElement('component', $unattendNamespace)
+ $null = $shellSetupComponent.SetAttribute('name', 'Microsoft-Windows-Shell-Setup')
+ $null = $shellSetupComponent.SetAttribute('processorArchitecture', $processorArchitecture)
+ $null = $shellSetupComponent.SetAttribute('publicKeyToken', '31bf3856ad364e35')
+ $null = $shellSetupComponent.SetAttribute('language', 'neutral')
+ $null = $shellSetupComponent.SetAttribute('versionScope', 'nonSxS')
+ $null = $shellSetupComponent.SetAttribute('xmlns:wcm', 'http://www.w3.org/2000/xmlns/', 'http://schemas.microsoft.com/WMIConfig/2002/State')
+ $null = $shellSetupComponent.SetAttribute('xmlns:xsi', 'http://www.w3.org/2000/xmlns/', 'http://www.w3.org/2001/XMLSchema-instance')
+
+ $firstComponentNode = $specializeSettings.SelectSingleNode('un:component', $namespaceManager)
+ if ($null -ne $firstComponentNode) {
+ $null = $specializeSettings.InsertBefore($shellSetupComponent, $firstComponentNode)
+ }
+ else {
+ $null = $specializeSettings.AppendChild($shellSetupComponent)
+ }
+ $createdShellSetupComponent = $true
+ }
+
+ $computerNameElement = $shellSetupComponent.SelectSingleNode('un:ComputerName', $namespaceManager)
+ $createdComputerNameElement = $false
+ if ($null -eq $computerNameElement) {
+ $computerNameElement = $UnattendXml.CreateElement('ComputerName', $unattendNamespace)
+ $null = $shellSetupComponent.AppendChild($computerNameElement)
+ $createdComputerNameElement = $true
+ }
+
+ return [PSCustomObject]@{
+ ComputerNameElement = $computerNameElement
+ CreatedSpecializeSettings = $createdSpecializeSettings
+ CreatedShellSetupComponent = $createdShellSetupComponent
+ CreatedComputerNameElement = $createdComputerNameElement
+ }
+ }
+
function Save-LocalStagedUnattendFile {
param(
[string]$SourcePath,
[string]$DestinationPath,
[string]$DeviceNamingMode,
- [string]$DeviceNameTemplate
+ [string]$DeviceNameTemplate,
+ [string]$WindowsArch,
+ [bool]$LegacyPrefixesWillBeStaged = $false
)
- if ($DeviceNamingMode -in @('Legacy', 'Prefixes')) {
+ if ($DeviceNamingMode -eq 'None') {
Copy-Item -Path $SourcePath -Destination $DestinationPath -Force | Out-Null
return
}
[xml]$unattendXml = Get-Content -Path $SourcePath
- $computerNameComponent = $null
- foreach ($component in $unattendXml.unattend.settings.component) {
- if ($component.ComputerName) {
- $computerNameComponent = $component
- break
+ $computerNamePath = Initialize-UnattendComputerNamePath -UnattendXml $unattendXml -WindowsArch $WindowsArch
+
+ if ($computerNamePath.CreatedSpecializeSettings -or $computerNamePath.CreatedShellSetupComponent -or $computerNamePath.CreatedComputerNameElement) {
+ $createdParts = @()
+ if ($computerNamePath.CreatedSpecializeSettings) {
+ $createdParts += 'specialize settings'
}
- }
-
- if ($null -eq $computerNameComponent) {
- if ($DeviceNamingMode -eq 'None') {
- Copy-Item -Path $SourcePath -Destination $DestinationPath -Force | Out-Null
- return
+ if ($computerNamePath.CreatedShellSetupComponent) {
+ $createdParts += 'Microsoft-Windows-Shell-Setup component'
}
-
- throw "ComputerName element not found in unattend source file: $SourcePath"
+ if ($computerNamePath.CreatedComputerNameElement) {
+ $createdParts += 'ComputerName element'
+ }
+ WriteLog "Created $($createdParts -join ', ') while staging unattend file $DestinationPath"
}
- if ($DeviceNamingMode -eq 'None') {
- $computerNameComponent.ComputerName = '*'
- }
- elseif ($DeviceNamingMode -eq 'Prompt') {
- $computerNameComponent.ComputerName = 'MyComputer'
+ if ($DeviceNamingMode -eq 'Prompt') {
+ $computerNamePath.ComputerNameElement.InnerText = 'MyComputer'
}
elseif ($DeviceNamingMode -eq 'Template') {
- $computerNameComponent.ComputerName = $DeviceNameTemplate
+ $computerNamePath.ComputerNameElement.InnerText = $DeviceNameTemplate
+ }
+ elseif ($DeviceNamingMode -eq 'Prefixes') {
+ if ($computerNamePath.CreatedComputerNameElement) {
+ $computerNamePath.ComputerNameElement.InnerText = '*'
+ }
+ }
+ elseif (($DeviceNamingMode -eq 'Legacy') -and $computerNamePath.CreatedComputerNameElement) {
+ $computerNamePath.ComputerNameElement.InnerText = if ($LegacyPrefixesWillBeStaged) { '*' } else { 'MyComputer' }
}
$unattendXml.Save($DestinationPath)
@@ -4443,12 +4588,13 @@ Function New-DeploymentUSB {
WriteLog "Copying unattend file to $UnattendPathOnUSB"
New-Item -Path $UnattendPathOnUSB -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
$unattendSource = Get-LocalUnattendSourcePath -UnattendFolder $using:UnattendFolder -WindowsArch $using:WindowsArch
- Save-LocalStagedUnattendFile -SourcePath $unattendSource -DestinationPath (Join-Path $UnattendPathOnUSB 'Unattend.xml') -DeviceNamingMode $using:DeviceNamingMode -DeviceNameTemplate $using:normalizedDeviceNameTemplate
+ $legacyPrefixesWillBeStaged = ($using:DeviceNamingMode -eq 'Legacy') -and (Test-Path -Path $using:resolvedDeviceNamePrefixesPath -PathType Leaf)
+ Save-LocalStagedUnattendFile -SourcePath $unattendSource -DestinationPath (Join-Path $UnattendPathOnUSB 'Unattend.xml') -DeviceNamingMode $using:DeviceNamingMode -DeviceNameTemplate $using:normalizedDeviceNameTemplate -WindowsArch $using:WindowsArch -LegacyPrefixesWillBeStaged $legacyPrefixesWillBeStaged
if ($using:DeviceNamingMode -eq 'Prefixes') {
WriteLog "Writing prefixes.txt file to $UnattendPathOnUSB"
$using:effectiveDeviceNamePrefixes | Set-Content -Path (Join-Path $UnattendPathOnUSB 'prefixes.txt') -Encoding UTF8
}
- elseif (($using:DeviceNamingMode -eq 'Legacy') -and (Test-Path -Path $using:resolvedDeviceNamePrefixesPath -PathType Leaf)) {
+ elseif ($legacyPrefixesWillBeStaged) {
WriteLog "Copying prefixes.txt file to $UnattendPathOnUSB"
Copy-Item -Path $using:resolvedDeviceNamePrefixesPath -Destination (Join-Path $UnattendPathOnUSB 'prefixes.txt') -Force | Out-Null
}
@@ -5717,21 +5863,29 @@ if ($CopyUnattend) {
throw "-CopyUnattend is set to `$true, but the $UnattendFolder folder is missing a .XML file"
}
- if ($DeviceNamingMode -in @('Prompt', 'Prefixes')) {
+ if ($DeviceNamingMode -ne 'None') {
$unattendSourcePath = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch
- if (-not (Test-UnattendHasComputerNameElement -Path $unattendSourcePath)) {
- throw "DeviceNamingMode $DeviceNamingMode requires a ComputerName element in $unattendSourcePath"
+ try {
+ [xml]$validationUnattendXml = Get-Content -Path $unattendSourcePath
+ $null = Initialize-UnattendComputerNamePath -UnattendXml $validationUnattendXml -WindowsArch $WindowsArch
+ }
+ catch {
+ throw "DeviceNamingMode $DeviceNamingMode requires a valid specialize/Microsoft-Windows-Shell-Setup/ComputerName path in $unattendSourcePath. $($_.Exception.Message)"
}
}
WriteLog 'Unattend validation complete'
}
-if ($InjectUnattend -and $DeviceNamingMode -eq 'Template') {
+if ($InjectUnattend -and ($DeviceNamingMode -ne 'None')) {
$injectUnattendSourcePath = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch
if (Test-Path -Path $injectUnattendSourcePath -PathType Leaf) {
- if (-not (Test-UnattendHasComputerNameElement -Path $injectUnattendSourcePath)) {
- throw "DeviceNamingMode Template requires a ComputerName element in $injectUnattendSourcePath"
+ try {
+ [xml]$validationUnattendXml = Get-Content -Path $injectUnattendSourcePath
+ $null = Initialize-UnattendComputerNamePath -UnattendXml $validationUnattendXml -WindowsArch $WindowsArch
+ }
+ catch {
+ throw "DeviceNamingMode $DeviceNamingMode requires a valid specialize/Microsoft-Windows-Shell-Setup/ComputerName path in $injectUnattendSourcePath. $($_.Exception.Message)"
}
}
}
@@ -6644,7 +6798,7 @@ if ($InstallApps) {
# Copy if source exists; otherwise log and skip
if (Test-Path -Path $unattendSource -PathType Leaf) {
$destination = Join-Path $targetFolder 'Unattend.xml'
- Save-StagedUnattendFile -SourcePath $unattendSource -DestinationPath $destination -DeviceNamingMode $DeviceNamingMode -DeviceNameTemplate $normalizedDeviceNameTemplate
+ Save-StagedUnattendFile -SourcePath $unattendSource -DestinationPath $destination -DeviceNamingMode $DeviceNamingMode -DeviceNameTemplate $normalizedDeviceNameTemplate -WindowsArch $WindowsArch
WriteLog "Injected unattend file into Apps: $unattendSource -> $destination"
}
else {
From 7bd5decc627a925527b0b8ba9559d73bddcb0f76 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Thu, 9 Apr 2026 16:44:39 -0700
Subject: [PATCH 26/34] Adds custom unattend XML file selection paths
Adds parameters for x64 and arm64 unattend XML file paths.
Updates the BuildFFUVM_UI to let the user pick specific XML files to copy or inject instead of requiring them to exist in the `unattend` folder.
Adds validation to ensure the selected unattend XML files are not empty.
Updates documentation to reflect the new functionality.
---
FFUDevelopment/BuildFFUVM.ps1 | 105 ++++++++++++------
FFUDevelopment/BuildFFUVM_UI.ps1 | 32 ++++++
FFUDevelopment/BuildFFUVM_UI.xaml | 49 ++++++--
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 12 ++
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 67 +++++++++++
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 6 +
FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 | 4 +
FFUDevelopment/config/Sample_default.json | Bin 6506 -> 6826 bytes
docs/build.md | 34 ++++--
docs/parameters_reference.md | 6 +-
10 files changed, 258 insertions(+), 57 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index dfe1b92..305f56c 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -70,7 +70,7 @@ When set to $true, enables adding WinPE drivers. By default copies drivers from
When set to $true, will copy the provisioning package from the $FFUDevelopmentPath\PPKG folder to the Deployment partition of the USB drive. Default is $false.
.PARAMETER CopyUnattend
-When set to $true, will copy the $FFUDevelopmentPath\Unattend folder to the Deployment partition of the USB drive. Default is $false.
+When set to $true, stages the selected architecture-specific unattend XML file as Unattend.xml on the deployment partition of the USB drive. Default is $false.
.PARAMETER DeviceNamingMode
Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Supported values are Legacy, None, Prompt, Template, and Prefixes.
@@ -84,6 +84,12 @@ Sets the prefixes used when DeviceNamingMode is Prefixes. Each entry becomes a l
.PARAMETER DeviceNamePrefixesPath
Path to the source prefixes file used for legacy copy or when DeviceNamePrefixes is not supplied. Default is $FFUDevelopmentPath\Unattend\prefixes.txt.
+.PARAMETER UnattendX64FilePath
+Path to the x64 unattend XML source file. Default is $FFUDevelopmentPath\Unattend\unattend_x64.xml.
+
+.PARAMETER UnattendArm64FilePath
+Path to the arm64 unattend XML source file. Default is $FFUDevelopmentPath\Unattend\unattend_arm64.xml.
+
.PARAMETER CreateDeploymentMedia
When set to $true, this will create WinPE deployment media for use when deploying to a physical device.
@@ -118,7 +124,7 @@ Prefix for the generated FFU file. Default is _FFU.
Headers to use when downloading files. Not recommended to modify.
.PARAMETER InjectUnattend
-When set to $true and InstallApps is also $true, copies unattend_[arch].xml from $FFUDevelopmentPath\unattend to $FFUDevelopmentPath\Apps\Unattend\Unattend.xml so sysprep can use it inside the VM. Default is $false.
+When set to $true and InstallApps is also $true, stages the selected architecture-specific unattend XML file to $FFUDevelopmentPath\Apps\Unattend\Unattend.xml so sysprep can use it inside the VM. Default is $false.
.PARAMETER InstallApps
When set to $true, the script will create an Apps.iso file from the $FFUDevelopmentPath\Apps folder. It will also create a VM, mount the Apps.iso, install the apps, sysprep, and capture the VM. When set to $false, the FFU is created from a VHDX file, and no VM is created.
@@ -424,6 +430,8 @@ param(
[string]$DeviceNameTemplate,
[string[]]$DeviceNamePrefixes,
[string]$DeviceNamePrefixesPath,
+ [string]$UnattendX64FilePath,
+ [string]$UnattendArm64FilePath,
[bool]$CopyAutopilot,
[bool]$CompactOS = $true,
[bool]$CleanupDeployISO = $true,
@@ -527,11 +535,31 @@ function Get-UnattendSourcePath {
[Parameter(Mandatory = $true)]
[string]$UnattendFolder,
[Parameter(Mandatory = $true)]
- [string]$WindowsArch
+ [string]$WindowsArch,
+ [string]$UnattendX64FilePath,
+ [string]$UnattendArm64FilePath
)
- $archSuffix = if ($WindowsArch -ieq 'arm64') { 'arm64' } else { 'x64' }
- return Join-Path $UnattendFolder "unattend_$archSuffix.xml"
+ $resolvedArch = if ($WindowsArch -ieq 'arm64') { 'arm64' } else { 'x64' }
+ $resolvedSourcePath = if ($resolvedArch -eq 'arm64') {
+ if ([string]::IsNullOrWhiteSpace($UnattendArm64FilePath)) {
+ Join-Path $UnattendFolder 'unattend_arm64.xml'
+ }
+ else {
+ $UnattendArm64FilePath
+ }
+ }
+ else {
+ if ([string]::IsNullOrWhiteSpace($UnattendX64FilePath)) {
+ Join-Path $UnattendFolder 'unattend_x64.xml'
+ }
+ else {
+ $UnattendX64FilePath
+ }
+ }
+
+ WriteLog "Resolved unattend source path for ${resolvedArch}: $resolvedSourcePath"
+ return $resolvedSourcePath
}
function Initialize-UnattendComputerNamePath {
@@ -915,6 +943,8 @@ if (-not $EdgePath) { $EdgePath = "$AppsPath\Edge" }
if (-not $DriversFolder) { $DriversFolder = "$FFUDevelopmentPath\Drivers" }
if (-not $PPKGFolder) { $PPKGFolder = "$FFUDevelopmentPath\PPKG" }
if (-not $UnattendFolder) { $UnattendFolder = "$FFUDevelopmentPath\Unattend" }
+if ([string]::IsNullOrWhiteSpace($UnattendX64FilePath)) { $UnattendX64FilePath = Join-Path $UnattendFolder 'unattend_x64.xml' }
+if ([string]::IsNullOrWhiteSpace($UnattendArm64FilePath)) { $UnattendArm64FilePath = Join-Path $UnattendFolder 'unattend_arm64.xml' }
if (-not $AutopilotFolder) { $AutopilotFolder = "$FFUDevelopmentPath\Autopilot" }
if (-not $PEDriversFolder) { $PEDriversFolder = "$FFUDevelopmentPath\PEDrivers" }
if (-not $VHDXCacheFolder) { $VHDXCacheFolder = "$FFUDevelopmentPath\VHDXCache" }
@@ -4397,11 +4427,31 @@ Function New-DeploymentUSB {
function Get-LocalUnattendSourcePath {
param(
[string]$UnattendFolder,
- [string]$WindowsArch
+ [string]$WindowsArch,
+ [string]$UnattendX64FilePath,
+ [string]$UnattendArm64FilePath
)
- $archSuffix = if ($WindowsArch -ieq 'arm64') { 'arm64' } else { 'x64' }
- return Join-Path $UnattendFolder "unattend_$archSuffix.xml"
+ $resolvedArch = if ($WindowsArch -ieq 'arm64') { 'arm64' } else { 'x64' }
+ $resolvedSourcePath = if ($resolvedArch -eq 'arm64') {
+ if ([string]::IsNullOrWhiteSpace($UnattendArm64FilePath)) {
+ Join-Path $UnattendFolder 'unattend_arm64.xml'
+ }
+ else {
+ $UnattendArm64FilePath
+ }
+ }
+ else {
+ if ([string]::IsNullOrWhiteSpace($UnattendX64FilePath)) {
+ Join-Path $UnattendFolder 'unattend_x64.xml'
+ }
+ else {
+ $UnattendX64FilePath
+ }
+ }
+
+ WriteLog "Resolved unattend source path for ${resolvedArch}: $resolvedSourcePath"
+ return $resolvedSourcePath
}
function Initialize-UnattendComputerNamePath {
@@ -4587,7 +4637,7 @@ Function New-DeploymentUSB {
$UnattendPathOnUSB = Join-Path $DeployPartitionDriveLetter "Unattend"
WriteLog "Copying unattend file to $UnattendPathOnUSB"
New-Item -Path $UnattendPathOnUSB -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
- $unattendSource = Get-LocalUnattendSourcePath -UnattendFolder $using:UnattendFolder -WindowsArch $using:WindowsArch
+ $unattendSource = Get-LocalUnattendSourcePath -UnattendFolder $using:UnattendFolder -WindowsArch $using:WindowsArch -UnattendX64FilePath $using:UnattendX64FilePath -UnattendArm64FilePath $using:UnattendArm64FilePath
$legacyPrefixesWillBeStaged = ($using:DeviceNamingMode -eq 'Legacy') -and (Test-Path -Path $using:resolvedDeviceNamePrefixesPath -PathType Leaf)
Save-LocalStagedUnattendFile -SourcePath $unattendSource -DestinationPath (Join-Path $UnattendPathOnUSB 'Unattend.xml') -DeviceNamingMode $using:DeviceNamingMode -DeviceNameTemplate $using:normalizedDeviceNameTemplate -WindowsArch $using:WindowsArch -LegacyPrefixesWillBeStaged $legacyPrefixesWillBeStaged
if ($using:DeviceNamingMode -eq 'Prefixes') {
@@ -5850,21 +5900,23 @@ if ($CopyAutopilot) {
WriteLog 'Autopilot validation complete'
}
-#Validate Unattend folder
-if ($CopyUnattend) {
+# Validate unattend source file
+if ($CopyUnattend -or $InjectUnattend) {
WriteLog 'Doing Unattend validation'
- if (!(Test-Path -Path $UnattendFolder)) {
- WriteLog "-CopyUnattend is set to `$true, but the $UnattendFolder folder is missing"
- throw "-CopyUnattend is set to `$true, but the $UnattendFolder folder is missing"
+ $selectedUnattendMode = if ($CopyUnattend) { 'CopyUnattend' } else { 'InjectUnattend' }
+ $unattendSourcePath = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch -UnattendX64FilePath $UnattendX64FilePath -UnattendArm64FilePath $UnattendArm64FilePath
+ if (!(Test-Path -Path $unattendSourcePath -PathType Leaf)) {
+ WriteLog "-$selectedUnattendMode is set to `$true, but the selected unattend XML file is missing: $unattendSourcePath"
+ throw "-$selectedUnattendMode is set to `$true, but the selected unattend XML file is missing: $unattendSourcePath"
}
- #Check for .XML file
- if (!(Get-ChildItem -Path $UnattendFolder -Filter unattend_*.xml)) {
- WriteLog "-CopyUnattend is set to `$true, but the $UnattendFolder folder is missing a .XML file"
- throw "-CopyUnattend is set to `$true, but the $UnattendFolder folder is missing a .XML file"
+
+ $selectedUnattendFile = Get-Item -Path $unattendSourcePath -ErrorAction SilentlyContinue
+ if (($null -eq $selectedUnattendFile) -or ($selectedUnattendFile.Length -le 0)) {
+ WriteLog "-$selectedUnattendMode is set to `$true, but the selected unattend XML file is empty: $unattendSourcePath"
+ throw "-$selectedUnattendMode is set to `$true, but the selected unattend XML file is empty: $unattendSourcePath"
}
if ($DeviceNamingMode -ne 'None') {
- $unattendSourcePath = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch
try {
[xml]$validationUnattendXml = Get-Content -Path $unattendSourcePath
$null = Initialize-UnattendComputerNamePath -UnattendXml $validationUnattendXml -WindowsArch $WindowsArch
@@ -5877,19 +5929,6 @@ if ($CopyUnattend) {
WriteLog 'Unattend validation complete'
}
-if ($InjectUnattend -and ($DeviceNamingMode -ne 'None')) {
- $injectUnattendSourcePath = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch
- if (Test-Path -Path $injectUnattendSourcePath -PathType Leaf) {
- try {
- [xml]$validationUnattendXml = Get-Content -Path $injectUnattendSourcePath
- $null = Initialize-UnattendComputerNamePath -UnattendXml $validationUnattendXml -WindowsArch $WindowsArch
- }
- catch {
- throw "DeviceNamingMode $DeviceNamingMode requires a valid specialize/Microsoft-Windows-Shell-Setup/ComputerName path in $injectUnattendSourcePath. $($_.Exception.Message)"
- }
- }
-}
-
#Override $InstallApps value if using ESD to build FFU. This is due to a strange issue where building the FFU
#from vhdx doesn't work (you get an older style OOBE screen and get stuck in an OOBE reboot loop when hitting next).
#This behavior doesn't happen with WIM files.
@@ -6787,7 +6826,7 @@ if ($InstallApps) {
#Create Apps ISO
# Inject Unattend.xml into Apps if requested and applicable
if ($InstallApps -and $InjectUnattend) {
- $unattendSource = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch
+ $unattendSource = Get-UnattendSourcePath -UnattendFolder $UnattendFolder -WindowsArch $WindowsArch -UnattendX64FilePath $UnattendX64FilePath -UnattendArm64FilePath $UnattendArm64FilePath
# Ensure target folder exists under Apps
$targetFolder = Join-Path $AppsPath 'Unattend'
diff --git a/FFUDevelopment/BuildFFUVM_UI.ps1 b/FFUDevelopment/BuildFFUVM_UI.ps1
index b0771cc..6f2c462 100644
--- a/FFUDevelopment/BuildFFUVM_UI.ps1
+++ b/FFUDevelopment/BuildFFUVM_UI.ps1
@@ -439,6 +439,38 @@ $script:uiState.Controls.btnRun.Add_Click({
return
}
+ if ($config.CopyUnattend -or $config.InjectUnattend) {
+ $selectedUnattendArch = if ($config.WindowsArch -ieq 'arm64') { 'arm64' } else { 'x64' }
+ $selectedUnattendSourcePath = if ($selectedUnattendArch -eq 'arm64') {
+ [string]$config.UnattendArm64FilePath
+ }
+ else {
+ [string]$config.UnattendX64FilePath
+ }
+
+ if ([string]::IsNullOrWhiteSpace($selectedUnattendSourcePath)) {
+ [System.Windows.MessageBox]::Show("Select a valid $selectedUnattendArch unattend XML file before using Copy Unattend.xml or Inject Unattend.xml.", "Unattend File Required", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: unattend file path required."
+ return
+ }
+
+ if (-not (Test-Path -Path $selectedUnattendSourcePath -PathType Leaf)) {
+ [System.Windows.MessageBox]::Show("The selected $selectedUnattendArch unattend XML file was not found:`n$selectedUnattendSourcePath", "Unattend File Missing", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: unattend file missing."
+ return
+ }
+
+ $selectedUnattendFileInfo = Get-Item -Path $selectedUnattendSourcePath -ErrorAction SilentlyContinue
+ if (($null -eq $selectedUnattendFileInfo) -or ($selectedUnattendFileInfo.Length -le 0)) {
+ [System.Windows.MessageBox]::Show("The selected $selectedUnattendArch unattend XML file is empty:`n$selectedUnattendSourcePath", "Unattend File Empty", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: unattend file empty."
+ return
+ }
+ }
+
if ($config.DeviceNamingMode -eq 'Prompt') {
if (-not $config.CopyUnattend) {
[System.Windows.MessageBox]::Show("Select Copy Unattend.xml before using 'Prompt for Device Name'.", "Copy Unattend Required", "OK", "Warning") | Out-Null
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 038e261..e1977cb 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -836,11 +836,13 @@
-
+
-
+
-
+
+
+
@@ -900,13 +902,39 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -938,8 +966,8 @@
-
-
+
+
@@ -947,7 +975,6 @@
-
@@ -1004,8 +1031,8 @@
-
-
+
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index f31c69f..f9e24de 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -43,6 +43,8 @@ function Get-UIConfig {
CopyAdditionalFFUFiles = $State.Controls.chkCopyAdditionalFFUFiles.IsChecked
CreateDeploymentMedia = $State.Controls.chkCreateDeploymentMedia.IsChecked
InjectUnattend = $State.Controls.chkInjectUnattend.IsChecked
+ UnattendX64FilePath = $State.Controls.txtUnattendX64FilePath.Text
+ UnattendArm64FilePath = $State.Controls.txtUnattendArm64FilePath.Text
CustomFFUNameTemplate = $State.Controls.txtCustomFFUNameTemplate.Text
Disksize = [int64]$State.Controls.txtDiskSize.Text * 1GB
DownloadDrivers = $State.Controls.chkDownloadDrivers.IsChecked
@@ -454,8 +456,18 @@ function Update-UIFromConfig {
Set-UIValue -ControlName 'chkCopyAdditionalFFUFiles' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CopyAdditionalFFUFiles' -State $State
Set-UIValue -ControlName 'chkCreateDeploymentMedia' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CreateDeploymentMedia' -State $State
Set-UIValue -ControlName 'chkInjectUnattend' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'InjectUnattend' -State $State
+ Set-UIValue -ControlName 'txtUnattendX64FilePath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'UnattendX64FilePath' -State $State
+ Set-UIValue -ControlName 'txtUnattendArm64FilePath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'UnattendArm64FilePath' -State $State
Set-UIValue -ControlName 'chkVerbose' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'Verbose' -State $State
+ if ([string]::IsNullOrWhiteSpace($State.Controls.txtUnattendX64FilePath.Text)) {
+ $State.Controls.txtUnattendX64FilePath.Text = Get-DefaultUnattendFilePath -FFUDevelopmentPath $State.Controls.txtFFUDevPath.Text -WindowsArch 'x64'
+ }
+
+ if ([string]::IsNullOrWhiteSpace($State.Controls.txtUnattendArm64FilePath.Text)) {
+ $State.Controls.txtUnattendArm64FilePath.Text = Get-DefaultUnattendFilePath -FFUDevelopmentPath $State.Controls.txtFFUDevPath.Text -WindowsArch 'arm64'
+ }
+
# USB Drive Modification group (Build Tab)
Set-UIValue -ControlName 'chkCopyAutopilot' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CopyAutopilot' -State $State
Set-UIValue -ControlName 'chkCopyUnattend' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CopyUnattend' -State $State
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 0fe70fc..37a0c96 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -101,6 +101,21 @@ function Get-DefaultDeviceNamePrefixesPath {
return Join-Path (Join-Path $FFUDevelopmentPath 'unattend') 'prefixes.txt'
}
+function Get-DefaultUnattendFilePath {
+ param(
+ [string]$FFUDevelopmentPath,
+ [ValidateSet('x64', 'arm64')]
+ [string]$WindowsArch
+ )
+
+ if ([string]::IsNullOrWhiteSpace($FFUDevelopmentPath)) {
+ return $null
+ }
+
+ $fileName = if ($WindowsArch -ieq 'arm64') { 'unattend_arm64.xml' } else { 'unattend_x64.xml' }
+ return Join-Path (Join-Path $FFUDevelopmentPath 'unattend') $fileName
+}
+
function Import-DeviceNamePrefixesFromConfiguredPath {
param(
[PSCustomObject]$State,
@@ -416,12 +431,24 @@ function Register-EventHandlers {
$selectedPath = Invoke-BrowseAction -Type 'Folder' -Title "Select FFU Development Path"
if ($selectedPath) {
$currentPrefixesPath = $localState.Controls.txtDeviceNamePrefixesPath.Text
+ $currentUnattendX64FilePath = $localState.Controls.txtUnattendX64FilePath.Text
+ $currentUnattendArm64FilePath = $localState.Controls.txtUnattendArm64FilePath.Text
$previousDefaultPrefixesPath = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text
+ $previousDefaultUnattendX64FilePath = Get-DefaultUnattendFilePath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text -WindowsArch 'x64'
+ $previousDefaultUnattendArm64FilePath = Get-DefaultUnattendFilePath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text -WindowsArch 'arm64'
$localState.Controls.txtFFUDevPath.Text = $selectedPath
$newDefaultPrefixesPath = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $selectedPath
+ $newDefaultUnattendX64FilePath = Get-DefaultUnattendFilePath -FFUDevelopmentPath $selectedPath -WindowsArch 'x64'
+ $newDefaultUnattendArm64FilePath = Get-DefaultUnattendFilePath -FFUDevelopmentPath $selectedPath -WindowsArch 'arm64'
if ([string]::IsNullOrWhiteSpace($currentPrefixesPath) -or $currentPrefixesPath -ieq $previousDefaultPrefixesPath) {
$localState.Controls.txtDeviceNamePrefixesPath.Text = $newDefaultPrefixesPath
}
+ if ([string]::IsNullOrWhiteSpace($currentUnattendX64FilePath) -or $currentUnattendX64FilePath -ieq $previousDefaultUnattendX64FilePath) {
+ $localState.Controls.txtUnattendX64FilePath.Text = $newDefaultUnattendX64FilePath
+ }
+ if ([string]::IsNullOrWhiteSpace($currentUnattendArm64FilePath) -or $currentUnattendArm64FilePath -ieq $previousDefaultUnattendArm64FilePath) {
+ $localState.Controls.txtUnattendArm64FilePath.Text = $newDefaultUnattendArm64FilePath
+ }
Import-DeviceNamePrefixesFromConfiguredPath -State $localState
Update-DeviceNamingControls -State $localState
}
@@ -484,6 +511,46 @@ function Register-EventHandlers {
Update-DeviceNamingControls -State $localState
}
})
+ $State.Controls.btnBrowseUnattendX64FilePath.Add_Click({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ $currentUnattendX64FilePath = $localState.Controls.txtUnattendX64FilePath.Text
+ if ([string]::IsNullOrWhiteSpace($currentUnattendX64FilePath)) {
+ $currentUnattendX64FilePath = Get-DefaultUnattendFilePath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text -WindowsArch 'x64'
+ }
+ $initialDirectory = if ([string]::IsNullOrWhiteSpace($currentUnattendX64FilePath)) {
+ $null
+ }
+ else {
+ Split-Path $currentUnattendX64FilePath -Parent
+ }
+ $fileName = if ([string]::IsNullOrWhiteSpace($currentUnattendX64FilePath)) { 'unattend_x64.xml' } else { Split-Path $currentUnattendX64FilePath -Leaf }
+ $selectedPath = Invoke-BrowseAction -Type 'OpenFile' -Title 'Select x64 unattend XML file' -Filter 'XML files (*.xml)|*.xml|All files (*.*)|*.*' -InitialDirectory $initialDirectory -FileName $fileName
+ if (-not [string]::IsNullOrWhiteSpace($selectedPath)) {
+ $localState.Controls.txtUnattendX64FilePath.Text = $selectedPath
+ }
+ })
+ $State.Controls.btnBrowseUnattendArm64FilePath.Add_Click({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ $currentUnattendArm64FilePath = $localState.Controls.txtUnattendArm64FilePath.Text
+ if ([string]::IsNullOrWhiteSpace($currentUnattendArm64FilePath)) {
+ $currentUnattendArm64FilePath = Get-DefaultUnattendFilePath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text -WindowsArch 'arm64'
+ }
+ $initialDirectory = if ([string]::IsNullOrWhiteSpace($currentUnattendArm64FilePath)) {
+ $null
+ }
+ else {
+ Split-Path $currentUnattendArm64FilePath -Parent
+ }
+ $fileName = if ([string]::IsNullOrWhiteSpace($currentUnattendArm64FilePath)) { 'unattend_arm64.xml' } else { Split-Path $currentUnattendArm64FilePath -Leaf }
+ $selectedPath = Invoke-BrowseAction -Type 'OpenFile' -Title 'Select arm64 unattend XML file' -Filter 'XML files (*.xml)|*.xml|All files (*.*)|*.*' -InitialDirectory $initialDirectory -FileName $fileName
+ if (-not [string]::IsNullOrWhiteSpace($selectedPath)) {
+ $localState.Controls.txtUnattendArm64FilePath.Text = $selectedPath
+ }
+ })
$State.Controls.btnSaveDeviceNamePrefixes.Add_Click({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index 62cac40..62dcdc0 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -220,6 +220,10 @@ function Initialize-UIControls {
$State.Controls.chkAllowVHDXCaching = $window.FindName('chkAllowVHDXCaching')
$State.Controls.chkCreateDeploymentMedia = $window.FindName('chkCreateDeploymentMedia')
$State.Controls.chkInjectUnattend = $window.FindName('chkInjectUnattend')
+ $State.Controls.txtUnattendX64FilePath = $window.FindName('txtUnattendX64FilePath')
+ $State.Controls.btnBrowseUnattendX64FilePath = $window.FindName('btnBrowseUnattendX64FilePath')
+ $State.Controls.txtUnattendArm64FilePath = $window.FindName('txtUnattendArm64FilePath')
+ $State.Controls.btnBrowseUnattendArm64FilePath = $window.FindName('btnBrowseUnattendArm64FilePath')
$State.Controls.rbDeviceNamingNone = $window.FindName('rbDeviceNamingNone')
$State.Controls.rbDeviceNamingPrompt = $window.FindName('rbDeviceNamingPrompt')
$State.Controls.rbDeviceNamingTemplate = $window.FindName('rbDeviceNamingTemplate')
@@ -387,6 +391,8 @@ function Initialize-UIDefaults {
$State.Controls.chkOptimize.IsChecked = $State.Defaults.generalDefaults.Optimize
$State.Controls.chkAllowVHDXCaching.IsChecked = $State.Defaults.generalDefaults.AllowVHDXCaching
$State.Controls.chkInjectUnattend.IsChecked = $State.Defaults.generalDefaults.InjectUnattend
+ $State.Controls.txtUnattendX64FilePath.Text = $State.Defaults.generalDefaults.UnattendX64FilePath
+ $State.Controls.txtUnattendArm64FilePath.Text = $State.Defaults.generalDefaults.UnattendArm64FilePath
$State.Controls.chkCreateDeploymentMedia.IsChecked = $State.Defaults.generalDefaults.CreateDeploymentMedia
$State.Controls.chkAllowExternalHardDiskMedia.IsChecked = $State.Defaults.generalDefaults.AllowExternalHardDiskMedia
$State.Controls.chkPromptExternalHardDiskMedia.IsChecked = $State.Defaults.generalDefaults.PromptExternalHardDiskMedia
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
index a841359..8957f4a 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
@@ -112,6 +112,8 @@ function Get-GeneralDefaults {
$userAppListPath = Join-Path -Path $appsPath -ChildPath "UserAppList.json"
$driversJsonPath = Join-Path -Path $driversPath -ChildPath "Drivers.json"
$deviceNamePrefixesPath = Join-Path -Path $unattendPath -ChildPath "prefixes.txt"
+ $unattendX64FilePath = Join-Path -Path $unattendPath -ChildPath "unattend_x64.xml"
+ $unattendArm64FilePath = Join-Path -Path $unattendPath -ChildPath "unattend_arm64.xml"
return [PSCustomObject]@{
# Build Tab Defaults
@@ -134,6 +136,8 @@ function Get-GeneralDefaults {
CopyUnattend = $false
CopyPPKG = $false
InjectUnattend = $false
+ UnattendX64FilePath = $unattendX64FilePath
+ UnattendArm64FilePath = $unattendArm64FilePath
DeviceNamingMode = 'None'
DeviceNameTemplate = ''
DeviceNamePrefixesPath = $deviceNamePrefixesPath
diff --git a/FFUDevelopment/config/Sample_default.json b/FFUDevelopment/config/Sample_default.json
index af3cdb33d447449dc337a675b20442b2136b4d21..dcc97ea59f3b218479d5eb387e6e203bfa03be38 100644
GIT binary patch
delta 170
zcmaE5w90hDG8WlThCGHuh7ur51+r2YA{fjVOc>l4G8u9hQYWsroZQ4JB43K8D4wAL
stV|C`=Q89>Ze$i#L^sHhp$I64X_zvmVTo|1NCr+mz$&zP2g@cA0At)I_W%F@
delta 15
XcmZ2w`pRg-GL}i~LYsfEZV~|iH)sZT
diff --git a/docs/build.md b/docs/build.md
index 3c5849a..4e92747 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -283,11 +283,23 @@ The deployment media is saved as an ISO file at `$FFUDevelopmentPath\WinPE_FFU_D
>
> If you just need to re-create deployment media, you can use the `Create-PEMedia.ps1` script to regenerate the deploy ISO without running a full build.
+## Unattend.xml Options Expander
+
+Use the **Unattend.xml Options** expander to choose how unattend content is staged and which source XML file FFU Builder should use for x64 and arm64 builds.
+
+### x64 Unattend File Path
+
+Use **x64 Unattend File Path** to browse to the source XML file for x64 builds. The default path is `.\FFUDevelopment\unattend\unattend_x64.xml`.
+
+### arm64 Unattend File Path
+
+Use **arm64 Unattend File Path** to browse to the source XML file for arm64 builds. The default path is `.\FFUDevelopment\unattend\unattend_arm64.xml`.
+
### Inject Unattend.xml
-Controls the `-InjectUnattend` parameter. When checked, copies the architecture-specific unattend XML file from `.\FFUDevelopment\unattend` into the Apps ISO so it's baked into the FFU during the VM build process. The default is **unchecked**.
+Controls the `-InjectUnattend` parameter. When checked, stages the XML file selected for the current architecture in **Unattend.xml Options** into the Apps ISO so it's baked into the FFU during the VM build process. The default is **unchecked**.
-This option is only available when **Install Apps** is checked.
+This option is used only when **Install Apps** is checked.
`Copy Unattend.xml` and `Inject Unattend.xml` are mutually exclusive. Select only one.
@@ -295,18 +307,16 @@ This option is only available when **Install Apps** is checked.
When enabled, the build process:
-1. Determines the correct unattend file based on the target architecture:
- * **unattend_x64.xml** for x64 builds
- * **unattend_arm64.xml** for arm64 builds
+1. Uses the x64 or arm64 source file selected in **Unattend.xml Options** for the current build architecture
2. Creates an `Unattend` folder inside `.\FFUDevelopment\Apps` if it doesn't exist
-3. Copies the architecture-specific unattend file to `.\FFUDevelopment\Apps\Unattend\Unattend.xml`
+3. Copies that file to `.\FFUDevelopment\Apps\Unattend\Unattend.xml`
4. Includes the unattend file in the Apps ISO, making it available to sysprep during the VM build
The unattend file is then used by sysprep during the specialize phase and/or other OOBE phases when the FFU is deployed.
#### Creating Your Unattend Files
-Modify the architecture-specific unattend file in the `.\FFUDevelopment\unattend` folder:
+You can keep the default architecture-specific files in the `.\FFUDevelopment\unattend` folder or browse to another XML file in the UI:
| File | Description |
| ---------------------------- | ----------------------------------- |
@@ -317,7 +327,7 @@ Modify the architecture-specific unattend file in the `.\FFUDevelopment\unattend
> Important
>
-> Keep the file names with the architecture suffix (e.g., unattend_x64.xml). The script handles renaming the file to `Unattend.xml` when copying it to the Apps folder.
+> The default paths use the architecture suffix file names shown above. FFU Builder still renames the selected file to `Unattend.xml` when it stages it into the Apps folder.
#### When to Use This Option
@@ -516,15 +526,17 @@ This leverages the Autopilot for existing devices json file. It's not recommende
### Copy Unattend.xml
-Controls the `-CopyUnattend` parameter. When checked, copies the architecture-appropriate unattend XML file from `.\FFUDevelopment\Unattend` to an `Unattend` folder on the Deployment partition of the USB drive. The default is **unchecked**.
+Controls the `-CopyUnattend` parameter. When checked, stages the XML file selected for the current architecture in **Unattend.xml Options** to an `Unattend` folder on the Deployment partition of the USB drive. The default is **unchecked**.
-This option is only available when **Build USB Drive** is checked.
+Use this option when you plan to build deployment USB media.
When enabled, the build process copies:
-- **unattend_x64.xml** (for x64 builds) or **unattend_arm64.xml** (for arm64 builds) → renamed to **Unattend.xml** on the USB drive
+- The selected x64 or arm64 unattend XML file → renamed to **Unattend.xml** on the USB drive
- **prefixes.txt** → created from the **Device Naming** prefixes list when that mode is selected
+If you keep the default file paths in place, FFU Builder uses `unattend_x64.xml` for x64 builds and `unattend_arm64.xml` for arm64 builds.
+
During deployment, `ApplyFFU.ps1` applies `Unattend.xml` whenever it is present. Device naming only happens when the **Device Naming** setting requires it, or when older media still uses the legacy prompt-based workflow.
See **Device Naming Expander** above for the available computer-name modes and prefixes-file behavior.
diff --git a/docs/parameters_reference.md b/docs/parameters_reference.md
index 661c20b..ec31da0 100644
--- a/docs/parameters_reference.md
+++ b/docs/parameters_reference.md
@@ -38,12 +38,14 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -CopyDrivers | bool | Copy Drivers to USB drive | When set to $true, will copy the drivers from the $FFUDevelopmentPath\Drivers folder to the Drivers folder on the deploy partition of the USB drive. Default is $false. |
| -CopyPEDrivers | bool | Copy PE Drivers | When set to $true, enables adding WinPE drivers. By default copies drivers from $FFUDevelopmentPath\PEDrivers to the WinPE deployment media unless -UseDriversAsPEDrivers is also $true. |
| -CopyPPKG | bool | Copy Provisioning Package | When set to $true, will copy the provisioning package from the $FFUDevelopmentPath\PPKG folder to the Deployment partition of the USB drive. Default is $false. |
-| -CopyUnattend | bool | Copy Unattend.xml | When set to $true, will copy the $FFUDevelopmentPath\Unattend folder to the Deployment partition of the USB drive. Cannot be used together with -InjectUnattend. Default is $false. |
+| -CopyUnattend | bool | Copy Unattend.xml | When set to $true, stages the selected architecture-specific unattend XML file as Unattend.xml on the Deployment partition of the USB drive. Cannot be used together with -InjectUnattend. Default is $false. |
| -CreateDeploymentMedia | bool | Create Deployment Media | When set to $true, this will create WinPE deployment media for use when deploying to a physical device. |
| -CustomFFUNameTemplate | string | Custom FFU Name Template | Sets a custom FFU output name with placeholders. Allowed placeholders are: {WindowsRelease}, {WindowsVersion}, {SKU}, {BuildDate}, {yyyy}, {MM}, {dd}, {H}, {hh}, {mm}, {tt}. |
| -DeviceNamingMode | string | Device Naming expander | Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Accepted values are Legacy, None, Prompt, Template, and Prefixes. The UI uses None, Prompt, Template, and Prefixes. Prompt rewrites the staged deployment unattend to the existing manual prompt placeholder and requires -CopyUnattend. |
| -DeviceNameTemplate | string | Specify Device Name | Sets the device name used when DeviceNamingMode is Template. Supports a static name or the %serial% token when -CopyUnattend is used. |
| -DeviceNamePrefixesPath | string | Prefixes File Path | Path to the source prefixes file used for legacy copy or when -DeviceNamePrefixes is not supplied. Default is $FFUDevelopmentPath\Unattend\prefixes.txt. |
+| -UnattendX64FilePath | string | x64 Unattend File Path | Path to the x64 unattend XML source file used by Copy Unattend.xml and Inject Unattend.xml. Default is $FFUDevelopmentPath\Unattend\unattend_x64.xml. |
+| -UnattendArm64FilePath | string | arm64 Unattend File Path | Path to the arm64 unattend XML source file used by Copy Unattend.xml and Inject Unattend.xml. Default is $FFUDevelopmentPath\Unattend\unattend_arm64.xml. |
| -DeviceNamePrefixes | string[] | Specify a list of Prefixes | Sets the prefixes used when DeviceNamingMode is Prefixes. Each entry becomes a line in prefixes.txt on the deployment media. |
| -Disksize | uint64 | Disk Size (GB) | Size of the virtual hard disk for the virtual machine. Default is a 50GB dynamic disk. |
| -DriversFolder | string | Drivers Folder | Path to the drivers folder. Default is $FFUDevelopmentPath\Drivers. |
@@ -54,7 +56,7 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -FFUDevelopmentPath | string | FFU Development Path | Path to the FFU development folder. Default is $PSScriptRoot. |
| -FFUPrefix | string | VM Name Prefix | Prefix for the generated FFU file. Default is _FFU. |
| -Headers | hashtable | CLI only (no UI control) | Headers to use when downloading files. Not recommended to modify. |
-| -InjectUnattend | bool | Inject Unattend.xml | When set to $true and InstallApps is also $true, copies unattend_[arch].xml from $FFUDevelopmentPath\unattend to $FFUDevelopmentPath\Apps\Unattend\Unattend.xml so sysprep can use it inside the VM. Cannot be used together with -CopyUnattend. Default is $false. |
+| -InjectUnattend | bool | Inject Unattend.xml | When set to $true and InstallApps is also $true, stages the selected architecture-specific unattend XML file to $FFUDevelopmentPath\Apps\Unattend\Unattend.xml so sysprep can use it inside the VM. Cannot be used together with -CopyUnattend. Default is $false. |
| -InstallApps | bool | Install Applications | When set to $true, the script will create an Apps.iso file from the $FFUDevelopmentPath\Apps folder. It will also create a VM, mount the Apps.iso, install the apps, sysprep, and capture the VM. When set to $false, the FFU is created from a VHDX file, and no VM is created. |
| -InstallDrivers | bool | Install Drivers to FFU | Install device drivers from the specified $FFUDevelopmentPath\Drivers folder if set to $true. Download the drivers and put them in the Drivers folder. The script will recurse the drivers folder and add the drivers to the FFU. |
| -InstallOffice | bool | Install Office | Install Microsoft Office if set to $true. The script will download the latest ODT and Office files in the $FFUDevelopmentPath\Apps\Office folder and install Office in the FFU via VM. |
From 28297f3a0e43691e26063b3d6bf62d484265010d Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Tue, 14 Apr 2026 14:56:02 -0700
Subject: [PATCH 27/34] Switches to Windows ADK DISM CLI for adding Windows
packages
Replaces the native PowerShell command for adding Windows packages with direct command-line invocations of the Deployment Image Servicing and Management (DISM) tool. This fixes an issue introduced by the March 31, 2026 OOB update that persists in the April 2026 2B update where Add-WindowsPackage fails due to issues with CBS. Using native dism fixes the issue.
---
FFUDevelopment/BuildFFUVM.ps1 | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 305f56c..5d52cbb 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -3708,7 +3708,8 @@ function New-PEMedia {
foreach ($Package in $Packages) {
$PackagePath = Join-Path $PackagePathBase $Package
WriteLog "Adding Package $Package"
- Add-WindowsPackage -Path "$WinPEFFUPath\mount" -PackagePath $PackagePath | Out-Null
+ # Add-WindowsPackage -Path "$WinPEFFUPath\mount" -PackagePath $PackagePath | Out-Null
+ Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WinPEFFUPath\mount /Add-Package /PackagePath:$PackagePath" | Out-Null
WriteLog "Adding package complete"
}
WriteLog "Copying $FFUDevelopmentPath\WinPEDeployFFUFiles\* to WinPE deploy media"
@@ -7404,10 +7405,8 @@ try {
if ($WindowsRelease -eq 2016 -and $installationType -eq "Server") {
WriteLog 'WindowsRelease is 2016, adding SSU first'
WriteLog "Adding SSU to $WindowsPartition"
- # Add-WindowsPackage -Path $WindowsPartition -PackagePath $SSUFilePath -PreventPending | Out-Null
- # Commenting out -preventpending as it causes an issue with the SSU being applied
- # Seems to be because of the registry being mounted per dism.log
- Add-WindowsPackage -Path $WindowsPartition -PackagePath $SSUFilePath | Out-Null
+ # Add-WindowsPackage -Path $WindowsPartition -PackagePath $SSUFilePath | Out-Null
+ Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$SSUFilePath" | Out-Null
WriteLog "SSU added to $WindowsPartition"
# WriteLog "Removing $SSUFilePath"
# Remove-Item -Path $SSUFilePath -Force | Out-Null
@@ -7416,7 +7415,8 @@ try {
if ($WindowsRelease -in 2016, 2019, 2021 -and $isLTSC) {
WriteLog "WindowsRelease is $WindowsRelease and is $WindowsSKU, adding SSU first"
WriteLog "Adding SSU to $WindowsPartition"
- Add-WindowsPackage -Path $WindowsPartition -PackagePath $SSUFilePath | Out-Null
+ # Add-WindowsPackage -Path $WindowsPartition -PackagePath $SSUFilePath | Out-Null
+ Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$SSUFilePath" | Out-Null
WriteLog "SSU added to $WindowsPartition"
# WriteLog "Removing $SSUFilePath"
# Remove-Item -Path $SSUFilePath -Force | Out-Null
@@ -7429,23 +7429,27 @@ try {
}
else {
WriteLog "Adding $CUPath to $WindowsPartition"
- Add-WindowsPackage -Path $WindowsPartition -PackagePath $CUPath | Out-Null
+ # Add-WindowsPackage -Path $WindowsPartition -PackagePath $CUPath | Out-Null
+ Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$CUPath" | Out-Null
WriteLog "$CUPath added to $WindowsPartition"
}
}
if ($UpdatePreviewCU) {
WriteLog "Adding $CUPPath to $WindowsPartition"
- Add-WindowsPackage -Path $WindowsPartition -PackagePath $CUPPath | Out-Null
+ # Add-WindowsPackage -Path $WindowsPartition -PackagePath $CUPPath | Out-Null
+ Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$CUPPath" | Out-Null
WriteLog "$CUPPath added to $WindowsPartition"
}
if ($UpdateLatestNet) {
WriteLog "Adding $NETPath to $WindowsPartition"
- Add-WindowsPackage -Path $WindowsPartition -PackagePath $NETPath | Out-Null
+ # Add-WindowsPackage -Path $WindowsPartition -PackagePath $NETPath | Out-Null
+ Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$NETPath" | Out-Null
WriteLog "$NETPath added to $WindowsPartition"
}
if ($UpdateLatestMicrocode -and $WindowsRelease -in 2016, 2019) {
WriteLog "Adding $MicrocodePath to $WindowsPartition"
- Add-WindowsPackage -Path $WindowsPartition -PackagePath $MicrocodePath | Out-Null
+ # Add-WindowsPackage -Path $WindowsPartition -PackagePath $MicrocodePath | Out-Null
+ Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$MicrocodePath" | Out-Null
WriteLog "$MicrocodePath added to $WindowsPartition"
}
WriteLog "KBs added to $WindowsPartition"
From 0607cf53868f1200e6b0f96976e3fe676dfe0473 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Tue, 14 Apr 2026 18:18:53 -0700
Subject: [PATCH 28/34] Updates package addition to use native cmdlet
Replaces the direct invocation of DISM via cmd with the native Windows PowerShell cmdlet to streamline and simplify the package installation process during WinPE media creation.
---
FFUDevelopment/BuildFFUVM.ps1 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 5d52cbb..fe09363 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -3708,8 +3708,7 @@ function New-PEMedia {
foreach ($Package in $Packages) {
$PackagePath = Join-Path $PackagePathBase $Package
WriteLog "Adding Package $Package"
- # Add-WindowsPackage -Path "$WinPEFFUPath\mount" -PackagePath $PackagePath | Out-Null
- Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WinPEFFUPath\mount /Add-Package /PackagePath:$PackagePath" | Out-Null
+ Add-WindowsPackage -Path "$WinPEFFUPath\mount" -PackagePath $PackagePath | Out-Null
WriteLog "Adding package complete"
}
WriteLog "Copying $FFUDevelopmentPath\WinPEDeployFFUFiles\* to WinPE deploy media"
From 24f10b89b0934cbd8e60141577cf3e648de0852c Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Wed, 15 Apr 2026 13:04:12 -0700
Subject: [PATCH 29/34] Fixes DeviceNamingMode UI state tracking and defaults
Updates the FFU UI core to better track the loaded `DeviceNamingMode` configuration.
Introduces flags to detect explicit user changes versus default states.
Ensures that if the user does not explicitly set the device naming mode, it defaults gracefully and preserves legacy script behaviors.
Updates documentation to reflect the actual behavior of not writing the `DeviceNamingMode` key unless modified.
---
FFUDevelopment/BuildFFUVM_UI.ps1 | 7 +-
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 19 +++--
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 77 +++++++++++++++++-
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 8 +-
FFUDevelopment/config/Sample_default.json | Bin 6826 -> 6760 bytes
docs/build.md | 7 +-
docs/parameters_reference.md | 2 +-
7 files changed, 102 insertions(+), 18 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.ps1 b/FFUDevelopment/BuildFFUVM_UI.ps1
index 6f2c462..f2503d6 100644
--- a/FFUDevelopment/BuildFFUVM_UI.ps1
+++ b/FFUDevelopment/BuildFFUVM_UI.ps1
@@ -46,7 +46,8 @@ $script:uiState = [PSCustomObject]@{
logStreamReader = $null;
pollTimer = $null;
currentBuildProcess = $null;
- lastConfigFilePath = $null
+ lastConfigFilePath = $null;
+ loadedDeviceNamingMode = $null
};
Flags = @{
installAppsForcedByUpdates = $false;
@@ -56,7 +57,9 @@ $script:uiState = [PSCustomObject]@{
lastSortAscending = $true;
isBuilding = $false;
isCleanupRunning = $false;
- isFluentSupported = $false
+ isFluentSupported = $false;
+ deviceNamingModeWasExplicitlyChanged = $false;
+ suppressDeviceNamingChangeTracking = $false
};
Defaults = @{};
LogFilePath = "$FFUDevelopmentPath\FFUDevelopment_UI.log"
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index f9e24de..a7a5d6d 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -36,7 +36,7 @@ function Get-UIConfig {
UseDriversAsPEDrivers = $State.Controls.chkUseDriversAsPEDrivers.IsChecked
CopyPPKG = $State.Controls.chkCopyPPKG.IsChecked
CopyUnattend = $State.Controls.chkCopyUnattend.IsChecked
- DeviceNamingMode = Get-SelectedDeviceNamingMode -State $State
+ DeviceNamingMode = Get-ConfiguredDeviceNamingMode -State $State
DeviceNameTemplate = $State.Controls.txtDeviceNameTemplate.Text
DeviceNamePrefixesPath = $State.Controls.txtDeviceNamePrefixesPath.Text
DeviceNamePrefixes = @(Get-DeviceNamePrefixes -State $State)
@@ -480,17 +480,20 @@ function Update-UIFromConfig {
$State.Controls.txtDeviceNamePrefixesPath.Text = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $State.Controls.txtFFUDevPath.Text
}
- $deviceNamingMode = 'None'
+ $loadedDeviceNamingMode = $null
if ($ConfigContent.PSObject.Properties.Name -contains 'DeviceNamingMode') {
- $deviceNamingMode = [string]$ConfigContent.DeviceNamingMode
+ $candidateDeviceNamingMode = [string]$ConfigContent.DeviceNamingMode
+ if ($candidateDeviceNamingMode -in @('Legacy', 'None', 'Prompt', 'Template', 'Prefixes')) {
+ $loadedDeviceNamingMode = $candidateDeviceNamingMode
+ }
}
- if ($deviceNamingMode -eq 'Legacy') {
- $deviceNamingMode = 'Prompt'
+ $displayDeviceNamingMode = if ($loadedDeviceNamingMode -in @('Prompt', 'Template', 'Prefixes')) {
+ $loadedDeviceNamingMode
}
- if ($deviceNamingMode -notin @('None', 'Prompt', 'Template', 'Prefixes')) {
- $deviceNamingMode = 'None'
+ else {
+ 'None'
}
- Set-DeviceNamingMode -State $State -Mode $deviceNamingMode
+ Set-DeviceNamingModeState -State $State -DisplayMode $displayDeviceNamingMode -LoadedMode $loadedDeviceNamingMode
Import-DeviceNamePrefixesFromConfiguredPath -State $State
Update-DeviceNamingControls -State $State
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 37a0c96..6b86f6f 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -58,6 +58,55 @@ function Set-DeviceNamingMode {
$State.Controls.rbDeviceNamingPrefixes.IsChecked = $Mode -eq 'Prefixes'
}
+function Set-DeviceNamingModeState {
+ param(
+ [PSCustomObject]$State,
+ [ValidateSet('None', 'Prompt', 'Template', 'Prefixes')]
+ [string]$DisplayMode,
+ [AllowNull()]
+ [string]$LoadedMode
+ )
+
+ if ($null -eq $State.Flags) {
+ $State.Flags = @{}
+ }
+
+ if ($null -eq $State.Data) {
+ $State.Data = @{}
+ }
+
+ $previousSuppressionState = $true -eq $State.Flags.suppressDeviceNamingChangeTracking
+ $State.Flags.suppressDeviceNamingChangeTracking = $true
+ try {
+ Set-DeviceNamingMode -State $State -Mode $DisplayMode
+ }
+ finally {
+ $State.Flags.suppressDeviceNamingChangeTracking = $previousSuppressionState
+ }
+
+ $State.Data.loadedDeviceNamingMode = if ([string]::IsNullOrWhiteSpace($LoadedMode)) {
+ $null
+ }
+ else {
+ $LoadedMode.Trim()
+ }
+ $State.Flags.deviceNamingModeWasExplicitlyChanged = $false
+}
+
+function Get-ConfiguredDeviceNamingMode {
+ param([PSCustomObject]$State)
+
+ if (($null -ne $State.Flags) -and ($true -eq $State.Flags.deviceNamingModeWasExplicitlyChanged)) {
+ return Get-SelectedDeviceNamingMode -State $State
+ }
+
+ if (($null -ne $State.Data) -and -not [string]::IsNullOrWhiteSpace([string]$State.Data.loadedDeviceNamingMode)) {
+ return [string]$State.Data.loadedDeviceNamingMode
+ }
+
+ return $null
+}
+
function Get-DeviceNamePrefixes {
param([PSCustomObject]$State)
@@ -467,17 +516,32 @@ function Register-EventHandlers {
$State.Controls.rbDeviceNamingNone.Add_Checked({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
- Update-DeviceNamingControls -State $window.Tag
+ $localState = $window.Tag
+ if (-not ($true -eq $localState.Flags.suppressDeviceNamingChangeTracking)) {
+ $localState.Flags.deviceNamingModeWasExplicitlyChanged = $true
+ $localState.Data.loadedDeviceNamingMode = $null
+ }
+ Update-DeviceNamingControls -State $localState
})
$State.Controls.rbDeviceNamingPrompt.Add_Checked({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
- Update-DeviceNamingControls -State $window.Tag
+ $localState = $window.Tag
+ if (-not ($true -eq $localState.Flags.suppressDeviceNamingChangeTracking)) {
+ $localState.Flags.deviceNamingModeWasExplicitlyChanged = $true
+ $localState.Data.loadedDeviceNamingMode = $null
+ }
+ Update-DeviceNamingControls -State $localState
})
$State.Controls.rbDeviceNamingTemplate.Add_Checked({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
- Update-DeviceNamingControls -State $window.Tag
+ $localState = $window.Tag
+ if (-not ($true -eq $localState.Flags.suppressDeviceNamingChangeTracking)) {
+ $localState.Flags.deviceNamingModeWasExplicitlyChanged = $true
+ $localState.Data.loadedDeviceNamingMode = $null
+ }
+ Update-DeviceNamingControls -State $localState
})
$State.Controls.txtDeviceNameTemplate.Add_TextChanged({
param($eventSource, $textChangedEventArgs)
@@ -489,7 +553,12 @@ function Register-EventHandlers {
$State.Controls.rbDeviceNamingPrefixes.Add_Checked({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
- Update-DeviceNamingControls -State $window.Tag
+ $localState = $window.Tag
+ if (-not ($true -eq $localState.Flags.suppressDeviceNamingChangeTracking)) {
+ $localState.Flags.deviceNamingModeWasExplicitlyChanged = $true
+ $localState.Data.loadedDeviceNamingMode = $null
+ }
+ Update-DeviceNamingControls -State $localState
})
$State.Controls.btnBrowseDeviceNamePrefixesPath.Add_Click({
param($eventSource, $routedEventArgs)
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index 62dcdc0..43530b8 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -400,7 +400,13 @@ function Initialize-UIDefaults {
$State.Controls.chkCopyAutopilot.IsChecked = $State.Defaults.generalDefaults.CopyAutopilot
$State.Controls.chkCopyUnattend.IsChecked = $State.Defaults.generalDefaults.CopyUnattend
$State.Controls.chkCopyPPKG.IsChecked = $State.Defaults.generalDefaults.CopyPPKG
- Set-DeviceNamingMode -State $State -Mode $State.Defaults.generalDefaults.DeviceNamingMode
+ $defaultDeviceNamingMode = if ($State.Defaults.generalDefaults.DeviceNamingMode -in @('None', 'Prompt', 'Template', 'Prefixes')) {
+ $State.Defaults.generalDefaults.DeviceNamingMode
+ }
+ else {
+ 'None'
+ }
+ Set-DeviceNamingModeState -State $State -DisplayMode $defaultDeviceNamingMode -LoadedMode $null
$State.Controls.txtDeviceNameTemplate.Text = $State.Defaults.generalDefaults.DeviceNameTemplate
$State.Controls.txtDeviceNamePrefixesPath.Text = $State.Defaults.generalDefaults.DeviceNamePrefixesPath
$State.Controls.txtDeviceNamePrefixes.Text = ($State.Defaults.generalDefaults.DeviceNamePrefixes -join [System.Environment]::NewLine)
diff --git a/FFUDevelopment/config/Sample_default.json b/FFUDevelopment/config/Sample_default.json
index dcc97ea59f3b218479d5eb387e6e203bfa03be38..09ee3809718125cf9310f12a19e6e85eae76fc66 100644
GIT binary patch
delta 12
TcmZ2w`od(x57y0AYy~0!Cjtc^
delta 44
zcmaE1vdVPB4_5I^hCGIJ249AJh7^WW1|*` for this default behavior.
+- If you leave device naming untouched, FFU Builder does not write `DeviceNamingMode` to the generated config. This preserves the script's `Legacy` default, so an existing `FFUDevelopment\Unattend\prefixes.txt` file is still copied to deployment media when present.
+- If you explicitly select this option, FFU Builder writes `DeviceNamingMode = None`. The unattend file is still applied, but Windows generates a random computer name instead of forcing a prompt or a fixed name.
+
+The active `unattend_*.xml` files in `FFUDevelopment\Unattend` use `*` in the current sample files.
### Prompt for Device Name
diff --git a/docs/parameters_reference.md b/docs/parameters_reference.md
index ec31da0..400f89b 100644
--- a/docs/parameters_reference.md
+++ b/docs/parameters_reference.md
@@ -41,7 +41,7 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -CopyUnattend | bool | Copy Unattend.xml | When set to $true, stages the selected architecture-specific unattend XML file as Unattend.xml on the Deployment partition of the USB drive. Cannot be used together with -InjectUnattend. Default is $false. |
| -CreateDeploymentMedia | bool | Create Deployment Media | When set to $true, this will create WinPE deployment media for use when deploying to a physical device. |
| -CustomFFUNameTemplate | string | Custom FFU Name Template | Sets a custom FFU output name with placeholders. Allowed placeholders are: {WindowsRelease}, {WindowsVersion}, {SKU}, {BuildDate}, {yyyy}, {MM}, {dd}, {H}, {hh}, {mm}, {tt}. |
-| -DeviceNamingMode | string | Device Naming expander | Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Accepted values are Legacy, None, Prompt, Template, and Prefixes. The UI uses None, Prompt, Template, and Prefixes. Prompt rewrites the staged deployment unattend to the existing manual prompt placeholder and requires -CopyUnattend. |
+| -DeviceNamingMode | string | Device Naming expander | Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Accepted values are Legacy, None, Prompt, Template, and Prefixes. The UI shows None, Prompt, Template, and Prefixes. When device naming is left untouched in the UI, the generated config does not write DeviceNamingMode, which preserves the script default of Legacy. Prompt rewrites the staged deployment unattend to the existing manual prompt placeholder and requires -CopyUnattend. |
| -DeviceNameTemplate | string | Specify Device Name | Sets the device name used when DeviceNamingMode is Template. Supports a static name or the %serial% token when -CopyUnattend is used. |
| -DeviceNamePrefixesPath | string | Prefixes File Path | Path to the source prefixes file used for legacy copy or when -DeviceNamePrefixes is not supplied. Default is $FFUDevelopmentPath\Unattend\prefixes.txt. |
| -UnattendX64FilePath | string | x64 Unattend File Path | Path to the x64 unattend XML source file used by Copy Unattend.xml and Inject Unattend.xml. Default is $FFUDevelopmentPath\Unattend\unattend_x64.xml. |
From 38323e6be1a8ff0df8f7c54450ea2ad7d37fcef1 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Wed, 15 Apr 2026 14:39:14 -0700
Subject: [PATCH 30/34] Add support for SerialComputerNames CSV mapping
Introduces a new `SerialComputerNames` device naming mode that allows automated device naming during deployment based on the BIOS serial number. The mapping is provided via a CSV file with `SerialNumber` and `ComputerName` columns.
This feature requires `CopyUnattend` and writes a `SerialComputerNames.csv` file to the USB deployment media, replacing the need for manual prompts or prefix selection when device serial numbers are known in advance. The UI has been updated to support creating, loading, and saving the CSV mapping content.
---
FFUDevelopment/BuildFFUVM.ps1 | 72 +++++++-
FFUDevelopment/BuildFFUVM_UI.ps1 | 16 ++
FFUDevelopment/BuildFFUVM_UI.xaml | 18 ++
.../FFUUI.Core/FFUUI.Core.Config.psm1 | 13 +-
.../FFUUI.Core/FFUUI.Core.Handlers.psm1 | 154 +++++++++++++++++-
.../FFUUI.Core/FFUUI.Core.Initialize.psm1 | 11 +-
FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 | 3 +
FFUDevelopment/config/Sample_default.json | Bin 6760 -> 7042 bytes
.../unattend/SampleSerialComputerNames.csv | 4 +
docs/build.md | 41 ++++-
docs/parameters_reference.md | 4 +-
docs/quickstart.md | 14 ++
12 files changed, 335 insertions(+), 15 deletions(-)
create mode 100644 FFUDevelopment/unattend/SampleSerialComputerNames.csv
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index fe09363..d37ff13 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -73,7 +73,7 @@ When set to $true, will copy the provisioning package from the $FFUDevelopmentPa
When set to $true, stages the selected architecture-specific unattend XML file as Unattend.xml on the deployment partition of the USB drive. Default is $false.
.PARAMETER DeviceNamingMode
-Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Supported values are Legacy, None, Prompt, Template, and Prefixes.
+Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Supported values are Legacy, None, Prompt, Template, Prefixes, and SerialComputerNames.
.PARAMETER DeviceNameTemplate
Sets the device name used when DeviceNamingMode is Template. Supports a static name or the %serial% token when CopyUnattend is used.
@@ -84,6 +84,12 @@ Sets the prefixes used when DeviceNamingMode is Prefixes. Each entry becomes a l
.PARAMETER DeviceNamePrefixesPath
Path to the source prefixes file used for legacy copy or when DeviceNamePrefixes is not supplied. Default is $FFUDevelopmentPath\Unattend\prefixes.txt.
+.PARAMETER DeviceNameSerialComputerNames
+Sets the CSV content used when DeviceNamingMode is SerialComputerNames. The CSV must include SerialNumber and ComputerName headers.
+
+.PARAMETER DeviceNameSerialComputerNamesPath
+Path to the source CSV file used when DeviceNamingMode is SerialComputerNames and DeviceNameSerialComputerNames is not supplied. Default is $FFUDevelopmentPath\Unattend\SerialComputerNames.csv.
+
.PARAMETER UnattendX64FilePath
Path to the x64 unattend XML source file. Default is $FFUDevelopmentPath\Unattend\unattend_x64.xml.
@@ -425,11 +431,13 @@ param(
[bool]$AllowVHDXCaching,
[bool]$CopyPPKG,
[bool]$CopyUnattend,
- [ValidateSet('Legacy', 'None', 'Prompt', 'Template', 'Prefixes')]
+ [ValidateSet('Legacy', 'None', 'Prompt', 'Template', 'Prefixes', 'SerialComputerNames')]
[string]$DeviceNamingMode = 'Legacy',
[string]$DeviceNameTemplate,
[string[]]$DeviceNamePrefixes,
[string]$DeviceNamePrefixesPath,
+ [string[]]$DeviceNameSerialComputerNames,
+ [string]$DeviceNameSerialComputerNamesPath,
[string]$UnattendX64FilePath,
[string]$UnattendArm64FilePath,
[bool]$CopyAutopilot,
@@ -644,7 +652,7 @@ function Save-StagedUnattendFile {
[Parameter(Mandatory = $true)]
[string]$DestinationPath,
[Parameter(Mandatory = $true)]
- [ValidateSet('Legacy', 'None', 'Prompt', 'Template', 'Prefixes')]
+ [ValidateSet('Legacy', 'None', 'Prompt', 'Template', 'Prefixes', 'SerialComputerNames')]
[string]$DeviceNamingMode,
[string]$DeviceNameTemplate,
[Parameter(Mandatory = $true)]
@@ -685,6 +693,11 @@ function Save-StagedUnattendFile {
$computerNamePath.ComputerNameElement.InnerText = '*'
}
}
+ elseif ($DeviceNamingMode -eq 'SerialComputerNames') {
+ if ($computerNamePath.CreatedComputerNameElement) {
+ $computerNamePath.ComputerNameElement.InnerText = '*'
+ }
+ }
elseif (($DeviceNamingMode -eq 'Legacy') -and $computerNamePath.CreatedComputerNameElement) {
$computerNamePath.ComputerNameElement.InnerText = if ($LegacyPrefixesWillBeStaged) { '*' } else { 'MyComputer' }
}
@@ -707,12 +720,24 @@ $resolvedDeviceNamePrefixesPath = if ([string]::IsNullOrWhiteSpace($DeviceNamePr
else {
$DeviceNamePrefixesPath
}
+$effectiveDeviceNameSerialComputerNames = @($DeviceNameSerialComputerNames | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | ForEach-Object { $_.Trim() })
+$resolvedDeviceNameSerialComputerNamesPath = if ([string]::IsNullOrWhiteSpace($DeviceNameSerialComputerNamesPath)) {
+ Join-Path (Join-Path $FFUDevelopmentPath 'Unattend') 'SerialComputerNames.csv'
+}
+else {
+ $DeviceNameSerialComputerNamesPath
+}
if (($DeviceNamingMode -eq 'Prefixes') -and ($effectiveDeviceNamePrefixes.Count -eq 0) -and (Test-Path -Path $resolvedDeviceNamePrefixesPath -PathType Leaf)) {
$effectiveDeviceNamePrefixes = @(Get-Content -Path $resolvedDeviceNamePrefixesPath | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | ForEach-Object { $_.Trim() })
WriteLog "Loaded device name prefixes from $resolvedDeviceNamePrefixesPath"
}
+if (($DeviceNamingMode -eq 'SerialComputerNames') -and ($effectiveDeviceNameSerialComputerNames.Count -eq 0) -and (Test-Path -Path $resolvedDeviceNameSerialComputerNamesPath -PathType Leaf)) {
+ $effectiveDeviceNameSerialComputerNames = @(Get-Content -Path $resolvedDeviceNameSerialComputerNamesPath | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | ForEach-Object { $_.Trim() })
+ WriteLog "Loaded serial computer-name mappings from $resolvedDeviceNameSerialComputerNamesPath"
+}
+
if ($CopyUnattend -and $InjectUnattend) {
throw 'CopyUnattend and InjectUnattend cannot both be set to `$true. Select only one unattend delivery method.'
}
@@ -749,6 +774,38 @@ elseif ($DeviceNamingMode -eq 'Prefixes') {
throw 'DeviceNamingMode Prefixes requires at least one DeviceNamePrefixes entry or a valid DeviceNamePrefixesPath.'
}
}
+elseif ($DeviceNamingMode -eq 'SerialComputerNames') {
+ if (-not $CopyUnattend) {
+ throw 'DeviceNamingMode SerialComputerNames requires CopyUnattend. Serial-to-computer-name mapping is not supported with InjectUnattend.'
+ }
+
+ if ($effectiveDeviceNameSerialComputerNames.Count -eq 0) {
+ throw 'DeviceNamingMode SerialComputerNames requires DeviceNameSerialComputerNames content or a valid DeviceNameSerialComputerNamesPath.'
+ }
+
+ try {
+ $serialComputerNameMappings = @($effectiveDeviceNameSerialComputerNames | ConvertFrom-Csv -ErrorAction Stop)
+ }
+ catch {
+ throw "DeviceNamingMode SerialComputerNames requires valid CSV content with SerialNumber and ComputerName headers. $($_.Exception.Message)"
+ }
+
+ if ($serialComputerNameMappings.Count -eq 0) {
+ throw 'DeviceNamingMode SerialComputerNames requires at least one CSV data row.'
+ }
+
+ $serialComputerNameHeaders = @($serialComputerNameMappings[0].PSObject.Properties.Name)
+ if ((-not ($serialComputerNameHeaders -contains 'SerialNumber')) -or (-not ($serialComputerNameHeaders -contains 'ComputerName'))) {
+ throw 'DeviceNamingMode SerialComputerNames requires SerialNumber and ComputerName headers.'
+ }
+
+ $validSerialComputerNameMappings = @($serialComputerNameMappings | Where-Object {
+ -not [string]::IsNullOrWhiteSpace([string]$_.SerialNumber) -and -not [string]::IsNullOrWhiteSpace([string]$_.ComputerName)
+ })
+ if ($validSerialComputerNameMappings.Count -eq 0) {
+ throw 'DeviceNamingMode SerialComputerNames requires at least one row with both SerialNumber and ComputerName values.'
+ }
+}
# Validate that the selected Windows SKU is compatible with the chosen Windows release and ensure an ISO is provided for unsupported releases
$clientSKUs = @(
@@ -4570,6 +4627,11 @@ Function New-DeploymentUSB {
$computerNamePath.ComputerNameElement.InnerText = '*'
}
}
+ elseif ($DeviceNamingMode -eq 'SerialComputerNames') {
+ if ($computerNamePath.CreatedComputerNameElement) {
+ $computerNamePath.ComputerNameElement.InnerText = '*'
+ }
+ }
elseif (($DeviceNamingMode -eq 'Legacy') -and $computerNamePath.CreatedComputerNameElement) {
$computerNamePath.ComputerNameElement.InnerText = if ($LegacyPrefixesWillBeStaged) { '*' } else { 'MyComputer' }
}
@@ -4644,6 +4706,10 @@ Function New-DeploymentUSB {
WriteLog "Writing prefixes.txt file to $UnattendPathOnUSB"
$using:effectiveDeviceNamePrefixes | Set-Content -Path (Join-Path $UnattendPathOnUSB 'prefixes.txt') -Encoding UTF8
}
+ elseif ($using:DeviceNamingMode -eq 'SerialComputerNames') {
+ WriteLog "Writing SerialComputerNames.csv file to $UnattendPathOnUSB"
+ $using:effectiveDeviceNameSerialComputerNames | Set-Content -Path (Join-Path $UnattendPathOnUSB 'SerialComputerNames.csv') -Encoding UTF8
+ }
elseif ($legacyPrefixesWillBeStaged) {
WriteLog "Copying prefixes.txt file to $UnattendPathOnUSB"
Copy-Item -Path $using:resolvedDeviceNamePrefixesPath -Destination (Join-Path $UnattendPathOnUSB 'prefixes.txt') -Force | Out-Null
diff --git a/FFUDevelopment/BuildFFUVM_UI.ps1 b/FFUDevelopment/BuildFFUVM_UI.ps1
index f2503d6..2dd3c1e 100644
--- a/FFUDevelopment/BuildFFUVM_UI.ps1
+++ b/FFUDevelopment/BuildFFUVM_UI.ps1
@@ -528,6 +528,22 @@ $script:uiState.Controls.btnRun.Add_Click({
return
}
}
+ elseif ($config.DeviceNamingMode -eq 'SerialComputerNames') {
+ if (-not $config.CopyUnattend) {
+ [System.Windows.MessageBox]::Show("Select Copy Unattend.xml before using 'Specify Serial to Device Name Mapping'.", "Copy Unattend Required", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: serial computer-name mapping requires Copy Unattend.xml."
+ return
+ }
+
+ $hasSavedSerialComputerNamesPath = -not [string]::IsNullOrWhiteSpace([string]$config.DeviceNameSerialComputerNamesPath) -and (Test-Path -Path $config.DeviceNameSerialComputerNamesPath -PathType Leaf)
+ if ((($null -eq $config.DeviceNameSerialComputerNames) -or ($config.DeviceNameSerialComputerNames.Count -eq 0)) -and -not $hasSavedSerialComputerNamesPath) {
+ [System.Windows.MessageBox]::Show("Enter CSV content or choose a valid SerialComputerNames.csv file before using 'Specify Serial to Device Name Mapping'.", "Serial Mapping Required", "OK", "Warning") | Out-Null
+ $btnRun.IsEnabled = $true
+ $script:uiState.Controls.txtStatus.Text = "Build canceled: serial computer-name mapping required."
+ return
+ }
+ }
$configFilePath = Join-Path $config.FFUDevelopmentPath "\config\FFUConfig.json"
# Sort top-level keys alphabetically for consistent output
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index e1977cb..7de9f6d 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -963,6 +963,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
index a7a5d6d..90616a4 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Config.psm1
@@ -40,6 +40,8 @@ function Get-UIConfig {
DeviceNameTemplate = $State.Controls.txtDeviceNameTemplate.Text
DeviceNamePrefixesPath = $State.Controls.txtDeviceNamePrefixesPath.Text
DeviceNamePrefixes = @(Get-DeviceNamePrefixes -State $State)
+ DeviceNameSerialComputerNamesPath = $State.Controls.txtDeviceNameSerialComputerNamesPath.Text
+ DeviceNameSerialComputerNames = @(Get-SerialComputerNamesLines -State $State)
CopyAdditionalFFUFiles = $State.Controls.chkCopyAdditionalFFUFiles.IsChecked
CreateDeploymentMedia = $State.Controls.chkCreateDeploymentMedia.IsChecked
InjectUnattend = $State.Controls.chkInjectUnattend.IsChecked
@@ -473,21 +475,27 @@ function Update-UIFromConfig {
Set-UIValue -ControlName 'chkCopyUnattend' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CopyUnattend' -State $State
Set-UIValue -ControlName 'chkCopyPPKG' -PropertyName 'IsChecked' -ConfigObject $ConfigContent -ConfigKey 'CopyPPKG' -State $State
Set-UIValue -ControlName 'txtDeviceNamePrefixesPath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'DeviceNamePrefixesPath' -State $State
+ Set-UIValue -ControlName 'txtDeviceNameSerialComputerNamesPath' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'DeviceNameSerialComputerNamesPath' -State $State
Set-UIValue -ControlName 'txtDeviceNameTemplate' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'DeviceNameTemplate' -State $State
Set-UIValue -ControlName 'txtDeviceNamePrefixes' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'DeviceNamePrefixes' -TransformValue { param($val) if ($val -is [System.Array]) { $val -join [System.Environment]::NewLine } else { [string]$val } } -State $State
+ Set-UIValue -ControlName 'txtDeviceNameSerialComputerNames' -PropertyName 'Text' -ConfigObject $ConfigContent -ConfigKey 'DeviceNameSerialComputerNames' -TransformValue { param($val) if ($val -is [System.Array]) { $val -join [System.Environment]::NewLine } else { [string]$val } } -State $State
if ([string]::IsNullOrWhiteSpace($State.Controls.txtDeviceNamePrefixesPath.Text)) {
$State.Controls.txtDeviceNamePrefixesPath.Text = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $State.Controls.txtFFUDevPath.Text
}
+ if ([string]::IsNullOrWhiteSpace($State.Controls.txtDeviceNameSerialComputerNamesPath.Text)) {
+ $State.Controls.txtDeviceNameSerialComputerNamesPath.Text = Get-DefaultSerialComputerNamesPath -FFUDevelopmentPath $State.Controls.txtFFUDevPath.Text
+ }
+
$loadedDeviceNamingMode = $null
if ($ConfigContent.PSObject.Properties.Name -contains 'DeviceNamingMode') {
$candidateDeviceNamingMode = [string]$ConfigContent.DeviceNamingMode
- if ($candidateDeviceNamingMode -in @('Legacy', 'None', 'Prompt', 'Template', 'Prefixes')) {
+ if ($candidateDeviceNamingMode -in @('Legacy', 'None', 'Prompt', 'Template', 'Prefixes', 'SerialComputerNames')) {
$loadedDeviceNamingMode = $candidateDeviceNamingMode
}
}
- $displayDeviceNamingMode = if ($loadedDeviceNamingMode -in @('Prompt', 'Template', 'Prefixes')) {
+ $displayDeviceNamingMode = if ($loadedDeviceNamingMode -in @('Prompt', 'Template', 'Prefixes', 'SerialComputerNames')) {
$loadedDeviceNamingMode
}
else {
@@ -495,6 +503,7 @@ function Update-UIFromConfig {
}
Set-DeviceNamingModeState -State $State -DisplayMode $displayDeviceNamingMode -LoadedMode $loadedDeviceNamingMode
Import-DeviceNamePrefixesFromConfiguredPath -State $State
+ Import-SerialComputerNamesFromConfiguredPath -State $State
Update-DeviceNamingControls -State $State
# Post Build Cleanup group (Build Tab)
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index 6b86f6f..c77825d 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -42,13 +42,17 @@ function Get-SelectedDeviceNamingMode {
return 'Prefixes'
}
+ if ($true -eq $State.Controls.rbDeviceNamingSerialComputerNames.IsChecked) {
+ return 'SerialComputerNames'
+ }
+
return 'None'
}
function Set-DeviceNamingMode {
param(
[PSCustomObject]$State,
- [ValidateSet('None', 'Prompt', 'Template', 'Prefixes')]
+ [ValidateSet('None', 'Prompt', 'Template', 'Prefixes', 'SerialComputerNames')]
[string]$Mode
)
@@ -56,12 +60,13 @@ function Set-DeviceNamingMode {
$State.Controls.rbDeviceNamingPrompt.IsChecked = $Mode -eq 'Prompt'
$State.Controls.rbDeviceNamingTemplate.IsChecked = $Mode -eq 'Template'
$State.Controls.rbDeviceNamingPrefixes.IsChecked = $Mode -eq 'Prefixes'
+ $State.Controls.rbDeviceNamingSerialComputerNames.IsChecked = $Mode -eq 'SerialComputerNames'
}
function Set-DeviceNamingModeState {
param(
[PSCustomObject]$State,
- [ValidateSet('None', 'Prompt', 'Template', 'Prefixes')]
+ [ValidateSet('None', 'Prompt', 'Template', 'Prefixes', 'SerialComputerNames')]
[string]$DisplayMode,
[AllowNull()]
[string]$LoadedMode
@@ -121,6 +126,20 @@ function Get-DeviceNamePrefixes {
)
}
+function Get-SerialComputerNamesLines {
+ param([PSCustomObject]$State)
+
+ if ($null -eq $State.Controls.txtDeviceNameSerialComputerNames) {
+ return @()
+ }
+
+ return @(
+ $State.Controls.txtDeviceNameSerialComputerNames.Text -split "\r?\n" |
+ Where-Object { -not [string]::IsNullOrWhiteSpace($_) } |
+ ForEach-Object { $_.Trim() }
+ )
+}
+
function Import-DeviceNamePrefixesFile {
param(
[PSCustomObject]$State,
@@ -140,6 +159,25 @@ function Import-DeviceNamePrefixesFile {
return $true
}
+function Import-SerialComputerNamesFile {
+ param(
+ [PSCustomObject]$State,
+ [string]$FilePath
+ )
+
+ if ([string]::IsNullOrWhiteSpace($FilePath) -or -not (Test-Path -Path $FilePath -PathType Leaf)) {
+ return $false
+ }
+
+ $serialMappingLines = @(Get-Content -Path $FilePath | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | ForEach-Object { $_.Trim() })
+ if ($null -ne $State.Controls.txtDeviceNameSerialComputerNamesPath) {
+ $State.Controls.txtDeviceNameSerialComputerNamesPath.Text = $FilePath
+ }
+ $State.Controls.txtDeviceNameSerialComputerNames.Text = $serialMappingLines -join [System.Environment]::NewLine
+ WriteLog "Imported serial computer-name mappings from $FilePath"
+ return $true
+}
+
function Get-DefaultDeviceNamePrefixesPath {
param([string]$FFUDevelopmentPath)
@@ -150,6 +188,16 @@ function Get-DefaultDeviceNamePrefixesPath {
return Join-Path (Join-Path $FFUDevelopmentPath 'unattend') 'prefixes.txt'
}
+function Get-DefaultSerialComputerNamesPath {
+ param([string]$FFUDevelopmentPath)
+
+ if ([string]::IsNullOrWhiteSpace($FFUDevelopmentPath)) {
+ return $null
+ }
+
+ return Join-Path (Join-Path $FFUDevelopmentPath 'unattend') 'SerialComputerNames.csv'
+}
+
function Get-DefaultUnattendFilePath {
param(
[string]$FFUDevelopmentPath,
@@ -188,6 +236,29 @@ function Import-DeviceNamePrefixesFromConfiguredPath {
}
}
+function Import-SerialComputerNamesFromConfiguredPath {
+ param(
+ [PSCustomObject]$State,
+ [switch]$SkipIfTextPresent
+ )
+
+ if ($SkipIfTextPresent -and -not [string]::IsNullOrWhiteSpace($State.Controls.txtDeviceNameSerialComputerNames.Text)) {
+ return
+ }
+
+ $serialComputerNamesPath = $State.Controls.txtDeviceNameSerialComputerNamesPath.Text
+ if ([string]::IsNullOrWhiteSpace($serialComputerNamesPath)) {
+ $serialComputerNamesPath = Get-DefaultSerialComputerNamesPath -FFUDevelopmentPath $State.Controls.txtFFUDevPath.Text
+ if (-not [string]::IsNullOrWhiteSpace($serialComputerNamesPath) -and $null -ne $State.Controls.txtDeviceNameSerialComputerNamesPath) {
+ $State.Controls.txtDeviceNameSerialComputerNamesPath.Text = $serialComputerNamesPath
+ }
+ }
+
+ if (Test-Path -Path $serialComputerNamesPath -PathType Leaf) {
+ Import-SerialComputerNamesFile -State $State -FilePath $serialComputerNamesPath | Out-Null
+ }
+}
+
function Test-DeviceNameTemplateUsesSerialToken {
param([PSCustomObject]$State)
@@ -201,7 +272,7 @@ function Update-UnattendSelectionControls {
$isCopyUnattendSelected = $true -eq $State.Controls.chkCopyUnattend.IsChecked
$isInjectUnattendSelected = $true -eq $State.Controls.chkInjectUnattend.IsChecked
$deviceNameTemplateUsesSerialToken = Test-DeviceNameTemplateUsesSerialToken -State $State
- $requiresCopiedUnattend = ($selectedDeviceNamingMode -in @('Prompt', 'Prefixes')) -or $deviceNameTemplateUsesSerialToken
+ $requiresCopiedUnattend = ($selectedDeviceNamingMode -in @('Prompt', 'Prefixes', 'SerialComputerNames')) -or $deviceNameTemplateUsesSerialToken
if ($isCopyUnattendSelected -and $isInjectUnattendSelected) {
if ($requiresCopiedUnattend) {
@@ -247,19 +318,24 @@ function Update-UnattendSelectionControls {
function Update-DeviceNamingControls {
param([PSCustomObject]$State)
- if (($true -eq $State.Controls.chkInjectUnattend.IsChecked) -and (($true -eq $State.Controls.rbDeviceNamingPrompt.IsChecked) -or ($true -eq $State.Controls.rbDeviceNamingPrefixes.IsChecked))) {
+ if (($true -eq $State.Controls.chkInjectUnattend.IsChecked) -and (($true -eq $State.Controls.rbDeviceNamingPrompt.IsChecked) -or ($true -eq $State.Controls.rbDeviceNamingPrefixes.IsChecked) -or ($true -eq $State.Controls.rbDeviceNamingSerialComputerNames.IsChecked))) {
$State.Controls.rbDeviceNamingNone.IsChecked = $true
}
$selectedDeviceNamingMode = Get-SelectedDeviceNamingMode -State $State
$State.Controls.deviceNameTemplatePanel.Visibility = if ($selectedDeviceNamingMode -eq 'Template') { 'Visible' } else { 'Collapsed' }
$State.Controls.deviceNamePrefixesPanel.Visibility = if ($selectedDeviceNamingMode -eq 'Prefixes') { 'Visible' } else { 'Collapsed' }
+ $State.Controls.deviceNameSerialComputerNamesPanel.Visibility = if ($selectedDeviceNamingMode -eq 'SerialComputerNames') { 'Visible' } else { 'Collapsed' }
$State.Controls.rbDeviceNamingPrompt.IsEnabled = -not ($true -eq $State.Controls.chkInjectUnattend.IsChecked)
$State.Controls.rbDeviceNamingPrefixes.IsEnabled = -not ($true -eq $State.Controls.chkInjectUnattend.IsChecked)
+ $State.Controls.rbDeviceNamingSerialComputerNames.IsEnabled = -not ($true -eq $State.Controls.chkInjectUnattend.IsChecked)
if ($selectedDeviceNamingMode -eq 'Prefixes') {
Import-DeviceNamePrefixesFromConfiguredPath -State $State -SkipIfTextPresent
}
+ elseif ($selectedDeviceNamingMode -eq 'SerialComputerNames') {
+ Import-SerialComputerNamesFromConfiguredPath -State $State -SkipIfTextPresent
+ }
Update-UnattendSelectionControls -State $State
}
@@ -480,18 +556,24 @@ function Register-EventHandlers {
$selectedPath = Invoke-BrowseAction -Type 'Folder' -Title "Select FFU Development Path"
if ($selectedPath) {
$currentPrefixesPath = $localState.Controls.txtDeviceNamePrefixesPath.Text
+ $currentSerialComputerNamesPath = $localState.Controls.txtDeviceNameSerialComputerNamesPath.Text
$currentUnattendX64FilePath = $localState.Controls.txtUnattendX64FilePath.Text
$currentUnattendArm64FilePath = $localState.Controls.txtUnattendArm64FilePath.Text
$previousDefaultPrefixesPath = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text
+ $previousDefaultSerialComputerNamesPath = Get-DefaultSerialComputerNamesPath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text
$previousDefaultUnattendX64FilePath = Get-DefaultUnattendFilePath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text -WindowsArch 'x64'
$previousDefaultUnattendArm64FilePath = Get-DefaultUnattendFilePath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text -WindowsArch 'arm64'
$localState.Controls.txtFFUDevPath.Text = $selectedPath
$newDefaultPrefixesPath = Get-DefaultDeviceNamePrefixesPath -FFUDevelopmentPath $selectedPath
+ $newDefaultSerialComputerNamesPath = Get-DefaultSerialComputerNamesPath -FFUDevelopmentPath $selectedPath
$newDefaultUnattendX64FilePath = Get-DefaultUnattendFilePath -FFUDevelopmentPath $selectedPath -WindowsArch 'x64'
$newDefaultUnattendArm64FilePath = Get-DefaultUnattendFilePath -FFUDevelopmentPath $selectedPath -WindowsArch 'arm64'
if ([string]::IsNullOrWhiteSpace($currentPrefixesPath) -or $currentPrefixesPath -ieq $previousDefaultPrefixesPath) {
$localState.Controls.txtDeviceNamePrefixesPath.Text = $newDefaultPrefixesPath
}
+ if ([string]::IsNullOrWhiteSpace($currentSerialComputerNamesPath) -or $currentSerialComputerNamesPath -ieq $previousDefaultSerialComputerNamesPath) {
+ $localState.Controls.txtDeviceNameSerialComputerNamesPath.Text = $newDefaultSerialComputerNamesPath
+ }
if ([string]::IsNullOrWhiteSpace($currentUnattendX64FilePath) -or $currentUnattendX64FilePath -ieq $previousDefaultUnattendX64FilePath) {
$localState.Controls.txtUnattendX64FilePath.Text = $newDefaultUnattendX64FilePath
}
@@ -499,6 +581,7 @@ function Register-EventHandlers {
$localState.Controls.txtUnattendArm64FilePath.Text = $newDefaultUnattendArm64FilePath
}
Import-DeviceNamePrefixesFromConfiguredPath -State $localState
+ Import-SerialComputerNamesFromConfiguredPath -State $localState
Update-DeviceNamingControls -State $localState
}
})
@@ -560,6 +643,16 @@ function Register-EventHandlers {
}
Update-DeviceNamingControls -State $localState
})
+ $State.Controls.rbDeviceNamingSerialComputerNames.Add_Checked({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ if (-not ($true -eq $localState.Flags.suppressDeviceNamingChangeTracking)) {
+ $localState.Flags.deviceNamingModeWasExplicitlyChanged = $true
+ $localState.Data.loadedDeviceNamingMode = $null
+ }
+ Update-DeviceNamingControls -State $localState
+ })
$State.Controls.btnBrowseDeviceNamePrefixesPath.Add_Click({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
@@ -580,6 +673,26 @@ function Register-EventHandlers {
Update-DeviceNamingControls -State $localState
}
})
+ $State.Controls.btnBrowseDeviceNameSerialComputerNamesPath.Add_Click({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ $currentSerialComputerNamesPath = $localState.Controls.txtDeviceNameSerialComputerNamesPath.Text
+ if ([string]::IsNullOrWhiteSpace($currentSerialComputerNamesPath)) {
+ $currentSerialComputerNamesPath = Get-DefaultSerialComputerNamesPath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text
+ }
+ $initialDirectory = if ([string]::IsNullOrWhiteSpace($currentSerialComputerNamesPath)) {
+ $null
+ }
+ else {
+ Split-Path $currentSerialComputerNamesPath -Parent
+ }
+ $fileName = if ([string]::IsNullOrWhiteSpace($currentSerialComputerNamesPath)) { 'SerialComputerNames.csv' } else { Split-Path $currentSerialComputerNamesPath -Leaf }
+ $selectedPath = Invoke-BrowseAction -Type 'OpenFile' -Title 'Select SerialComputerNames.csv file path' -Filter 'CSV files (*.csv)|*.csv|All files (*.*)|*.*' -InitialDirectory $initialDirectory -FileName $fileName
+ if (Import-SerialComputerNamesFile -State $localState -FilePath $selectedPath) {
+ Update-DeviceNamingControls -State $localState
+ }
+ })
$State.Controls.btnBrowseUnattendX64FilePath.Add_Click({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
@@ -653,6 +766,39 @@ function Register-EventHandlers {
[System.Windows.MessageBox]::Show("Saving prefixes failed for '$currentPrefixesPath'. $($_.Exception.Message)", "Save Prefixes Failed", "OK", "Error") | Out-Null
}
})
+ $State.Controls.btnSaveDeviceNameSerialComputerNames.Add_Click({
+ param($eventSource, $routedEventArgs)
+ $window = [System.Windows.Window]::GetWindow($eventSource)
+ $localState = $window.Tag
+ $serialComputerNameLines = @(Get-SerialComputerNamesLines -State $localState)
+
+ if ($serialComputerNameLines.Count -eq 0) {
+ [System.Windows.MessageBox]::Show("Enter CSV content before saving the serial mapping file.", "Serial Mapping Required", "OK", "Warning") | Out-Null
+ return
+ }
+
+ $currentSerialComputerNamesPath = $localState.Controls.txtDeviceNameSerialComputerNamesPath.Text
+ if ([string]::IsNullOrWhiteSpace($currentSerialComputerNamesPath)) {
+ $currentSerialComputerNamesPath = Get-DefaultSerialComputerNamesPath -FFUDevelopmentPath $localState.Controls.txtFFUDevPath.Text
+ if (-not [string]::IsNullOrWhiteSpace($currentSerialComputerNamesPath)) {
+ $localState.Controls.txtDeviceNameSerialComputerNamesPath.Text = $currentSerialComputerNamesPath
+ }
+ }
+
+ if ([string]::IsNullOrWhiteSpace($currentSerialComputerNamesPath)) {
+ [System.Windows.MessageBox]::Show("Select a valid SerialComputerNames.csv file path before saving the serial mapping.", "Serial Mapping File Path Required", "OK", "Warning") | Out-Null
+ return
+ }
+
+ try {
+ $serialComputerNameLines | Set-Content -Path $currentSerialComputerNamesPath -Encoding UTF8
+ $localState.Controls.txtDeviceNameSerialComputerNamesPath.Text = $currentSerialComputerNamesPath
+ WriteLog "Saved serial computer-name mappings to $currentSerialComputerNamesPath"
+ }
+ catch {
+ [System.Windows.MessageBox]::Show("Saving serial mapping failed for '$currentSerialComputerNamesPath'. $($_.Exception.Message)", "Save Serial Mapping Failed", "OK", "Error") | Out-Null
+ }
+ })
$State.Controls.chkCopyUnattend.Add_Checked({
param($eventSource, $routedEventArgs)
$window = [System.Windows.Window]::GetWindow($eventSource)
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index 43530b8..ca8f396 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -228,13 +228,19 @@ function Initialize-UIControls {
$State.Controls.rbDeviceNamingPrompt = $window.FindName('rbDeviceNamingPrompt')
$State.Controls.rbDeviceNamingTemplate = $window.FindName('rbDeviceNamingTemplate')
$State.Controls.rbDeviceNamingPrefixes = $window.FindName('rbDeviceNamingPrefixes')
+ $State.Controls.rbDeviceNamingSerialComputerNames = $window.FindName('rbDeviceNamingSerialComputerNames')
$State.Controls.deviceNameTemplatePanel = $window.FindName('deviceNameTemplatePanel')
$State.Controls.deviceNamePrefixesPanel = $window.FindName('deviceNamePrefixesPanel')
+ $State.Controls.deviceNameSerialComputerNamesPanel = $window.FindName('deviceNameSerialComputerNamesPanel')
$State.Controls.txtDeviceNameTemplate = $window.FindName('txtDeviceNameTemplate')
$State.Controls.txtDeviceNamePrefixesPath = $window.FindName('txtDeviceNamePrefixesPath')
$State.Controls.btnBrowseDeviceNamePrefixesPath = $window.FindName('btnBrowseDeviceNamePrefixesPath')
$State.Controls.txtDeviceNamePrefixes = $window.FindName('txtDeviceNamePrefixes')
$State.Controls.btnSaveDeviceNamePrefixes = $window.FindName('btnSaveDeviceNamePrefixes')
+ $State.Controls.txtDeviceNameSerialComputerNamesPath = $window.FindName('txtDeviceNameSerialComputerNamesPath')
+ $State.Controls.btnBrowseDeviceNameSerialComputerNamesPath = $window.FindName('btnBrowseDeviceNameSerialComputerNamesPath')
+ $State.Controls.txtDeviceNameSerialComputerNames = $window.FindName('txtDeviceNameSerialComputerNames')
+ $State.Controls.btnSaveDeviceNameSerialComputerNames = $window.FindName('btnSaveDeviceNameSerialComputerNames')
$State.Controls.chkVerbose = $window.FindName('chkVerbose')
$State.Controls.chkCopyAutopilot = $window.FindName('chkCopyAutopilot')
$State.Controls.chkCopyUnattend = $window.FindName('chkCopyUnattend')
@@ -400,7 +406,7 @@ function Initialize-UIDefaults {
$State.Controls.chkCopyAutopilot.IsChecked = $State.Defaults.generalDefaults.CopyAutopilot
$State.Controls.chkCopyUnattend.IsChecked = $State.Defaults.generalDefaults.CopyUnattend
$State.Controls.chkCopyPPKG.IsChecked = $State.Defaults.generalDefaults.CopyPPKG
- $defaultDeviceNamingMode = if ($State.Defaults.generalDefaults.DeviceNamingMode -in @('None', 'Prompt', 'Template', 'Prefixes')) {
+ $defaultDeviceNamingMode = if ($State.Defaults.generalDefaults.DeviceNamingMode -in @('None', 'Prompt', 'Template', 'Prefixes', 'SerialComputerNames')) {
$State.Defaults.generalDefaults.DeviceNamingMode
}
else {
@@ -410,7 +416,10 @@ function Initialize-UIDefaults {
$State.Controls.txtDeviceNameTemplate.Text = $State.Defaults.generalDefaults.DeviceNameTemplate
$State.Controls.txtDeviceNamePrefixesPath.Text = $State.Defaults.generalDefaults.DeviceNamePrefixesPath
$State.Controls.txtDeviceNamePrefixes.Text = ($State.Defaults.generalDefaults.DeviceNamePrefixes -join [System.Environment]::NewLine)
+ $State.Controls.txtDeviceNameSerialComputerNamesPath.Text = $State.Defaults.generalDefaults.DeviceNameSerialComputerNamesPath
+ $State.Controls.txtDeviceNameSerialComputerNames.Text = ($State.Defaults.generalDefaults.DeviceNameSerialComputerNames -join [System.Environment]::NewLine)
Import-DeviceNamePrefixesFromConfiguredPath -State $State
+ Import-SerialComputerNamesFromConfiguredPath -State $State
Update-DeviceNamingControls -State $State
$State.Controls.chkCleanupAppsISO.IsChecked = $State.Defaults.generalDefaults.CleanupAppsISO
$State.Controls.chkCleanupDeployISO.IsChecked = $State.Defaults.generalDefaults.CleanupDeployISO
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
index 8957f4a..5f41546 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.psm1
@@ -112,6 +112,7 @@ function Get-GeneralDefaults {
$userAppListPath = Join-Path -Path $appsPath -ChildPath "UserAppList.json"
$driversJsonPath = Join-Path -Path $driversPath -ChildPath "Drivers.json"
$deviceNamePrefixesPath = Join-Path -Path $unattendPath -ChildPath "prefixes.txt"
+ $deviceNameSerialComputerNamesPath = Join-Path -Path $unattendPath -ChildPath "SerialComputerNames.csv"
$unattendX64FilePath = Join-Path -Path $unattendPath -ChildPath "unattend_x64.xml"
$unattendArm64FilePath = Join-Path -Path $unattendPath -ChildPath "unattend_arm64.xml"
@@ -142,6 +143,8 @@ function Get-GeneralDefaults {
DeviceNameTemplate = ''
DeviceNamePrefixesPath = $deviceNamePrefixesPath
DeviceNamePrefixes = @()
+ DeviceNameSerialComputerNamesPath = $deviceNameSerialComputerNamesPath
+ DeviceNameSerialComputerNames = @()
CleanupAppsISO = $true
CleanupDeployISO = $true
CleanupDrivers = $false
diff --git a/FFUDevelopment/config/Sample_default.json b/FFUDevelopment/config/Sample_default.json
index 09ee3809718125cf9310f12a19e6e85eae76fc66..49192e40e14e1bea8cc293d813b00522e6187fa1 100644
GIT binary patch
delta 146
zcmaE1(qz8j58LE@Y$B?`45JE
delta 12
TcmZoNe_^uW58GxjjvQeCB*z5U
diff --git a/FFUDevelopment/unattend/SampleSerialComputerNames.csv b/FFUDevelopment/unattend/SampleSerialComputerNames.csv
new file mode 100644
index 0000000..58e390a
--- /dev/null
+++ b/FFUDevelopment/unattend/SampleSerialComputerNames.csv
@@ -0,0 +1,4 @@
+SerialNumber,ComputerName
+ABC12345,CORP-001
+DEF67890,KIOSK-010
+XYZ24680,STORE-015
\ No newline at end of file
diff --git a/docs/build.md b/docs/build.md
index 99f7b20..1e7bd04 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -340,7 +340,7 @@ This option is primarily intended for scenarios where:
| Limitation | Description |
| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **No prefixes.txt or %serial% support** | Unlike **Copy Unattend.xml**, this method does not support `prefixes.txt` or the `%serial%` variable for deployment-time device naming |
+| **No prefixes.txt, SerialComputerNames.csv, or %serial% support** | Unlike **Copy Unattend.xml**, this method does not support `prefixes.txt`, `SerialComputerNames.csv`, or the `%serial%` variable for deployment-time device naming |
| **Fixed configuration** | The unattend settings are baked into the FFU at build time and cannot be changed at deployment time |
| **Requires VM to be built** | This option only works when**Install Apps** is `$true` because the unattend file is included in the Apps ISO |
@@ -348,7 +348,7 @@ This option is primarily intended for scenarios where:
> Note
>
-> Most users should continue using the **Copy Unattend** option via the USB drive, which provides more flexibility including support for `prefixes.txt` device naming. Use **Inject Unattend.xml** only when you won't be using the USB drive for deployment.
+> Most users should continue using the **Copy Unattend** option via the USB drive, which provides more flexibility including support for `prefixes.txt`, `SerialComputerNames.csv`, and `%serial%` device naming. Use **Inject Unattend.xml** only when you won't be using the USB drive for deployment.
{: .tip-title}
@@ -423,6 +423,37 @@ Use **Prefixes File Path** to point the UI at the source text file for the prefi
Use **Save Prefixes** to write the current multiline prefixes list back to the file specified in **Prefixes File Path**.
+### Specify Serial to Device Name Mapping
+
+This option writes `SerialComputerNames.csv` from the CSV content in the UI. Use `SerialNumber,ComputerName` as the header row, then add one row per device. During deployment, `ApplyFFU.ps1` compares the current BIOS serial number to the `SerialNumber` column and uses the matching `ComputerName` value.
+
+Sample `SerialComputerNames.csv` content:
+
+```plaintext
+SerialNumber,ComputerName
+ABC12345,CORP-001
+DEF67890,KIOSK-010
+XYZ24680,STORE-015
+```
+
+- This option requires **Copy Unattend.xml**.
+- **Inject Unattend.xml** is not supported with this option.
+- If no matching serial number is found during deployment, `ApplyFFU.ps1` falls back to a random `FFU-*` computer name so setup can finish.
+
+{: .note-title}
+
+> Note
+>
+> If `prefixes.txt` and `SerialComputerNames.csv` are both staged manually on the same deployment media, `ApplyFFU.ps1` checks `prefixes.txt` first. FFU Builder avoids this conflict by only staging the naming file for the selected device-naming mode.
+
+### SerialComputerNames.csv File Path
+
+Use **SerialComputerNames.csv File Path** to point the UI at the source CSV file for the serial-to-device-name mapping. The file can use any name. When you browse to a mapping file in the UI, or when a saved configuration references a valid CSV path, the UI loads that file and populates the multiline CSV box from its contents.
+
+### Save Serial Mapping
+
+Use **Save Serial Mapping** to write the current CSV content back to the file specified in **SerialComputerNames.csv File Path**.
+
### Deployment Prompt Compatibility
Older deployment media that already has an unattend file with `ComputerName` set to the legacy placeholder value and no `prefixes.txt` file will still prompt for a device name during deployment.
@@ -443,8 +474,9 @@ The `.\FFUDevelopment\Unattend` folder includes sample files you can customize:
| **unattend_x64.xml** | Active unattend file used for x64 builds |
| **unattend_arm64.xml** | Active unattend file used for arm64 builds |
| **SamplePrefixes.txt** | Example prefixes file for device naming |
+| **SampleSerialComputerNames.csv** | Example serial-to-device-name CSV file |
-Copy and customize the sample files to create your own `unattend_x64.xml`, `unattend_arm64.xml`, and `prefixes.txt` files.
+Copy and customize the sample files to create your own `unattend_x64.xml`, `unattend_arm64.xml`, `prefixes.txt`, and `SerialComputerNames.csv` files.
{: .note-title}
@@ -537,12 +569,13 @@ When enabled, the build process copies:
- The selected x64 or arm64 unattend XML file → renamed to **Unattend.xml** on the USB drive
- **prefixes.txt** → created from the **Device Naming** prefixes list when that mode is selected
+- **SerialComputerNames.csv** → created from the **Device Naming** serial mapping list when that mode is selected
If you keep the default file paths in place, FFU Builder uses `unattend_x64.xml` for x64 builds and `unattend_arm64.xml` for arm64 builds.
During deployment, `ApplyFFU.ps1` applies `Unattend.xml` whenever it is present. Device naming only happens when the **Device Naming** setting requires it, or when older media still uses the legacy prompt-based workflow.
-See **Device Naming Expander** above for the available computer-name modes and prefixes-file behavior.
+See **Device Naming Expander** above for the available computer-name modes and naming-file behavior.
### Copy Provisioning Package
diff --git a/docs/parameters_reference.md b/docs/parameters_reference.md
index 400f89b..a87d625 100644
--- a/docs/parameters_reference.md
+++ b/docs/parameters_reference.md
@@ -41,12 +41,14 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -CopyUnattend | bool | Copy Unattend.xml | When set to $true, stages the selected architecture-specific unattend XML file as Unattend.xml on the Deployment partition of the USB drive. Cannot be used together with -InjectUnattend. Default is $false. |
| -CreateDeploymentMedia | bool | Create Deployment Media | When set to $true, this will create WinPE deployment media for use when deploying to a physical device. |
| -CustomFFUNameTemplate | string | Custom FFU Name Template | Sets a custom FFU output name with placeholders. Allowed placeholders are: {WindowsRelease}, {WindowsVersion}, {SKU}, {BuildDate}, {yyyy}, {MM}, {dd}, {H}, {hh}, {mm}, {tt}. |
-| -DeviceNamingMode | string | Device Naming expander | Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Accepted values are Legacy, None, Prompt, Template, and Prefixes. The UI shows None, Prompt, Template, and Prefixes. When device naming is left untouched in the UI, the generated config does not write DeviceNamingMode, which preserves the script default of Legacy. Prompt rewrites the staged deployment unattend to the existing manual prompt placeholder and requires -CopyUnattend. |
+| -DeviceNamingMode | string | Device Naming expander | Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Accepted values are Legacy, None, Prompt, Template, Prefixes, and SerialComputerNames. The UI shows None, Prompt, Template, Prefixes, and SerialComputerNames. When device naming is left untouched in the UI, the generated config does not write DeviceNamingMode, which preserves the script default of Legacy. Prompt rewrites the staged deployment unattend to the existing manual prompt placeholder and requires -CopyUnattend. Prefixes writes prefixes.txt and requires -CopyUnattend. SerialComputerNames writes SerialComputerNames.csv and requires -CopyUnattend. |
| -DeviceNameTemplate | string | Specify Device Name | Sets the device name used when DeviceNamingMode is Template. Supports a static name or the %serial% token when -CopyUnattend is used. |
| -DeviceNamePrefixesPath | string | Prefixes File Path | Path to the source prefixes file used for legacy copy or when -DeviceNamePrefixes is not supplied. Default is $FFUDevelopmentPath\Unattend\prefixes.txt. |
+| -DeviceNameSerialComputerNamesPath | string | SerialComputerNames.csv File Path | Path to the source CSV file used when DeviceNamingMode is SerialComputerNames and -DeviceNameSerialComputerNames is not supplied. Default is $FFUDevelopmentPath\Unattend\SerialComputerNames.csv. |
| -UnattendX64FilePath | string | x64 Unattend File Path | Path to the x64 unattend XML source file used by Copy Unattend.xml and Inject Unattend.xml. Default is $FFUDevelopmentPath\Unattend\unattend_x64.xml. |
| -UnattendArm64FilePath | string | arm64 Unattend File Path | Path to the arm64 unattend XML source file used by Copy Unattend.xml and Inject Unattend.xml. Default is $FFUDevelopmentPath\Unattend\unattend_arm64.xml. |
| -DeviceNamePrefixes | string[] | Specify a list of Prefixes | Sets the prefixes used when DeviceNamingMode is Prefixes. Each entry becomes a line in prefixes.txt on the deployment media. |
+| -DeviceNameSerialComputerNames | string[] | Specify Serial to Device Name Mapping | Sets the CSV content used when DeviceNamingMode is SerialComputerNames. The content must include SerialNumber and ComputerName headers, and the staged file is written as SerialComputerNames.csv on the deployment media. |
| -Disksize | uint64 | Disk Size (GB) | Size of the virtual hard disk for the virtual machine. Default is a 50GB dynamic disk. |
| -DriversFolder | string | Drivers Folder | Path to the drivers folder. Default is $FFUDevelopmentPath\Drivers. |
| -DriversJsonPath | string | Drivers.json Path | Path to a JSON file that specifies which drivers to download. |
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 8ed8fe7..01d8c1d 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -213,6 +213,20 @@ This option writes `prefixes.txt` from the list in the UI. Enter one prefix per
>
> If the technician skips prefix selection when multiple prefixes are available, `ApplyFFU.ps1` leaves the existing unattend `ComputerName` value unchanged. With the current unattend samples set to `*`, Windows falls back to its default random computer-name behavior, typically resulting in a name such as `WIN-*`.
+**Specify Serial to Device Name Mapping**
+
+This option writes `SerialComputerNames.csv` from the CSV content in the UI. Use `SerialNumber,ComputerName` as the header row, then add one row per device. During deployment, `ApplyFFU.ps1` compares the current BIOS serial number to the CSV and applies the matching computer name.
+
+- This option requires **Copy Unattend.xml**.
+- **Inject Unattend.xml** is not supported with this option.
+- If no matching serial number is found during deployment, `ApplyFFU.ps1` falls back to a random `FFU-*` computer name.
+
+{: .note-title}
+
+> Note
+>
+> If `prefixes.txt` and `SerialComputerNames.csv` are both present on the same deployment media, `ApplyFFU.ps1` checks `prefixes.txt` first. FFU Builder stages only the naming file for the selected device-naming mode.
+
{: .warning-title}
> Warning
From 14811e3f9c7469b48e379fae47eeb9e3455e00cf Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Wed, 15 Apr 2026 14:42:23 -0700
Subject: [PATCH 31/34] Updates version to 2604.1
Increments the script version identifiers to reflect the new release cycle.
---
FFUDevelopment/BuildFFUVM.ps1 | 2 +-
FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index d37ff13..a692f13 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -480,7 +480,7 @@ param(
[switch]$Cleanup
)
$ProgressPreference = 'SilentlyContinue'
-$version = '2603.2'
+$version = '2604.1'
# Remove any existing modules to avoid conflicts
if (Get-Module -Name 'FFU.Common.Core' -ErrorAction SilentlyContinue) {
diff --git a/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1 b/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1
index 9fd106a..49b93ba 100644
--- a/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1
+++ b/FFUDevelopment/WinPEDeployFFUFiles/ApplyFFU.ps1
@@ -950,7 +950,7 @@ $LogFileName = 'ScriptLog.txt'
$USBDrive = Get-USBDrive
New-item -Path $USBDrive -Name $LogFileName -ItemType "file" -Force | Out-Null
$LogFile = $USBDrive + $LogFilename
-$version = '2603.2'
+$version = '2604.1'
WriteLog 'Begin Logging'
WriteLog "Script version: $version"
From 6b76f6b9a27949be972a4825f88307873bc562f1 Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Thu, 16 Apr 2026 14:25:47 -0700
Subject: [PATCH 32/34] Renames serial mapping file path UI labels
Updates UI labels, tooltips, message boxes, dialog titles, and corresponding documentation to use "Serial Computer Names CSV Mapping File Path" instead of "SerialComputerNames.csv File Path" to improve clarity and presentation.
Co-authored-by: Copilot
---
FFUDevelopment/BuildFFUVM_UI.ps1 | 2 +-
FFUDevelopment/BuildFFUVM_UI.xaml | 4 ++--
FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 | 4 ++--
docs/build.md | 6 +++---
docs/parameters_reference.md | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/FFUDevelopment/BuildFFUVM_UI.ps1 b/FFUDevelopment/BuildFFUVM_UI.ps1
index 2dd3c1e..ac5de98 100644
--- a/FFUDevelopment/BuildFFUVM_UI.ps1
+++ b/FFUDevelopment/BuildFFUVM_UI.ps1
@@ -538,7 +538,7 @@ $script:uiState.Controls.btnRun.Add_Click({
$hasSavedSerialComputerNamesPath = -not [string]::IsNullOrWhiteSpace([string]$config.DeviceNameSerialComputerNamesPath) -and (Test-Path -Path $config.DeviceNameSerialComputerNamesPath -PathType Leaf)
if ((($null -eq $config.DeviceNameSerialComputerNames) -or ($config.DeviceNameSerialComputerNames.Count -eq 0)) -and -not $hasSavedSerialComputerNamesPath) {
- [System.Windows.MessageBox]::Show("Enter CSV content or choose a valid SerialComputerNames.csv file before using 'Specify Serial to Device Name Mapping'.", "Serial Mapping Required", "OK", "Warning") | Out-Null
+ [System.Windows.MessageBox]::Show("Enter CSV content or choose a valid Serial Computer Names CSV Mapping File Path before using 'Specify Serial to Device Name Mapping'.", "Serial Mapping Required", "OK", "Warning") | Out-Null
$btnRun.IsEnabled = $true
$script:uiState.Controls.txtStatus.Text = "Build canceled: serial computer-name mapping required."
return
diff --git a/FFUDevelopment/BuildFFUVM_UI.xaml b/FFUDevelopment/BuildFFUVM_UI.xaml
index 7de9f6d..c668923 100644
--- a/FFUDevelopment/BuildFFUVM_UI.xaml
+++ b/FFUDevelopment/BuildFFUVM_UI.xaml
@@ -965,14 +965,14 @@
-
+
-
+
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
index c77825d..6049179 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Handlers.psm1
@@ -688,7 +688,7 @@ function Register-EventHandlers {
Split-Path $currentSerialComputerNamesPath -Parent
}
$fileName = if ([string]::IsNullOrWhiteSpace($currentSerialComputerNamesPath)) { 'SerialComputerNames.csv' } else { Split-Path $currentSerialComputerNamesPath -Leaf }
- $selectedPath = Invoke-BrowseAction -Type 'OpenFile' -Title 'Select SerialComputerNames.csv file path' -Filter 'CSV files (*.csv)|*.csv|All files (*.*)|*.*' -InitialDirectory $initialDirectory -FileName $fileName
+ $selectedPath = Invoke-BrowseAction -Type 'OpenFile' -Title 'Select Serial Computer Names CSV Mapping File Path' -Filter 'CSV files (*.csv)|*.csv|All files (*.*)|*.*' -InitialDirectory $initialDirectory -FileName $fileName
if (Import-SerialComputerNamesFile -State $localState -FilePath $selectedPath) {
Update-DeviceNamingControls -State $localState
}
@@ -786,7 +786,7 @@ function Register-EventHandlers {
}
if ([string]::IsNullOrWhiteSpace($currentSerialComputerNamesPath)) {
- [System.Windows.MessageBox]::Show("Select a valid SerialComputerNames.csv file path before saving the serial mapping.", "Serial Mapping File Path Required", "OK", "Warning") | Out-Null
+ [System.Windows.MessageBox]::Show("Select a valid Serial Computer Names CSV Mapping File Path before saving the serial mapping.", "Serial Mapping File Path Required", "OK", "Warning") | Out-Null
return
}
diff --git a/docs/build.md b/docs/build.md
index 1e7bd04..e968463 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -446,13 +446,13 @@ XYZ24680,STORE-015
>
> If `prefixes.txt` and `SerialComputerNames.csv` are both staged manually on the same deployment media, `ApplyFFU.ps1` checks `prefixes.txt` first. FFU Builder avoids this conflict by only staging the naming file for the selected device-naming mode.
-### SerialComputerNames.csv File Path
+### Serial Computer Names CSV Mapping File Path
-Use **SerialComputerNames.csv File Path** to point the UI at the source CSV file for the serial-to-device-name mapping. The file can use any name. When you browse to a mapping file in the UI, or when a saved configuration references a valid CSV path, the UI loads that file and populates the multiline CSV box from its contents.
+Use **Serial Computer Names CSV Mapping File Path** to point the UI at the source CSV file for the serial-to-device-name mapping. The file can use any name. When you browse to a mapping file in the UI, or when a saved configuration references a valid CSV path, the UI loads that file and populates the multiline CSV box from its contents.
### Save Serial Mapping
-Use **Save Serial Mapping** to write the current CSV content back to the file specified in **SerialComputerNames.csv File Path**.
+Use **Save Serial Mapping** to write the current CSV content back to the file specified in **Serial Computer Names CSV Mapping File Path**.
### Deployment Prompt Compatibility
diff --git a/docs/parameters_reference.md b/docs/parameters_reference.md
index a87d625..b5a2e8a 100644
--- a/docs/parameters_reference.md
+++ b/docs/parameters_reference.md
@@ -44,7 +44,7 @@ This table lists all top-level parameters in BuildFFUVM.ps1.
| -DeviceNamingMode | string | Device Naming expander | Controls how device naming is handled when unattend content is copied to USB media or injected into the FFU. Accepted values are Legacy, None, Prompt, Template, Prefixes, and SerialComputerNames. The UI shows None, Prompt, Template, Prefixes, and SerialComputerNames. When device naming is left untouched in the UI, the generated config does not write DeviceNamingMode, which preserves the script default of Legacy. Prompt rewrites the staged deployment unattend to the existing manual prompt placeholder and requires -CopyUnattend. Prefixes writes prefixes.txt and requires -CopyUnattend. SerialComputerNames writes SerialComputerNames.csv and requires -CopyUnattend. |
| -DeviceNameTemplate | string | Specify Device Name | Sets the device name used when DeviceNamingMode is Template. Supports a static name or the %serial% token when -CopyUnattend is used. |
| -DeviceNamePrefixesPath | string | Prefixes File Path | Path to the source prefixes file used for legacy copy or when -DeviceNamePrefixes is not supplied. Default is $FFUDevelopmentPath\Unattend\prefixes.txt. |
-| -DeviceNameSerialComputerNamesPath | string | SerialComputerNames.csv File Path | Path to the source CSV file used when DeviceNamingMode is SerialComputerNames and -DeviceNameSerialComputerNames is not supplied. Default is $FFUDevelopmentPath\Unattend\SerialComputerNames.csv. |
+| -DeviceNameSerialComputerNamesPath | string | Serial Computer Names CSV Mapping File Path | Path to the source CSV file used when DeviceNamingMode is SerialComputerNames and -DeviceNameSerialComputerNames is not supplied. Default is $FFUDevelopmentPath\Unattend\SerialComputerNames.csv. |
| -UnattendX64FilePath | string | x64 Unattend File Path | Path to the x64 unattend XML source file used by Copy Unattend.xml and Inject Unattend.xml. Default is $FFUDevelopmentPath\Unattend\unattend_x64.xml. |
| -UnattendArm64FilePath | string | arm64 Unattend File Path | Path to the arm64 unattend XML source file used by Copy Unattend.xml and Inject Unattend.xml. Default is $FFUDevelopmentPath\Unattend\unattend_arm64.xml. |
| -DeviceNamePrefixes | string[] | Specify a list of Prefixes | Sets the prefixes used when DeviceNamingMode is Prefixes. Each entry becomes a line in prefixes.txt on the deployment media. |
From 15ca246abd71d0c554a133e9f9f4d328c88c251d Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Thu, 16 Apr 2026 15:46:02 -0700
Subject: [PATCH 33/34] Updates documentation screenshots and UI descriptions
Refreshes numerous screenshot image references across the documentation to reflect the latest UI changes. Updates text descriptions in several documents (Build, Prerequisites, Quickstart, Windows Settings) to align with recent features, such as the new Windows Media Source options, explicitly mentioning PowerShell 7.6+ requirements, and clarifying the Device Naming and Copy Unattend.xml behavior.
Co-authored-by: Copilot
---
docs/M365appsoffice.md | 4 +-
docs/applications.md | 2 +-
docs/appsscriptvariables.md | 6 +-
docs/build.md | 78 ++++++++++--------
docs/byoapps.md | 2 +-
docs/drivers.md | 4 +-
docs/hyperv_settings.md | 2 +-
docs/image/M365appsoffice/1776379074990.png | Bin 0 -> 170168 bytes
docs/image/Prerequisites/1776376971272.png | Bin 0 -> 287411 bytes
docs/image/applications/1776378755854.png | Bin 0 -> 153881 bytes
.../appsscriptvariables/1776379026213.png | Bin 0 -> 51776 bytes
docs/image/build/1776379303045.png | Bin 0 -> 204901 bytes
docs/image/byoapps/1776378975827.png | Bin 0 -> 150504 bytes
docs/image/drivers/1776379108391.png | Bin 0 -> 252740 bytes
docs/image/drivers/1776379241359.png | Bin 0 -> 255095 bytes
docs/image/hyperv_settings/1776378277110.png | Bin 0 -> 166032 bytes
docs/image/monitor/1776379380344.png | Bin 0 -> 383314 bytes
docs/image/quickstart/1776377145296.png | Bin 0 -> 269149 bytes
docs/image/quickstart/1776377420583.png | Bin 0 -> 202032 bytes
docs/image/quickstart/1776377442979.png | Bin 0 -> 256124 bytes
docs/image/quickstart/1776377516879.png | Bin 0 -> 208056 bytes
docs/image/quickstart/1776377592432.png | Bin 0 -> 222929 bytes
docs/image/quickstart/1776377622826.png | Bin 0 -> 216385 bytes
docs/image/ui_overview/1776378210391.png | Bin 0 -> 300406 bytes
docs/image/updates/1776378727768.png | Bin 0 -> 175763 bytes
docs/image/windows_settings/1776378316739.png | Bin 0 -> 262546 bytes
docs/image/winget/1776378791094.png | Bin 0 -> 338348 bytes
docs/image/winget/1776378813453.png | Bin 0 -> 23694 bytes
docs/image/winget/1776378860799.png | Bin 0 -> 131712 bytes
docs/image/winget/1776378878837.png | Bin 0 -> 17101 bytes
docs/monitor.md | 4 +-
docs/parameters_reference.md | 13 +--
docs/prerequisites.md | 6 +-
docs/quickstart.md | 28 +++++--
docs/ui_overview.md | 4 +-
docs/updates.md | 4 +-
docs/windows_settings.md | 22 +++--
docs/winget.md | 8 +-
38 files changed, 108 insertions(+), 79 deletions(-)
create mode 100644 docs/image/M365appsoffice/1776379074990.png
create mode 100644 docs/image/Prerequisites/1776376971272.png
create mode 100644 docs/image/applications/1776378755854.png
create mode 100644 docs/image/appsscriptvariables/1776379026213.png
create mode 100644 docs/image/build/1776379303045.png
create mode 100644 docs/image/byoapps/1776378975827.png
create mode 100644 docs/image/drivers/1776379108391.png
create mode 100644 docs/image/drivers/1776379241359.png
create mode 100644 docs/image/hyperv_settings/1776378277110.png
create mode 100644 docs/image/monitor/1776379380344.png
create mode 100644 docs/image/quickstart/1776377145296.png
create mode 100644 docs/image/quickstart/1776377420583.png
create mode 100644 docs/image/quickstart/1776377442979.png
create mode 100644 docs/image/quickstart/1776377516879.png
create mode 100644 docs/image/quickstart/1776377592432.png
create mode 100644 docs/image/quickstart/1776377622826.png
create mode 100644 docs/image/ui_overview/1776378210391.png
create mode 100644 docs/image/updates/1776378727768.png
create mode 100644 docs/image/windows_settings/1776378316739.png
create mode 100644 docs/image/winget/1776378791094.png
create mode 100644 docs/image/winget/1776378813453.png
create mode 100644 docs/image/winget/1776378860799.png
create mode 100644 docs/image/winget/1776378878837.png
diff --git a/docs/M365appsoffice.md b/docs/M365appsoffice.md
index a73027e..99da68a 100644
--- a/docs/M365appsoffice.md
+++ b/docs/M365appsoffice.md
@@ -9,7 +9,7 @@ parent: UI Overview
---
# M365 Apps/Office
-
+
FFU Builder uses the Office Deployment Toolkit (ODT) to install Office. In the `.\FFUDevelopment\Apps\Office` folder you'll find two files:
@@ -64,6 +64,6 @@ For more information about deploying languages see: [Overview of deploying langu
## Copy Office Configuration XML
-If you want to include your own custom XML file for office, check **Copy Office Configuration XML** and browse to the location of your custom XML file. The path to your custom Office configuration XML file is stored in the `OfficeConfigXMLFile` parameter. This file gets added to the `.\FFUDevelopment\Apps\Office` folder and is referenced in the `.\FFUDevelopment\Apps\Orchestration\Install-Office.ps1` file.
+If you want to include your own custom XML file for office, check **Copy Office Configuration XML** and browse to the location of your custom XML file. The path to your custom Office configuration XML file is stored in the `OfficeConfigXMLFile` parameter. This file gets added to the `.\FFUDevelopment\Apps\Office` folder and is referenced in the `.\FFUDevelopment\Apps\Orchestration\Install-Office.ps1` file.
{% include page_nav.html %}
diff --git a/docs/applications.md b/docs/applications.md
index c1957ab..5ed9c84 100644
--- a/docs/applications.md
+++ b/docs/applications.md
@@ -10,7 +10,7 @@ has_toc: false
---
# Applications
-
+
Applications can be installed in three different ways:
diff --git a/docs/appsscriptvariables.md b/docs/appsscriptvariables.md
index a7a6845..79be4c1 100644
--- a/docs/appsscriptvariables.md
+++ b/docs/appsscriptvariables.md
@@ -10,7 +10,7 @@ grand_parent: UI Overview
---
# Apps Script Variables
-
+
Apps Script Variables are key value pairs that are used to create a hashtable that is passed to the `BuildFFUVM.ps1` script (stored in the `$AppScriptVariables` parameter as a hashtable). At build time, `BuildFFUVM.ps1` will export the `$AppsScriptVariables` hashtable to an `AppsScriptVariables.json` file in the `$OrchestrationPath` folder (`$AppsPath\Orchestration`). You can also manually create your own `AppsScriptVariables.json `file and place it in the `$AppsPath\Orchestration` folder.
@@ -45,7 +45,7 @@ In the VM, the `Orchestrator.ps1` file will call `Invoke-AppsScript.ps1` if `App
This allows for you to create a dynamic task sequence via a PowerShell script with simple if statements to run apps, commands, etc. This is all driven by your `FFUConfig.json` file. For example, the following `FFUConfig.json` file contains an AppsScriptVariables hashtable of foo and vmwaretools like the screenshot above. If you build servers that require vmware tools, you may set the value to true. However there may be situations where you don't need vmwaretools installed. If that's the case, you set vmwaretools to false. This allows for your `Invoke-AppsScript.ps1` file to stay the same and all you have to do is adjust the variables.
```
-{
+s{
"AdditionalFFUFiles": [],
"AllowExternalHardDiskMedia": false,
"AllowVHDXCaching": false,
@@ -128,6 +128,4 @@ Example command line to run with vmwaretools set to false and foo set to foo. Th
`.\BuildFFUVM.ps1 -configFile 'C:\FFUDevelopment\config\FFUConfig.json' -appsScriptVariables @{foo='foo'; vmwaretools='false'}`
-
-
{% include page_nav.html %}
diff --git a/docs/build.md b/docs/build.md
index e968463..2784f30 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -9,7 +9,7 @@ parent: UI Overview
---
# Build
-
+
The Build tab is where the magic happens
@@ -283,6 +283,12 @@ The deployment media is saved as an ISO file at `$FFUDevelopmentPath\WinPE_FFU_D
>
> If you just need to re-create deployment media, you can use the `Create-PEMedia.ps1` script to regenerate the deploy ISO without running a full build.
+### Verbose
+
+Controls the `-Verbose` common parameter. When checked, enables detailed verbose output during the build process. The default is **unchecked**.
+
+In prior builds it was necessary to enable `-verbose` output to track in real-time the build process if you didn't have `cmtrace.exe` or some other log-monitoring tool. With the UI, you can now watch the build in real-time using the monitor tab. Enabling verbose shouldn't be necessary but is available for those who wish to use it.
+
## Unattend.xml Options Expander
Use the **Unattend.xml Options** expander to choose how unattend content is staged and which source XML file FFU Builder should use for x64 and arm64 builds.
@@ -338,11 +344,11 @@ This option is primarily intended for scenarios where:
#### Limitations
-| Limitation | Description |
-| --------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **No prefixes.txt, SerialComputerNames.csv, or %serial% support** | Unlike **Copy Unattend.xml**, this method does not support `prefixes.txt`, `SerialComputerNames.csv`, or the `%serial%` variable for deployment-time device naming |
-| **Fixed configuration** | The unattend settings are baked into the FFU at build time and cannot be changed at deployment time |
-| **Requires VM to be built** | This option only works when**Install Apps** is `$true` because the unattend file is included in the Apps ISO |
+| Limitation | Description |
+| ----------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **No prefixes.txt, SerialComputerNames.csv, or %serial% support** | Unlike**Copy Unattend.xml**, this method does not support `prefixes.txt`, `SerialComputerNames.csv`, or the `%serial%` variable for deployment-time device naming |
+| **Fixed configuration** | The unattend settings are baked into the FFU at build time and cannot be changed at deployment time |
+| **Requires VM to be built** | This option only works when**Install Apps** is `$true` because the unattend file is included in the Apps ISO |
{: .note-title}
@@ -356,11 +362,23 @@ This option is primarily intended for scenarios where:
>
> If you're using this option, you can disable **Build Deploy ISO** to save time during the build process since the deployment ISO is not needed when you're not using the USB drive method.
-### Verbose
+### Copy Unattend.xml
-Controls the `-Verbose` common parameter. When checked, enables detailed verbose output during the build process. The default is **unchecked**.
+Controls the `-CopyUnattend` parameter. When checked, stages the XML file selected for the current architecture in **Unattend.xml Options** to an `Unattend` folder on the Deployment partition of the USB drive. The default is **unchecked**.
-In prior builds it was necessary to enable `-verbose` output to track in real-time the build process if you didn't have `cmtrace.exe` or some other log-monitoring tool. With the UI, you can now watch the build in real-time using the monitor tab. Enabling verbose shouldn't be necessary but is available for those who wish to use it.
+Use this option when you plan to build deployment USB media.
+
+When enabled, the build process copies:
+
+- The selected x64 or arm64 unattend XML file -> renamed to **Unattend.xml** on the USB drive
+- **prefixes.txt** -> created from the **Device Naming** prefixes list when that mode is selected
+- **SerialComputerNames.csv** -> created from the **Device Naming** serial mapping list when that mode is selected
+
+If you keep the default file paths in place, FFU Builder uses `unattend_x64.xml` for x64 builds and `unattend_arm64.xml` for arm64 builds.
+
+During deployment, `ApplyFFU.ps1` applies `Unattend.xml` whenever it is present. Device naming only happens when the **Device Naming** setting requires it, or when older media still uses the legacy prompt-based workflow.
+
+See **Device Naming Expander** below for the available computer-name modes and naming-file behavior.
## Device Naming Expander
@@ -374,7 +392,7 @@ Use the **Device Naming** expander to decide whether `ComputerName` should be se
This is the default radio selection in the UI.
- If you leave device naming untouched, FFU Builder does not write `DeviceNamingMode` to the generated config. This preserves the script's `Legacy` default, so an existing `FFUDevelopment\Unattend\prefixes.txt` file is still copied to deployment media when present.
-- If you explicitly select this option, FFU Builder writes `DeviceNamingMode = None`. The unattend file is still applied, but Windows generates a random computer name instead of forcing a prompt or a fixed name.
+- If you explicitly select this option, FFU Builder sets `DeviceNamingMode = None`. The unattend file is still applied, but Windows generates a random computer name instead of forcing a prompt or a fixed name.
The active `unattend_*.xml` files in `FFUDevelopment\Unattend` use `*` in the current sample files.
@@ -382,6 +400,7 @@ The active `unattend_*.xml` files in `FFUDevelopment\Unattend` use `*`.
- During the build, FFU Builder rewrites only the staged deployment copy of `Unattend.xml` to the legacy prompt placeholder that `ApplyFFU.ps1` already recognizes.
@@ -391,6 +410,7 @@ Use this option when you want the technician to enter the computer name during d
Use this option when you want a static device name or a template such as `Comp-%serial%`.
+- FFU Builder sets `DeviceNamingMode = Template`.
- With **Copy Unattend.xml**, `%serial%` is resolved during deployment in PE.
- With **Inject Unattend.xml**, only static names are supported.
- **Copy Unattend.xml** and **Inject Unattend.xml** are mutually exclusive. Select only one.
@@ -399,6 +419,8 @@ Use this option when you want a static device name or a template such as `Comp-%
This option writes `prefixes.txt` from the list in the UI. Enter one prefix per line in the multiline prefixes box. If there is a single prefix, deployment uses it automatically. If there are multiple prefixes, the technician is prompted to select one. The selected prefix is combined with the device serial number to create the computer name.
+- FFU Builder sets `DeviceNamingMode = Prefixes`.
+
For example, with a prefix of `CORP-` and a serial number of `ABC123`, the resulting computer name would be `CORP-ABC123` (truncated to 15 characters if necessary).
Sample `prefixes.txt` content:
@@ -427,6 +449,8 @@ Use **Save Prefixes** to write the current multiline prefixes list back to the f
This option writes `SerialComputerNames.csv` from the CSV content in the UI. Use `SerialNumber,ComputerName` as the header row, then add one row per device. During deployment, `ApplyFFU.ps1` compares the current BIOS serial number to the `SerialNumber` column and uses the matching `ComputerName` value.
+- FFU Builder sets `DeviceNamingMode = SerialComputerNames`.
+
Sample `SerialComputerNames.csv` content:
```plaintext
@@ -468,13 +492,13 @@ Older deployment media that already has an unattend file with `ComputerName` set
The `.\FFUDevelopment\Unattend` folder includes sample files you can customize:
-| File | Description |
-| -------------------------------- | ------------------------------------------ |
-| **SampleUnattend_x64.xml** | Example unattend file for x64 systems |
-| **unattend_x64.xml** | Active unattend file used for x64 builds |
-| **unattend_arm64.xml** | Active unattend file used for arm64 builds |
-| **SamplePrefixes.txt** | Example prefixes file for device naming |
-| **SampleSerialComputerNames.csv** | Example serial-to-device-name CSV file |
+| File | Description |
+| --------------------------------------- | ------------------------------------------ |
+| **SampleUnattend_x64.xml** | Example unattend file for x64 systems |
+| **unattend_x64.xml** | Active unattend file used for x64 builds |
+| **unattend_arm64.xml** | Active unattend file used for arm64 builds |
+| **SamplePrefixes.txt** | Example prefixes file for device naming |
+| **SampleSerialComputerNames.csv** | Example serial-to-device-name CSV file |
Copy and customize the sample files to create your own `unattend_x64.xml`, `unattend_arm64.xml`, `prefixes.txt`, and `SerialComputerNames.csv` files.
@@ -559,24 +583,6 @@ This option is only available when **Build USB Drive** is checked.
This leverages the Autopilot for existing devices json file. It's not recommended to use this method any longer as devices enrolled via this method are enrolled as personal instead of corporate.
-### Copy Unattend.xml
-
-Controls the `-CopyUnattend` parameter. When checked, stages the XML file selected for the current architecture in **Unattend.xml Options** to an `Unattend` folder on the Deployment partition of the USB drive. The default is **unchecked**.
-
-Use this option when you plan to build deployment USB media.
-
-When enabled, the build process copies:
-
-- The selected x64 or arm64 unattend XML file → renamed to **Unattend.xml** on the USB drive
-- **prefixes.txt** → created from the **Device Naming** prefixes list when that mode is selected
-- **SerialComputerNames.csv** → created from the **Device Naming** serial mapping list when that mode is selected
-
-If you keep the default file paths in place, FFU Builder uses `unattend_x64.xml` for x64 builds and `unattend_arm64.xml` for arm64 builds.
-
-During deployment, `ApplyFFU.ps1` applies `Unattend.xml` whenever it is present. Device naming only happens when the **Device Naming** setting requires it, or when older media still uses the legacy prompt-based workflow.
-
-See **Device Naming Expander** above for the available computer-name modes and naming-file behavior.
-
### Copy Provisioning Package
Controls the `-CopyPPKG` parameter. When checked, copies the contents of `.\FFUDevelopment\PPKG` to the `PPKG` folder on the Deployment partition of the USB drive. The default is **unchecked**.
@@ -745,7 +751,7 @@ During the build process, application content accumulates in several subfolders
| Folder | Contents |
| ----------- | ------------------------------------------------------------------------------------------------------------------------ |
-| `Win32` | Winget source applications and Bring Your Own Apps content copied using the **Copy Apps** button or manually copied |
+| `Win32` | Winget source applications and Bring Your Own Apps content copied using the**Copy Apps** button or manually copied |
| `MSStore` | Microsoft Store applications downloaded via Winget |
| `Office` | Microsoft 365 Apps installer files downloaded by the Office Deployment Tool |
diff --git a/docs/byoapps.md b/docs/byoapps.md
index 007c049..0f8d179 100644
--- a/docs/byoapps.md
+++ b/docs/byoapps.md
@@ -10,7 +10,7 @@ grand_parent: UI Overview
---
# Bring Your Own Applications
-
+
Bring Your Own Applications allows you to run any command line you want in the virtual machine to include in your FFU to install an application, run a script, etc. As the name implies, you'll provide the content, command line, arguments, and additional exit codes.
diff --git a/docs/drivers.md b/docs/drivers.md
index 34b6db2..2396b79 100644
--- a/docs/drivers.md
+++ b/docs/drivers.md
@@ -9,7 +9,7 @@ parent: UI Overview
---
# Drivers
-
+
FFU Builder supports adding drivers directly to the FFU file at build time, or adding them as folders on your USB drive which can be serviced offline after the FFU has been applied to your device.
@@ -72,7 +72,7 @@ To find the Machine Type for Lenovo devices, check the bottom/back of the device
You can multi-select different models within the same make, or mix and match different makes. The screenshot below shows different Dell, HP, Lenovo, and Microsoft models selected
-
+
## Save Drivers.json
diff --git a/docs/hyperv_settings.md b/docs/hyperv_settings.md
index 9d3e04f..bdc8b90 100644
--- a/docs/hyperv_settings.md
+++ b/docs/hyperv_settings.md
@@ -9,7 +9,7 @@ parent: UI Overview
---
# Hyper-V Settings
-
+
## Enable VM Networking (Experimental)
diff --git a/docs/image/M365appsoffice/1776379074990.png b/docs/image/M365appsoffice/1776379074990.png
new file mode 100644
index 0000000000000000000000000000000000000000..85838dc01691dd4bc03ab260e13b284fd0d16d02
GIT binary patch
literal 170168
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