[7.0] Migrate to slnx solution file format#4112
Draft
paulmedynski wants to merge 1 commit intocherry-pick/7.0/4033from
Draft
[7.0] Migrate to slnx solution file format#4112paulmedynski wants to merge 1 commit intocherry-pick/7.0/4033from
paulmedynski wants to merge 1 commit intocherry-pick/7.0/4033from
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR migrates the repository’s primary solution from legacy .sln to the modern .slnx format and updates supporting build/CI wiring to align with the newer build tooling and artifact layout.
Changes:
- Replace
src/Microsoft.Data.SqlClient.slnwithsrc/Microsoft.Data.SqlClient.slnxand update consumers (Dev Container + CodeQL workflow). - Introduce
src/Microsoft.Data.SqlClient/MdsVersions.propsand shift MDS versioning/artifact output conventions to the newer scheme. - Update PR/CI pipeline templates to use
build2.projand new MSBuild properties/targets for building and running tests.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| tools/targets/GenerateThisAssemblyCs.targets | Default AssemblyFileVersion handling for generated ThisAssembly.cs. |
| tools/specs/Microsoft.Data.SqlClient.nuspec | Update packaged file paths to new artifacts folder layout. |
| tools/props/Versions.props | Remove MDS versioning block in favor of MdsVersions.props. |
| tools/intellisense/TrimDocs.ps1 | Make doc trimming fail fast (throw on missing input). |
| src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs | Fix XML doc <include> relative paths and whitespace cleanup. |
| src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlJson.cs | Fix XML doc <include> relative paths and formatting cleanup. |
| src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlDbTypeExtensions.cs | Fix XML doc <include> relative paths. |
| src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs | Fix XML doc <include> relative paths and whitespace cleanup. |
| src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj | Add versioning import + change output path to include ReferenceType-Configuration. |
| src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj | Add versioning import, output path update, and safer TrimDocs target conditions. |
| src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs | Correct XML doc <include> paths in ref source. |
| src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj | Add versioning import and update output/ref artifact paths to match new layout. |
| src/Microsoft.Data.SqlClient/MdsVersions.props | New MDS versioning source of truth. |
| src/Microsoft.Data.SqlClient.slnx | New solution file in .slnx format. |
| src/Microsoft.Data.SqlClient.sln | Remove legacy .sln. |
| eng/pipelines/sqlclient-pr-project-ref-pipeline.yml | Include build2.proj in PR path filters. |
| eng/pipelines/sqlclient-pr-package-ref-pipeline.yml | Include build2.proj in PR path filters. |
| eng/pipelines/common/templates/steps/run-all-tests-step.yml | Switch test execution from build.proj to build2.proj targets + new property names. |
| eng/pipelines/common/templates/steps/ci-project-build-step.yml | Update MDS build to use build2.proj (but currently Windows-gated). |
| build2.proj | Expand build/test/pack targets, new parameters, and artifact conventions. |
| .github/workflows/codeql.yml | Build the .slnx in CodeQL manual build step. |
| .devcontainer/devcontainer.json | Point default solution to .slnx. |
Contributor
Author
|
/azp run |
|
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
benrr101
approved these changes
Mar 31, 2026
Contributor
benrr101
left a comment
benrr101
left a comment
There was a problem hiding this comment.
While theoretically not needed in this servicing branch, it'll be useful when we have to open up the branch for modifications. Most IDEs will remember the solution file they opened, so making this change means we don't have to close/reopen our IDEs.
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
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.
Cherry-pick of #4070 to release/7.0
Depends on #4110
Original PR Description
Description
I used Opus 4.6 to plan a migration from the legacy sln format to the modern slnx format, and it didn't find any legitimate issues. I encourage folks to try out the new slnx file on this branch with their IDEs and tooling.
Benefits include:
Testing
Our pipelines don't use the solution file, but they can check for any other regressions.