[automated] Merge branch 'release/5.0-rc2' => 'master' #25650

dotnet-maestro-bot · 2020-09-05T22:44:55Z

I detected changes in the release/5.0-rc2 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-rc2 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-rc2
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/5.0-rc2

# 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-rc2-to-master

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-rc2-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-rc2-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-rc2-to-master master
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/5.0-rc2-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-rc2-to-master

or if you are using SSH

git checkout -b merge/release/5.0-rc2-to-master master
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/5.0-rc2-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-rc2-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 a cherry pick of the 3.1 PR. https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/pullrequest/9042 The only change was to remove a questionable call to Abort after catching the exception. There are some less severe issues in Kestrel and MVC that we'll follow up on publicly after this releases.

Create the GCHandle per operation and Free it when resetting the ValueTaskSource for re-use. Cherry-picked change from 3.1

…rom dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:2f3f3ff0-d34f-49bd-50aa-08d828f9655f) ## From https://github.com/dotnet/runtime - **Subscription**: 2f3f3ff0-d34f-49bd-50aa-08d828f9655f - **Build**: 20200722.7 - **Date Produced**: 7/23/2020 12:04 AM - **Commit**: 3cab6dd440a5f3763bfbd2d582b36fe51095686a - **Branch**: refs/heads/internal/release/5.0-preview8 [DependencyUpdate]: <> (Begin) - **Updates**: - **System.Diagnostics.DiagnosticSource**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.Diagnostics.EventLog**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.Drawing.Common**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.IO.Pipelines**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.ComponentModel.Annotations**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Configuration**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Console**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Debug**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.EventLog**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.EventSource**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.TraceSource**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Options**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Options.ConfigurationExtensions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Options.DataAnnotations**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Primitives**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Internal.Transport**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Hosting.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Caching.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Caching.Memory**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration.Binder**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration.CommandLine**: from 5.0.0-preview.8.203...

…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

…nal/dotnet-runtime

…nal/dotnet-efcore - Updates: - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - dotnet-ef: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - Microsoft.EntityFrameworkCore: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2

…nal/dotnet-runtime

dotnet-maestro-bot · 2020-09-09T16:57:42Z

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

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

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

* Fix header tab ordering issues. Fixes 1163117 * Ensure text can be zoomed to 200% without switching to mobile layout. Fixes 1163184. * Ensure "Log out" link can show focus state. Fixes 1162890 * Use screen reader-friendly link text. Fixes 1163642 * Update template test

dotnet-maestro-bot · 2020-09-09T18:11:07Z

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

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

