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

dotnet-maestro-bot · 2020-08-19T16:31:16Z

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:

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.

* Enable trimming for Microsoft.Extensions packages Fixes dotnet#24634 * Update Microsoft.NET.Sdk.BlazorWebAssembly.csproj * Apply suggestions from code review * Fixup test

ghost

Auto-approving branch merge.

ghost · 2020-08-19T16:31: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.

dotnet-maestro-bot · 2020-08-19T16:35:49Z

This pull request has been updated.

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

Create new instances of List<T> with an appropriate capacity for the items that will be added. Use Array.Empty<T>() where appropriate, rather than create an empty list and then return it.

dotnet-maestro-bot · 2020-08-19T16:52:07Z

This pull request has been updated.

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

See dotnet/sdk#12872 (comment)

dotnet-maestro-bot · 2020-08-19T17:03:34Z

This pull request has been updated.

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

* Add new ctors for RequestQueue and UrlGroup * Add DelegateRequest pinvokes * Add Request Transfer Feature * Fix accessibility of feature * Test cleanup * Update ref assembly * hack: Make HttpSysServer packable * Cleanup based on PR feedback * Avoid sending headers after transfer * Fix ref assembly * Fix rebase conflict * Switch to DelegateRequestEx * Add feature detection * Delete ref folder * Add server feature * s/RequestQueueWrapper/DelegationRule * Fix UrlGroup was null issue * Add light-up for ServerDelegationPropertyFeature * Revert changes to sample * Revert changes to sample take 2 * PR feedback * s/Transfered/Transferred * DelegateAfterRequestBodyReadShouldThrow * Make DelegationRule disposable * More license headers * Incomplete XML doc * PR feedback * Fix broken test * PR feedback * Fixup test * s/Transfer/Delegate * s/transfer/delegate * PR feedback

dotnet-maestro-bot · 2020-08-19T17:33:28Z

This pull request has been updated.

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

…819.5 (dotnet#25040) [release/5.0] Update dependencies from dotnet/efcore - Updates: - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20419.5 - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20419.5 - dotnet-ef: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20419.5 - Microsoft.EntityFrameworkCore: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20419.5 - Microsoft.EntityFrameworkCore.Design: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20419.5 - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20419.5 - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20419.5 - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20419.5

dotnet-maestro-bot · 2020-08-19T18:41:39Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-08-19T19:34:07Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master 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 · 2020-08-19T20:30:24Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master 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 · 2020-08-19T21:32:55Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master 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 · 2020-08-19T21:38:39Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master 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 · 2020-08-19T22:05:15Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master 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 · 2020-08-19T23:03:10Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master 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.

BrennanConroy · 2020-08-19T23:14:52Z

Did I do something wrong before? It's including the previous 5.0->master merge commit here o.O

dougbu · 2020-08-19T23:37:01Z

@BrennanConroy you mean commits already merged to 'master' are showing up here❔ That could happen if you squashed or rebased the incoming commits rather than choosing "Create a merge commit".

My question is about the https://github.com/dotnet/aspnetcore/pull/25039/files#diff-5c6a1c77fe216efcfbbdccb11b863063R46 change. Why is any version update coming in from the 5.0 branch❔

BrennanConroy · 2020-08-19T23:47:40Z

you mean commits already merged to 'master' are showing up here❔

Ignore me XD

Why is any version update coming in from the 5.0 branch

That one is odd, I'll fix it

dotnet-maestro-bot · 2020-08-20T01:28:16Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master 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 · 2020-08-20T02:03:36Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0, but I could not automatically push those to merge/release/5.0-to-master 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.

jkotalik and others added 2 commits August 19, 2020 09:28

Reenable concurrent read/write test (dotnet#25017)

187eacd

Enable trimming for Microsoft.Extensions packages (dotnet#24986)

d2f34d6

* Enable trimming for Microsoft.Extensions packages Fixes dotnet#24634 * Update Microsoft.NET.Sdk.BlazorWebAssembly.csproj * Apply suggestions from code review * Fixup test

dotnet-maestro-bot requested review from Tratcher, halter73 and jkotalik as code owners August 19, 2020 16:31

dotnet-maestro-bot force-pushed the merge/release/5.0-to-master branch from 333d009 to 187eacd Compare August 19, 2020 16:31

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

ghost approved these changes Aug 19, 2020

View reviewed changes

ghost added auto-merge labels Aug 19, 2020

dotnet-maestro-bot requested review from a team and SteveSandersonMS as code owners August 19, 2020 16:35

ghost removed the auto-merge label Aug 19, 2020

Right-size Lists when created (dotnet#23714)

b22512d

Create new instances of List<T> with an appropriate capacity for the items that will be added. Use Array.Empty<T>() where appropriate, rather than create an empty list and then return it.

dotnet-maestro-bot requested review from BrennanConroy and javiercn as code owners August 19, 2020 16:52

Enable the compatibility analyzer for Blazor WebAssembly (dotnet#24978)

c6814f4

See dotnet/sdk#12872 (comment)

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

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

8c7d0cb

BrennanConroy added 2 commits August 19, 2020 20:42

Update Version.Details.xml

422d178

Update Version.Details.xml

e5bf53e

BrennanConroy merged commit f490dd2 into dotnet:master Aug 20, 2020

amcasey added area-middleware Includes: URL rewrite, redirect, response cache/compression, session, and other general middlewares 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' #25039

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

Uh oh!

Conversation

dotnet-maestro-bot commented Aug 19, 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 19, 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 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!

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!

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 commented Aug 19, 2020

Uh oh!

dougbu commented Aug 19, 2020

Uh oh!

BrennanConroy commented Aug 19, 2020

Uh oh!

dotnet-maestro-bot commented Aug 20, 2020

Uh oh!

dotnet-maestro-bot commented Aug 20, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 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.