From 2bbe828c07167fd44936a2c534009ae896bb4874 Mon Sep 17 00:00:00 2001 From: Arlo Date: Tue, 12 May 2026 23:17:45 -0500 Subject: [PATCH 1/8] Initial copy-over of Windows SDK installer script from 7x repo at https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/c8f76d072df53d3622fb5440d63afb06cb9e7a10/build/Install-WindowsSDK.ps1 --- Install-WindowsSdk.ps1 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Install-WindowsSdk.ps1 diff --git a/Install-WindowsSdk.ps1 b/Install-WindowsSdk.ps1 new file mode 100644 index 00000000..afeb2db2 --- /dev/null +++ b/Install-WindowsSdk.ps1 @@ -0,0 +1,10 @@ + +$WinSdkTempDir = "C:\WinSdkTemp\" +$WinSdkSetupExe = "C:\WinSdkTemp\" + "WinSdkSetup.exe" + +mkdir $WinSdkTempDir + +$client = [System.Net.WebClient]::new() +$client.DownloadFile("https://go.microsoft.com/fwlink/p/?linkid=870807", $WinSdkSetupExe) + +Start-Process -Wait $WinSdkSetupExe "/features OptionId.UWPCpp /q" \ No newline at end of file From 839fa23e4820bb14a3d1858fd529b63a6ad5afdb Mon Sep 17 00:00:00 2001 From: Arlo Date: Tue, 12 May 2026 23:17:45 -0500 Subject: [PATCH 2/8] Bumped runner to windows-2025 and added build step for Windows SDK installation --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13d5215d..cd675f0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ env: jobs: # This workflow contains a single job called "Xaml-Style-Check" Xaml-Style-Check: - runs-on: windows-2022 + runs-on: windows-2025 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -191,6 +191,10 @@ jobs: copy ./tooling/.config/dotnet-tools.json ./.config/dotnet-tools.json mkdir ./components + - name: Install Windows SDKs + shell: pwsh + run: ./tooling/Install-WindowsSdk.ps1 + - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 From 748db767d51ade9a05f610800f21b252a7589893 Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 11 Sep 2026 15:47:19 -0500 Subject: [PATCH 3/8] Fix UWP and WASDK configurations overlapping when they share exact TFMs --- MultiTarget/MultiTargetIdentifiers.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props index ff961168..47c8eb48 100644 --- a/MultiTarget/MultiTargetIdentifiers.props +++ b/MultiTarget/MultiTargetIdentifiers.props @@ -37,8 +37,8 @@ true true - true - true + true + true $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) From 8e49764bf73490fe737979fad90ae5f59aefdf40 Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 11 Sep 2026 15:47:24 -0500 Subject: [PATCH 4/8] Update WASDK TFMs to 26100 --- MultiTarget/AvailableTargetFrameworks.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props index 02f9d9aa..1c02bc51 100644 --- a/MultiTarget/AvailableTargetFrameworks.props +++ b/MultiTarget/AvailableTargetFrameworks.props @@ -10,7 +10,7 @@ uap10.0.17763;net8.0-windows10.0.26100.0;net9.0-windows10.0.26100.0; - net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0; + net9.0-windows10.0.26100.0;net8.0-windows10.0.26100.0; net9.0; net9.0; From 32eb8107e862cfeffdee23993bea3a5b9dc5d87c Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 11 Sep 2026 16:18:51 -0500 Subject: [PATCH 5/8] bump uno-check to 1.34.1 --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1c15e1f1..c67b543c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "uno.check": { - "version": "1.33.1", + "version": "1.34.1", "commands": [ "uno-check" ] From de643221cb8c7f6f5680cad93659c85b9a06e378 Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 11 Sep 2026 17:20:53 -0500 Subject: [PATCH 6/8] Remove ISO-based Windows SDK installer, rely on runner image inbox Windows SDKs --- Install-WindowsSdk.ps1 | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Install-WindowsSdk.ps1 diff --git a/Install-WindowsSdk.ps1 b/Install-WindowsSdk.ps1 deleted file mode 100644 index afeb2db2..00000000 --- a/Install-WindowsSdk.ps1 +++ /dev/null @@ -1,10 +0,0 @@ - -$WinSdkTempDir = "C:\WinSdkTemp\" -$WinSdkSetupExe = "C:\WinSdkTemp\" + "WinSdkSetup.exe" - -mkdir $WinSdkTempDir - -$client = [System.Net.WebClient]::new() -$client.DownloadFile("https://go.microsoft.com/fwlink/p/?linkid=870807", $WinSdkSetupExe) - -Start-Process -Wait $WinSdkSetupExe "/features OptionId.UWPCpp /q" \ No newline at end of file From d6d9bdf15ec43eb3139483761509b10849d0cb84 Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 11 Sep 2026 17:29:00 -0500 Subject: [PATCH 7/8] Remove ISO-based Windows SDK installer, rely on runner image inbox Windows SDKs --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd675f0d..d0b85902 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -191,10 +191,6 @@ jobs: copy ./tooling/.config/dotnet-tools.json ./.config/dotnet-tools.json mkdir ./components - - name: Install Windows SDKs - shell: pwsh - run: ./tooling/Install-WindowsSdk.ps1 - - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 From d0c1e8e65ccf152a53f015dc40050e925e81f229 Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 11 Sep 2026 17:37:30 -0500 Subject: [PATCH 8/8] Update build requirements in readme --- ReadMe.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index c935fdd8..a8b0ee4f 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -7,10 +7,10 @@ This repository contains the tooling infrastructure for other Community Toolkit ## Build Requirements -- Visual Studio 2022 (UWP & Desktop Workloads for .NET) -- .NET 6 SDK +- Visual Studio 2026 (UWP & Desktop Workloads for .NET) +- .NET 9 SDK - Windows App SDK -- Windows SDK 19041 +- Windows SDK 26100 ## 📄 Code of Conduct