Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .buildkite/pipeline-windows-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ steps:
steps:
- label: ":windows: install_windows_10_sdk Tests - Version file with valid format and version"
command: |
"20348" | Out-File .windows-10-sdk-version
"19041" | Out-File .windows-10-sdk-version
.\tests\test_install_windows_10_sdk.ps1 -ExpectedExitCode 0
agents:
queue: windows
Expand All @@ -26,7 +26,7 @@ steps:

- label: ":windows: install_windows_10_sdk Tests - Version file with one new line"
command: |
"20348`n" | Out-File .windows-10-sdk-version
"19041`n" | Out-File .windows-10-sdk-version
.\tests\test_install_windows_10_sdk.ps1 -ExpectedExitCode 0
agents:
queue: windows
Expand All @@ -36,7 +36,7 @@ steps:

- label: ":windows: install_windows_10_sdk Tests - Version file with more than one new line"
command: |
"20348`n`n" | Out-File .windows-10-sdk-version
"19041`n`n" | Out-File .windows-10-sdk-version
.\tests\test_install_windows_10_sdk.ps1 -ExpectedExitCode 0
agents:
queue: windows
Expand All @@ -56,7 +56,7 @@ steps:

- label: ":windows: install_windows_10_sdk Tests - Version file with trailing whitespaces"
command: |
"18362 " | Out-File .windows-10-sdk-version
"19041 " | Out-File .windows-10-sdk-version
.\tests\test_install_windows_10_sdk.ps1 -ExpectedExitCode 0
agents:
queue: windows
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ _None._

### Internal Changes

_None._
- Windows 10 SDKs are now limited to version 19041 due to availability from Microsoft. [#188]

## 5.5.0

Expand Down
11 changes: 2 additions & 9 deletions bin/install_windows_10_sdk.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#
# Example:
#
# 20348
# 19041

param (
[switch]$DryRun = $false,
Expand All @@ -25,14 +25,7 @@ Write-Output "--- :windows: Installing Windows 10 SDK and Visual Studio Build To

# See list at https://learn.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022
$allowedVersions = @(
"20348",
"19041",
"18362",
"17763",
"17134",
"16299",
"15063",
"14393"
"19041"
Copy link
Contributor

Choose a reason for hiding this comment

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

❓ Are we sure all those other versions should be removed from the allowlist, not just 20348?

In other words, have you tested each single one of those and removed them all because you validated that 19041 was indeed the only one remaining valid? Or did you remove them all just because you considered it was not worth the effort for us to allow/support those older versions and didn't want to bother?

(I'm fine with either, just curious)

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we could go for something like:

$allowedVersions = @(
    # Windows 11 SDK
    "22621",
    "22000", 
    # Windows 10 SDK
    "19041",
    "18362"
)

As these are the Windows SDK versions that are included in the workload "WinUI application development build tools".

Copy link
Contributor

Choose a reason for hiding this comment

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

(I know Windows 11 choices would make it fail as is but it's something to iterate on later)

Copy link
Contributor Author

@twstokes twstokes Aug 6, 2025

Choose a reason for hiding this comment

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

This was mainly because I don't think they're available either judging by only 19041 showing when searching with the GUI. I also don't think it's worth the effort to support them, although going forward I can see where we'd keep 19041 and then start adding Windows 11 SDKs.

Screenshot 2025-08-05 at 20 40 50

Copy link
Contributor

Choose a reason for hiding this comment

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

Ahh got it 👍 makes sense.

)

$windowsSDKVersionFile = ".windows-10-sdk-version"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_prepare_windows_host_for_app_distribution.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Write-Output "`n--- Test 1: Skip SDK installation without native tools"
Remove-TestFiles

# Create a valid SDK version file to ensure it's not being used when skip is set
$sdkVersion = "20348"
$sdkVersion = "19041"
"$sdkVersion" | Out-File .windows-10-sdk-version

$output = & "$PSScriptRoot\..\bin\prepare_windows_host_for_app_distribution.ps1" -SkipWindows10SDKInstallation
Expand Down
Loading