Skip to content

Switch SDK rollForward from disable to patch for automatic servicing updates#4364

Merged
paulmedynski merged 3 commits into
mainfrom
dev/paul/sdk-rollforward-patch
Jun 16, 2026
Merged

Switch SDK rollForward from disable to patch for automatic servicing updates#4364
paulmedynski merged 3 commits into
mainfrom
dev/paul/sdk-rollforward-patch

Conversation

@paulmedynski

Copy link
Copy Markdown
Contributor

Description

Switches global.json SDK resolution from "rollForward": "disable" (exact pin) to "rollForward": "patch" (allow roll-forward within the 10.0.3xx feature band).

Motivation

  • Servicing patches (e.g. security fix 10.0.301) are picked up automatically by CI agents and developers without requiring a dedicated PR for each bump.
  • The feature band boundary (10.0.3xx) is still respected — no risk of new analyzers, MSBuild behavior changes, or codegen differences sneaking in.
  • Reduces maintenance burden of security-bump PRs for patch-level SDK updates.

Changes

File Change
global.json rollForward: disablepatch, updated comment
tools/PackageCompatibility/global.json rollForward: disablepatch

Notes

  • Base version remains 10.0.300 — this is the minimum required SDK
  • Any installed 10.0.3xx servicing patch will be used automatically
  • Build verified locally: dotnet build of the main SqlClient project succeeds with SDK 10.0.300

Testing

  • Local build succeeds with SDK 10.0.300 (lowest in band)
  • CI validation

Allow automatic roll-forward within the 10.0.3xx feature band so that
servicing patches (e.g. security fixes like 10.0.301) are picked up by
CI agents and developers without requiring a dedicated PR for each bump.

The base version remains 10.0.300 — this is the minimum required SDK.
Any installed 10.0.3xx patch will be used automatically.

Updated both global.json files:
- /global.json (repo root)
- /tools/PackageCompatibility/global.json
Copilot AI review requested due to automatic review settings June 15, 2026 16:55
@github-project-automation github-project-automation Bot moved this to To triage in SqlClient Board Jun 15, 2026
@paulmedynski paulmedynski added the Area\Engineering Use this for issues that are targeted for changes in the 'eng' folder or build systems. label Jun 15, 2026
@paulmedynski paulmedynski moved this from To triage to In progress in SqlClient Board Jun 15, 2026
@paulmedynski paulmedynski added this to the 7.1.0-preview2 milestone Jun 15, 2026
@paulmedynski paulmedynski added the Hotfix 7.0.2 PRs targeting main that should be backported to release/7.0 for the 7.0.2 release. label Jun 15, 2026

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 SDK resolution policy to keep the repo on the .NET 10.0.3xx feature band while allowing automatic pickup of servicing patches, reducing the need for frequent SDK-bump PRs.

Changes:

  • Change global.json rollForward from disable to patch and update the explanatory comment.
  • Change tools/PackageCompatibility/global.json rollForward from disable to patch to mirror root SDK selection behavior.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
global.json Allows patch roll-forward within the .NET 10.0.3xx SDK feature band while keeping prereleases disallowed.
tools/PackageCompatibility/global.json Mirrors root SDK roll-forward policy for commands run from the PackageCompatibility subtree.

Comment thread tools/PackageCompatibility/global.json Outdated
@paulmedynski paulmedynski removed the Hotfix 7.0.2 PRs targeting main that should be backported to release/7.0 for the 7.0.2 release. label Jun 15, 2026
@paulmedynski paulmedynski marked this pull request as ready for review June 15, 2026 16:59
@paulmedynski paulmedynski requested a review from a team as a code owner June 15, 2026 16:59
Copilot AI review requested due to automatic review settings June 15, 2026 16:59
@paulmedynski paulmedynski added the Hotfix 7.0.2 PRs targeting main that should be backported to release/7.0 for the 7.0.2 release. label Jun 15, 2026

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

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

@paulmedynski paulmedynski moved this from In progress to In review in SqlClient Board Jun 15, 2026
@paulmedynski paulmedynski enabled auto-merge (squash) June 16, 2026 00:00
@codecov

codecov Bot commented Jun 16, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 63.65%. Comparing base (fd8cb4b) to head (7c66489).
⚠️ Report is 7 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4364      +/-   ##
==========================================
- Coverage   65.69%   63.65%   -2.05%     
==========================================
  Files         285      280       -5     
  Lines       43311    66193   +22882     
==========================================
+ Hits        28453    42132   +13679     
- Misses      14858    24061    +9203     
Flag Coverage Δ
CI-SqlClient ?
PR-SqlClient-Project 63.65% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@paulmedynski paulmedynski merged commit 47f4e52 into main Jun 16, 2026
301 checks passed
@paulmedynski paulmedynski deleted the dev/paul/sdk-rollforward-patch branch June 16, 2026 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area\Engineering Use this for issues that are targeted for changes in the 'eng' folder or build systems. Hotfix 7.0.2 PRs targeting main that should be backported to release/7.0 for the 7.0.2 release.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants