Skip to content

Upgrade to .NET 10, runner images to windows-2025, use only 26100 Windows SDK #805

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
Arlodotexe wants to merge 12 commits into
base: main
Choose a base branch
from
+16 −20
Open

Upgrade to .NET 10, runner images to windows-2025, use only 26100 Windows SDK #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fca7199
Migrate remaining mentions of windows-2022 to windows-2025
Arlodotexe May 15, 2026
49fa9ca
Upgraded to large runners per https://github.com/CommunityToolkit/Win…
Arlodotexe May 15, 2026
1045fd8
Use non-'large' runner for Xaml-Style-Check job
Arlodotexe May 15, 2026
2da2c9c
Use 'windows-latest-large' until 'windows-2025-large' is available
Arlodotexe May 15, 2026
615fe24
Revert "Use 'windows-latest-large' until 'windows-2025-large' is avai…
Arlodotexe May 15, 2026
fcd5fe8
Remove manual Windows SDK install from CI, use only preinstalled 2610…
Arlodotexe May 19, 2026
9fd245a
Bump tooling pointer to include ISO-based SDK installer
Arlodotexe May 19, 2026
64b95a7
Use ISO-based Windows SDK installer in CI, target 19041
Arlodotexe May 19, 2026
957b8c3
Update tooling submodule to PR 315 head
Sergio0694 Sep 16, 2026
4a935eb
Remove experimental "Install Windows SDKs" CI step
Arlodotexe Sep 16, 2026
4893424
Update slngen to 12.0.32
Arlodotexe Sep 16, 2026
cfe6bc1
Update global.json to .NET 10.0.401
Arlodotexe Sep 16, 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 @@ -15,7 +15,7 @@
]
},
"microsoft.visualstudio.slngen.tool": {
"version": "12.0.13",
"version": "12.0.32",
"commands": [
"slngen"
]
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
# Build both Uno.UI/WinUI2/UWP and Uno.WinUI/WinUI3/WindowsAppSDK versions of our packages using a matrix
build:
needs: [Xaml-Style-Check]
runs-on: windows-2022
runs-on: windows-2025-large

# See https://docs.github.com/actions/using-jobs/using-a-matrix-for-your-jobs
strategy:
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
--skip vswinworkloads
--skip vswin
--verbose

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2
if: ${{ env.HAS_BUILDABLE_COMPONENTS == 'true' }}
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
dotnet-dump analyze ${{ steps.filter.outputs.dump_files }} -c "clrstack" -c "pe -lines" -c "exit"

package:
runs-on: windows-2022
runs-on: windows-2025-large
needs: [build]
strategy:
fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion.
Expand Down Expand Up @@ -310,10 +310,6 @@ jobs:
--skip vswin
--verbose

- name: Install Windows SDKs
shell: pwsh
run: ./tooling/Install-WindowsSdk.ps1

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2
with:
Expand Down Expand Up @@ -391,7 +387,7 @@ jobs:
sign:
needs: [package]
if: ${{ startsWith(github.ref, 'refs/heads/rel/') || startsWith(github.ref, 'refs/tags/') }}
runs-on: windows-2022
runs-on: windows-2025
permissions:
id-token: write # Required for requesting the JWT

Expand Down
20 changes: 10 additions & 10 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"sdk": {
"version": "9.0.310",
"rollForward": "latestFeature"
},
"msbuild-sdks":
{
"MSBuild.Sdk.Extras":"3.0.23"
}
}
{
"sdk": {
"version": "10.0.401",
"rollForward": "latestFeature"
},
"msbuild-sdks":
{
"MSBuild.Sdk.Extras":"3.0.23"
}
}
2 changes: 1 addition & 1 deletion tooling
Open in desktop
Submodule tooling updated 11 files
+3 −3 .config/dotnet-tools.json
+8 −7 .devcontainer/Dockerfile
+1 −3 .devcontainer/devcontainer.json
+10 −8 .github/workflows/build.yml
+1 −1 MultiTarget/AvailableTargetFrameworks.props
+2 −2 MultiTarget/MultiTargetIdentifiers.props
+11 −0 ProjectHeads/App.Head.Wasm.props
+3 −3 ReadMe.md
+1 −1 ToolkitComponent.SampleProject.props
+1 −1 ToolkitComponent.SourceProject.props
+2 −2 global.json
Loading