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

dotnet-maestro-bot · 2019-10-25T03:58:10Z

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.

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/AspNetCore HEAD:merge/release/3.1-to-master

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore 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/AspNetCore merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore 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/AspNetCore merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore 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.

* Update dependencies from https://github.com/dotnet/arcade build 20191017.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19517.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19517.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19517.3 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.2 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.2 - dotnet-ef - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.2 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.2 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.4 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.4 - dotnet-ef - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.4 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.4 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.5 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.5 - dotnet-ef - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.5 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.5 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.7 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.7 - dotnet-ef - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.7 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.7 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.8 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.8 - dotnet-ef - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.8 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.8 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.9 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.9 - dotnet-ef - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.9 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.9 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.11 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.11 - dotnet-ef - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.11 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.11 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.12 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.12 - dotnet-ef - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.12 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.12 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.13 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.13 - dotnet-ef - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.13 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.13 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.1 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.1 - dotnet-ef - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.1 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.1 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.3 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.3 - dotnet-ef - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.3 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.3 * Remove duplicate icon url * Remove more duplicate icon elements * Remove more package icons * Remove packageIcon * Update dependencies from https://github.com/aspnet/Blazor build 20191023.1 - Microsoft.AspNetCore.Blazor.Mono - 3.1.0-preview2.19523.1 * Undo bad deletion of eng/common file

…build 20191023.2 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.0-preview2.19523.2 - Microsoft.AspNetCore.Razor.Language - 3.1.0-preview2.19523.2 - Microsoft.CodeAnalysis.Razor - 3.1.0-preview2.19523.2 - Microsoft.NET.Sdk.Razor - 3.1.0-preview2.19523.2

…build 20191023.7 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19523.7 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19523.7 - dotnet-ef - 3.1.0-preview2.19523.7 - Microsoft.EntityFrameworkCore - 3.1.0-preview2.19523.7 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19523.7 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19523.7 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19523.7

re-assigned the callback array to itself after running splice on it when a client unsubscribed from notifications.

- dotnet/aspnetcore-internal#3281

…host (dotnet#15365)

…-5c39-48b8-b5ca-54e135ffeaa4 [release/3.1] Update dependencies from 2 repositories

dotnet-maestro-bot · 2019-10-25T06:04:22Z

This pull request has been updated.

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

…dotnet#15401)

dotnet-maestro-bot · 2019-10-25T15:49:13Z

This pull request has been updated.

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

…et-maestro-bot/AspNetCore into merge/release/3.1-to-master

dotnet-maestro bot and others added 10 commits October 24, 2019 00:07

[ApiAuth] Fix subscription callbacks when unsubscribe (dotnet#15194)

5776542

re-assigned the callback array to itself after running splice on it when a client unsubscribed from notifications.

Update doc references in Auth action results (dotnet#15110)

6cf34a9

Rebrand for 3.1.0-preview3

7132548

- dotnet/aspnetcore-internal#3281

[Templating][Fixes dotnet#15349] Update SPA templates to use generic …

60cb700

…host (dotnet#15365)

[Blazor] Reliability improvements for the E2E tests (dotnet#15320)

4b30542

Merge pull request dotnet#15356 from aspnet/darc-release/3.1-63f8fcd8…

4481046

…-5c39-48b8-b5ca-54e135ffeaa4 [release/3.1] Update dependencies from 2 repositories

Fix race with CTS disposing (dotnet#11757)

e40b218

dotnet-maestro-bot requested review from a team, BrennanConroy, SteveSandersonMS, analogrelay, dougbu and halter73 as code owners October 25, 2019 03:58

Nuke helix arm runs on 3.1 (dotnet#15390)

08299d5

Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Oct 25, 2019

[Blazor][Fixes dotnet#14959] NavLink match should be case-insensitive (…

bf846cb

…dotnet#15401)

Merge branch 'merge/release/3.1-to-master' of https://github.com/dotn…

bc67c58

…et-maestro-bot/AspNetCore into merge/release/3.1-to-master

ryanbrandenburg merged commit affd7e0 into dotnet:master Oct 25, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

dotnet-maestro-bot commented Oct 25, 2019

Uh oh!

dotnet-maestro-bot commented Oct 25, 2019

Uh oh!

dotnet-maestro-bot commented Oct 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

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

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

Uh oh!

Conversation

dotnet-maestro-bot commented Oct 25, 2019

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

dotnet-maestro-bot commented Oct 25, 2019

Uh oh!

dotnet-maestro-bot commented Oct 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants