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

dotnet-maestro-bot · 2020-08-12T16:18:29Z

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

This is the 3.1 version of https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/pullrequest/9014. The concerns in 3.1 are slightly different than prior versions due to a significant rede# how the response body was handled. In 2.1 very few components implemented IHttpSendFileFeature, and most of those that did would eagerly terminate if the request aborted (e.g. HttpSys server). We mainly had to be concerned about the fallback code that did a copy loop when IHttpSendFileFeature wasn't available. In 3.x the response body Stream, PipeWriter, and SendFileAsync were consolidated onto the new IHttpResponseBodyFeature. Now all servers and component shims support all three ways to send data and we can't make any assumptions about how eagerly they terminate. E.g. many components implemented SendFileAsync using a fallback copy loop, and these components don't have access to RequestAborted to eagerly terminate. This means that in 3.1 we need to pass the RequestAborted token when calling IHttpSendFileFeature.SendFileAsync, as well as any copy loops that have access to the token. I've primarily fixed the HttpResponse.SendFileAsync extension methods and made sure the other affected components call through here. [Infrastructure side note] This commit needs to be rebased on internal/release/3.1 before merging. That branch can't be built locally so I developed this fix based on release/3.1 instead.

The 3.1 PR builds aren't working so I missed some new test failures caused by my prior change. https://dev.azure.com/dnceng/internal/_build/results?buildId=734369&view=ms.vss-test-web.build-test-results-tab HttpSys has some odd behavior when you call SendFileAsync multiple times on an aborted response. The first time throws an OperationCancelledException, but the second time throws an ObjectDisposedException. This only happens if you enable HttpSysOptions.ThrowWriteExceptions and pass in a cancelled token. https://github.com/dotnet/aspnetcore/blob/472fc5058ecbddd4cd546a40628ec5a0545b8125/src/Servers/HttpSys/src/RequestProcessing/ResponseBody.cs#L577 I'm not aware of any scenarios where SendFileAsync is called multiple times like this, so for now I'm only fixing up the tests.

Create the GCHandle per operation and Free it when resetting the ValueTaskSource for re-use.

…g/internal/dotnet-aspnetcore-tooling This pull request updates the following dependencies [marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d - **Build**: 20200721.7 - **Date Produced**: 7/22/2020 4:18 AM - **Commit**: 1c22292bc7fca352074d8862cf39fbdb8647f208 - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.AspNetCore.Razor.Language**: from 3.1.6 to 3.1.7 - **Microsoft.CodeAnalysis.Razor**: from 3.1.6 to 3.1.7 - **Microsoft.NET.Sdk.Razor**: from 3.1.6 to 3.1.7 - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.6 to 3.1.7 [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)

…g/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.Analyzer.Testing**: from 3.1.6-servicing.20316.5 to 3.1.7-servicing.20371.8 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.6-servicing.20316.5 to 3.1.7-servicing.20371.8 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.ActivatorUtilities.Sources**: from 3.1.6-servicing.20316.5 to 3.1.7-servicing.20371.8 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.Abstractions**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.Memory**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.SqlServer**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.StackExchangeRedis**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.6-servicing.20316.5 to 3.1.7-servicing.20371.8 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Abstractions**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.AzureKeyVault**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Binder**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.CommandLine**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.EnvironmentVariables**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.FileExtensions**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Ini**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Json**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.KeyPerFile**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.UserSecrets**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Xml**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration**: from 3.1.6 to 3.1.7 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.DependencyInjection.Abstractions**: from ...

- build targeting pack to pick up NuGet/Home#8599 fix - dotnet/extensions#2750 and dotnet#24200 2/2 - requires follow-up after next official extensions build - fake the baseline update - remainder must be done after the 3.1.7 release

Update branding to 3.1.8

ghost

Auto-approving branch merge.

ghost · 2020-08-12T16:18:38Z

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.

Tratcher

Do not merge this into master before the preview8 internal branch has been merged.

Tratcher · 2020-08-12T18:27:31Z

Apparently the preview 8 branch won't be merged publicly until preview8 ships. I'll cherry pick the fix into master.

Tratcher · 2020-08-12T19:43:04Z

#24849

src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs

Directory.Build.props

src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs

dotnet-maestro-bot · 2020-08-13T17:16:10Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-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-13T20:20:45Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-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-13T20:20:45Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-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-13T20:21:11Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-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-13T20:40:57Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.1, but I could not automatically push those to merge/release/3.1-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-13T21:08:00Z

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

Tratcher and others added 13 commits July 16, 2020 21:37

Merge in 'release/3.1' changes

b110c81

Merged PR 9189: Modify WebSockets ValueTaskSource

40383cf

Create the GCHandle per operation and Free it when resetting the ValueTaskSource for re-use.

Update branding to 3.1.8

9f03b0a

- build targeting pack to pick up NuGet/Home#8599 fix - dotnet/extensions#2750 and dotnet#24200 2/2 - requires follow-up after next official extensions build - fake the baseline update - remainder must be done after the 3.1.7 release

Do not run hostname tests on macOS

522088b

Remove internal feeds

5d1a8b4

Update to 3.1.107 SDK

8f21d61

Update Baseline.* files

1709e5b

Undo package downgrade

95386ff

Merge pull request dotnet#24709 from dotnet/dougbu/update.branding

a8e8fe2

Update branding to 3.1.8

dotnet-maestro-bot requested review from dougbu, halter73, jkotalik and Tratcher as code owners August 12, 2020 16:18

dotnet-maestro-bot force-pushed the merge/release/3.1-to-master branch from 0c6187d to a8e8fe2 Compare August 12, 2020 16:18

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

ghost approved these changes Aug 12, 2020

View reviewed changes

ghost added the auto-merge label Aug 12, 2020

Tratcher requested changes Aug 12, 2020

View reviewed changes

Tratcher closed this Aug 12, 2020

Tratcher reopened this Aug 12, 2020

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

ac6b62b

Tratcher approved these changes Aug 12, 2020

View reviewed changes

src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs Outdated Show resolved Hide resolved

Directory.Build.props Outdated Show resolved Hide resolved

wtgodbe reviewed Aug 12, 2020

View reviewed changes

Directory.Build.props Outdated Show resolved Hide resolved

Tratcher assigned dougbu Aug 13, 2020

Apply suggestions from code review

e35c4a8

Tratcher reviewed Aug 13, 2020

View reviewed changes

src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs Outdated Show resolved Hide resolved

Apply suggestions from code review

5dbd68a

Tratcher mentioned this pull request Aug 13, 2020

[3.1] Remove cookie name decoding #24389

Merged

jaredpar mentioned this pull request Aug 13, 2020

OSX machines are de-provisioned during CI / PR runs leading to failures dotnet/runtime#34472

Closed

dougbu merged commit aab95ea into dotnet:master Aug 13, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

dotnet-maestro-bot commented Aug 12, 2020

Uh oh!

ghost left a comment

Uh oh!

ghost commented Aug 12, 2020

Uh oh!

Tratcher left a comment

Uh oh!

Tratcher commented Aug 12, 2020

Uh oh!

Tratcher commented Aug 12, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

Uh oh!

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

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

Uh oh!

Conversation

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

Tratcher left a comment

Choose a reason for hiding this comment

Uh oh!

Tratcher commented Aug 12, 2020

Uh oh!

Tratcher commented Aug 12, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

dotnet-maestro-bot commented Aug 13, 2020

Uh oh!

Uh oh!

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.