[automated] Merge branch 'release/5.0' => 'main'

[dotnet-maestro-bot]

I detected changes in the release/5.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/5.0 by the following committers:

• wtgodbe

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

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.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/5.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/5.0-to-main main
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/5.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/5.0-to-main

or if you are using SSH

git checkout -b merge/release/5.0-to-main main
git pull git@github.com:dotnet-maestro-bot/AspNetCore merge/release/5.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.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.

[ghost]

Auto-approving branch merge.

[dougbu]

@wtgodbe this is weird. Any idea why this isn't a no-op merge❔

@HaoK I doubt retry is going to help w/ the cert-related test failures. Please let us review #31456 and let's get that in.

[HaoK]

31456 isn't related to the tests, I already skipped the tests I thought in main

[HaoK]

This is the PR needed to skip that test (the cert is fixed now, but I saw some failures on ubuntu still), so I went ahead and skipped it

[dougbu]

Something is not right @HaoK because the failures of Microsoft.AspNetCore.Authentication.Test.VerifyNotYetValidSelfSignedFails() are consistent across all Helix agents. See https://dev.azure.com/dnceng/public/_build/results?buildId=1148158&view=ms.vss-test-web.build-test-results-tab Are the tests actually skipped in 'main'❔

[dougbu]

This is the PR …

Which PR❔

[HaoK]

Oops forgot to paste: #32812

[dougbu]

Oops forgot to paste: #32812

But, you got that into main two days ago and this PR has only been open a few hours. What's causing the test failures❔

On an unrelated note, once @wtgodbe has fixed #32777, please use the backport bot to get #32812 into any branch w/ the test affected by that certificate. Do the same w/ whatever's causing the problems in this PR. (I'm about to rerun from scratch in case the GitHub merge commit was messed up.)

[dougbu]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 2 pipeline(s).

[HaoK]

I'm not sure since it should be skipped in main at this point right?

[HaoK]

Are there any branches that we need for helix runs other than release/5.0 and release/3.0?

[dougbu]

it should be skipped in main at this point right?

Unless we broke [SkipOnHelix(...)] at some point❔

Are there any branches that we need for helix runs other than release/5.0 and release/3.0?

As long as you mean release/5.0 and release/3.1, no -- that's it.

[HaoK]

@wtgodbe Can you take a look at https://github.com/dotnet/aspnetcore/runs/2634842735?check_suite_focus=true looks like it failed with repo collaborator for me?

[HaoK]

Unless we broke [SkipOnHelix(...)] at some point❔

I think we'd notice that as a ton of tests would fail...

[dougbu]

@wtgodbe Can you take a look at …

@HaoK this is a known issue and it's the reason I said "once @wtgodbe has fixed #32777". See also our overlapping conversation in #32812.