Update branding to 3.1.8 - #24709
Merged
Merged
Conversation
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 redesign in 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 ...
dougbu
added
the
area-infrastructure
wtgodbe
requested changes
Aug 8, 2020
wtgodbe
left a comment
wtgodbe
left a comment
Member
There was a problem hiding this comment.
This needs to be combined with the code merge, on Tuesday
Contributor
Author
Yup. Also needs the "skip the "Host" AddressRegistrationTests on macOS in release/3.1" fix @halter73 suggested. Working on that to be ready for Tuesday… |
dougbu
force-pushed
the
dougbu/update.branding
branch
from
August 8, 2020 23:31
75f36f4 to
dbc7a8d
Compare
dougbu
force-pushed
the
dougbu/update.branding
branch
from
August 8, 2020 23:38
dbc7a8d to
d248a95
Compare
dougbu
added
* NO MERGE *
dougbu
force-pushed
the
dougbu/update.branding
branch
from
August 9, 2020 01:17
d248a95 to
3209cb6
Compare
- build targeting pack to pick up NuGet/Home#8599 fix - dotnet/extensions#2750 and #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
Member
|
@dougbu please update w/ the code merge |
dougbu
force-pushed
the
dougbu/update.branding
branch
from
August 11, 2020 23:35
3209cb6 to
f338018
Compare
dougbu
removed
the
* NO MERGE *
Contributor
Author
|
This PR is no longer blocked |
dougbu
force-pushed
the
dougbu/update.branding
branch
from
August 12, 2020 01:08
f338018 to
95386ff
Compare
Contributor
Author
|
Just waiting on you @wtgodbe |
Tratcher
approved these changes
Aug 12, 2020
wtgodbe
approved these changes
Aug 12, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
!!! Include code merge and baseline generation before merge !!!