Skip to content

[automated] Merge branch 'release/3.1' => 'master'#2585

Merged
BrennanConroy merged 11 commits intodotnet:masterfrom
dotnet-maestro-bot:merge/release/3.1-to-master
Nov 1, 2019
Merged

[automated] Merge branch 'release/3.1' => 'master'#2585
BrennanConroy merged 11 commits intodotnet:masterfrom
dotnet-maestro-bot:merge/release/3.1-to-master

Conversation

@dotnet-maestro-bot
Copy link
Contributor

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/Common HEAD:merge/release/3.1-to-master
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/Common 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/Common merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/Common 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 [email protected]:dotnet-maestro-bot/Common merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/Common 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
Copy link
Contributor Author

This pull request has been updated.

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

<Sha>4950751278293d59898be799c0115e0ad895747e</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview3.19530.5">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mmitche Should this be in master too?

…0191031.6 (dotnet#2587)

- Microsoft.NETCore.App.Ref - 3.1.0-preview3.19531.6
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19531.6
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

…0191031.15 (dotnet#2589)

- Microsoft.NETCore.App.Ref - 3.1.0-preview3.19531.15
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview3.19531.15

Dependency coherency updates

- Microsoft.Bcl.AsyncInterfaces - 1.1.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.DiagnosticSource - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.8.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 4.7.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.Platforms - 3.1.0-preview3.19531.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

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

@BrennanConroy BrennanConroy merged commit c4afd46 into dotnet:master Nov 1, 2019
JunTaoLuo pushed a commit to dotnet/aspnetcore that referenced this pull request Feb 12, 2020
…ge/release/3.1-to-master

[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from dotnet/extensions@c4afd46
JunTaoLuo pushed a commit to dotnet/aspnetcore that referenced this pull request Feb 15, 2020
…ge/release/3.1-to-master

[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from dotnet/extensions@c4afd46
maryamariyan pushed a commit to maryamariyan/runtime that referenced this pull request Feb 28, 2020
…ge/release/3.1-to-master

[automated] Merge branch 'release/3.1' => 'master'


Commit migrated from dotnet/extensions@c4afd46
maryamariyan pushed a commit to maryamariyan/runtime that referenced this pull request Mar 2, 2020
…ge/release/3.1-to-master

[automated] Merge branch 'release/3.1' => 'master'


Commit migrated from dotnet/extensions@c4afd46
@ghost ghost locked as resolved and limited conversation to collaborators May 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants