Skip to content

Commit ebb5ee2

Browse files
authored
Merge pull request #316 from CommunityToolkit/check,ci/runner,images,github,actions/improvement/windows-2025,upgrade,windows-sdks/5.12.2026,arlodotexe
Upgrade runner image to windows-2025, use only 26100 Windows SDK
2 parents 2c6819d + 248a440 commit ebb5ee2

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"uno.check": {
6-
"version": "1.33.1",
6+
"version": "1.34.1",
77
"commands": [
88
"uno-check"
99
]

‎MultiTarget/AvailableTargetFrameworks.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<!-- 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 -->
1212
<UwpTargetFrameworks Condition="'$(UwpTargetFrameworks)' == '' AND '$(BuildingInsideVisualStudio)' != 'true'">uap10.0.17763;net8.0-windows10.0.26100.0;net9.0-windows10.0.26100.0;</UwpTargetFrameworks>
13-
<WinAppSdkTargetFrameworks Condition="'$(WinAppSdkTargetFrameworks)' == ''">net9.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;</WinAppSdkTargetFrameworks>
13+
<WinAppSdkTargetFrameworks Condition="'$(WinAppSdkTargetFrameworks)' == ''">net9.0-windows10.0.26100.0;net8.0-windows10.0.26100.0;</WinAppSdkTargetFrameworks>
1414

1515
<WasmHeadTargetFramework Condition="'$(WasmHeadTargetFramework)' == ''">net9.0;</WasmHeadTargetFramework>
1616
<LinuxHeadTargetFramework Condition="'$(LinuxHeadTargetFramework)' == ''">net9.0;</LinuxHeadTargetFramework>

‎MultiTarget/MultiTargetIdentifiers.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<IsGtkLib Condition="'$(IsGtkLib)' == '' AND $(LinuxLibTargetFrameworks.Contains('$(TargetFramework);')) AND '$(LinuxLibTargetFrameworks)' != '' AND '$(MultiTargetsLinuxGtk)' == 'true'">true</IsGtkLib>
3838
<IsGtk Condition="'$(IsGtk)' == '' AND ('$(IsGtkHead)' == 'true' or '$(IsGtkLib)' == 'true')">true</IsGtk>
3939

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

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

‎ReadMe.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ This repository contains the tooling infrastructure for other Community Toolkit
77

88
## Build Requirements
99

10-
- Visual Studio 2022 (UWP & Desktop Workloads for .NET)
11-
- .NET 6 SDK
10+
- Visual Studio 2026 (UWP & Desktop Workloads for .NET)
11+
- .NET 9 SDK
1212
- Windows App SDK
13-
- Windows SDK 19041
13+
- Windows SDK 26100
1414

1515
## 📄 Code of Conduct
1616

0 commit comments

Comments
 (0)