Merge | Cleanup by benrr101 · Pull Request #4145 · dotnet/SqlClient

benrr101 · 2026-04-06T23:47:22Z

Description

This PR will hopefully bring the separate codebases chapter of SqlClient history to a close. This PR cleans up the old separate projects and all the remaining cruft that was part of it.

Separate projects (netfx/netcore) and ref counterparts are deleted
Remove lingering reference to BuildAllConfigurations
Drop separate project targets from build.proj
Change non-production projects to output to the default bin/obj folders to enable ...
Drop properties from build.proj and Directory.Build.props that are no longer being used
Delete targets files and a couple props files that are no longer used

Issues

N/A

Testing

Local testing suggests this will pass. There's a lot of things intertwined with the directory.build.props and build.proj files so I expect some hiccups. But theoretically it should be easy.

... this was less satisfying than I expected it'd be

…o give it a special place.

Copilot

Pull request overview

This PR removes the remaining legacy netfx/netcore split-project infrastructure and related build/packaging targets, and updates test/tool projects to use the unified repo layout and default bin/obj outputs.

Changes:

Deletes obsolete MSBuild targets/props used by the historical netfx/netcore split (contract/not-supported/doc-trim/package-gen, etc.).
Updates test and tool .csproj files to reference dependencies via $(RepoRoot) and to use default output/intermediate paths.
Simplifies build.proj/OneBranch Roslyn-analyzer integration by removing legacy/default target assumptions.

Reviewed changes

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

Show a summary per file

File	Description
tools/targets/TrimDocsForIntelliSense.targets	Removed obsolete XML doc trimming target.
tools/targets/ResolveContract.targets	Removed legacy contract-resolution target.
tools/targets/NotSupported.targets	Removed legacy “platform not supported” assembly generation target.
tools/targets/GenerateMdsPackage.targets	Removed legacy nuspec-based MDS package generation target.
tools/props/Tools.props	Removed unused tool-related props file.
tools/GenAPI/Directory.Build.props	Removed GenAPI-local Directory.Build.props shim.
src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj	Updates project references to use `$(RepoRoot)` paths.
src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj	Simplifies to single `TargetFramework` and default output paths.
src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj	Updates project references to `$(RepoRoot)` paths and simplifies TFM/output settings.
src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj	Simplifies TFM/output settings and updates project reference paths.
src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj	Simplifies to single `TargetFramework` and default output paths.
src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj	Simplifies to single `TargetFramework`.
src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj	Moves to default output paths and modernizes conditional Project/Package reference selection.
src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj	Removes legacy netfx/netcore output/target-group plumbing.
src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj	Removes legacy netfx/netcore output/target-group plumbing.
src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj	Removes legacy netfx/netcore output/target-group plumbing.
src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj	Removes legacy netfx/netcore output/target-group plumbing.
src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj	Updates project references to use `$(RepoRoot)` paths.
src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj	Updates project references to use `$(RepoRoot)` paths.
src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyRef.targets	Deletes legacy netfx-only codegen target.
src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyInfo.targets	Deletes legacy netfx-only codegen target.
src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj	Deletes legacy netfx driver project.
src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj	Deletes legacy netfx ref-assembly project.
src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj	Deletes legacy netcore driver project.
src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj	Deletes legacy netcore ref-assembly project.
src/Microsoft.Data.SqlClient.slnx	Updates solution structure to remove legacy netfx/netcore projects and adjust folder layout.
src/Directory.Build.props	Removes legacy split-project path/OS properties; keeps minimal repo-wide build settings.
eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml	Removes `BuildAllConfigurations` default and simplifies analyzer invocation.
build.proj	Removes legacy default target and legacy driver build/test orchestration; keeps extension/AKV/SqlServer targets.

build.proj

src/Directory.Build.props

paulmedynski

Nothing better than waking up to a PR that deletes 3000+ lines of obsolete code!

...osoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj

codecov · 2026-04-07T16:55:39Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 66.44%. Comparing base (52c7149) to head (94fbbaa).
⚠️ Report is 3 commits behind head on main.

❗ There is a different number of reports uploaded between BASE (52c7149) and HEAD (94fbbaa). Click for more details.

HEAD has 1 upload less than BASE

Flag BASE (52c7149) HEAD (94fbbaa)

CI-SqlClient 1 0

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4145      +/-   ##
==========================================
- Coverage   74.27%   66.44%   -7.83%     
==========================================
  Files         279      274       -5     
  Lines       42980    65799   +22819     
==========================================
+ Hits        31922    43723   +11801     
- Misses      11058    22076   +11018

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

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

Looks ok to me. We can revisit the API compatibility target later and get it better integrated.

Copilot

Pull request overview

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

build.proj

Copilot · 2026-04-08T16:51:14Z

build.proj

  <!-- SqlServer Targets -->
  <PropertyGroup>
    <SqlServerProperties>$(CommonProperties)</SqlServerProperties>

-    <SqlServerProperties
-      Condition="'$(SqlServerPackageVersion)' != ''">
+    <SqlServerProperties Condition="'$(SqlServerPackageVersion)' != ''">
      $(SqlServerProperties);SqlServerPackageVersion=$(SqlServerPackageVersion)
    </SqlServerProperties>


$(CommonProperties) is referenced to build up SqlServerProperties/AbstractionsProperties/LoggingProperties/AzureProperties/AkvProviderProperties, but CommonProperties is no longer defined anywhere (not in this file nor src/Directory.Build.props). Either reintroduce the property (if it’s meant to carry shared globals like Configuration/ReferenceType) or remove these expansions to avoid misleading no-op property plumbing.

benrr101 added 9 commits April 6, 2026 18:37

Delete separate projects

6f6b61c

... this was less satisfying than I expected it'd be

Test output should go to the same folder as the project ... no need t…

1574e36

…o give it a special place.

Drop targets that aren't necessary from build.proj

e022fe3

Remove extraneous properties from build.proj

0785de1

Remove unused targets

95460b9

Test project references from RepoRoot

e3005d9

Remove unnecessary stuff from Directory.Build.props

8cf7020

Drop some more unnecessary files

a6a6260

Remove references to BuildAllConfigurations

a5f1354

benrr101 added this to the 7.1.0-preview1 milestone Apr 6, 2026

benrr101 requested a review from a team as a code owner April 6, 2026 23:47

Copilot AI review requested due to automatic review settings April 6, 2026 23:47

benrr101 added the Common Project 🚮 Things that relate to the common project project label Apr 6, 2026

github-project-automation bot added this to SqlClient Board Apr 6, 2026

github-project-automation bot moved this to To triage in SqlClient Board Apr 6, 2026

Copilot started reviewing on behalf of benrr101 April 6, 2026 23:47 View session

Copilot AI reviewed Apr 6, 2026

View reviewed changes

build.proj Show resolved Hide resolved

src/Directory.Build.props Show resolved Hide resolved

paulmedynski self-assigned this Apr 7, 2026

paulmedynski moved this from To triage to In review in SqlClient Board Apr 7, 2026

paulmedynski previously approved these changes Apr 7, 2026

View reviewed changes

...osoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj Show resolved Hide resolved

mdaigle previously approved these changes Apr 7, 2026

View reviewed changes

🤖 Remove separate project stuff from CompareMdsRefAssemblies.targets

051d157

benrr101 dismissed stale reviews from mdaigle and paulmedynski via 051d157 April 7, 2026 19:57

mdaigle previously approved these changes Apr 7, 2026

View reviewed changes

paulmedynski previously approved these changes Apr 8, 2026

View reviewed changes

apoorvdeshmukh previously approved these changes Apr 8, 2026

View reviewed changes

Merge branch 'main' into dev/russellben/common/cleanup

11f1e0c

Copilot AI review requested due to automatic review settings April 8, 2026 16:43

benrr101 dismissed stale reviews from apoorvdeshmukh, paulmedynski, and mdaigle via 11f1e0c April 8, 2026 16:43

Copilot started reviewing on behalf of benrr101 April 8, 2026 16:44 View session

Copilot AI reviewed Apr 8, 2026

View reviewed changes

Merge branch 'main' into dev/russellben/common/cleanup

94fbbaa

benrr101 enabled auto-merge (squash) April 8, 2026 23:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge | Cleanup#4145

Merge | Cleanup#4145
benrr101 wants to merge 12 commits intomainfrom
dev/russellben/common/cleanup

benrr101 commented Apr 6, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

paulmedynski left a comment

Uh oh!

Uh oh!

codecov bot commented Apr 7, 2026 •

edited

Loading

Uh oh!

mdaigle left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI Apr 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

benrr101 commented Apr 6, 2026

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!

paulmedynski left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov bot commented Apr 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

mdaigle left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Apr 7, 2026 •

edited

Loading