Skip to content

[automated] Merge branch 'vs17.10' => 'vs17.11' #11710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Apr 9, 2025

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

This PR merges commits made on vs17.10 by the following committers:

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.

merge button instructions

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 vs17.10
git pull --ff-only
git checkout vs17.11
git pull --ff-only
git merge --no-ff vs17.10

# 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/msbuild HEAD:merge/vs17.10-to-vs17.11
or if you are using SSH
git push git@github.com:dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11

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/vs17.10-to-vs17.11'. 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/vs17.10-to-vs17.11 origin/vs17.11
git pull https://github.com/dotnet/msbuild merge/vs17.10-to-vs17.11
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11
or if you are using SSH
git fetch
git checkout -b merge/vs17.10-to-vs17.11 origin/vs17.11
git pull git@github.com:dotnet/msbuild merge/vs17.10-to-vs17.11
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11

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.

dotnet-maestro bot and others added 7 commits March 18, 2025 09:11
* Update dependencies from https://github.com/dotnet/arcade build 20250220.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25114.5 -> To Version 8.0.0-beta.25120.1

* Update Versions.props VersionPrefix

* Update dependencies from https://github.com/dotnet/arcade build 20250314.5

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25114.5 -> To Version 8.0.0-beta.25164.5

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
* remove release branding for experimental in CI Build

* backport experimental insertion and add servicing branch selection logic

* fix removing versionkind

* bump version

* simplify version suffix selection

* fix comment
changes in the vs17.8 branch which have not been merged yet to vs17.10
@github-actions github-actions bot requested a review from a team as a code owner April 9, 2025 12:59
* Update dependencies from https://github.com/dotnet/arcade build 20250408.7

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25204.7 -> To Version 8.0.0-beta.25208.7

* Update VersionPrefix to 17.10.27

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on vs17.10 by the following committers:

@GangWang01
Copy link
Member

@YuliiaKovalova The changes are the arcade update from vs17.10 flowing into vs17.11. It should be done in arcade update PR for each release branch (e.g. #11712 that has the same changes).
For inter branch merge flow, we need keep the arcade part of target branch as is. Is it right?

@GangWang01
Copy link
Member

Close and let the arcade update do the change for each branch.

@GangWang01 GangWang01 closed this Apr 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants