Skip to content

[Windows] Add Windows 11 SDK version 10.0.28000 #14208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
v-sergei-pyshnoi wants to merge 16 commits into
base: main
Choose a base branch
from
+50 −7
Open

[Windows] Add Windows 11 SDK version 10.0.28000 #14208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1dda146
Add Windows 11 SDK version 10.0.28000 support and update related tests
Jun 9, 2026
a1cbe8e
Add debug output for installed Visual Studio components in tests
Jun 10, 2026
37d693e
Remove Windows 11 SDK version 10.0.28000 from toolsets configuration …
Jun 10, 2026
43a6a10
Remove deprecated Windows SDK components from toolset configuration f…
Jun 11, 2026
4d86518
Add cleanup for downloaded installer in Install-Binary function
Jun 15, 2026
895f220
Add logging and error handling for Chocolatey installation of LLVM
Jun 15, 2026
b878b39
Move LLVM installation order
Jun 16, 2026
b16f361
Refactor LLVM installation script by removing redundant logging and e…
Jun 16, 2026
e12aaef
Remove debug logging for disk free space check before LLVM installation
Jun 17, 2026
d15440e
Update LLVM installation order
Jun 17, 2026
ec5e3c0
Add Windows SDK components for Visual Studio installations
Jun 17, 2026
e2d4264
Skip test for Windows 11 SDK 28000 installation on unsupported archit…
Jun 17, 2026
bbf74aa
Add logging for temporary directories size and free disk space
Jun 18, 2026
d0ce85d
Remove logging for temporary directories and free disk space; add cle…
Jun 18, 2026
4e3d88d
Add disk space logging before Windows updates; increase restart timeo…
Jun 19, 2026
0dc2e5b
Add cleanup for installer temp directory and update Windows SDK compo…
Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions images/windows/scripts/build/Install-VisualStudio.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ Install-Binary -Type EXE `
-InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") `
-ExpectedSubject $(Get-MicrosoftPublisher)

if (-not (Test-IsWin22-X64)) {
# Install Windows 11 SDK version 10.0.28000
Install-Binary -Type EXE `
-Url 'https://go.microsoft.com/fwlink/?linkid=2366211' `
-InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") `
-ExpectedSubject $(Get-MicrosoftPublisher)
Comment on lines +52 to +56

@R1r3Br33d R1r3Br33d Jul 12, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mune

}

