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 'vs16.9' => 'master' #6120

Merged
merged 1 commit into from Feb 8, 2021

Conversation

@dotnet-maestro-bot
Copy link
Contributor

@dotnet-maestro-bot dotnet-maestro-bot commented Feb 4, 2021

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

This PR merges commits made on vs16.9 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 vs16.9
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff vs16.9

# 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/msbuild HEAD:merge/vs16.9-to-master
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/msbuild HEAD:merge/vs16.9-to-master

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/vs16.9-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

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

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.

Simplify `#ifdef` logic (across source code)
Normalize and Fix namespaces (in Test projects)
@Forgind
Copy link
Member

@Forgind Forgind commented Feb 8, 2021

Squash, right?

@Forgind
Forgind approved these changes Feb 8, 2021
@Forgind Forgind merged commit bcaa609 into dotnet:master Feb 8, 2021
9 checks passed
9 checks passed
@dotnet-bot
MSBuild #20210204.3 succeeded with issues
Details
license/cla All CLA requirements met.
Details
@azure-pipelines
msbuild-pr Build #20210203.16 succeeded
Details
@azure-pipelines
msbuild-pr (Linux Core) Linux Core succeeded
Details
@azure-pipelines
msbuild-pr (Windows Core) Windows Core succeeded
Details
@azure-pipelines
msbuild-pr (Windows Full Release (no bootstrap)) Windows Full Release (no bootstrap) succeeded
Details
@azure-pipelines
msbuild-pr (Windows Full) Windows Full succeeded
Details
@azure-pipelines
msbuild-pr (macOS Core) macOS Core succeeded
Details
@azure-pipelines
msbuild-pr (macOS Mono) macOS Mono succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants