Merge | Official Builds From Common Project by benrr101 · Pull Request #4068 · dotnet/SqlClient

benrr101 · 2026-03-19T21:51:00Z

Description

This PR is the last functional PR for common project completion. It updates the official/non-official builds to use the targets from build2.proj, and effectively build the common project for official releases. I had plans for a larger overhaul of the "new" official pipeline, but I lost control of the direction, so I took a step back, pulled out the minimal changes to make this happen and am submitting this now.

Since the *csproj* steps/jobs are based on build.proj, I've created separate steps for MDS build.

🤖

Dropped "compound-" from steps files and fixed links. I thought I was onto something when I adopted that naming convention a while back, but ... no.

Update: used codex to attempt to wire versioning together, but it didn't really figure it out in a simple way. But it did help trace through the wiring to find what was broken.

Issues

N/A

Testing

Currently running test build can he found:
~~https://sqlclientdrivers.visualstudio.com/ADO.Net/_build/results?buildId=144204&view=results~~
~~https://sqlclientdrivers.visualstudio.com/ADO.Net/_build/results?buildId=144572&view=results~~
~~https://sqlclientdrivers.visualstudio.com/ADO.Net/_build/results?buildId=144579&view=results~~
~~https://sqlclientdrivers.visualstudio.com/ADO.Net/_build/results?buildId=144586&view=results~~
~~https://sqlclientdrivers.visualstudio.com/ADO.Net/_build/results?buildId=144869&view=results~~
https://sqlclientdrivers.visualstudio.com/ADO.Net/_build/results?buildId=145060&view=results PASSES
https://sqlclientdrivers.visualstudio.com/ADO.Net/_build/results?buildId=145414&view=results PASSES

Copilot

Pull request overview

Updates OneBranch official/non-official pipeline templates to build Microsoft.Data.SqlClient (MDS) from build2.proj (common project) and refactors pipeline steps by removing the prior “compound-*” templates in favor of more granular build/sign/pack/analyze steps.

Changes:

Replace the old SqlClient official build job with a new build-signed-mds-package-job.yml that drives MDS build/pack via build2.proj.
Add new OneBranch step templates for Roslyn analyzers, MDS build/pack, ESRP signing, APIScan file extraction, and symbols publishing parameterization.
Remove deprecated “compound-*” step templates and the prior SqlClient job template.

Reviewed changes

Copilot reviewed 17 out of 20 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
src/Microsoft.Data.SqlClient.sln	Updates solution items to reference new OneBranch job/step templates.
eng/pipelines/onebranch/variables/common-variables.yml	Updates comments around template aliases.
eng/pipelines/onebranch/stages/build-stages.yml	Switches SqlClient build job to new MDS/build2-based job and wires new parameters.
eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml	New job orchestrating build2-based MDS build/analyze/sign/pack/publish-symbols.
eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml	Migrates to new Roslyn analyzers/sign/pack/symbol templates.
eng/pipelines/onebranch/steps/build-mds-step.yml	New step template to run `build2.proj -t:BuildMds`.
eng/pipelines/onebranch/steps/pack-mds-step.yml	New step template to run `build2.proj -t:PackMds`.
eng/pipelines/onebranch/steps/extract-apiscan-files-mds-step.yml	New step template to copy MDS DLL/PDB outputs to APIScan folders.
eng/pipelines/onebranch/steps/roslyn-analyzers-mds-step.yml	New step template to run Roslyn analyzers for build2-based MDS build.
eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml	New generic Roslyn analyzers step for build.proj-driven builds.
eng/pipelines/onebranch/steps/publish-symbols-step.yml	Refactors the symbols publish template parameter model and implementation.
eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml	Updates ESRP DLL signing inputs/paths and parameter quoting.
eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml	New dedicated ESRP NuGet signing step template.
eng/pipelines/onebranch/steps/pack-csproj-step.yml	New dedicated pack step for csproj-based extension packages.
eng/pipelines/onebranch/steps/build-csproj-step.yml	Comment update to reference new pack step template name.
eng/pipelines/onebranch/steps/esrp-code-signing-step.yml	Removed legacy combined DLL/pkg signing template.
eng/pipelines/onebranch/steps/compound-publish-symbols-step.yml	Removed deprecated compound symbols template.
eng/pipelines/onebranch/steps/compound-nuget-pack-step.yml	Removed deprecated compound NuGet pack template.
eng/pipelines/onebranch/steps/build-all-configurations-signed-dlls-step.yml	Removed legacy MDS build-all-configurations step driven by build.proj.
eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml	Removed prior SqlClient official build job template.

codecov · 2026-03-19T23:28:12Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 66.46%. Comparing base (60d4b92) to head (967206a).
⚠️ Report is 11 commits behind head on main.

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

HEAD has 1 upload less than BASE

Flag BASE (60d4b92) HEAD (967206a)

CI-SqlClient 1 0

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4068      +/-   ##
==========================================
- Coverage   73.22%   66.46%   -6.77%     
==========================================
  Files         280      274       -6     
  Lines       43000    65778   +22778     
==========================================
+ Hits        31486    43717   +12231     
- Misses      11514    22061   +10547

Flag	Coverage Δ
CI-SqlClient	`?`
PR-SqlClient-Project	`66.46% <ø> (?)`

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

☔ View full report in Codecov by Sentry.
📢 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.

mdaigle

Really just the one comment, otherwise looks good. I would also like to review the pipeline run when we get one that's green.

mdaigle

Really just the one comment, otherwise looks good. I would also like to review the pipeline run when we get one that's green.

mdaigle

🤖

Code Review Summary

Thanks for moving the MDS build to build2.proj — the cleanup of the "compound-" prefix and the separation of MDS into its own job/step templates is a nice improvement.

I found 3 critical issues and 1 major issue that will likely cause the official pipeline to produce incorrectly signed or broken packages:

Critical

#	Issue	File
C1	Typo: `PackageVersionAbstraction` → `PackageVersionAbstractions` (missing trailing 's') — pack step will fail	`pack-mds-step.yml:27`
C2	ESRP NuGet signing scans wrong directory: Signing searches `$(PACK_OUTPUT)` (`output/`) but `PackMds` emits `.nupkg` to `$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/Package-Release/` — packages ship unsigned	`build-signed-mds-package-job.yml:142`
C3	`PackMds` re-builds over signed DLLs: `DependsOnTargets="BuildMds"` re-triggers the build in a fresh MSBuild invocation, overwriting ESRP-signed DLLs. `-p:PackBuild=false` has no effect (not implemented in `build2.proj`)	`pack-mds-step.yml:25`

Major

#	Issue	File
M1	`$(PACKAGE_NAME)` is undefined: Symbols publish with empty product name	`build-signed-mds-package-job.yml:157`

Minor (not commented inline)

Missing @self on pack-mds-step.yml template reference (line 139 of the job file)
ob_outputDirectory: '$(BUILD_OUTPUT)' publishes the entire artifacts/ tree instead of just nupkg — compare with csproj jobs which use $(PACK_OUTPUT)

Question

Has the test build (pipeline 144204) successfully produced and validated a signed MDS package? The issues above should cause failures in the signing/validation stages.

…eBranch. This band-aid avoids completely messing with the CI properties.

cheenamalhotra

Assembly Version needs a fix - rest everything looks good!
Great work 🎉

File version = major.minor.patch.build Package version = major.minor.patch[-suffixbuildnumber]

mdaigle · 2026-03-30T23:43:26Z

Will also take a quick look at the build when it finishes. Otherwise looks good.

Copilot

Pull request overview

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

Rename compound-* step files to match internal/main naming from #4068: compound-build-csproj-step -> build-csproj-step compound-esrp-dll-signing-step -> esrp-dll-signing-step compound-esrp-nuget-signing-step -> esrp-nuget-signing-step compound-pack-csproj-step -> pack-csproj-step code-analyze-step -> roslyn-analyzers-csproj-step Add new split step files from main: build-sqlclient-step, pack-sqlclient-step, roslyn-analyzers-sqlclient-step Remove orphaned files no longer referenced: build-all-configurations-signed-dlls-step, compound-nuget-pack-step, compound-publish-symbols-step, esrp-code-signing-step, sqlclient-validation-variables Add package-variables.yml with per-package version definitions for 7.0.1, with isPreview conditional toggling between GA and preview versions.

benrr101 added this to the 7.0.1 milestone Mar 19, 2026

benrr101 requested a review from a team as a code owner March 19, 2026 21:51

benrr101 added the Common Project 🚮 Things that relate to the common project project label Mar 19, 2026

Copilot AI review requested due to automatic review settings March 19, 2026 21:51

github-project-automation Bot added this to SqlClient Board Mar 19, 2026

github-project-automation Bot moved this to To triage in SqlClient Board Mar 19, 2026

Copilot started reviewing on behalf of benrr101 March 19, 2026 21:51 View session

Copilot AI reviewed Mar 19, 2026

View reviewed changes

benrr101 commented Mar 19, 2026

View reviewed changes

Comment thread eng/pipelines/onebranch/steps/publish-symbols-step.yml

paulmedynski self-assigned this Mar 20, 2026

paulmedynski moved this from To triage to In review in SqlClient Board Mar 20, 2026

paulmedynski requested changes Mar 20, 2026

View reviewed changes

github-project-automation Bot moved this from In review to In progress in SqlClient Board Mar 20, 2026

mdaigle requested changes Mar 20, 2026

View reviewed changes

Comment thread eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml Outdated

mdaigle requested changes Mar 20, 2026

View reviewed changes

Comment thread eng/pipelines/onebranch/steps/pack-mds-step.yml

Comment thread eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml

Comment thread eng/pipelines/onebranch/steps/pack-mds-step.yml

Comment thread eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml

paulmedynski mentioned this pull request Mar 23, 2026

Add symbol verification to OneBranch pipelines #4073

Open

cheenamalhotra modified the milestones: 7.0.1, 7.1.0-preview1 Mar 23, 2026

Copilot AI review requested due to automatic review settings March 23, 2026 17:54

Copilot started reviewing on behalf of benrr101 March 23, 2026 17:54 View session

This comment was marked as outdated.

Sign in to view

Copilot AI review requested due to automatic review settings March 23, 2026 18:33

Copilot started reviewing on behalf of benrr101 March 23, 2026 18:33 View session

This comment was marked as outdated.

Sign in to view

cheenamalhotra requested review from mdaigle and paulmedynski March 23, 2026 20:01

paulmedynski previously approved these changes Mar 23, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings March 24, 2026 22:03

This comment was marked as spam.

Sign in to view

benrr101 added 2 commits March 27, 2026 17:30

Merge branch 'main' into dev/russellben/common/official-mds-build2

f953d78

Rework the package version for CI to match the package version for On…

f356f00

…eBranch. This band-aid avoids completely messing with the CI properties.

Copilot AI review requested due to automatic review settings March 27, 2026 23:08

benrr101 force-pushed the dev/russellben/common/official-mds-build2 branch from 48a27d2 to f356f00 Compare March 27, 2026 23:08

Copilot started reviewing on behalf of benrr101 March 27, 2026 23:08 View session

This comment was marked as spam.

Sign in to view

cheenamalhotra reviewed Mar 28, 2026

View reviewed changes

Comment thread src/Microsoft.Data.SqlClient/MdsVersions.props Outdated

cheenamalhotra requested changes Mar 28, 2026

View reviewed changes

cheenamalhotra reviewed Mar 28, 2026

View reviewed changes

Comment thread eng/pipelines/libraries/ci-build-variables.yml Outdated

cheenamalhotra reviewed Mar 28, 2026

View reviewed changes

Comment thread eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml

Assembly version = major.0.0.0

7d000a2

File version = major.minor.patch.build Package version = major.minor.patch[-suffixbuildnumber]

cheenamalhotra previously approved these changes Mar 30, 2026

View reviewed changes

Comment thread src/Microsoft.Data.SqlClient/MdsVersions.props

mdaigle requested changes Mar 30, 2026

View reviewed changes

Comment thread eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml Outdated

Comment that Malcolm is holding the build up for.

96bd8aa

Copilot AI review requested due to automatic review settings March 30, 2026 23:53

benrr101 dismissed cheenamalhotra’s stale review via 96bd8aa March 30, 2026 23:53

Copilot started reviewing on behalf of benrr101 March 30, 2026 23:54 View session

Copilot AI reviewed Mar 30, 2026

View reviewed changes

Comment thread src/Microsoft.Data.SqlClient/MdsVersions.props Outdated

Can I please be done with this PR now?

967206a

mdaigle approved these changes Mar 31, 2026

View reviewed changes

paulmedynski approved these changes Mar 31, 2026

View reviewed changes

paulmedynski moved this from In progress to In review in SqlClient Board Mar 31, 2026

benrr101 merged commit 2c37eb9 into main Mar 31, 2026
300 checks passed

benrr101 deleted the dev/russellben/common/official-mds-build2 branch March 31, 2026 20:39

github-project-automation Bot moved this from In review to Done in SqlClient Board Mar 31, 2026

This was referenced Apr 20, 2026

[7.0.1 - Cherry-pick] Move symbol publishing into a dedicated stage and refactor build artifacts #4211

Closed

Sync release/7.0 with main — cherry-pick batch #4215

Closed

Conversation

benrr101 commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

🤖

Issues

Testing

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mdaigle left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mdaigle left a comment

Choose a reason for hiding this comment

Uh oh!

mdaigle left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Code Review Summary

Critical

Major

Minor (not commented inline)

Question

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

Uh oh!

cheenamalhotra left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mdaigle commented Mar 30, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

benrr101 commented Mar 19, 2026 •

edited

Loading

codecov Bot commented Mar 19, 2026 •

edited

Loading

mdaigle left a comment •

edited

Loading