# Enable Windows Desktop Debuggers (cdb.exe) on Windows Server 2025
if (Test-IsWin25-X64) {
$installerEntry = Get-ItemProperty HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\* `
Expand All @@ -62,4 +70,11 @@ if (Test-IsWin25-X64) {
}
}

# Clean installer temp directory
$installerTempPath = "$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp"
if (Test-Path $installerTempPath) {
Write-Host "Cleaning $installerTempPath"
Remove-Item -Path "$installerTempPath\*" -Recurse -Force -ErrorAction SilentlyContinue
}

Invoke-PesterTests -TestFile "VisualStudio"
15 changes: 15 additions & 0 deletions images/windows/scripts/build/Install-WindowsUpdates.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@
## Should be run at end, just before SoftwareReport and Finalize-VM.ps1.
################################################################################

# Clean installer temp directory
$installerTempPath = "$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp"
if (Test-Path $installerTempPath) {
Write-Host "Cleaning $installerTempPath"
Remove-Item -Path "$installerTempPath\*" -Recurse -Force -ErrorAction SilentlyContinue
}

Write-Host "Disk space before windows updates"
Get-CimInstance Win32_LogicalDisk -Filter "DriveType = 3" | Sort-Object DeviceID | ForEach-Object {
$totalSpaceGb = [Math]::Round($_.Size / 1GB, 2)
$freeSpaceGb = [Math]::Round($_.FreeSpace / 1GB, 2)
$usedSpaceGb = [Math]::Round(($_.Size - $_.FreeSpace) / 1GB, 2)
Write-Host ("Drive {0}: used {1} GB, free {2} GB, total {3} GB" -f $_.DeviceID, $usedSpaceGb, $freeSpaceGb, $totalSpaceGb)
}

function Install-WindowsUpdates {
Write-Host "Starting wuauserv"
Start-Service -Name wuauserv -PassThru | Out-Host
Expand Down
9 changes: 9 additions & 0 deletions images/windows/scripts/helpers/InstallHelpers.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ function Install-Binary {
[String] $InstallerLogPath
)

$downloadedInstallerPath = $null

if ($PSCmdlet.ParameterSetName -eq "LocalPath") {
if (-not (Test-Path -Path $LocalPath)) {
throw "LocalPath parameter is specified, but the file does not exist."
Expand All @@ -76,6 +78,7 @@ function Install-Binary {
$fileName = [System.IO.Path]::GetFileNameWithoutExtension([System.IO.Path]::GetRandomFileName()) + ".$Type".ToLower()
}
$filePath = Invoke-DownloadWithRetry -Url $Url -Path "${env:TEMP_DIR}\$fileName"
$downloadedInstallerPath = $filePath
}

if ($PSBoundParameters.ContainsKey('ExpectedSubject')) {
Expand Down Expand Up @@ -122,8 +125,14 @@ function Install-Binary {
$installCompleteTime = [math]::Round(($(Get-Date) - $installStartTime).TotalSeconds, 2)
if ($exitCode -eq 0) {
Write-Host "Installation successful in $installCompleteTime seconds"
if ($downloadedInstallerPath -and (Test-Path -Path $downloadedInstallerPath)) {
Remove-Item -Path $downloadedInstallerPath -Force -ErrorAction SilentlyContinue
}
} elseif ($exitCode -eq 3010) {
Write-Host "Installation successful in $installCompleteTime seconds. Reboot is required."
if ($downloadedInstallerPath -and (Test-Path -Path $downloadedInstallerPath)) {
Remove-Item -Path $downloadedInstallerPath -Force -ErrorAction SilentlyContinue
}
} else {
Write-Host "Installation process returned unexpected exit code: $exitCode"
Write-Host "Time elapsed: $installCompleteTime seconds"
Expand Down
4 changes: 4 additions & 0 deletions images/windows/scripts/tests/VisualStudio.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,8 @@ Describe "Windows 11 SDK" {
It "Verifies 26100 SDK is installed" {
"${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.26100.0\UAP.props" | Should -Exist
}

It "Verifies 28000 SDK is installed" -Skip:(Test-IsWin22-X64) {
"${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.28000.0\UAP.props" | Should -Exist
}
}
2 changes: 1 addition & 1 deletion images/windows/templates/build.windows-11-vs2026-arm64.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ build {

provisioner "windows-restart" {
check_registry = true
restart_timeout = "10m"
restart_timeout = "30m"
}

provisioner "powershell" {
Expand Down
6 changes: 3 additions & 3 deletions images/windows/templates/build.windows-2025-vs2026.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ build {
environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}", "INSTALL_VS_2026=true"]
scripts = [
"${path.root}/../scripts/build/Install-VisualStudio.ps1",
"${path.root}/../scripts/build/Install-KubernetesTools.ps1"
"${path.root}/../scripts/build/Install-KubernetesTools.ps1",
"${path.root}/../scripts/build/Install-LLVM.ps1",
]
valid_exit_codes = [0, 3010]
}
Expand Down Expand Up @@ -198,8 +199,7 @@ build {
"${path.root}/../scripts/build/Configure-DynamicPort.ps1",
"${path.root}/../scripts/build/Configure-GDIProcessHandleQuota.ps1",
"${path.root}/../scripts/build/Configure-Shell.ps1",
"${path.root}/../scripts/build/Configure-DeveloperMode.ps1",
"${path.root}/../scripts/build/Install-LLVM.ps1"
"${path.root}/../scripts/build/Configure-DeveloperMode.ps1"
]
}

Expand Down
6 changes: 3 additions & 3 deletions images/windows/templates/build.windows-2025.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ build {
environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [
"${path.root}/../scripts/build/Install-VisualStudio.ps1",
"${path.root}/../scripts/build/Install-KubernetesTools.ps1"
"${path.root}/../scripts/build/Install-KubernetesTools.ps1",
"${path.root}/../scripts/build/Install-LLVM.ps1"
]
valid_exit_codes = [0, 3010]
}
Expand Down Expand Up @@ -198,8 +199,7 @@ build {
"${path.root}/../scripts/build/Configure-DynamicPort.ps1",
"${path.root}/../scripts/build/Configure-GDIProcessHandleQuota.ps1",
"${path.root}/../scripts/build/Configure-Shell.ps1",
"${path.root}/../scripts/build/Configure-DeveloperMode.ps1",
"${path.root}/../scripts/build/Install-LLVM.ps1"
"${path.root}/../scripts/build/Configure-DeveloperMode.ps1"
]
}

Expand Down
Loading