Skip to content

Upgrade runner image to windows-2025, use only 26100 Windows SDK #316

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

Merged
Sergio0694 merged 9 commits into from
Sep 11, 2026
Merged

Upgrade runner image to windows-2025, use only 26100 Windows SDK #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2bbe828
Initial copy-over of Windows SDK installer script from 7x repo at htt…
Arlodotexe May 13, 2026
839fa23
Bumped runner to windows-2025 and added build step for Windows SDK in…
Arlodotexe May 13, 2026
748db76
Fix UWP and WASDK configurations overlapping when they share exact TFMs
Arlodotexe Sep 11, 2026
8e49764
Update WASDK TFMs to 26100
Arlodotexe Sep 11, 2026
32eb810
bump uno-check to 1.34.1
Arlodotexe Sep 11, 2026
de64322
Remove ISO-based Windows SDK installer, rely on runner image inbox Wi…
Arlodotexe Sep 11, 2026
d6d9bdf
Remove ISO-based Windows SDK installer, rely on runner image inbox Wi…
Arlodotexe Sep 11, 2026
d0c1e8e
Update build requirements in readme
Arlodotexe Sep 11, 2026
248a440
Merge branch 'main' into check,ci/runner,images,github,actions/improv…
Arlodotexe Sep 11, 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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"uno.check": {
"version": "1.33.1",
"version": "1.34.1",
"commands": [
"uno-check"
]
Expand Down
2 changes: 1 addition & 1 deletion MultiTarget/AvailableTargetFrameworks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<!-- We also include 'net9.0-windows10.0.26100.0' explicitly for UWP as a workaround for https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/238 -->
<UwpTargetFrameworks Condition="'$(UwpTargetFrameworks)' == '' AND '$(BuildingInsideVisualStudio)' != 'true'">uap10.0.17763;net8.0-windows10.0.26100.0;net9.0-windows10.0.26100.0;</UwpTargetFrameworks>
<WinAppSdkTargetFrameworks Condition="'$(WinAppSdkTargetFrameworks)' == ''">net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;</WinAppSdkTargetFrameworks>
<WinAppSdkTargetFrameworks Condition="'$(WinAppSdkTargetFrameworks)' == ''">net9.0-windows10.0.26100.0;net8.0-windows10.0.26100.0;</WinAppSdkTargetFrameworks>

<WasmHeadTargetFramework Condition="'$(WasmHeadTargetFramework)' == ''">net9.0;</WasmHeadTargetFramework>
<LinuxHeadTargetFramework Condition="'$(LinuxHeadTargetFramework)' == ''">net9.0;</LinuxHeadTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions MultiTarget/MultiTargetIdentifiers.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<IsGtkLib Condition="'$(IsGtkLib)' == '' AND $(LinuxLibTargetFrameworks.Contains('$(TargetFramework);')) AND '$(LinuxLibTargetFrameworks)' != '' AND '$(MultiTargetsLinuxGtk)' == 'true'">true</IsGtkLib>
<IsGtk Condition="'$(IsGtk)' == '' AND ('$(IsGtkHead)' == 'true' or '$(IsGtkLib)' == 'true')">true</IsGtk>

<IsUwp Condition="'$(IsUwp)' == '' AND $(UwpTargetFrameworks.Contains('$(TargetFramework);')) AND '$(UwpTargetFrameworks)' != '' AND '$(MultiTargetsUwp)' == 'true'">true</IsUwp>
<IsWinAppSdk Condition="'$(IsWinAppSdk)' == '' AND $(WinAppSdkTargetFrameworks.Contains('$(TargetFramework);')) AND '$(WinAppSdkTargetFrameworks)' != '' AND '$(MultiTargetsWasdk)' == 'true'">true</IsWinAppSdk>
<IsUwp Condition="'$(IsUwp)' == '' AND '$(UwpTargetFrameworks)' != '' AND $(UwpTargetFrameworks.Contains('$(TargetFramework);')) AND '$(MultiTargetsUwp)' == 'true' AND $(EnabledMultiTargets.Contains('uwp'))">true</IsUwp>
<IsWinAppSdk Condition="'$(IsWinAppSdk)' == '' AND '$(WinAppSdkTargetFrameworks)' != '' AND $(WinAppSdkTargetFrameworks.Contains('$(TargetFramework);')) AND '$(MultiTargetsWasdk)' == 'true' AND $(EnabledMultiTargets.Contains('wasdk'))">true</IsWinAppSdk>

<MultiTargetPlatformIdentifier Condition="'$(MultiTargetPlatformIdentifier)' == ''">$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</MultiTargetPlatformIdentifier>

Expand Down
6 changes: 3 additions & 3 deletions ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading