Skip to content

Comments

[automated] Merge branch 'release/10.0.3xx' => 'main'#1594

Open
github-actions[bot] wants to merge 7 commits intomainfrom
merge/release/10.0.3xx-to-main
Open

[automated] Merge branch 'release/10.0.3xx' => 'main'#1594
github-actions[bot] wants to merge 7 commits intomainfrom
merge/release/10.0.3xx-to-main

Conversation

@github-actions
Copy link
Contributor

I detected changes in the release/10.0.3xx 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.3xx by the following committers:

  • dotnet-maestro[bot]
  • ViktorHofer
  • github-actions[bot]
  • phil-allen-msft

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.3xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/10.0.3xx

# 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/sourcelink HEAD:merge/release/10.0.3xx-to-main
or if you are using SSH
git push git@github.com:dotnet/sourcelink HEAD:merge/release/10.0.3xx-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.3xx-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.3xx-to-main origin/main
git pull https://github.com/dotnet/sourcelink merge/release/10.0.3xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sourcelink HEAD:merge/release/10.0.3xx-to-main
or if you are using SSH
git fetch
git checkout -b merge/release/10.0.3xx-to-main origin/main
git pull git@github.com:dotnet/sourcelink merge/release/10.0.3xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sourcelink HEAD:merge/release/10.0.3xx-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 7 commits January 22, 2026 02:06
…0a2-4dc8-8183-168729a42f8b

[release/10.0.2xx] Source code updates from dotnet/dotnet
Reset patterns:
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
- NuGet.config
- global.json
)

* Update dependencies

* Reset files to release/10.0.3xx

Reset patterns:
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
- NuGet.config
- global.json

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Phil Allen <phillipa@microsoft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
* Backflow from https://github.com/dotnet/dotnet / 262dff3 build 301743

[[ commit created by automation ]]

* Update dependencies from build 301743
On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26103.116 -> To Version 10.0.0-beta.26113.102 (parent: )

[[ commit created by automation ]]

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Reset patterns:
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
- NuGet.config
- global.json
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