Skip to content

[automated] Merge branch 'release/10.0.2xx' => 'release/10.0.3xx'#1587

Open
github-actions[bot] wants to merge 18 commits intorelease/10.0.3xxfrom
merge/release/10.0.2xx-to-release/10.0.3xx
Open

[automated] Merge branch 'release/10.0.2xx' => 'release/10.0.3xx'#1587
github-actions[bot] wants to merge 18 commits intorelease/10.0.3xxfrom
merge/release/10.0.2xx-to-release/10.0.3xx

Conversation

@github-actions
Copy link
Contributor

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

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

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

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 release/10.0.3xx
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/sourcelink HEAD:merge/release/10.0.2xx-to-release/10.0.3xx
or if you are using SSH
git push git@github.com:dotnet/sourcelink HEAD:merge/release/10.0.2xx-to-release/10.0.3xx

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-release/10.0.3xx'. 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-release/10.0.3xx origin/release/10.0.3xx
git pull https://github.com/dotnet/sourcelink merge/release/10.0.2xx-to-release/10.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sourcelink HEAD:merge/release/10.0.2xx-to-release/10.0.3xx
or if you are using SSH
git fetch
git checkout -b merge/release/10.0.2xx-to-release/10.0.3xx origin/release/10.0.3xx
git pull git@github.com:dotnet/sourcelink merge/release/10.0.2xx-to-release/10.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sourcelink HEAD:merge/release/10.0.2xx-to-release/10.0.3xx

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.

ViktorHofer and others added 18 commits January 13, 2026 19:54
…7ba-461a-be86-cca5dd02d88b

[release/10.0.2xx] Source code updates from dotnet/dotnet
…54a-4c21-a7c4-251e07a921b3

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

* Mark dotnet-sourcelink as non-shipping (#1568)

* Backflow from https://github.com/dotnet/dotnet / 976695d build 297004

[[ commit created by automation ]]

* Update dependencies

* Update dependencies

* Update dependencies

* Update dependencies

* Reset files to release/10.0.2xx

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

---------

Co-authored-by: Viktor Hofer <viktor.hofer@outlook.com>
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>
* Backflow from https://github.com/dotnet/dotnet / c8bc46f build 300611

[[ commit created by automation ]]

* Update dependencies

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26106.102 -> To Version 10.0.0-beta.26109.105 (parent: )

[[ commit created by automation ]]
On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26109.105 -> To Version 10.0.0-beta.26110.110 (parent: )

[[ commit created by automation ]]
…08a-4a0d-9620-e4c4ae2bc640

[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
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

Comments