Skip to content

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

Merged
Arlodotexe merged 20 commits into
mainfrom
user/sergiopedri/refresh-net-10-pr
Oct 27, 2026
Merged

Arlodotexe merged 20 commits into
mainfrom
user/sergiopedri/refresh-net-10-pr

Conversation

@Sergio0694

@Sergio0694 Sergio0694 commented Oct 26, 2026 •

Copy link
Copy Markdown
Member

Fixes

Replaces the closed #852 with the same changes on a separate branch, so GitHub can create fresh checks instead of retaining the stale external Testspace status. This is a PR recreation, not a new issue fix or a change to Testspace configuration. The branch points directly to #852's original head, bd6d1efeccaea972b6d84d8d89707b8ab74f728c: all 20 original commit objects, hashes, authors, timestamps, messages, and parent relationships are preserved without cherry-picking or rewriting them.

PR Type

What kind of change does this PR introduce?

What is the current behavior?

The original #852 was blocked by stale external Testspace reporting. At the original branch point, the root SDK is .NET 9, the Windows CI jobs use windows-2022, and Release builds pin NuGet.Build.Tasks.Pack 6.12.1. The old TextBox lifetime test recursively disconnects its visual tree, which can cause delayed native teardown failures.

What is the new behavior?

The final diff is identical to #852: six files changed, 9 insertions and 11 deletions.

  • Use .NET SDK 10.0.402 and tooling commit f02adf9e2d1ec1fd4865116bc786e217298985af from the merged CommunityToolkit/Tooling-Windows-Submodule#315, including its Windows SDK 26100 configuration.
  • Use windows-2025 for XAML styling and windows-2025-large for the Windows build, package, and signing jobs. Rely on the runner's inbox Windows SDKs; no ISO-based SDK installer is added.
  • Update uno.check to 1.34.1 and SlnGen to 12.0.32.
  • Let the TextBox unload normally by clearing its owning collection instead of recursively disconnecting its internal visual tree.
  • Remove the old Release-only pack-task pin so restore and pack use compatible SDK-provided NuGet tasks.

No additional implementation or Testspace changes are introduced by this recreation. The original PR stays closed and its branch remains unchanged.

PR Checklist

Please check if your PR fulfills the following requirements:

  • Created a feature/dev branch in your fork (vs. submitting directly from a commit on main)
  • Based off latest main branch of toolkit
  • Tested code with current supported SDKs
  • New component
    • Documentation has been added
    • Sample in sample app has been added
    • Analyzers are passing for documentation and samples
    • Icon has been created (if new sample) following the Thumbnail Style Guide and templates
  • Tests for the changes have been added (if applicable)
  • Header has been added to all new source files
  • Contains NO breaking changes

Other information

This is a separate feature branch in the upstream repository, not a fork. No new components, source files, or tests are added beyond the original changes; the corresponding checklist items are not applicable.

The original history has been restored directly as requested in review. Its branch point is 34a57f969bf7966e0a3cbe9d4d10a47758d097a0. main has since advanced to 25567617499ca5e5bd82fc0414a5b7aed29c12bc; the original commits have not been rebased or merged with those later changes.

Validation performed after restoring the original history:

  • git rev-parse HEAD origin/pr852-source — passed; both resolve to the original head bd6d1efeccaea972b6d84d8d89707b8ab74f728c.
  • git rev-list --reverse 34a57f969bf7966e0a3cbe9d4d10a47758d097a0..HEAD and the same command using origin/pr852-source — passed; all 20 commit hashes match in order, not merely their patches.
  • git diff --exit-code bd6d1efeccaea972b6d84d8d89707b8ab74f728c HEAD — passed; identical final tree, 5cd3e627d8e26d3a466a8a419d5e7f41fb412375.
  • git ls-remote origin refs/heads/user/sergiopedri/refresh-net-10-pr — passed; remote branch points to the original head. GitHub also confirms this PR's head and its 20 commits, six changed files, 9 insertions, and 11 deletions.
  • git status --porcelain — passed; clean worktree.

The documented build/test workflow in ReadMe.md and .github/workflows/build.yml was inspected. Builds and tests were not rerun locally for this history-only correction; no new CI success is claimed.

Arlodotexe and others added 20 commits October 20, 2026 12:20
Use commit 0b619e9e9f10222b5857dc3a0bedb3870ee901de from CommunityToolkit/Tooling-Windows-Submodule#315 for end-to-end validation before merging.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Pin tooling to the latest commit from CommunityToolkit/Tooling-Windows-Submodule#315 and match its .NET SDK version.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Remove test children through their owning collection instead of recursively disconnecting the TextBox template. Recursive disconnection causes a delayed native fail-fast in WinUI TextBoxView teardown, aborting later unrelated tests. Keep the weak-reference collection assertion intact.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Remove the Release-only NuGet.Build.Tasks.Pack 6.12.1 pin. The old pack task misreads the alias-keyed assets produced by NuGet 7 restore, dropping implicit mobile platform versions and failing both package jobs with NU1012. Let the .NET SDK provide compatible restore and pack tasks.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@Sergio0694
Sergio0694 enabled auto-merge (squash) October 27, 2026 00:00

@Arlodotexe Arlodotexe left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't recreate all the commits manually by hand, even if they're 1:1 identical and have re-added attribution as co-author. It breaks the timeline of commit history and makes future investigations much harder. Instead, just reapply the commits from the PR we re-opened this from (e.g. set the branch to the right hash and force-push).

@Sergio0694
Sergio0694 force-pushed the user/sergiopedri/refresh-net-10-pr branch from 6e45ffb to bd6d1ef Compare October 27, 2026 00:27
@Arlodotexe
Arlodotexe disabled auto-merge October 27, 2026 00:30
@Arlodotexe
Arlodotexe enabled auto-merge (rebase) October 27, 2026 00:30
@Arlodotexe
Arlodotexe merged commit a2fa47a into main Oct 27, 2026
43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants