[automated] Merge branch 'main' => 'dev'

[dotnet-maestro-bot]

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

This PR merges commits made on main by the following committers:

• joperezr

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 main
git pull --ff-only
git checkout dev
git pull --ff-only
git merge --no-ff main

# 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/Common HEAD:merge/main-to-dev

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/Common HEAD:merge/main-to-dev

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

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

or if you are using SSH

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

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.

Microsoft Reviewers: Open in CodeFlow

[joperezr]

@RussKie I fixed the merge conflict and the issue with the build (the test change didn't need to be ported over from main as the test acts differently in 9.0). For now, I removed during my merge the baseline files for the suppression of the SDL issues assuming that those will get added too separately for this branch, is that right?

If that's the case, then I think this is ready to go, so please feel free to merge this in then.

[RussKie]

Oh bugger, I accidentally s/merged it, so we'll have to do it again...