[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'

[dotnet-maestro-bot]

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

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

• MichaelSimons

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.1xx
git pull --ff-only
git checkout release/6.0.3xx
git pull --ff-only
git merge --no-ff release/6.0.1xx

# 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/core-sdk HEAD:merge/release/6.0.1xx-to-release/6.0.3xx

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/core-sdk HEAD:merge/release/6.0.1xx-to-release/6.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/6.0.1xx-to-release/6.0.3xx'. 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.1xx-to-release/6.0.3xx release/6.0.3xx
git pull https://github.com/dotnet-maestro-bot/core-sdk merge/release/6.0.1xx-to-release/6.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/core-sdk HEAD:merge/release/6.0.1xx-to-release/6.0.3xx

or if you are using SSH

git checkout -b merge/release/6.0.1xx-to-release/6.0.3xx release/6.0.3xx
git pull [email protected]:dotnet-maestro-bot/core-sdk merge/release/6.0.1xx-to-release/6.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/core-sdk HEAD:merge/release/6.0.1xx-to-release/6.0.3xx

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.

[v-wuzhai]

@dotnet/source-build-internal @lbussell I've resolved the conflict, could you help to review them?

[lbussell]

@v-wuzhai We should not have the commit 96efc2a as we are not building or supporting source-build for 6.0.3xx at the moment. If you remove that the CI should pass.

[MichaelSimons]

@v-wuzhai We should not have the commit 96efc2a as we are not building or supporting source-build for 6.0.3xx at the moment. If you remove that the CI should pass.

I don't think we should remove this commit, rather I think we should disable CI. I thought I made these changes someplace yesterday.

[MichaelSimons]

I have pushed a fix to disable source-build tarball build validation.

[marcpopMSFT]

@MichaelSimons will we need e551553 to flow to 6.0.4xx but not to 7.0.1xx? I've generally just been letting most source build changes flow with the auto-flow but if specific ones should not, we'll need to watch for that.

[MichaelSimons]

@MichaelSimons will we need e551553 to flow to 6.0.4xx but not to 7.0.1xx? I've generally just been letting most source build changes flow with the auto-flow but if specific ones should not, we'll need to watch for that.

That's correct, we should not flow this one beyond 6.0.4xx.