Skip to content

[automated] Merge branch 'vs18.7' => 'main'#13659

Closed
github-actions[bot] wants to merge 2 commits into
mainfrom
merge/vs18.7-to-main
Closed

[automated] Merge branch 'vs18.7' => 'main'#13659
github-actions[bot] wants to merge 2 commits into
mainfrom
merge/vs18.7-to-main

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

I detected changes in the vs18.7 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 vs18.7 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 vs18.7
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff vs18.7

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

Phase 4 of the [18.7 release
checklist](#13639): final
branding for the 18.7.0 release.

### Changes (generated by `scripts/Stabilize-Release.ps1`)
- Add `<DotNetFinalVersionKind>release</DotNetFinalVersionKind>` on the
`VersionPrefix` line (kept inline to create a conflict in forward-flow
per release docs)
- Change `PreReleaseVersionLabel` from `preview` to `servicing`

### Notes
- **Phase 4.1 (PublicAPI promotion)**: no-op — there are no non-empty
`PublicAPI.Unshipped.txt` entries on `vs18.7`.
- Same shape as 18.6 final branding PR #13473.

⚠️ **Time-sensitive**: VS snaps `main` → `rel/insiders` on
**2026-05-01**. Final-branded bits need to be in VS `main` before the
snap.

Tracks #13639.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions github-actions Bot requested a review from a team as a code owner April 30, 2026 12:28
The 18.7.0 build had optprof disabled so isn't insertable.
@github-actions

Copy link
Copy Markdown
Contributor Author

This pull request has been updated.

This PR merges commits made on vs18.7 by the following committers:

@SimaTian SimaTian mentioned this pull request May 4, 2026
61 tasks
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.

3 participants