[automated] Merge branch 'release/3.1-preview1' => 'release/3.1' #14645

dotnet-maestro-bot · 2019-10-01T21:52:34Z

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

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

@mkArtakMSFT

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-preview1
git pull --ff-only
git checkout release/3.1
git pull --ff-only
git merge --no-ff release/3.1-preview1

# 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-preview1-to-release/3.1

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-preview1-to-release/3.1

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-preview1-to-release/3.1'. 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-preview1-to-release/3.1 release/3.1
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/3.1-preview1-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-preview1-to-release/3.1

or if you are using SSH

git checkout -b merge/release/3.1-preview1-to-release/3.1 release/3.1
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/3.1-preview1-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-preview1-to-release/3.1

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.

…nToken (dotnet#13880)

…op bubbling"

…ons about storage formats

…e's no real value in deleting that tracking info later

dotnet-maestro-bot · 2019-10-01T22:54:36Z

This pull request has been updated.

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

dotnet-maestro-bot · 2019-10-01T23:03:03Z

This pull request has been updated.

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

…build 20191001.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.0-preview1.19501.1 - Microsoft.AspNetCore.Razor.Language - 3.1.0-preview1.19501.1 - Microsoft.CodeAnalysis.Razor - 3.1.0-preview1.19501.1 - Microsoft.NET.Sdk.Razor - 3.1.0-preview1.19501.1

)

dotnet-maestro-bot · 2019-10-01T23:07:43Z

This pull request has been updated.

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

dotnet-maestro-bot · 2019-10-01T23:07:47Z

This pull request has been updated.

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

dotnet-maestro-bot · 2019-10-01T23:07:59Z

This pull request has been updated.

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

* Update AuthZ & Cors middlewares to only set endpoint routing metadata when executing in the context of endpoint routing * Add analyzers for incorrect UseAuth use Fixes dotnet#14049

Fixes dotnet#13396

Fixes dotnet#14433

dotnet-maestro-bot · 2019-10-01T23:10:29Z

This pull request has been updated.

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

dotnet-maestro-bot · 2019-10-01T23:13:31Z

This pull request has been updated.

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

dotnet-maestro-bot · 2019-10-01T23:13:33Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1-preview1, but I could not automatically push those to merge/release/3.1-preview1-to-release/3.1 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

dotnet-maestro-bot · 2019-10-01T23:13:34Z

This pull request has been updated.

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

Negotiate protocol versioning and ConnectionID split

dotnet-maestro-bot · 2019-10-01T23:28:19Z

This pull request has been updated.

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

…-96d6c08d-39ce-42c2-9ed1-e4457d1b99df [release/3.1-preview1] Update dependencies from aspnet/AspNetCore-Tooling

dotnet-maestro-bot · 2019-10-02T03:50:00Z

This pull request has been updated.

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

* MacOSX Catalina Beta wasm workaround for booting mono wasm from Blazor. * Address review comments * Address review comments * Make it clear why global scope is used. * Stylistic tweaks for Catalina workaround * Further streamlining * Update js binaries

dotnet-maestro-bot · 2019-10-02T14:49:06Z

This pull request has been updated.

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

BrennanConroy

SignalR changes look good

mikaelm12 and others added 30 commits September 24, 2019 14:18

