Skip to content

[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx' - #5768

Merged
wli3 merged 16 commits into
dotnet:release/3.1.2xxfrom
dotnet-maestro-bot:merge/release/3.1.1xx-to-release/3.1.2xx
Dec 5, 2019
Merged

[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'#5768
wli3 merged 16 commits into
dotnet:release/3.1.2xxfrom
dotnet-maestro-bot:merge/release/3.1.1xx-to-release/3.1.2xx

Conversation

@dotnet-maestro-bot

Copy link
Copy Markdown

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

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

  • wli3
  • dotnet-maestro[bot]

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.1xx
git pull --ff-only
git checkout release/3.1.2xx
git pull --ff-only
git merge --no-ff release/3.1.1xx

# 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/core-sdk HEAD:merge/release/3.1.1xx-to-release/3.1.2xx
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/3.1.1xx-to-release/3.1.2xx

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

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.

halex2005 and others added 16 commits November 12, 2019 18:05
…0191121.5 (dotnet#5747)

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0
- Microsoft.WindowsDesktop.App.Ref - 3.1.0
- Microsoft.NETCore.App.Host.win-x64 - 3.1.0
- Microsoft.NETCore.App.Internal - 3.1.0-rtm.19571.5
- Microsoft.NETCore.DotNetHostResolver - 3.1.0
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0
- Microsoft.NETCore.App.Ref - 3.1.0

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19570.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
…5718)

* Update dependencies from https://github.com/aspnet/AspNetCore build 20191119.2

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19569.2
- dotnet-user-secrets - 3.1.0-rtm.19569.2
- dotnet-watch - 3.1.0-rtm.19569.2
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19569.2

* Update dependencies from https://github.com/aspnet/AspNetCore build 20191121.5

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19571.5
- dotnet-user-secrets - 3.1.0-rtm.19571.5
- dotnet-watch - 3.1.0-rtm.19571.5
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19571.5
…icing

update branding 3.1.101 servicing
…5769)

* Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.12

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.12
- dotnet-user-secrets - 3.1.0-rtm.19572.12
- dotnet-watch - 3.1.0-rtm.19572.12
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19572.12

* Update dependencies from https://github.com/aspnet/AspNetCore build 20191122.16

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.16
- dotnet-user-secrets - 3.1.0-rtm.19572.16
- dotnet-watch - 3.1.0-rtm.19572.16
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19572.16
…5772)

* Update dependencies from https://github.com/dotnet/core-setup build 20191122.6

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19572.6
- Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19572.6
- Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19572.6
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19572.6
- Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19572.6
- Microsoft.NETCore.App.Internal - 3.1.1-servicing.19572.6
- Microsoft.NETCore.App.Ref - 3.1.1-servicing.19572.6

* Update dependencies from https://github.com/dotnet/core-setup build 20191122.8

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19572.8
- Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19572.8
- Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19572.8
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19572.8
- Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19572.8
- Microsoft.NETCore.App.Internal - 3.1.1-servicing.19572.8
- Microsoft.NETCore.App.Ref - 3.1.1-servicing.19572.8

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-rtm.19572.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
…0191122.19 (dotnet#5778)

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19572.19
- dotnet-user-secrets - 3.1.0-rtm.19572.19
- dotnet-watch - 3.1.0-rtm.19572.19
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19572.19
…0191123.3 (dotnet#5781)

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-rtm.19573.3
- dotnet-user-secrets - 3.1.0-rtm.19573.3
- dotnet-watch - 3.1.0-rtm.19573.3
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-rtm.19573.3
…0191125.1 (dotnet#5783)

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19575.1
- Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19575.1
- Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19575.1
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19575.1
- Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19575.1
- Microsoft.NETCore.App.Internal - 3.1.1-servicing.19575.1
- Microsoft.NETCore.App.Ref - 3.1.1-servicing.19575.1
…122.3 (dotnet#5766)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3
…0191126.4 (dotnet#5791)

- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.4
- Microsoft.NETCore.DotNetHostResolver - 3.1.1-servicing.19576.4
- Microsoft.WindowsDesktop.App.Ref - 3.1.1-servicing.19576.4
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.1-servicing.19576.4
- Microsoft.NETCore.App.Host.win-x64 - 3.1.1-servicing.19576.4
- Microsoft.NETCore.App.Internal - 3.1.1-servicing.19576.4
- Microsoft.NETCore.App.Ref - 3.1.1-servicing.19576.4
…127.5 (dotnet#5799)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5
@wli3
wli3 merged commit 731d27c into dotnet:release/3.1.2xx Dec 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants