Skip to content

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

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.

Sign up for GitHub

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
rainersigwald merged 3 commits into from
Apr 7, 2026
+7 −3
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01583a3
Bump main to 18.7, add vs18.6 to merge flow
MichalPavlik Mar 31, 2026
e315d67
Apply suggestions from code review
rainersigwald Apr 2, 2026
cc50582
Apply suggestion from @rainersigwald
rainersigwald Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .config/git-merge-flow-config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,12 @@
"vs18.4": {
"MergeToBranch": "vs18.5"
},
// Automate opening PRs to merge msbuild's vs18.5 (VS) into main (VS canary, SDK main & next-feature-band)
// Automate opening PRs to merge msbuild's vs18.5 (VS) into vs18.6 (VS, SDK 10.0.3xx)
"vs18.5": {
"MergeToBranch": "vs18.6"
},
// Automate opening PRs to merge msbuild's vs18.6 (VS) into main (VS canary, SDK main & next-feature-band)
"vs18.6": {
"MergeToBranch": "main"
}
}
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<Import Project="Version.Details.props" />

<PropertyGroup>
<VersionPrefix>18.6.0</VersionPrefix>
<VersionPrefix>18.7.0</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PackageValidationBaselineVersion>18.5.0-preview-26126-01</PackageValidationBaselineVersion>
<PackageValidationBaselineVersion>18.5.0</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>

<!-- differentiate experimental insertions to avoid package id conflicts,
Expand Down
Loading