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 'vs17.11' => 'main' #10623

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 6, 2024

I detected changes in the vs17.11 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 vs17.11 by the following committers:

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 vs17.11
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff vs17.11

# 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/msbuild HEAD:merge/vs17.11-to-main
or if you are using SSH
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.11-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/vs17.11-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/vs17.11-to-main main
git pull https://github.com/dotnet/msbuild merge/vs17.11-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.11-to-main
or if you are using SSH
git checkout -b merge/vs17.11-to-main main
git pull [email protected]:dotnet/msbuild merge/vs17.11-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.11-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-bot and others added 2 commits August 23, 2024 15:31
…: Build ID 10000931 (#10267)

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 9752299
* Increase VersionPrefix version

---------

Co-authored-by: Jenny Bai <[email protected]>
* Resolves CG alerts
---------

Co-authored-by: Rainer Sigwald <[email protected]>
@github-actions github-actions bot requested a review from a team as a code owner September 6, 2024 07:50
@maridematte
Copy link
Contributor

waiting for this PR (#10624) to be included here.

* Fixing the assembly redirect
Copy link
Contributor Author

github-actions bot commented Sep 9, 2024

This pull request has been updated.

This PR merges commits made on vs17.11 by the following committers:

* Update dependencies from https://github.com/dotnet/arcade build 20240910.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24460.4

* version bump

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Mariana Garces Dematte <[email protected]>
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on vs17.11 by the following committers:

Will address dotnet/sdk#43339 when deployed in VS.

---------

Co-authored-by: Rainer Sigwald <[email protected]>
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on vs17.11 by the following committers:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants