Skip to content

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

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 19 commits into
base: main
Choose a base branch
from
+9 −10
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2204b09
Bumped tooling pointer to latest PR draft
Arlodotexe May 13, 2026
f1d760d
Bumped runner to windows-2025 and added build step for Windows SDK in…
Arlodotexe May 13, 2026
b19c5d2
Updated tooling to latest main
Arlodotexe May 13, 2026
ff36457
Migrate remaining mentions of windows-2022 to windows-2025
Arlodotexe May 15, 2026
b3b0b5e
Upgraded to large runners per https://github.com/CommunityToolkit/Win…
Arlodotexe May 15, 2026
e1844f8
Use non-'large' runner for Xaml-Style-Check job
Arlodotexe May 15, 2026
49e87bf
Use 'windows-latest-large' until 'windows-2025-large' is available
Arlodotexe May 15, 2026
77db4ee
Revert "Use 'windows-latest-large' until 'windows-2025-large' is avai…
Arlodotexe May 15, 2026
8893010
Bumped tooling to latest PR branch
Arlodotexe Sep 11, 2026
e4e834a
bump uno-check to 1.34.1
Arlodotexe Sep 11, 2026
66fbd9c
Pin uno-check manifest to enable installing net9 workloads until net1…
Arlodotexe Sep 11, 2026
33937f4
Remove ISO-based Windows SDK installer, rely on runner image inbox Wi…
Arlodotexe Sep 11, 2026
8bd8bd3
Revert uno-check manifest pinning, didn't work
Arlodotexe Sep 11, 2026
a2b0242
Bump tooling to latest PR version
Arlodotexe Sep 11, 2026
97c7cf0
Pin tooling submodule to .NET 10 PR branch
Sergio0694 Sep 16, 2026
4d57fd7
Update slngen to 12.0.32
Arlodotexe Sep 16, 2026
cac5a2a
Update global.json to .NET 10.0.401
Arlodotexe Sep 16, 2026
de3fab5
Update tooling pointer and .NET SDK to 10.0.402
Sergio0694 Oct 20, 2026
a33b855
Avoid recursive disconnection in the TextBox lifetime test
Sergio0694 Oct 26, 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
4 changes: 2 additions & 2 deletions .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 All @@ -15,7 +15,7 @@
]
},
"microsoft.visualstudio.slngen.tool": {
"version": "12.0.13",
"version": "12.0.32",
"commands": [
"slngen"
]
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,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:
Expand Down Expand Up @@ -78,7 +78,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

env:
PROCDUMP_PATH: ${{ github.workspace }}
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
dotnet-dump analyze ${{ steps.detect-dump.outputs.DUMP_FILE }} -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 @@ -351,7 +351,7 @@ jobs:
sign:
needs: [package]
if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/rel/') }}
runs-on: windows-2022
runs-on: windows-2025-large
permissions:
id-token: write # Required for requesting the JWT

Expand Down
3 changes: 1 addition & 2 deletions components/Extensions/tests/Element/FrameworkElementExtensionsTests.RelativeAncestor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ public async Task FrameworkElementExtension_RelativeAncestor_FreeParentBaseline(

Assert.IsNotNull(parent, "Couldn't find parent Grid");

// Remove all the children from the grid to simulate it unloading.
VisualTreeHelper.DisconnectChildrenRecursive(parent);
// Let templated controls tear down their internal visual trees through normal unloading.
parent.Children.Clear();
parent = null;

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