Bump main to 18.7, add vs18.6 to merge flow#13472
Merged
Merged
Conversation
Phase 1.3 + Phase 2: Update VersionPrefix to 18.7.0 and insert vs18.6 into the merge-flow chain. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
53 tasks
Contributor
There was a problem hiding this comment.
Pull request overview
Updates MSBuild’s main branch versioning and merge automation to reflect the new VS 18.6 release branch and the next development version (18.7).
Changes:
- Bump
eng/Versions.propsVersionPrefixfrom18.6.0to18.7.0. - Extend the merge-flow chain so
vs18.5merges intovs18.6, andvs18.6merges intomain.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| eng/Versions.props | Updates the main-branch version prefix to 18.7.0. |
| .config/git-merge-flow-config.jsonc | Inserts vs18.6 into the automated branch merge chain before main. |
ViktorHofer
approved these changes
Mar 31, 2026
rainersigwald
approved these changes
Apr 2, 2026
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Rainer Sigwald <raines@microsoft.com>
Member
Member
|
^ that is now merged so we should be good |
dfederm
pushed a commit
to dfederm/msbuild
that referenced
this pull request
Apr 9, 2026
--------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Rainer Sigwald <raines@microsoft.com>
OvesN
added a commit
that referenced
this pull request
May 4, 2026
Phase 2 of the [18.7 release checklist](#13639): bump `main` to 18.8 now that `vs18.7` has been snapped. ### Changes - `VersionPrefix`: `18.7.0` → `18.8.0` - `PackageValidationBaselineVersion`: `18.6.0-preview-26180-08` → `18.7.0-preview-26230-02` - This is the 18.7 preview that was inserted into VS main via [DevDiv VS#733906](https://devdiv.visualstudio.com/DevDiv/_git/VS/pullrequest/734784) (msbuild commit `f215cd0f`), matching the prior pattern used in #13472 (which set baseline to the latest 18.6 preview at the time of snap). ### Notes - `CompatibilitySuppressions.xml` files: not updated here. If ApiCompat fails CI, run `dotnet pack MSBuild.Dev.slnf /p:ApiCompatGenerateSuppressionFile=true` to regenerate. - `azure-pipelines/vs-insertion.yml`: no `AutoInsertTargetBranch` field on this version — no change needed for the main bump. - `azure-pipelines/vs-insertion-experimental.yml`: already has `main`/`rel/insiders`/`rel/stable` — no change needed. Tracks #13639. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Jan Provazník <janpro@janpro.dev> Co-authored-by: Veronika Ovsyannikova <150850103+OvesN@users.noreply.github.com>
This was referenced Jun 10, 2026
This was referenced Jun 11, 2026
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Release 18.6 — Phase 1.3 + Phase 2
Tracking issue: #13468
Changes
Not changed (no-op)
el/insiders/
el/stable\ target options