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

[github-actions]

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

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

• MiYanni
• dotnet-maestro[bot]
• DonnaChen888

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.1xx
git pull --ff-only
git checkout release/10.0.2xx
git pull --ff-only
git merge --no-ff release/10.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/sdk HEAD:merge/release/10.0.1xx-to-release/10.0.2xx

or if you are using SSH

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

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.1xx-to-release/10.0.2xx'. 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.1xx-to-release/10.0.2xx origin/release/10.0.2xx
git pull https://github.com/dotnet/sdk merge/release/10.0.1xx-to-release/10.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.0.2xx

or if you are using SSH

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

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.

[MiYanni]

@dotnet/product-construction The "reset files" commit happened (for the codeflow specific files), but those files still have changes in this PR somehow...

[MiYanni]

Incorrect file versions being changed.

[premun]

This PR is coming from a GitHub workflow that we don't own and so I think the version files will need to be handled manually during these merges. I don't see any other way other than configuring the workflow to ignore these files.
But I also don't understand the details of the SDK repo and if it is actually the case that some V.D.xml bumps should be backported.

[MiYanni]

@premun

This PR is coming from a GitHub workflow that we don't own and so I think the version files will need to be handled manually during these merges. I don't see any other way other than configuring the workflow to ignore these files. But I also don't understand the details of the SDK repo and if it is actually the case that some V.D.xml bumps should be backported.

That doesn't sound correct to me. The workflow for the PR itself comes from an Arcade template, and I've only seen those Reset files to commits on these PRs. Also, these are never backports (only forward-ports). So, the versions in the target branch will always be correct. Maybe someone else has more details? CC @mmitche (this commit for context)

[mmitche]

@premun

This PR is coming from a GitHub workflow that we don't own and so I think the version files will need to be handled manually during these merges. I don't see any other way other than configuring the workflow to ignore these files. But I also don't understand the details of the SDK repo and if it is actually the case that some V.D.xml bumps should be backported.

That doesn't sound correct to me. The workflow for the PR itself comes from an Arcade template, and I've only seen those Reset files to commits on these PRs. Also, these are never backports (only forward-ports). So, the versions in the target branch will always be correct. Maybe someone else has more details? CC @mmitche (this commit for context)

@MiYanni The only diff I can see between the commit and the HEAD of release/10.0.2xx is that Versions.props has some interesting diffs. Vesions.props is not reset to the target paths. https://github.com/dotnet/sdk/blob/main/github-merge-flow.jsonc#L38. THat was eliminated here: 231d624

This looks intentional in the PR. Versions.props may contain things that are NOT auto-dependency flow related that should go forward.

[MiYanni]

/ba-g no file changes