Skip to content

Add vs18.8 to merge-flow config - #13877

Merged
OvesN merged 3 commits into
dotnet:mainfrom
OvesN:release/msbuild-18.8-merge-flow
May 27, 2026
Merged

Add vs18.8 to merge-flow config#13877
OvesN merged 3 commits into
dotnet:mainfrom
OvesN:release/msbuild-18.8-merge-flow

Conversation

@OvesN

@OvesN OvesN commented May 27, 2026

Copy link
Copy Markdown
Contributor

Adds vs18.8 to the merge-flow chain so that commits flow vs18.7 → vs18.8 → main once the vs18.8 release branch is created.

This is part of the 18.8 release, Phase 1.3 of the release checklist.

Change

  • Repoint vs18.7.MergeToBranch from main to vs18.8
  • Add new entry vs18.8.MergeToBranch: main
  • Updated the surrounding comments to note VS/SDK 10.0.5xx context for vs18.8 (following the pattern: vs18.6 → 10.0.3xx, vs18.7 → 10.0.4xx)

The vs18.8 branch itself is created as part of Phase 1.1 of the release.

Insert vs18.8 as the last entry before main in the merge chain so commits flow vs18.7 -> vs18.8 -> main. Comments updated to note VS/SDK 10.0.5xx context.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI review requested due to automatic review settings May 27, 2026 12:03

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 the merge-flow configuration to insert the newly-created vs18.8 branch into MSBuild’s servicing-to-main merge chain, enabling automated merges to flow vs18.7 → vs18.8 → main as part of the VS 18.8 release process.

Changes:

  • Repoints vs18.7.MergeToBranch from main to vs18.8.
  • Adds a new vs18.8 entry that merges to main.
  • Updates nearby comments to reflect the VS/SDK 10.0.5xx context for vs18.8.

Comment thread .config/git-merge-flow-config.jsonc Outdated
Comment thread .config/git-merge-flow-config.jsonc Outdated

@github-actions github-actions Bot 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.

Expert Review — 24-Dimension Analysis

PR Summary: Adds vs18.8 as an intermediary branch in the merge flow chain between vs18.7 and main, following the established VS servicing branching pattern.


Dimension Results

# Dimension Verdict
1 Backwards Compatibility Vigilance ✅ LGTM
2 ChangeWave Discipline ✅ LGTM (N/A)
3 Performance & Allocation Awareness ✅ LGTM (N/A)
4 Test Coverage & Completeness ✅ LGTM (N/A)
5 Error Message Quality ✅ LGTM (N/A)
6 Logging & Diagnostics Rigor ✅ LGTM (N/A)
7 String Comparison Correctness ✅ LGTM (N/A)
8 API Surface Discipline ✅ LGTM (N/A)
9 MSBuild Target Authoring Conventions ✅ LGTM (N/A)
10 Design Before Implementation ✅ LGTM
11 Cross-Platform Correctness ✅ LGTM (N/A)
12 Code Simplification ✅ LGTM
13 Concurrency & Thread Safety ✅ LGTM (N/A)
14 Naming Precision ✅ LGTM
15 SDK Integration Boundaries ✅ LGTM
16 Idiomatic C# Patterns ✅ LGTM (N/A)
17 File I/O & Path Handling ✅ LGTM (N/A)
18 Documentation Accuracy ✅ LGTM
19 Build Infrastructure Care ✅ LGTM
20 Scope & PR Discipline ✅ LGTM
21 Evaluation Model Integrity ✅ LGTM (N/A)
22 Correctness & Edge Cases ✅ LGTM
23 Dependency Management ✅ LGTM (N/A)
24 Security Awareness ✅ LGTM (N/A)

Key Observations

  • Merge chain integrity (Dim 19): The linear chain vs18.6 → vs18.7 → vs18.8 → main is correctly formed with no breaks or cycles.
  • Comment consistency (Dim 18): The new comments follow the established pattern. The vs18.7 annotation was already shown as just (VS) in the pre-existing vs18.6 comment, so removing the SDK 10.0.4xx annotation from vs18.7's own entry resolves a prior inconsistency.
  • Scope (Dim 20): Single-concern PR that only adds a new branch to the flow config.
  • Design (Dim 10): Follows the established VS servicing model — new feature bands get new branches inserted before main.

24/24 dimensions clean — no findings.

Generated by Expert Code Review (on open) for issue #13877 · ● 1.3M

@OvesN
OvesN merged commit 1f7595c into dotnet:main May 27, 2026
10 checks passed
This was referenced Aug 11, 2026
This was referenced Aug 12, 2026
WarperSan pushed a commit to WarperSan/ThunderPipe that referenced this pull request Aug 12, 2026
Updated
[Microsoft.Build.Utilities.Core](https://github.com/dotnet/msbuild) from
18.8.2 to 18.9.6.

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

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

## 18.9.6

## What's Changed
* [vs18.6] Update dependencies from dotnet/arcade by
@​dotnet-maestro[bot] in dotnet/msbuild#13793
* [vs18.0] Update dependencies from dotnet/arcade by
@​dotnet-maestro[bot] in dotnet/msbuild#13859
* [vs18.6] Update dependencies from dotnet/arcade by
@​dotnet-maestro[bot] in dotnet/msbuild#13858
* [vs18.7] Update dependencies from dotnet/arcade by
@​dotnet-maestro[bot] in dotnet/msbuild#13863
* CsWin32 follow-up: CLR metadata + TypeLib interop migration by
@​JeremyKuhne in dotnet/msbuild#13853
* Update vmr-sb-validation.yml for Azure Pipelines by @​meghnave in
dotnet/msbuild#13871
* Test: keep shell alive 15s in ToolTaskCanChangeCanonicalErrorFormat
(#​13734) by @​jankratochvilcz in
dotnet/msbuild#13878
* Add vs18.8 to merge-flow config by @​OvesN in
dotnet/msbuild#13877
* Stable branding for 18.8 release by @​OvesN in
dotnet/msbuild#13883
* Bump main to 18.9.0 after vs18.8 snap by @​OvesN in
dotnet/msbuild#13880
* Avoid checkout in insertion pipeline by @​rainersigwald in
dotnet/msbuild#13887
* Report actual launch path in MSB4216 for Runtime="NET" task host by
@​ViktorHofer in dotnet/msbuild#13889
* Migrate Tlblmp and AxImp to Multithreaded Execution by @​AlesProkop in
dotnet/msbuild#13708
* Replace ErrorUtilities assertion methods with Assumed API and BCL
throw helpers by @​DustinCampbell in
dotnet/msbuild#13790
* Fix CLR_E_SHIM_RUNTIMELOAD in RAR's IMetaDataDispenser activation by
@​JeremyKuhne in dotnet/msbuild#13899
* [main] Update dependencies from nuget/nuget.client by
@​dotnet-maestro[bot] in dotnet/msbuild#13905
* [main] Update dependencies from dotnet/arcade by @​dotnet-maestro[bot]
in dotnet/msbuild#13907
* [main] Update dependencies from dotnet/roslyn by @​dotnet-maestro[bot]
in dotnet/msbuild#13910
* [vs17.14] Update dependencies from dotnet/arcade by
@​dotnet-maestro[bot] in dotnet/msbuild#13908
* [vs18.0] Update dependencies from dotnet/arcade by
@​dotnet-maestro[bot] in dotnet/msbuild#13906
* Fix ToolTask output loss: increase EOF pipe timeout from 2s to 30s by
@​huulinhnguyen-dev in dotnet/msbuild#13767
* Improve symlink cycle condition by @​GangWang01 in
dotnet/msbuild#13901
* [vs18.6] Update dependencies from dotnet/arcade by
@​dotnet-maestro[bot] in dotnet/msbuild#13904
* Add flaky-test detection and auto-fix agentic workflows by
@​ViktorHofer in dotnet/msbuild#13915
* Quote --ignore-exit-code values so the quarantine pipeline does not
shell-split on Unix by @​ViktorHofer in
dotnet/msbuild#13918
* Fix flaky-test detector PR-evidence loss and raise scan limits by
@​ViktorHofer in dotnet/msbuild#13919
* Tighten the pr review agent by @​JanKrivanek in
dotnet/msbuild#13921
* Add environment variables for governance detection by @​ViktorHofer in
dotnet/msbuild#13920
* Change IsPackable to true and add IsShipping flag by @​ViktorHofer in
dotnet/msbuild#13924
* [vs18.7] Update dependencies from dotnet/arcade by
@​dotnet-maestro[bot] in dotnet/msbuild#13911
* Make flaky detector verify recurrence postdates the fix before
commenting by @​ViktorHofer in
dotnet/msbuild#13930
* Fix AbsolutePath.GetCanonicalForm process state leak on Windows by
@​OvesN in dotnet/msbuild#13788
* Fix flaky detector: unblock dnceng feed, fail fast, and defer
quarantine to a second run by @​ViktorHofer in
dotnet/msbuild#13936
* Update documentation for ImplicitUsings element by @​drewnoakes in
dotnet/msbuild#13900
* [vs18.6] Point OptProf bootstrapper at rel/stable instead of int.main
by @​AlesProkop in dotnet/msbuild#13923
* Add CS8618 suppressor for required MSBuild task properties by
@​AArnott in dotnet/msbuild#13926
* Tighten NodeLaunchData.EnvironmentOverrides nullability to
IDictionary<string, string?>? by @​OvesN with @​Copilot in
dotnet/msbuild#13815
* Fix ToolTask EOF wait to be STA-safe via CountdownEvent (MSB4018 in
AspNetCompiler) by @​YuliiaKovalova in
dotnet/msbuild#13917
* [automated] Merge branch 'vs18.6' => 'vs18.7' by @​github-actions[bot]
in dotnet/msbuild#13941
* Localized file check-in by OneLocBuild Task: Build definition ID 9434:
Build ID 14192258 by @​dotnet-bot in
dotnet/msbuild#13849
* Bumping to 10.0.8 runtime packages by @​OvesN in
dotnet/msbuild#13898
* Flaky-test workflow: reassure on empty PR list + drop local
reproduction (quarantine-first) by @​ViktorHofer in
dotnet/msbuild#13938
* [Flaky Test] Un-quarantine 5 consistently-green tests by
@​github-actions[bot] in dotnet/msbuild#13952
* Flaky-test detector: open PRs ready-for-review; drop
newly-filed-issues section from PR body by @​ViktorHofer in
dotnet/msbuild#13958
* [Flaky Test] Quarantine 4 flaky tests by @​github-actions[bot] in
dotnet/msbuild#13937
* Flaky-test: fix duplicate-issue bug by switching dedup key to a
visible code-block key by @​ViktorHofer in
dotnet/msbuild#13963
* CsWin32 follow-up: WindowsNative + VS Setup Configuration + remaining
hand-rolled interop by @​JeremyKuhne in
dotnet/msbuild#13872
* Add the reviewer release skill checking if the Learn article Change
waves is updated by @​GangWang01 in
dotnet/msbuild#13840
* [main] Source code updates from dotnet/dotnet by @​dotnet-maestro[bot]
in dotnet/msbuild#13977
 ... (truncated)

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

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Microsoft.Build.Utilities.Core&package-manager=nuget&previous-version=18.8.2&new-version=18.9.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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