Skip to content

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

Merged
rainersigwald merged 3 commits into
mainfrom
release/18.7-branding
Apr 7, 2026
Merged

Bump main to 18.7, add vs18.6 to merge flow#13472
rainersigwald merged 3 commits into
mainfrom
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 <[email protected]>
@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
@MichalPavlik MichalPavlik mentioned this pull request Mar 31, 2026
53 tasks

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

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.

Comment thread eng/Versions.props Outdated
Comment thread .config/git-merge-flow-config.jsonc Outdated
Comment thread eng/Versions.props Outdated
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Rainer Sigwald <[email protected]>
Comment thread eng/Versions.props Outdated
@rainersigwald

Copy link
Copy Markdown
Member

@rainersigwald

Copy link
Copy Markdown
Member

^ that is now merged so we should be good

@rainersigwald rainersigwald merged commit b013a87 into main Apr 7, 2026
10 checks passed
@rainersigwald rainersigwald deleted the release/18.7-branding branch April 7, 2026 14:00
dfederm pushed a commit to dfederm/msbuild that referenced this pull request Apr 9, 2026
---------

Co-authored-by: Copilot <[email protected]>
Co-authored-by: Rainer Sigwald <[email protected]>
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 <[email protected]>
Co-authored-by: Jan Provazník <[email protected]>
Co-authored-by: Veronika Ovsyannikova <[email protected]>
github-actions Bot pushed a commit to IntelliTect/Multitool that referenced this pull request Jun 29, 2026
Updated [Microsoft.Build](https://github.com/dotnet/msbuild) from 18.6.3
to 18.7.1.

<details>
<summary>Release notes</summary>

_Sourced from [Microsoft.Build's
releases](https://github.com/dotnet/msbuild/releases)._

## 18.7.1

## What's Changed
* Fix TraceEngine file contention deadlock in multithreaded mode by
@​JanProvaznik in dotnet/msbuild#13446
* Remove duplicate test cases in MultithreadableTaskAnalyzer by
@​Youssef1313 in dotnet/msbuild#13483
* Ensure ThreadSafeTaskAnalyzer.Tests is considered as a unit test
project by @​Youssef1313 in dotnet/msbuild#13481
* Fix MSBuildTask0002 analyzer warnings in already-migrated tasks by
@​JanProvaznik in dotnet/msbuild#13466
* Fix race conditions in task host path resolution by @​AR-May in
dotnet/msbuild#13485
* Migrate ToolTask and Al task to TaskEnvironment API by @​OvesN in
dotnet/msbuild#13423
* Bump main to 18.7, add vs18.6 to merge flow by @​MichalPavlik in
dotnet/msbuild#13472
* Avoid allocations in GetHashCode implementations by @​DustinCampbell
in dotnet/msbuild#13475
* Add PATs rotation to agentic workflow(s) by @​JanKrivanek in
dotnet/msbuild#13496
* Fix ASP.NET WebSite projects to copy netstandard.dll facade when
required by @​JanProvaznik in
dotnet/msbuild#13058
* Migrate AspNetCompiler to TaskEnvironment API by @​OvesN in
dotnet/msbuild#13424
* Add review workflow by @​JanKrivanek in
dotnet/msbuild#13503
* Strengthen reviewer skill: add step-back analysis dimensions by
@​JanProvaznik in dotnet/msbuild#13504
* Add 'Request Speedometer Perf Run' to VS experimental insertion build
policies by @​Copilot in dotnet/msbuild#13505
* Remove duplicate @ prefix from issueAuthor in GitOps by @​akoeplinger
in dotnet/msbuild#13492
* Improve review aw by @​JanKrivanek in
dotnet/msbuild#13510
* Migrates unit tests to use RoslynCodeTaskFactory to enable running
tests under .NET Core by @​jankratochvilcz in
dotnet/msbuild#13500
* Fix cross-AppDomain TaskItem modifier cache regression by
@​DustinCampbell in dotnet/msbuild#13493
* Discourage review agent from approving PRs by @​JanKrivanek in
dotnet/msbuild#13512
* Stop trying to deploy ValueTuple by @​rainersigwald in
dotnet/msbuild#13507
* Ad-hoc re-sign bootstrap dotnet on macOS to prevent SIGKILL by
@​jankratochvilcz in dotnet/msbuild#13513
* RoslynCodeTaskFactory: Log MSB3753 when task class does not implement
ITask by @​jankratochvilcz in
dotnet/msbuild#13517
* Update gh-aw (upon mcp policy changes) by @​JanKrivanek in
dotnet/msbuild#13526
* Eliminate XmlChildNodes allocations in GetXmlNodeInnerContents by
@​nareshjo in dotnet/msbuild#13509
* Fix telemetry allocation regression: per-engine collector ownership by
@​JanProvaznik in dotnet/msbuild#13516
* Migrate to xunit.v3 by @​Youssef1313 in
dotnet/msbuild#13482
* Fix stray brace in HandleBuildCancel trace string causing MSB1025 by
@​Copilot in dotnet/msbuild#13535
* Bumping to 10.0.4 runtime packages by @​MichalPavlik in
dotnet/msbuild#13533
* Remove early return in GetCanonicalForm, always call System.IO.Path by
@​OvesN in dotnet/msbuild#13532
* Do not overwrite GetCopyToOutputDirectoryItemsDependsOn, just add new…
by @​snechaev in dotnet/msbuild#13474
* Migrate GetReferenceAssemblyPaths task to TaskEnvironment API by
@​OvesN in dotnet/msbuild#13495
* Stabilize ToolTaskThatTimeoutAndRetry test by @​rainersigwald in
dotnet/msbuild#13489
* [automated] Merge branch 'vs18.6' => 'main' by @​github-actions[bot]
in dotnet/msbuild#13506
* Add extra test assertions around tests by @​Youssef1313 in
dotnet/msbuild#13536
* Add static eval for repo skills/agents via skill-validator by
@​JanKrivanek in dotnet/msbuild#13537
* Migrate SGen task to Task environment API by @​OvesN in
dotnet/msbuild#13457
* Fix TerminalLogger assert failure for metaproj files and cached
project eval ID by @​OvesN in
dotnet/msbuild#13480
* Filter out approving review from pr-reviewer agent by @​JanKrivanek in
dotnet/msbuild#13553
* Use a unique task name per invocation to tabilize
RoslynCodeTaskFactory_ReuseCompilation test by @​huulinhnguyen-dev in
dotnet/msbuild#13551
* Brief doc on feedback/logging/data systems by @​rainersigwald in
dotnet/msbuild#13554
* Localized file check-in by OneLocBuild Task: Build definition ID 9434:
Build ID 13881982 by @​dotnet-bot in
dotnet/msbuild#13437
* Stage 3: Forward BuildProjectFile* callbacks from OOP TaskHost to
worker node by @​JanProvaznik in
dotnet/msbuild#13350
* Enable TaskHost Callbacks by default by @​JanProvaznik in
dotnet/msbuild#13579
* Remove unactionable info from reviewer agent by @​JanKrivanek in
dotnet/msbuild#13578
* Enlighten RequiresFramework35SP1Assembly task for multithreaded mode
by @​jankratochvilcz in dotnet/msbuild#13575
* Make SdkResolver-provided environment variables take precedence over
ambient environment by @​Copilot in
dotnet/msbuild#12655
* Add dotnet/skills marketplace and enable plugins by @​Evangelink in
dotnet/msbuild#13582
* The skills/agents check filters-in only touched files by @​JanKrivanek
in dotnet/msbuild#13586
* Fix skill-validation workflow failing when agents directory is deleted
by @​JeremyKuhne in dotnet/msbuild#13592
 ... (truncated)

Commits viewable in [compare
view](dotnet/msbuild@v18.6.3...v18.7.1).
</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This was referenced Jun 29, 2026
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.

4 participants