Skip to content

chore: adjust for net10 (backport #1845)#1850

Merged
jeromelaban merged 7 commits into
release/stable/6.4from
mergify/bp/release/stable/6.4/pr-1845
Nov 12, 2025
Merged

chore: adjust for net10 (backport #1845)#1850
jeromelaban merged 7 commits into
release/stable/6.4from
mergify/bp/release/stable/6.4/pr-1845

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Nov 11, 2025

This pull request updates the default .NET target version for Uno templates and related CI infrastructure from .NET 9.0 to .NET 10.0. It also removes preview labels from .NET 10.0 descriptions and makes minor adjustments to CI scripts and bootstrapper versions to align with .NET 10.0 support.

Template updates:

  • Changed the default target framework to net10.0 in all Uno templates (unoapp, unolib, unolib-uitest, unomauilib) and updated descriptions to remove the "Preview" label for .NET 10.0. (F1fe99c3L22R22, [1] [2] [3] [4] [5] [6] [7]

  • Updated a template condition for net10.0 in unoapp so that the value is now set to false instead of true.

CI and build infrastructure:

  • Updated the .NET 10 version used in CI scripts to 10.0.100 (removing the release candidate suffix) and set the unocheckArguments to an empty string for .NET 10 test groups. [1] [2]

  • Added a TODO comment to the UnoWasmBootstrapVersionNet10 property and similar TODOs to environment variables for UnoCheck versions, indicating these should be updated when stable versions are released. [1] [2]


    This is an automatic backport of pull request chore: adjust for net10 #1845 done by Mergify.

kazo0 and others added 6 commits November 11, 2025 22:47
(cherry picked from commit 15bbfba)

# Conflicts:
#	src/Uno.Sdk.Updater.targets
(cherry picked from commit 29a2454)

# Conflicts:
#	src/Uno.Sdk.Updater.targets
(cherry picked from commit 2c64a5e)
@mergify mergify Bot added the conflicts label Nov 11, 2025
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Nov 11, 2025

Cherry-pick of 15bbfba has failed:

On branch mergify/bp/release/stable/6.4/pr-1845
Your branch is up to date with 'origin/release/stable/6.4'.

You are currently cherry-picking commit 15bbfba.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/actions/ci/generate-test-matrix/action.yml
	modified:   .github/actions/ci/run-tests/action.yml
	modified:   .github/workflows/ci.yml
	modified:   src/Uno.Templates/content/unoapp/.template.config/template.json
	modified:   src/Uno.Templates/content/unolib-uitest/.template.config/template.json
	modified:   src/Uno.Templates/content/unolib/.template.config/template.json
	modified:   src/Uno.Templates/content/unomauilib/.template.config/template.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.Sdk.Updater.targets

Cherry-pick of 29a2454 has failed:

On branch mergify/bp/release/stable/6.4/pr-1845
Your branch is ahead of 'origin/release/stable/6.4' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 29a2454.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.Sdk.Updater.targets

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot mentioned this pull request Nov 11, 2025
@jeromelaban jeromelaban merged commit 2cac090 into release/stable/6.4 Nov 12, 2025
69 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/6.4/pr-1845 branch November 12, 2025 00:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants