Skip to content

Bump main to 18.12 after the vs18.11 branch snap - #14841

Merged
ViktorHofer merged 2 commits into
mainfrom
release/bump-main-to-18.12
Aug 26, 2026
Merged

ViktorHofer merged 2 commits into
mainfrom
release/bump-main-to-18.12

Conversation

@ViktorHofer

Copy link
Copy Markdown
Member

Phase 3 of the 18.11 release — tracking issue #14840.

vs18.11 was cut from main at 9353559c2c on 2026-08-26, so main now becomes 18.12.

Required release changes

Step Change
3.1 eng/Versions.props: VersionPrefix 18.11.0 → 18.12.0
3.2 eng/Versions.props: PackageValidationBaselineVersion → 18.11.0-1.26426.2
3.3 .vsts-dotnet.yml: OptProfBaselineDrop → OptimizationData/DotNet-msbuild-Trusted/main/20260812.2/14983723/1

18.11.0-1.26426.2 is the official build (20260826.2) at the vs18.11 branch point, verified present on the public dotnet-tools feed. The OptProf drop keeps the next vs* branch cut from main able to complete its first official build without a manual bootstrap rerun.

Release tooling fixes

Three bugs surfaced while executing the checklist for this release:

  1. scripts/Get-PackageValidationBaseline.ps1 could not resolve a baseline at all. It hardcoded the legacy -preview-<shortDate>-<rev> version shape, but MSBuild produces -<PreReleaseVersionLabel>.<shortDate>.<rev> (PreReleaseVersionLabel is 1, hence 18.11.0-1.26426.2). Every candidate was reported [NOT on feed] and the script threw. It now reads PreReleaseVersionLabel from the release branch instead of assuming a label.
  2. Checklist step 2.3e used a non-existent darc verb. darc delete-subscription fails with "Verb 'delete-subscription' is not recognized." — the verb is delete-subscriptions (plural), and it needs -q or it blocks on a confirmation prompt. This aborted the Phase 2 batch mid-run.
  3. Checklist step 2.3i's instruction would duplicate a change. "Re-run the final write command without --no-pr" re-applies it; corrected to omit --no-pr on the last command of the batch in the first place.

Docs in documentation/release-checklist.md and .github/skills/release/SKILL.md are updated to the real version format, plus a note that the branch-point build publishes to the feed asynchronously (re-run the script rather than substituting an older build).

⚠️ Merge ordering

Do not merge before the Phase 2 DARC configuration PR maestro-configuration!64468 is merged. That PR moves main's default channel from VS 18.11 to VS 18.12; merging this one first would publish main's first 18.12 build to the stale VS 18.11 channel.

Phase 3 of the 18.11 release (#14840):

- eng/Versions.props: VersionPrefix 18.11.0 -> 18.12.0
- eng/Versions.props: PackageValidationBaselineVersion -> 18.11.0-1.26426.2,
  the build at the vs18.11 branch point (9353559, official build 20260826.2)
  verified present on the public dotnet-tools feed
- .vsts-dotnet.yml: refresh OptProfBaselineDrop so the next vs* branch cut from
  main inherits valid OptProf data

Also fixes release tooling bugs found while running the process:

- scripts/Get-PackageValidationBaseline.ps1 hardcoded the legacy
  "-preview-<shortDate>-<rev>" version shape. MSBuild builds
  "-<PreReleaseVersionLabel>.<shortDate>.<rev>" (e.g. 18.11.0-1.26426.2), so the
  script matched nothing on the feed and failed to resolve a baseline at all.
  It now reads PreReleaseVersionLabel from the release branch.
- documentation/release-checklist.md step 2.3e used "darc delete-subscription",
  which is not a valid verb; it is "delete-subscriptions" and needs -q to skip
  its confirmation prompt.
- documentation/release-checklist.md step 2.3i said to re-run the final write
  command without --no-pr, which duplicates the change. Corrected to omit
  --no-pr on the last command of the batch.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI lite review requested due to automatic review settings August 26, 2026 11:47
@ViktorHofer
ViktorHofer requested a review from a team as a code owner August 26, 2026 11:47
@github-actions

Copy link
Copy Markdown
Contributor

🔍 Skill Validator Results

⚠️ Warnings or advisories found

Scope Checked
Skills 1
Agents 0
Total 1
Severity Count
--- ---:
❌ Errors 0
⚠️ Warnings 1
ℹ️ Advisories 0

Summary

Level Finding
ℹ️ Found 1 skill(s)
ℹ️ [release] 📊 release: 3,737 BPE tokens [chars/4: 3,675] (standard ~), 13 sections, 1 code blocks
ℹ️ [release] ⚠ Skill is 3,737 BPE tokens (chars/4 estimate: 3,675) — approaching "comprehensive" range where gains diminish.
ℹ️ ✅ All checks passed (1 skill(s))
Full validator output ```text Found 1 skill(s) [release] 📊 release: 3,737 BPE tokens [chars/4: 3,675] (standard ~), 13 sections, 1 code blocks [release] ⚠ Skill is 3,737 BPE tokens (chars/4 estimate: 3,675) — approaching "comprehensive" range where gains diminish. ✅ All checks passed (1 skill(s)) ```

@ViktorHofer ViktorHofer mentioned this pull request Aug 26, 2026
52 of 64 tasks

Copilot AI commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

One or more custom setup steps configured for this repository failed during this Copilot code review run:

Restore MSBuild

Setup steps run before each review. If the review above is missing context, or no review was posted at all, the failing step above may be the cause. See the workflow run for failure details, fix your setup steps configuration, and re-request a review.

Note

You can configure setup steps for Copilot code review separately from Copilot cloud agent with a copilot-code-review.yml file. Read the docs for details.

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 main to the next minor version after cutting the vs18.11 release branch, and fixes/updates release tooling + documentation to reflect the current prerelease versioning and DARC command usage.

Changes:

  • Bump main branding to 18.12.0 and set PackageValidationBaselineVersion to the branch-point 18.11.0-1.26426.2.
  • Update Get-PackageValidationBaseline.ps1 to derive versions using PreReleaseVersionLabel from the release branch (instead of assuming the legacy -preview-... format).
  • Refresh release docs/skill guidance (version format, DARC verb/flags) and update the OptProf baseline drop.
Show a summary per file
File Description
scripts/Get-PackageValidationBaseline.ps1 Reads PreReleaseVersionLabel from vs* branch and computes baseline versions using the current -<label>.<shortDate>.<rev> scheme.
eng/Versions.props Bumps VersionPrefix to 18.12.0 and updates PackageValidationBaselineVersion to the vs18.11 branch-point build.
documentation/release-checklist.md Aligns checklist to the current version format and corrects DARC deletion instructions / PR-creation guidance.
.vsts-dotnet.yml Updates OptProfBaselineDrop so main can build officially without manual bootstrap reruns after the snap.
.github/skills/release/SKILL.md Updates release-skill guidance to the current version format and clarifies non-interactive DARC behavior/verbs.

Review details

💡 Add a code-review agent skill for context-aware, tailored reviews. Learn more in the docs.

  • Files reviewed: 5/5 changed files
  • Comments generated: 0
  • Review effort level: Lite

Advancing PackageValidationBaselineVersion to 18.11.0-1.26426.2 made every
suppression in src/Build/CompatibilitySuppressions.xml unnecessary, and the
build treats unnecessary suppressions as an error.

All 16 entries covered the MSBuild server namespace promotion (#12099), where
the server types moved from Microsoft.Build.Experimental to Microsoft.Build.Server:
MSBuildClient, MSBuildClientExitResult, MSBuildClientExitType and
OutOfProcServerNode, across lib/ref x net11.0/net472. The file's own comment
noted these were removable once the baseline advanced past the first release
containing the move -- the 18.11 baseline is that release.

Regenerated with build.cmd -pack /p:ApiCompatGenerateSuppressionFile=true.
No new suppressions were required and the Framework, Tasks and Utilities
suppression files are untouched.

Verified with a clean pack (no generate flag): 0 errors, 0 warnings. As a
control, restoring the old content and re-packing fails with 35 errors
including "Unnecessary suppressions found", confirming package validation
runs and that nothing is being masked.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 1540bcf4-a044-4ba7-8660-dd56edf92c8f
@ViktorHofer
ViktorHofer merged commit 0299086 into main Aug 26, 2026
11 checks passed
@ViktorHofer
ViktorHofer deleted the release/bump-main-to-18.12 branch August 26, 2026 13:23
This was referenced Nov 17, 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.

3 participants