[automated] Merge branch 'release/5.0' => 'master' #24990

dotnet-maestro-bot · 2020-08-18T02:35:18Z

I detected changes in the release/5.0 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/5.0 by the following committers:

@JamesNK

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

# 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/5.0-to-master

or if you are using SSH

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

or if you are using SSH

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

…Blazor WASM Revive support for globalization and localization in Blazor WASM * Load icu and timezone data files * Unskip tests Fixes dotnet#24174 Fixes dotnet#22975 Fixes dotnet#23260

ghost

Auto-approving branch merge.

ghost · 2020-08-18T02:35:26Z

Hello @msftbot[bot]!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 60 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

* Add support for model binding DateTime as UTC Fixes dotnet#11584 * Make test work in other TZs * Changes per PR comments * Cleanup unused exception code path, fix doc comments * Clean up usage of variables * Adjust logging to be consistent * Apply suggestions from code review

dotnet-maestro-bot · 2020-08-18T04:08:23Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-08-18T05:03:08Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-08-18T06:22:48Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-08-18T07:42:21Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-08-18T09:17:04Z

This pull request has been updated.

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

…Blazor WASM (dotnet#24773) * Merged PR 9371: Revive support for globalization and localization in Blazor WASM Revive support for globalization and localization in Blazor WASM * Load icu and timezone data files * Unskip tests Fixes dotnet#24174 Fixes dotnet#22975 Fixes dotnet#23260

dotnet-maestro-bot · 2020-08-18T13:37:55Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-08-18T16:38:50Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-08-18T17:37:28Z

This pull request has been updated.

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

)

dotnet-maestro-bot · 2020-08-18T18:20:10Z

This pull request has been updated.

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

…t#24953)

dotnet-maestro-bot · 2020-08-18T19:46:56Z

This pull request has been updated.

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

* Log for SameSite=None without Secure * Update src/Http/Http/src/Internal/EventIds.cs Co-authored-by: campersau <[email protected]> Co-authored-by: campersau <[email protected]>

dotnet-maestro-bot · 2020-08-18T19:58:27Z

This pull request has been updated.

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

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

dotnet-maestro-bot · 2020-08-18T23:26:37Z

This pull request has been updated.

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

Fixes dotnet#15166

dotnet-maestro-bot · 2020-08-19T00:00:50Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-08-19T01:28:55Z

This pull request has been updated.

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

… wrong. (dotnet#24920)

dotnet-maestro-bot · 2020-08-19T03:18:57Z

This pull request has been updated.

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

…et#25002) * Updates to IdentityServer 4.0.4 * Updates templates with the new migrations. * Fixes a small configuration bug that required the configuration for the key to be specified. * Updates the error url in IdentityServer config to match our template defaults.

dotnet-maestro-bot · 2020-08-19T09:15:22Z

This pull request has been updated.

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

BrennanConroy

Looks fine, not sure why this wasn't merged earlier

Pranav Krishnamoorthy and others added 3 commits August 17, 2020 09:02

Merged PR 9371: Revive support for globalization and localization in …

4e57d1b

…Blazor WASM Revive support for globalization and localization in Blazor WASM * Load icu and timezone data files * Unskip tests Fixes dotnet#24174 Fixes dotnet#22975 Fixes dotnet#23260

Fixups

8a8a1ac

HTTP2: Optimize header processing (dotnet#24945)

58a7592

dotnet-maestro-bot requested review from Tratcher, halter73 and jkotalik as code owners August 18, 2020 02:35

ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Aug 18, 2020

ghost approved these changes Aug 18, 2020

View reviewed changes

ghost added auto-merge labels Aug 18, 2020

ghost removed the auto-merge label Aug 18, 2020

Add inline scheduler option for Sockets transport (dotnet#24638)

c92eaa2

HTTP2: Write data and trailers under one lock (dotnet#24822)

28dc9bf

Optimize writing single segment sequences (dotnet#24929)

592cea6

Fix HTTP/2 tests that use HttpClient and H2C (dotnet#24981)

f68f5b0

dotnet-maestro-bot requested review from a team and SteveSandersonMS as code owners August 18, 2020 13:37

Remove \r\n for \n when writing to ostream (dotnet#24980)

cdb3cbd

Move the code sync action to the release branch (dotnet#25003)

90408c0

Add query param to check if Blazor WASM app is under debug (dotnet#24972

5297d5f

)

HTTP method matching: Jump table optimized for a single method (dotne…

edf25b7

…t#24953)

dotnet-maestro-bot requested a review from javiercn as a code owner August 18, 2020 19:46

Log for SameSite=None without Secure (dotnet#24970)

bc40f40

* Log for SameSite=None without Secure * Update src/Http/Http/src/Internal/EventIds.cs Co-authored-by: campersau <[email protected]> Co-authored-by: campersau <[email protected]>

Sync shared code from runtime (dotnet#25009)

ae1981f

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

dotnet-maestro-bot requested a review from a team August 18, 2020 23:26

HaoK and others added 2 commits August 18, 2020 16:57

Helix pass in -nopath for dotnet-install (dotnet#24968)

94e314d

Allow ProblemDetails \ ValidationProblemDetails to be more testable

2d6fd45

Fixes dotnet#15166

React to runtime release branch rename (dotnet#25026)

24f26e7

Make Virtualize behave correctly with when ItemSize is unspecified or…

6a3887a

… wrong. (dotnet#24920)

dotnet-maestro-bot requested a review from dougbu as a code owner August 19, 2020 09:15

Tratcher added 3 commits August 19, 2020 06:19

Merge branch 'master' into merge/release/5.0-to-master

32ea27c

Update Version.Details.xml

32b1e27

Update Versions.props

333d009

BrennanConroy approved these changes Aug 19, 2020

View reviewed changes

BrennanConroy merged commit 89c3d6b into dotnet:master Aug 19, 2020

amcasey added area-networking Includes servers, yarp, json patch, bedrock, websockets, http client factory, and http abstractions and removed area-runtime labels Jun 6, 2023

[automated] Merge branch 'release/5.0' => 'master' #24990

[automated] Merge branch 'release/5.0' => 'master' #24990

Uh oh!

Conversation

dotnet-maestro-bot commented Aug 18, 2020

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

ghost commented Aug 18, 2020

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 18, 2020

Uh oh!

dotnet-maestro-bot commented Aug 19, 2020

Uh oh!

dotnet-maestro-bot commented Aug 19, 2020

Uh oh!

dotnet-maestro-bot commented Aug 19, 2020

Uh oh!

dotnet-maestro-bot commented Aug 19, 2020

Uh oh!

BrennanConroy left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.