Update VersionPrefix to 18.6.0 + insertion flow#13296
Merged
MichalPavlik merged 5 commits intomainfrom Feb 26, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Updates MSBuild versioning to align with the next release train (18.6) and adjusts VS insertion/merge-flow configuration to account for new/updated servicing branches.
Changes:
- Bump
VersionPrefixto18.6.0and advance the package validation baseline to18.5.0. - Add
rel/d18.6as a VS insertion target and update auto-targeting logic forvs18.6. - Update merge-flow configuration to insert a
vs18.5hop before merging tomain.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| eng/Versions.props | Version bump to 18.6.0 and baseline update for package validation. |
| azure-pipelines/vs-insertion.yml | Adds 18.6 insertion target and updates auto branch mapping logic. |
| azure-pipelines/vs-insertion-experimental.yml | Adds 18.6 insertion target for experimental insertions and removes an older target. |
| .config/git-merge-flow-config.jsonc | Adjusts the servicing merge chain (notably around 18.4/18.5). |
Comments suppressed due to low confidence (3)
.config/git-merge-flow-config.jsonc:12
- The merge-flow chain now routes
vs16.11tovs17.8, but there is no configuration entry forvs17.8. This breaks the stated “servicing chain … through … to main” because automation will stop atvs17.8. Add avs17.8entry (e.g., tovs17.10or whatever the next branch should be) or changevs16.11to merge directly into the next configured branch.
// Automate opening PRs to merge msbuild's vs16.11 (VS until 4/2029) into vs17.8 (SDK 8.0.1xx)
"vs16.11": {
"MergeToBranch": "vs17.8"
},
// Automate opening PRs to merge msbuild's vs17.10 (SDK 8.0.3xx) into vs17.11 (SDK 8.0.4xx)
"vs17.10": {
"MergeToBranch": "vs17.11"
},
.config/git-merge-flow-config.jsonc:40
- With the repository moving forward (VersionPrefix 18.6.0 and insertion targeting
rel/d18.6), the merge-flow config likely needs to be extended to include the newvs18.6step (e.g.,vs18.5->vs18.6andvs18.6->main). As-is, automation will skipvs18.6entirely and continue mergingvs18.5directly tomain.
// Automate opening PRs to merge msbuild's vs18.4 (VS) into vs18.5 (VS)
"vs18.4": {
"MergeToBranch": "vs18.5"
},
// Automate opening PRs to merge msbuild's vs18.5 (VS) into main (VS canary, SDK main & next-feature-band)
"vs18.5": {
"MergeToBranch": "main"
}
azure-pipelines/vs-insertion.yml:48
- The
TargetBranchvalues entry forrel/d18.6has trailing whitespace. This can cause noisy diffs and may break strict YAML linting; please remove the extra spaces.
- main
- rel/d18.6
- rel/d18.5
rainersigwald
approved these changes
Feb 26, 2026
Co-authored-by: Rainer Sigwald <raines@microsoft.com>
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.
Update VersionPrefix to 18.6.0 + insertion flow