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/3.1' => 'master' #2807

Open
wants to merge 3 commits into
base: master
from

Conversation

@dotnet-maestro-bot
Copy link
Contributor

dotnet-maestro-bot commented Mar 25, 2020

I detected changes in the release/3.1 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 release/3.1 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 release/3.1
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/3.1

# 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/wpf HEAD:merge/release/3.1-to-master
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/wpf HEAD:merge/release/3.1-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/release/3.1-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/release/3.1-to-master master
git pull https://github.com/dotnet-maestro-bot/wpf merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/wpf HEAD:merge/release/3.1-to-master
or if you are using SSH
git checkout -b merge/release/3.1-to-master master
git pull git@github.com:dotnet-maestro-bot/wpf merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/wpf HEAD:merge/release/3.1-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.

dotnet-maestro bot and others added 3 commits Feb 28, 2020
* Update dependencies from https://github.com/dotnet/winforms build 20200227.4

- Microsoft.Private.Winforms - 4.8.1-servicing.20127.4

Dependency coherency updates

- Microsoft.Win32.Registry - 4.7.0 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.App - 3.1.3-servicing.20120.1 (parent: Microsoft.Private.Winforms)
- System.CodeDom - 4.7.0 (parent: Microsoft.NETCore.App)
- System.Configuration.ConfigurationManager - 4.7.0 (parent: Microsoft.NETCore.App)
- System.Diagnostics.EventLog - 4.7.0 (parent: Microsoft.NETCore.App)
- System.DirectoryServices - 4.7.0 (parent: Microsoft.NETCore.App)
- System.Drawing.Common - 4.7.0 (parent: Microsoft.NETCore.App)
- System.Reflection.Emit - 4.7.0 (parent: Microsoft.NETCore.App)
- System.Reflection.MetadataLoadContext - 4.7.1 (parent: Microsoft.NETCore.App)
- System.Security.AccessControl - 4.7.0 (parent: Microsoft.NETCore.App)
- System.Security.Cryptography.Xml - 4.7.0 (parent: Microsoft.NETCore.App)
- System.Security.Permissions - 4.7.0 (parent: Microsoft.NETCore.App)
- System.Security.Principal.Windows - 4.7.0 (parent: Microsoft.NETCore.App)
- System.Windows.Extensions - 4.7.0 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.Platforms - 3.1.0 (parent: Microsoft.NETCore.App)
- System.IO.Packaging - 4.7.0 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.ILDAsm - 3.1.3-servicing.20118.3 (parent: Microsoft.NETCore.Runtime.CoreCLR)
- Microsoft.NETCore.Runtime.CoreCLR - 3.1.3-servicing.20118.3 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.ILAsm - 3.1.3-servicing.20118.3 (parent: Microsoft.NETCore.Runtime.CoreCLR)
- System.Resources.Extensions - 4.7.0 (parent: Microsoft.NETCore.App)

* Fixup microsoft.netcore.app dependencies (#2675)

Co-authored-by: William Godbe <wigodbe@microsoft.com>
Robert LaDuca
Update branding for 3.1.4
@msftbot msftbot bot requested review from vatsan-madhavan and rladuca Mar 25, 2020
@msftbot msftbot bot added the PR label Mar 25, 2020
@msftbot msftbot bot requested a review from SamBent Mar 25, 2020
Copy link
Member

rladuca left a comment

Blocking

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

2 participants
You can’t perform that action at this time.