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

dotnet-maestro-bot · 2020-09-10T17:21:17Z

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 git@github.com: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 git@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 git@github.com: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.

[release/5.0-rc2] Update dependencies from dotnet/efcore

ghost

Auto-approving branch merge.

ghost · 2020-09-10T17:21:27Z

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-09-10T17:22:04Z

This pull request has been updated.

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

dotnet-maestro-bot · 2020-09-10T17:23:36Z

This pull request has been updated.

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

Changes WiX toolset used to 3.14 to support ARM64 Generates targeting pack from the x86/x64 leg, as it gets produced using a zip that gets generated there. The ARM64 leg now produces all the necessary msi's, exe, and wixlib needed for the installer to generate a bundle.

dotnet-maestro-bot · 2020-09-10T18:03:36Z

This pull request has been updated.

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

…tnet#25654)

dotnet-maestro-bot · 2020-09-10T18:47:44Z

❌ 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-10T18:47:49Z

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

…otnet#25747) This lets MVC use the defaults as specified by System.Text.Json. Right now, these defaults are identical to the two properties that were removed. However this allows MVC to pick up new S.T.J defaults in 6.0 including when users attempt to use a 6.0 versioned package with 5.0

This ends up building SDK's test assets as part of a regular build which ends up failing in a clean build.

dotnet-maestro-bot · 2020-09-10T18:57:26Z

❌ 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-14T17:51:58Z

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

…25836) - dotnet-watch builds against runtime in the SDK - other projects build after runtime project due to Ref.csproj reference - but, when the targeting packs aren't building, there's no reason to use Ref.csproj - followup on 76fbd1a and 8496266, reducing parallelism in build

dotnet-maestro-bot · 2020-09-14T18:37:54Z

❌ 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 MSB4109 error when the Microsoft.Extensions.ApiDescription.Server NuGet package is installed.

…5736) * Update to latest SDK * React to platform compatibility analyzer warnings * React to new warnings * Add platform compatibility attributes * Add SkipAnalyzers=true to component declaration compilation Fixes dotnet#25365 * Update eng/Version.Details.xml * Update Versions.props * Update Version.Details.xml * Update Versions.props * Update Version.Details.xml

dotnet-maestro-bot · 2020-09-14T19:45:55Z

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

