[automated] Merge branch 'release/7.0' => 'main' #43336

dotnet-maestro-bot · 2022-08-17T04:51:05Z

I detected changes in the release/7.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

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

@dotnet-maestro[bot]
@dougbu
@github-actions[bot]

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/7.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/7.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/7.0-to-main

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/7.0-to-main

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/7.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/7.0-to-main main
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/7.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/7.0-to-main

or if you are using SSH

git checkout -b merge/release/7.0-to-main main
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/7.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/7.0-to-main

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.

Co-authored-by: Aditya Mandaleeka <[email protected]>

…0816.3 (dotnet#43331) [release/7.0] Update dependencies from dotnet/runtime

…816.6 (dotnet#43333) [release/7.0] Update dependencies from dotnet/efcore

…816.10 (dotnet#43334) [release/7.0] Update dependencies from dotnet/efcore

ghost

Auto-approving branch merge.

ghost · 2022-08-17T04:51:18Z

Thanks for your PR, @dotnet-maestro-bot. Someone from the team will get assigned to your PR shortly and we'll get it reviewed.

ghost · 2022-08-17T04:51:43Z

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.

…816.14 (dotnet#43337) [release/7.0] Update dependencies from dotnet/efcore

dotnet-maestro-bot · 2022-08-17T07:24:23Z

This pull request has been updated.

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

@dotnet-maestro[bot]
@dougbu
@github-actions[bot]

…817.1 (dotnet#43343) [release/7.0] Update dependencies from dotnet/efcore

dotnet-maestro-bot · 2022-08-17T11:19:28Z

This pull request has been updated.

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

@dotnet-maestro[bot]
@dougbu
@github-actions[bot]

wtgodbe · 2022-08-17T16:15:36Z

@javiercn all conflicts here should be resolved in favor of main

…817.5 (dotnet#43349) [release/7.0] Update dependencies from dotnet/efcore

dotnet-maestro-bot · 2022-08-17T19:24:47Z

This pull request has been updated.

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

@dotnet-maestro[bot]
@dougbu
@github-actions[bot]

…otnet#43351) [release/7.0] Update dependencies from dotnet/runtime dotnet/efcore

dotnet-maestro-bot · 2022-08-18T04:45:09Z

This pull request has been updated.

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

@dotnet-maestro[bot]
@dougbu
@github-actions[bot]

- was "Exclusively use Azure (public) feeds (dotnet#43303)" - Correct ref to selenium-config.json - fix what broke `yarn install` in these directories - Use `yarn` in aspnetcore-components-e2e pipeline - also correct a missing `--frozen-lockfile` Co-authored-by: MerlinBot

dotnet-maestro-bot · 2022-08-18T16:29:28Z

This pull request has been updated.

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

@dougbu
@dotnet-maestro[bot]
@github-actions[bot]

…bly versions (dotnet#43359) - check against potentially-different versions for dotnet/aspnetcore and dotnet/runtime assemblies - backport parts of 416b981 - was "Update branding to 8.0.0-alpha1 (dotnet#43307)"

dotnet-maestro-bot · 2022-08-18T18:27:19Z

This pull request has been updated.

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

@dougbu
@dotnet-maestro[bot]
@github-actions[bot]

…819.1 (dotnet#43387) [release/7.0] Update dependencies from dotnet/efcore

dotnet-maestro-bot · 2022-08-19T14:46:30Z

This pull request has been updated.

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

@dotnet-maestro[bot]
@dougbu
@github-actions[bot]

eng/Versions.props

dougbu · 2022-08-19T18:13:01Z

Letting this auto-merge just to see if the interop tests fail w/ Failed to bind to address https://0.0.0.0:36972: address already in use. again. @halter73 and @Tratcher that problem seems to be impacting a number of builds in main (both aspnetcore-ci and aspnetcore-helix-matrix). Are these new tests or has the test infrastructure changed in the last couple of days❔

Tratcher · 2022-08-19T18:36:09Z

@dougbu which tests?

dotnet-maestro-bot · 2022-08-19T18:37:16Z

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

dougbu · 2022-08-19T18:43:19Z

Different builds failed different tests:

Interop.FunctionalTests.Http3.Http3RequestTests.POST_ClientSendsOnlyHeaders_RequestReceivedOnServer(protocol: Http3)
Interop.FunctionalTests.Http3.Http3RequestTests.POST_ServerAbortAfterWrite_ClientReceivesAbort
Interop.FunctionalTests.Http3.Http3TlsTests.OnAuthenticate_Available_Throws(protocols: Http1AndHttp2AndHttp3) times three
Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.QuicConnectionContextTests.StreamPool_StreamAbortedOnClientAndServer_NotPooled

That's 6 test failures over the 5 most recent aspnetcore-ci and aspnetcore-helix-matrix builds of main.

dotnet-maestro-bot · 2022-08-19T19:14:49Z

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

github-actions bot and others added 5 commits August 16, 2022 21:00

Fix missing using in Http3TimeoutTests. (dotnet#43321)

d86f3a4

Co-authored-by: Aditya Mandaleeka <[email protected]>

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

5a157c8

…0816.3 (dotnet#43331) [release/7.0] Update dependencies from dotnet/runtime

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

e45ffea

…816.6 (dotnet#43333) [release/7.0] Update dependencies from dotnet/efcore

Update branding to 7.0.0-rc2 (dotnet#43240)

16f14ed

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

787d6e7

…816.10 (dotnet#43334) [release/7.0] Update dependencies from dotnet/efcore

dotnet-maestro-bot requested review from Tratcher, halter73, BrennanConroy, JamesNK, a team, dougbu and wtgodbe as code owners August 17, 2022 04:51

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

ghost approved these changes Aug 17, 2022

View reviewed changes

ghost added auto-merge community-contribution Indicates that the PR has been added by a community member labels Aug 17, 2022

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

6d9b570

…816.14 (dotnet#43337) [release/7.0] Update dependencies from dotnet/efcore

ghost removed the auto-merge label Aug 17, 2022

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

6b4d8f3

…817.1 (dotnet#43343) [release/7.0] Update dependencies from dotnet/efcore

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

807d29d

…817.5 (dotnet#43349) [release/7.0] Update dependencies from dotnet/efcore

[release/7.0] Update dependencies from dotnet/runtime dotnet/efcore (d…

dc1e622

…otnet#43351) [release/7.0] Update dependencies from dotnet/runtime dotnet/efcore

dotnet-maestro-bot requested a review from Pilchie as a code owner August 18, 2022 16:29

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

04ef873

…819.1 (dotnet#43387) [release/7.0] Update dependencies from dotnet/efcore

javiercn approved these changes Aug 19, 2022

View reviewed changes

Merge branch 'main' into merge/release/7.0-to-main

fd3a655

javiercn reviewed Aug 19, 2022

View reviewed changes

eng/Versions.props Outdated Show resolved Hide resolved

Update eng/Versions.props

0fcff0b

dougbu enabled auto-merge August 19, 2022 18:10

dougbu merged commit dcbfb82 into dotnet:main Aug 19, 2022

ghost added this to the 8.0-alpha1 milestone Aug 19, 2022

dougbu mentioned this pull request Aug 25, 2022

Move to -Svc pool provider (release/7.0) #43529

Merged

4 tasks

mkArtakMSFT removed the community-contribution Indicates that the PR has been added by a community member label Sep 18, 2022

[automated] Merge branch 'release/7.0' => 'main' #43336

[automated] Merge branch 'release/7.0' => 'main' #43336

Uh oh!

Conversation

dotnet-maestro-bot commented Aug 17, 2022

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 17, 2022

Uh oh!

ghost commented Aug 17, 2022

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 17, 2022

Uh oh!

dotnet-maestro-bot commented Aug 17, 2022

Uh oh!

wtgodbe commented Aug 17, 2022

Uh oh!

dotnet-maestro-bot commented Aug 17, 2022

Uh oh!

dotnet-maestro-bot commented Aug 18, 2022

Uh oh!

dotnet-maestro-bot commented Aug 18, 2022

Uh oh!

dotnet-maestro-bot commented Aug 18, 2022

Uh oh!

dotnet-maestro-bot commented Aug 19, 2022

Uh oh!

Uh oh!

dougbu commented Aug 19, 2022

Uh oh!

Tratcher commented Aug 19, 2022

Uh oh!

dotnet-maestro-bot commented Aug 19, 2022

Uh oh!

dougbu commented Aug 19, 2022

Uh oh!

dotnet-maestro-bot commented Aug 19, 2022

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.