Skip to content

[automated] Merge branch 'vs17.14' => 'main' #11682

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

Merged
merged 5 commits into from
Apr 6, 2025
Merged

Conversation

github-actions[bot]
Copy link
Contributor

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

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

This PR merges commits made on vs17.14 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.14
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff vs17.14

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

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

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.

maridematte and others added 4 commits April 1, 2025 13:55
* final branding

* restore version bump check

* Updated Package Baseline Version
Avoids problems caused by updating references in MSBuild for core types
that are likely to be used in applications that use MSBuildLocator to
call our API: if we update our baked-in references, we will break some
of them, including Roslyn's MSBuildWorkspace BuildHost. If instead we
bake in the same references we've been using, but ship and binding
redirect to the newer versions, we can update (at runtime in normal
operation) while still being functional in older executables that
ship a stale version (and thus don't binding redirect to a new version).

This reverts commit 026c880.
@github-actions github-actions bot requested a review from a team as a code owner April 4, 2025 13:39
@rainersigwald rainersigwald enabled auto-merge April 4, 2025 19:57
@rainersigwald rainersigwald force-pushed the merge/vs17.14-to-main branch from 966e9a6 to ca31210 Compare April 4, 2025 20:46
@rainersigwald rainersigwald merged commit b878078 into main Apr 6, 2025
10 checks passed
@rainersigwald rainersigwald deleted the merge/vs17.14-to-main branch April 6, 2025 11:55
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