[automated] Merge branch 'release/10.0.2xx' => 'release/10.0.3xx'

[github-actions]

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

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

• joeloff
• DonnaChen888
• dotnet-maestro[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/10.0.2xx
git pull --ff-only
git checkout release/10.0.3xx
git pull --ff-only
git merge --no-ff release/10.0.2xx

# 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/sdk HEAD:merge/release/10.0.2xx-to-release/10.0.3xx

or if you are using SSH

git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.2xx-to-release/10.0.3xx

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/10.0.2xx-to-release/10.0.3xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/release/10.0.2xx-to-release/10.0.3xx origin/release/10.0.3xx
git pull https://github.com/dotnet/sdk merge/release/10.0.2xx-to-release/10.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.2xx-to-release/10.0.3xx

or if you are using SSH

git fetch
git checkout -b merge/release/10.0.2xx-to-release/10.0.3xx origin/release/10.0.3xx
git pull git@github.com:dotnet/sdk merge/release/10.0.2xx-to-release/10.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.2xx-to-release/10.0.3xx

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

[DonnaChen888]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[marcpopMSFT]

The only change in this PR is breaking the tests. I think the version of MTP in 3xx is behind 2xx. @dotnet/dotnet-testing how soon is the update coming? Seems like dotnet/dotnet#5511 is blocked.

I can close this, remove the extra baseline code (which will make this PR empty and make the flow back from 3xx fail once that other PR is in), or leave this open.

[Youssef1313]

@marcpopMSFT The test updates in this PR were originally paired with a dependency update of MTP. Why is this PR only getting the test update without the dependency update?

[Youssef1313]

Original PR from 10.0.2xx is #53669

[Youssef1313]

Looks like wrong merge or conflict resolution that happened in this PR. I pushed some changes.

[marcpopMSFT]

Looks like wrong merge or conflict resolution that happened in this PR. I pushed some changes.

Guidance to our team is to take the target branch for any eng folder merge conflicts. Occasionally, if there are eng folder changes with no conflicts, those slip through so this might have been a case like that.

[DonnaChen888]

Known issue dotnet/dnceng#6496

[DonnaChen888]

/ba-g no file changes