Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' #46744

Merged
merged 72 commits into from
Feb 13, 2025

Conversation

github-actions[bot]
Copy link
Contributor

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

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

  • baronfel
  • marcpopMSFT
  • nagilson
  • surayya-MS
  • v-wuzhai
  • dotnet-maestro[bot]
  • Forgind

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/8.0.4xx
git pull --ff-only
git checkout release/9.0.1xx
git pull --ff-only
git merge --no-ff release/8.0.4xx

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

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

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.

Surayya Huseyn Zada and others added 30 commits January 28, 2025 20:46
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Feb 11, 2025
@surayya-MS
Copy link
Member

surayya-MS commented Feb 12, 2025

Checks are failing because there is no BaseImageDigest.
BaseImageDigest was added in #44461 and was not backported to release/8.0.4xx

Fixed

@surayya-MS surayya-MS enabled auto-merge February 12, 2025 14:46
@nagilson
Copy link
Member

Microsoft.DotNet.Watcher.Tools.FileWatcherTests.Microsoft.DotNet.Watcher.Tools.FileWatcherTests.DeleteSubfolder
probably unrelated

@surayya-MS surayya-MS merged commit 54e82b9 into release/9.0.1xx Feb 13, 2025
31 checks passed
@surayya-MS surayya-MS deleted the merge/release/8.0.4xx-to-release/9.0.1xx branch February 13, 2025 02:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure Area-Watch untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants