Skip to content

[7.0.2 Cherry-pick] Switch SDK rollForward from disable to patch for automatic servicing updates#4367

Merged
paulmedynski merged 2 commits into
release/7.0from
dev/automation/pr-4364-to-7.0.2
Jun 16, 2026
Merged

[7.0.2 Cherry-pick] Switch SDK rollForward from disable to patch for automatic servicing updates#4367
paulmedynski merged 2 commits into
release/7.0from
dev/automation/pr-4364-to-7.0.2

Conversation

@github-actions

@github-actions github-actions Bot commented Jun 16, 2026

Copy link
Copy Markdown

Description

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

Motivation

  • Servicing patches (e.g. security fix 10.0.107) are picked up automatically by CI agents and developers without requiring a dedicated PR for each bump.
  • The feature band boundary (10.0.1xx) 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

Notes

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

Testing

  • Local build succeeds with SDK 10.0.107
  • CI validation

@github-actions github-actions Bot added this to the 7.0.2 milestone Jun 16, 2026
@github-project-automation github-project-automation Bot moved this to To triage in SqlClient Board Jun 16, 2026
…updates (#4364)

* Switch SDK rollForward from disable to patch

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

* Re-worded SDK comment.
@paulmedynski paulmedynski force-pushed the dev/automation/pr-4364-to-7.0.2 branch from 44e0d6f to 8690093 Compare June 16, 2026 09:40
@paulmedynski paulmedynski changed the title [7.0.2 Cherry-pick - CONFLICTS] Switch SDK rollForward from disable to patch for automatic servicing updates [7.0.2 Cherry-pick] Switch SDK rollForward from disable to patch for automatic servicing updates Jun 16, 2026
@paulmedynski

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 2 pipeline(s).

@paulmedynski paulmedynski added Area\Engineering Use this for issues that are targeted for changes in the 'eng' folder or build systems. Hotfix 6.1.6 PRs targeting main that should be backported to release/6.1 for the 6.1.6 release. labels Jun 16, 2026
@paulmedynski paulmedynski moved this from To triage to In progress in SqlClient Board Jun 16, 2026
@paulmedynski paulmedynski marked this pull request as ready for review June 16, 2026 10:36
@paulmedynski paulmedynski requested a review from a team as a code owner June 16, 2026 10:36
Copilot AI review requested due to automatic review settings June 16, 2026 10:36
@paulmedynski paulmedynski moved this from In progress to In review in SqlClient Board Jun 16, 2026
@paulmedynski

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 2 pipeline(s).

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

Adjusts .NET SDK selection policy to reduce maintenance overhead from frequent patch-level SDK bumps while staying within the MSBuild 17.x-compatible .NET 10.0.1xx feature band.

Changes:

  • Sets sdk.version to 10.0.100 as the minimum required .NET 10 SDK.
  • Updates rollForward from disable to allow patch-level servicing updates within the feature band.
  • Refreshes the explanatory comments around MSBuild compatibility constraints.

Comment thread global.json
@paulmedynski paulmedynski enabled auto-merge (squash) June 16, 2026 14:10
@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 65.64%. Comparing base (778614a) to head (a023224).

❗ There is a different number of reports uploaded between BASE (778614a) and HEAD (a023224). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (778614a) HEAD (a023224)
CI-SqlClient 1 0
Additional details and impacted files
@@               Coverage Diff               @@
##           release/7.0    #4367      +/-   ##
===============================================
- Coverage        73.11%   65.64%   -7.47%     
===============================================
  Files              280      275       -5     
  Lines            43026    65853   +22827     
===============================================
+ Hits             31457    43229   +11772     
- Misses           11569    22624   +11055     
Flag Coverage Δ
CI-SqlClient ?
PR-SqlClient-Project 65.64% <ø> (?)

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 bacb2d9 into release/7.0 Jun 16, 2026
301 checks passed
@paulmedynski paulmedynski deleted the dev/automation/pr-4364-to-7.0.2 branch June 16, 2026 17:49
@github-project-automation github-project-automation Bot moved this from In review to Done in SqlClient Board Jun 16, 2026
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 6.1.6 PRs targeting main that should be backported to release/6.1 for the 6.1.6 release.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants