Skip to content

Bump main to 18.7, add vs18.6 to merge flow#13472

Open
MichalPavlik wants to merge 1 commit intomainfrom
release/18.7-branding
Open

Bump main to 18.7, add vs18.6 to merge flow#13472
MichalPavlik wants to merge 1 commit intomainfrom
release/18.7-branding

Conversation

@MichalPavlik
Copy link
Copy Markdown
Member

Release 18.6 — Phase 1.3 + Phase 2

Tracking issue: #13468

Changes

  1. **\�ng/Versions.props**: Bump \VersionPrefix\ from \18.6.0\ → \18.7.0\
  2. **.config/git-merge-flow-config.jsonc**: Insert \�s18.6\ into the merge chain (\�s18.5 → vs18.6 → main)

Not changed (no-op)

  • \�s-insertion.yml: Auto-targets VS \main\ for all \�s*\ branches — no branch-specific mapping needed
  • \�s-insertion-experimental.yml: Already has \main/
    el/insiders/
    el/stable\ target options

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>
@MichalPavlik MichalPavlik requested a review from a team as a code owner March 31, 2026 14:56
Copilot AI review requested due to automatic review settings March 31, 2026 14:56
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.props VersionPrefix from 18.6.0 to 18.7.0.
  • Extend the merge-flow chain so vs18.5 merges into vs18.6, and vs18.6 merges into main.

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.

<VersionPrefix>18.6.0</VersionPrefix>
<VersionPrefix>18.7.0</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PackageValidationBaselineVersion>18.5.0-preview-26126-01</PackageValidationBaselineVersion>
Copy link

Copilot AI Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PackageValidationBaselineVersion was not updated as part of the main version bump. The release checklist requires setting this to the previous GA version published to NuGet (for this release cycle: 18.5.0) so package validation baselines against the correct shipping reference.

Suggested change
<PackageValidationBaselineVersion>18.5.0-preview-26126-01</PackageValidationBaselineVersion>
<PackageValidationBaselineVersion>18.5.0</PackageValidationBaselineVersion>

Copilot uses AI. Check for mistakes.
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