…914.2 (dotnet#25876) [release/5.0-rc2] Update dependencies from dotnet/efcore

dotnet-maestro-bot · 2020-09-14T21:51: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.

…/5.0-to-release/5.0-rc2 [automated] Merge branch 'release/5.0' => 'release/5.0-rc2'

dotnet-maestro-bot · 2020-09-14T22:27:49Z

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

NTaylorMullen · 2020-09-14T23:06:43Z

Holllllyyy, I just merged latest rc2 into master and this went from 4 commits to ~60? Feels wrong but it seems correct?

pranavkm

Changes look good. Lots of nullability, platform compatibility, PublicAPI.txt files, and MVC routing changes which would explain the size of this merge. But they look good!

NTaylorMullen · 2020-09-14T23:47:28Z

src/Mvc/Mvc.Core/src/Infrastructure/OrderedEndpointsSequenceProvider.cs

+
+namespace Microsoft.AspNetCore.Mvc.Infrastructure
+{
+    internal class OrderedEndpointsSequenceProvider


@javiercn can you perform the "correct" translation of the changes from the release/5.0-rc2 branch into the master branch? I assume I messed up the merge in some fashion.

…914.4 (dotnet#25886) [release/5.0-rc2] Update dependencies from dotnet/efcore

dotnet-maestro-bot · 2020-09-15T00:05: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.

…#25840) * Fix chrome/selenium tests (dotnet#25330) * Revert "Disable failing/hanging tests due to Chrome/Selenium issue (dotnet#25323)" This reverts commit 332f150. * Update Selenium to latest * Update API * Try specifying a version * Update Selenium to 4.0.0-beta5 * Disable browser log tests * Fix components e2e tests and disable blazor standalone template test * Disable tests using browser log * Disable template test * Avoid using .NET formatted strings in tests * Annotate BasicTestApp suggesting that it needs the all globalization data * Culture specific formatting relies on the ICU data carried by the OS. This causes issues in our tests if WebAssembly carries a different set than the OS. Instead updating these tests to use hardcoded strings. * Additionally fixing an issue where some projects in the solution were using tasks from the .dotnet SDK rather than the local copy of the SDK. This was causing issues building locally. Co-authored-by: Pranav K <prkrishn@hotmail.com>

dotnet-maestro-bot · 2020-09-15T01:47:32Z

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

…0914.8 (dotnet#25895) [release/5.0-rc2] Update dependencies from dotnet/runtime

dotnet-maestro-bot · 2020-09-15T03:37:38Z

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

…914.7 (dotnet#25896) [release/5.0-rc2] Update dependencies from dotnet/efcore

dotnet-maestro-bot · 2020-09-15T06:12: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.

Pilchie and others added 6 commits September 9, 2020 21:07

Add Public API baselines for Security (dotnet#25651)

14a3862

Add public API baselines for Servers (dotnet#25652)

6828192

[release/5.0-rc2] Update dependencies from dotnet/efcore (dotnet#25748)

70725b5

[release/5.0-rc2] Update dependencies from dotnet/efcore

Use ICU sharding (dotnet#25521)

2228c98

Update DfaMatcherBuilder to use the correct behavior (dotnet#25616)

0637599

Update error page (dotnet#25706)

31fcc8b

dotnet-maestro-bot requested review from dougbu, halter73, javiercn, jkotalik, SteveSandersonMS, Tratcher and a team as code owners September 10, 2020 17:21

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

ghost approved these changes Sep 10, 2020

View reviewed changes

ghost added the auto-merge label Sep 10, 2020

ghost removed the auto-merge label Sep 10, 2020

Pilchie added 2 commits September 10, 2020 11:44

Add public API baselines to SignalR (dotnet#25653)

158401f

Add public API baselines for SiteExtensions, Testing, WebEncoders (do…

848f42d

…tnet#25654)

pranavkm added 2 commits September 10, 2020 11:54

Point to the correct directory for SDK test assets (dotnet#25734)

0811b3c

This ends up building SDK's test assets as part of a regular build which ends up failing in a clean build.

Revert 2.2 site extension version update (dotnet#25879)

6b8ce80

martincostello and others added 2 commits September 14, 2020 12:07

Fix MSB4109 (dotnet#25880)

a0ede85

Fix MSB4109 error when the Microsoft.Extensions.ApiDescription.Server NuGet package is installed.

Update dependencies from https://github.com/dotnet/efcore build 20200…

7f1ca16

…914.2 (dotnet#25876) [release/5.0-rc2] Update dependencies from dotnet/efcore

Merge pull request dotnet#25881 from dotnet-maestro-bot/merge/release…

e3a52ee

…/5.0-to-release/5.0-rc2 [automated] Merge branch 'release/5.0' => 'release/5.0-rc2'

NTaylorMullen force-pushed the merge/release/5.0-rc2-to-master branch from ae739ef to aaa2e5f Compare September 14, 2020 23:05

dotnet-maestro-bot requested a review from BrennanConroy as a code owner September 14, 2020 23:05

dotnet-maestro-bot requested a review from a team September 14, 2020 23:05

pranavkm approved these changes Sep 14, 2020

View reviewed changes

NTaylorMullen force-pushed the merge/release/5.0-rc2-to-master branch from aaa2e5f to 5cf95e1 Compare September 14, 2020 23:39

NTaylorMullen reviewed Sep 14, 2020

View reviewed changes

Update dependencies from https://github.com/dotnet/efcore build 20200…

45dade2

…914.4 (dotnet#25886) [release/5.0-rc2] Update dependencies from dotnet/efcore

Update dependencies from https://github.com/dotnet/runtime build 2020…

38c9fe7

…0914.8 (dotnet#25895) [release/5.0-rc2] Update dependencies from dotnet/runtime

Update dependencies from https://github.com/dotnet/efcore build 20200…

17e04b7

…914.7 (dotnet#25896) [release/5.0-rc2] Update dependencies from dotnet/efcore

Merge branch 'release/5.0-rc2' into master

2b6cd9f

jkotalik force-pushed the merge/release/5.0-rc2-to-master branch from 5cf95e1 to 2b6cd9f Compare September 15, 2020 17:10

jkotalik merged commit 2b6cd9f into dotnet:master Sep 15, 2020

runfoapp bot mentioned this pull request Sep 29, 2020

Test initial triage jaredpar/runfo#50

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

dotnet-maestro-bot commented Sep 10, 2020

ghost left a comment

ghost commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 14, 2020

dotnet-maestro-bot commented Sep 14, 2020

dotnet-maestro-bot commented Sep 14, 2020

dotnet-maestro-bot commented Sep 14, 2020

dotnet-maestro-bot commented Sep 14, 2020

NTaylorMullen commented Sep 14, 2020

pranavkm left a comment

NTaylorMullen Sep 14, 2020 •

edited

Loading

dotnet-maestro-bot commented Sep 15, 2020

dotnet-maestro-bot commented Sep 15, 2020

dotnet-maestro-bot commented Sep 15, 2020

dotnet-maestro-bot commented Sep 15, 2020

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

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

Conversation

dotnet-maestro-bot commented Sep 10, 2020

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

ghost left a comment

Choose a reason for hiding this comment

ghost commented Sep 10, 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.

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 10, 2020

dotnet-maestro-bot commented Sep 14, 2020

dotnet-maestro-bot commented Sep 14, 2020

dotnet-maestro-bot commented Sep 14, 2020

dotnet-maestro-bot commented Sep 14, 2020

dotnet-maestro-bot commented Sep 14, 2020

NTaylorMullen commented Sep 14, 2020

pranavkm left a comment

Choose a reason for hiding this comment

NTaylorMullen Sep 14, 2020 • edited Loading

Choose a reason for hiding this comment

dotnet-maestro-bot commented Sep 15, 2020

dotnet-maestro-bot commented Sep 15, 2020

dotnet-maestro-bot commented Sep 15, 2020

dotnet-maestro-bot commented Sep 15, 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.

NTaylorMullen Sep 14, 2020 •

edited

Loading