[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx'

[dotnet-maestro-bot]

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

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

• marcpopMSFT
• dtivel
• v-wuzhai
• vseanreesermsft
• dotnet-maestro[bot]
• dotnet-bot
• mmitche
• Forgind

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/6.0.4xx
git pull --ff-only
git checkout release/7.0.1xx
git pull --ff-only
git merge --no-ff release/6.0.4xx

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

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/6.0.4xx-to-release/7.0.1xx

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

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

or if you are using SSH

git checkout -b merge/release/6.0.4xx-to-release/7.0.1xx release/7.0.1xx
git pull git@github.com:dotnet-maestro-bot/sdk merge/release/6.0.4xx-to-release/7.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/6.0.4xx-to-release/7.0.1xx

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.

[nagilson]

@dtivel I see you bumped System.Security.Cryptography.Pkcs here: https://github.com/dotnet/sdk/pull/35158/files but that was also adding the package to DARC for the first time. Where/why is this package being consumed now? I didn't see it being used in the SDK anywhere

[dtivel]

@nagilson, see #33928 for full context.

System.Security.Cryptography.Pkcs is a .NET Platform Extension and, therefore, not updated with .NET runtime updates. Several SDK components (i.e.: NuGet and MSBuild) use System.Security.Cryptography.Pkcs, but its update history is not great. By setting the version in the .NET SDK, the .NET SDK can bump the version globally.

@marcpopMSFT, applied this change in .NET 6.0.1xx and 6.0.3xx SDK's. This change applied the same version bump to the .NET 6.0.4xx SDK.

[marcpopMSFT]

Since this is codeflow into 7, I don't think we should take the change as is as we wouldn't want the 6.0.4 version. We can either remove the change entirely into 7.0.1xx or change it to target the latest 7.0 version of that package (which is 7.0.3)

[dtivel]

I agree. #35158 was only meant for 6.0.4xx.

[nagilson]

That's the only relevant change here so I'm closing this. Thank you for providing such great context.

[marcpopMSFT]

note that it'll probably keep showing up in these branch merges until we have a real change we want to take and we remove that commit from the flow.