Skip to content

Conversation

@dotnet-maestro-bot
Copy link
Contributor

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

  • JL03-Yue

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.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.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-maestro-bot/sdk HEAD:merge/release/8.0.2xx-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/8.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/8.0.2xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

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

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

JL03-Yue and others added 30 commits December 4, 2023 10:31
…dd automatic upgrade for ToolUpdateCommand; Add --allow-downgrade feature
…0105.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.8.4-preview-23613-13 -> To Version 17.8.5-preview-24055-02
…37784)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
… end up in a state where we're using the 9.0 SDK that was left behind. Let's just delete them all.
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/8.0.2xx-to-main branch from 56a94f0 to 75b02ea Compare January 9, 2024 19:36
@ghost ghost added Area-Infrastructure untriaged Request triage from a team member labels Jan 9, 2024
@v-wuzhai v-wuzhai force-pushed the merge/release/8.0.2xx-to-main branch from 30ffbb0 to 2df8186 Compare January 10, 2024 08:26
@v-wuzhai v-wuzhai requested review from a team and JL03-Yue January 10, 2024 08:27
@v-wuzhai
Copy link
Contributor

@JL03-Yue would you be able to review these changes? Thanks!

@v-wuzhai v-wuzhai merged commit bfd2919 into dotnet:main Jan 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure untriaged Request triage from a team member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants