Skip to content

Conversation

@github-actions
Copy link
Contributor

I detected changes in the release/10.0.2xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/10.0.2xx by the following committers:

  • DonnaChen888
  • dotnet-maestro[bot]
  • marcpopMSFT
  • invalid-email-address
  • vseanreesermsft
  • SimonZhao888

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/10.0.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/10.0.2xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/templating HEAD:merge/release/10.0.2xx-to-main
or if you are using SSH
git push git@github.com:dotnet/templating HEAD:merge/release/10.0.2xx-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/10.0.2xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/release/10.0.2xx-to-main origin/main
git pull https://github.com/dotnet/templating merge/release/10.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/templating HEAD:merge/release/10.0.2xx-to-main
or if you are using SSH
git fetch
git checkout -b merge/release/10.0.2xx-to-main origin/main
git pull git@github.com:dotnet/templating merge/release/10.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/templating HEAD:merge/release/10.0.2xx-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

dotnet-maestro bot and others added 30 commits September 13, 2025 02:02
…912.5

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25461.1 -> To Version 8.0.0-beta.25462.5
…ence-packages build 20250912.3

On relative base path root
Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25428.6 -> To Version 8.0.0-alpha.1.25462.3
…912.6

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25461.1 -> To Version 8.0.0-beta.25462.6
…90-4251-9126-3f46de088278

[release/8.0.1xx] Update dependencies from dotnet/arcade
…8c-499d-8072-f04192619a1a

[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages
…/8.0.3xx

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx'
…915.1

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25462.6 -> To Version 8.0.0-beta.25465.1
…915.1

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25462.6 -> To Version 8.0.0-beta.25465.1
…87-4627-95fa-5ebf2804aa9e

[release/8.0.1xx] Update dependencies from dotnet/arcade
…b4-4038-826d-44a6e3434f10

[release/8.0.3xx] Update dependencies from dotnet/arcade
…/8.0.3xx

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx'
…/8.0.4xx

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx'
…918.2

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25468.2
…918.2

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25468.2
…915.2

On relative base path root
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25462.4 -> To Version 9.0.0-beta.25465.2
…923.2

On relative base path root
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25462.4 -> To Version 9.0.0-beta.25473.2
…923.1

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25473.1
…923.1

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25473.1
…ence-packages build 20250924.1

On relative base path root
Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25462.3 -> To Version 8.0.0-alpha.1.25474.1
…925.3

On relative base path root
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25462.4 -> To Version 9.0.0-beta.25475.3
…925.2

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25475.2
…925.2

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25475.2
…004.1

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25504.1
…004.1

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25465.1 -> To Version 8.0.0-beta.25504.1
dotnet-maestro bot and others added 24 commits November 5, 2025 02:11
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25515.107 -> 10.0.0-beta.25554.104)
System.CommandLine (Version 2.0.0 -> 2.0.1)
…11-04-1013-77be202b-9764-4798-9c96-cf9ec45504c5

Update branding to 10.0.101
… into darc-release/10.0.1xx-27fe20a1-7b84-43ab-8337-8f945c8ea42f
…/9.0.3xx

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx'
…/10.0.1xx

[automated] Merge branch 'release/9.0.3xx' => 'release/10.0.1xx'
…e/10.0.2xx

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'
…b84-43ab-8337-8f945c8ea42f

[release/10.0.1xx] Source code updates from dotnet/dotnet
….2xx

[release/10.0.2xx] Fix NullReferenceException in LocalizationModelDeserializer for malformed keys
…e/10.0.2xx

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'
…105.4

On relative base path root
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25515.2 -> To Version 9.0.0-beta.25555.4
…0a-4ac8-9e13-0bd2b1e28471

[release/9.0.3xx] Update dependencies from dotnet/arcade
#9496)

[release/10.0.1xx] Source code updates from dotnet/dotnet
…/10.0.1xx

[automated] Merge branch 'release/9.0.3xx' => 'release/10.0.1xx'
…e/10.0.2xx

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'
@github-actions github-actions bot requested a review from a team as a code owner November 10, 2025 09:23
@github-actions github-actions bot force-pushed the merge/release/10.0.2xx-to-main branch from b54b1af to baaceb5 Compare November 10, 2025 09:23
@DonnaChen888 DonnaChen888 merged commit acc995e into main Nov 11, 2025
9 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.

5 participants