SignalR Negotiate protocol versioning (dotnet#13389)

ea8c2b9

SignalR ConnectionToken/ConnectionAddress feature (dotnet#13773)

7d59ae1

Add support for negotiateVersion query string parameter and Connectio…

de15b0c

…nToken (dotnet#13880)

[TS] Add support for negotiateVersion and connectionToken (dotnet#14157)

b5db4a9

C# and Java client negotiateVersion cleanup (dotnet#14196)

1aa29f0

Add RenderTreeBuilder extension methods for "prevent default" and "st…

e6f183e

…op bubbling"

Refactor EventHandlerInfosForElement storage to avoid ad-hoc assumpti…

3249dce

…ons about storage formats

Keep track of preventDefault/stopBubbling flags on JS side

3cd4726

Simplify: once we start tracking event info for a given element, ther…

31ee4a8

…e's no real value in deleting that tracking info later

Implement actual "stop bubbling"

e7e2ded

Implement actual "prevent default"

86a8dcf

Update JS binaries

d2887cc

Fix newly-created bug with 'on' prefix mismatch

cdef672

Make navigation interception participate in synthetic event bubbling

896feb4

Rename "stop bubbling" to "stop propagation" for consistency with JS

580184d

Update JS binaries

2339282

Add some E2E scenario code for bubbling

05c284f

E2E scenario code for preventDefault+navigation

47d1ffc

Make navigation+bubbling interactions work like native

eab8ba8

Actual event bubbling E2E tests

62f596c

Move navigation preventDefault tests to their own page

6f8b31b

E2E tests for navigation+preventDefault

0d30083

CR: Rename RenderTreeBuilderExtensions to WebRenderTreeBuilderExtensions

aca8db6

Regenerate blazor.server.js

428017a

Update ref assembly

2fc6041

Add unit tests for illegal ParameterView access

206f793

Fix comment

2e7c864

Have ParameterView track its owning RenderBatchBuilder

612a667

Wrap up lifetime concept as a type, and implement expiry

d59baa8

Complete test cases

e6656a6

Update templates for 3.1 (dotnet#14637)

92f771f

Tratcher and others added 5 commits October 1, 2019 16:04

[3.1] Re-implement SameSite for 2019 (dotnet#13776)

0a1e208

Make UseStatusCodePagesWithReExecute clear Endpoints (dotnet#14531)

12cba32

HttpSys GoAway (dotnet#14522)

5df258a

Support attaching to an existing request queue in HTTP.SYS (dotnet#14182

51ae61b

)

dotnet-maestro-bot requested review from jkotalik and Tratcher as code owners October 1, 2019 23:07

pranavkm and others added 3 commits October 1, 2019 16:08

Throw when UseAuthorization is incorrectly configured

29a1d50

* Update AuthZ & Cors middlewares to only set endpoint routing metadata when executing in the context of endpoint routing * Add analyzers for incorrect UseAuth use Fixes dotnet#14049

Prevent null refs in RemoteJSRuntime

cc368c8

Fixes dotnet#13396

Support parameters on server-side rendered components

6bc4d27

Fixes dotnet#14433

Merge pull request dotnet#14402 from aspnet/brecon/negotiateVersion

1ed31bd

Negotiate protocol versioning and ConnectionID split

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

Merge pull request dotnet#14651 from aspnet/darc-release/3.1-preview1…

ff095dd

…-96d6c08d-39ce-42c2-9ed1-e4457d1b99df [release/3.1-preview1] Update dependencies from aspnet/AspNetCore-Tooling

dotnet-maestro-bot requested a review from dougbu as a code owner October 2, 2019 03:50

BrennanConroy approved these changes Oct 2, 2019

View reviewed changes

dougbu merged commit 4345614 into dotnet:release/3.1 Oct 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/3.1-preview1' => 'release/3.1' #14645

[automated] Merge branch 'release/3.1-preview1' => 'release/3.1' #14645

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 2, 2019

Uh oh!

dotnet-maestro-bot commented Oct 2, 2019

Uh oh!

BrennanConroy left a comment

Uh oh!

Uh oh!

[automated] Merge branch 'release/3.1-preview1' => 'release/3.1' #14645

[automated] Merge branch 'release/3.1-preview1' => 'release/3.1' #14645

Uh oh!

Conversation

dotnet-maestro-bot commented Oct 1, 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 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 1, 2019

Uh oh!

dotnet-maestro-bot commented Oct 2, 2019

Uh oh!

dotnet-maestro-bot commented Oct 2, 2019

Uh oh!

BrennanConroy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!