* Eliminate duplicates in Helix `TestRunner` - do not add source that's already in NuGet.config - configuration file now part of Helix content - do not re-set an env variable that's set in `runtests.*` nit: simplify `%Path% setting in runtests.cmd - always quote the value - but, keep the `SETLOCAL` command - don't pollute environment on Helix agents * Remove `--source` options we don't need anymore from `runtests.*` - nit: add `--no-restore` to `dotnet run` command after `dotnet restore` * Add `--arch arm64` to ARM64 `restore` build steps - dotnet#25397 - was restoring for the wrong architecture nit: add `--no-restore` to Helix project build steps - already restored

dotnet-maestro-bot · 2020-09-09T19:02:11Z

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

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

* Update JSCallResultTypeHelper.cs and PublicAPI.Unshipped.txt * CR feedback. * Removed exception message

dotnet-maestro-bot · 2020-09-09T20:36:37Z

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

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

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

…into merge/release/5.0-rc2-to-master

This reverts commit 520b9e2.

dotnet-maestro-bot · 2020-09-10T04:18:09Z

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

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-rc2, but I could not automatically push those to merge/release/5.0-rc2-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-09-10T06:56:46Z

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/5.0-rc2, but I could not automatically push those to merge/release/5.0-rc2-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 30 commits July 17, 2020 23:07

Merge in 'release/5.0-preview8' changes

609b55f

Merge in 'release/5.0-preview8' changes

77435c3

Merge in 'release/5.0-preview8' changes

3ad9e57

Merge in 'release/5.0-preview8' changes

869d8f5

Merged PR 9196: Modify WebSockets ValueTaskSource

542031b

Create the GCHandle per operation and Free it when resetting the ValueTaskSource for re-use. Cherry-picked change from 3.1

Merge in 'release/5.0-preview8' changes

6654c8f

Merge in 'release/5.0-preview8' changes

ab7a11f

Merge in 'release/5.0-preview8' changes

f437647

Merge in 'release/5.0-preview8' changes

c88efce

Merge in 'release/5.0-preview8' changes

2bac45c

Merge in 'release/5.0-preview8' changes

43b68e3

Merge in 'release/5.0-preview8' changes

dc3a864

Merge in 'release/5.0-preview8' changes

716598e

Merge in 'release/5.0-preview8' changes

2827037

Merge in 'release/5.0-preview8' changes

670f952

Merge in 'release/5.0-preview8' changes

4d23ec0

Merge in 'release/5.0-preview8' changes

21a5f39

Merge in 'release/5.0-preview8' changes

864a292

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

3e7a106

…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

Merge in 'release/5.0-preview8' changes

6c665aa

[internal/release/5.0-preview8] Update dependencies from dnceng/inter…

f172d20

…nal/dotnet-runtime

Merge in 'release/5.0-preview8' changes

4581307

Merge in 'release/5.0-preview8' changes

c60c278

Merge in 'release/5.0-preview8' changes

f22aa71

[internal/release/5.0-preview8] Update dependencies from dnceng/inter…

5dc9931

…nal/dotnet-runtime

[internal/release/5.0-preview8] Update dependencies from dnceng/inter…

d2ccb49

…nal/dotnet-runtime

Merge in 'release/5.0-preview8' changes

06fbd7e

Enable PlatformCompatibilityAnalyzer for RCL projects (dotnet#25636)

0d548f3

Increase SignalR Java client test timeouts to 30 seconds (dotnet#25639)

b3f4a32

Fixed content type issue (dotnet#25702)

43ef580

Update JSCallResultTypeHelper.cs (dotnet#25628)

8f46188

* Update JSCallResultTypeHelper.cs and PublicAPI.Unshipped.txt * CR feedback. * Removed exception message

Strip duplicate files from SharedFx input to Nuget Pack (dotnet#25733)

76fbd1a

Add cache for retrieved RBAC claims (dotnet#25698)

035221d

Merge branch 'release/5.0-rc2' of https://github.com/dotnet/aspnetcore …

77825d9

…into merge/release/5.0-rc2-to-master

dotnet-maestro-bot requested review from BrennanConroy, SteveSandersonMS and halter73 as code owners September 9, 2020 21:49

captainsafia and others added 2 commits September 9, 2020 15:05

Remove stray merge conflict markers from AspNetCore.sln

e0ad841

Revert "System.IO.Pipelines Fix"

3a7fb76

This reverts commit 520b9e2.

This was referenced Sep 10, 2020

Enable build of ARM64 installers in ASP.NET Core #25579

Merged

Remove 2.2 package from the site extensions bundle #25742

Merged

captainsafia merged commit 6de6ba9 into dotnet:master Sep 10, 2020

[automated] Merge branch 'release/5.0-rc2' => 'master' #25650

[automated] Merge branch 'release/5.0-rc2' => 'master' #25650

Uh oh!

Conversation

dotnet-maestro-bot commented Sep 5, 2020

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 Sep 9, 2020

Uh oh!

dotnet-maestro-bot commented Sep 9, 2020

Uh oh!

dotnet-maestro-bot commented Sep 9, 2020

Uh oh!

dotnet-maestro-bot commented Sep 9, 2020

Uh oh!

dotnet-maestro-bot commented Sep 9, 2020

Uh oh!

dotnet-maestro-bot commented Sep 9, 2020

Uh oh!

dotnet-maestro-bot commented Sep 9, 2020

Uh oh!

dotnet-maestro-bot commented Sep 9, 2020

Uh oh!

dotnet-maestro-bot commented Sep 9, 2020

Uh oh!

dotnet-maestro-bot commented Sep 9, 2020

Uh oh!

dotnet-maestro-bot commented Sep 10, 2020

Uh oh!

dotnet-maestro-bot commented Sep 10, 2020

Uh oh!

dotnet-maestro-bot commented Sep 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants