Merge | Remove Extraneous Files #3781
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is adds the NugetPackageVersion field to the netfx project, but since these are internal fields, it should not matter.
benrr101
added
the
Common Project 🚮
Copilot finished reviewing on behalf of
benrr101
November 18, 2025 22:20
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR consolidates duplicate configuration files and moves shared code to common locations as part of the ongoing work toward a single Microsoft.Data.SqlClient csproj structure.
- Removes obsolete and duplicate files from platform-specific directories
- Consolidates build targets and type forwards to shared locations
- Standardizes configuration files across the solution
Reviewed Changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/Microsoft.Data.SqlClient/src/TypeForwards.netcore.cs | Added #if NET conditional compilation guards to ensure type forwards only apply to .NET Core/5+ builds |
| src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateThisAssemblyCs.targets | Deleted platform-specific version in favor of common targets file |
| src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj | Updated to reference common GenerateThisAssemblyCs.targets using $(ToolsDir) variable |
| src/Microsoft.Data.SqlClient/netfx/src/.editorconfig | Deleted platform-specific editor config; solution-wide .editorconfig at repository root now applies |
| src/Microsoft.Data.SqlClient/netcore/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp | Deleted analyzer exception list, superseded by APIScan |
| src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj | Updated to reference common TypeForwards.netcore.cs using $(CommonSourceRoot) variable |
| src/Microsoft.Data.SqlClient/netcore/src/MatchingRefApiCompatBaseline.txt | Deleted unreferenced API compatibility baseline file |
| src/Microsoft.Data.SqlClient/netcore/src/.editorconfig | Deleted platform-specific editor config; solution-wide .editorconfig at repository root now applies |
mdaigle
approved these changes
Nov 18, 2025
priyankatiwari08
approved these changes
Nov 19, 2025
paulmedynski
approved these changes
Nov 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR is the first in the next series towards a single MDS csproj. There are a handful of files that were left behind in the separate projects that could be easily swept up.
Issues
N/A, but continues from #1261 which was sort of the "common project" issue.
Testing
Projects still build, but CI (and likely an official build) will need to be used to verify.