[DRAFT] Azure Split - Step 1 - Prep Work #3902

paulmedynski · 2026-01-19T15:52:27Z

Description

This PR contains a variety of prep work that sets the stage for the addition of the Abstractions and Azure packages:

Lots of pipeline changes and cleanup to make it simple to add the Abstractions and Azure packages to the mix.
Some cleanup adjacent to where the Azure code will be moved out of MDS.
Some improvements that were made along the way for general clarity or consistency.

I have added commentary around the interesting changes. This is probably the largest and most complex PR of this series.

Testing

Normal PR/CI pipeline runs will validate most changes.
Manual inspection of pipeline logs and artifacts will confirm some of the fiddly parts.

Make all of the common changes that aren't directly related to the Azure Split work, but set the stage for it and will make subsequent PRs much easier to consume.

- Added a few more changes.

- Fixed compilation issues.

Copilot

Pull request overview

This PR represents "Step 1" of an Azure component split initiative, focusing on common infrastructure changes needed to support future modularization. The changes primarily refactor the build system, update pipeline configurations, and improve code quality without introducing functional changes to the driver itself.

Changes:

Refactored NuGet package generation by splitting monolithic targets into separate files for MDS, AKV, and SqlServer packages
Renamed and reorganized build properties (e.g., NugetPackageVersion → mdsPackageVersion, AssemblyFileVersion → mdsAssemblyFileVersion) to support multiple package versioning
Converted pipeline template paths from relative to absolute for better maintainability
Improved code quality with nullable annotations, property encapsulation, and defensive null checks
Updated test infrastructure to support both Project and Package reference types more cleanly

Reviewed changes

Copilot reviewed 97 out of 97 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
tools/targets/add-ons/GenerateAkvPackage.targets	New target file for generating AKV NuGet packages with commit ID and version properties
tools/targets/add-ons/GenerateAKVProviderNugetPackage.targets	Removed (replaced by GenerateAkvPackage.targets)
tools/targets/GenerateSqlServerPackage.targets	New target file for generating SqlServer NuGet packages
tools/targets/GenerateMdsPackage.targets	New target file for generating MDS NuGet packages with proper property passing
tools/targets/GenerateNugetPackage.targets	Removed (functionality split into separate package-specific targets)
tools/targets/CopySniDllsForNetFxProjectReferenceBuilds.targets	New helper target to copy SNI DLLs for .NET Framework project reference builds
tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec	Updated to use $MdsPackageVersion$ variable instead of hardcoded version ranges
tools/specs/Microsoft.SqlServer.Server.nuspec	Updated to use $ReferenceType$ property for flexible artifact paths
tools/specs/Microsoft.Data.SqlClient.nuspec	Updated to use $ReferenceType$ property for flexible artifact paths
tools/props/Versions.props	Reorganized version properties into logical groups (Common, SqlServer, MDS, AKV) with better documentation
src/Microsoft.SqlServer.Server/StringsHelper.cs	Added braces to single-statement if blocks for consistency
src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj	Changed DocumentationFile to use $(AssemblyName) variable
src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json	Updated for xUnit v2/v3 compatibility with comments and new configuration options
src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json	Added WorkloadIdentityFederationServiceConnectionId property
src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Utils.cs	Removed unused using statement
src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj	Simplified to target only netstandard2.0, removed unused package references
src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs	Added comment about environment variable override
src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props	Updated MDS version references and imported Versions.props
src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props	Reduced .NET Framework test targets to net462 only
src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj	Added conditional Project/Package reference support for MDS
src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj	Reorganized references and imported CopySniDllsForNetFxProjectReferenceBuilds.targets
src/Microsoft.Data.SqlClient/tests/FunctionalTests/app.config	Added comment for custom authentication provider
src/Microsoft.Data.SqlClient/tests/FunctionalTests/DataCommon/TestUtility.cs	Added IsNet, IsNetCore, IsNetFramework properties to replace old naming
src/Microsoft.Data.SqlClient/tests/FunctionalTests/DataCommon/DummySqlAuthenticationProvider.cs	Added braces to single-statement method
src/Microsoft.Data.SqlClient/tests/FunctionalTests/AssertExtensions.cs	Updated to use new TestUtility property names
src/Microsoft.Data.SqlClient/tests/Directory.Packages.props	Removed MDS package version dependency (moved to root)
src/Microsoft.Data.SqlClient/tests/Directory.Build.props	Removed ReferenceType default (moved to root Directory.Build.props)
src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj	Reorganized conditional references for clarity
src/Microsoft.Data.SqlClient/tests/Common/Common.csproj	Imported CopySniDllsForNetFxProjectReferenceBuilds.targets
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs	Refactored SqlFedAuthInfo and SqlFedAuthToken to use properties and constructors instead of public fields
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs	Updated to use new SqlFedAuthInfo constructor and properties
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs	Added conditional compilation for Windows-specific imports
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs	Improved null safety with defensive checks
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlErrorCollection.cs	Changed Add method to return SqlErrorCollection for chaining
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs	Added conditional compilation for Windows-specific imports
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationToken.cs	Removed internal helper methods (moved to SqlFedAuthToken)
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.cs	Added conditional compilation for Windows-specific imports
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolIdentity.cs	Fixed conditional compilation nesting
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs	Updated to use new SqlFedAuthToken constructor and properties
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationTimeoutRetryHelper.cs	Updated to use SqlFedAuthToken.AccessToken property
src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs	Added conditional compilation for Windows-specific imports
src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj	Added AssemblyName and reorganized TargetFrameworks properties
src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj	Changed DocumentationFile to use $(AssemblyName)
src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj	Added AssemblyName and changed DocumentationFile
src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj	Reordered properties for consistency
src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj	Added AssemblyName and changed DocumentationFile
src/Microsoft.Data.SqlClient/add-ons/Directory.Packages.props	Removed (functionality moved to root)
src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props	Removed ReferenceType and AllowedOutputExtensionsInPackageBuildOutputFolder properties
src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj	Reorganized conditional references for clarity
src/Directory.Build.props	Updated ReferenceType documentation and default value handling
eng/pipelines/variables/akv-official-variables.yml	Renamed assemblyFileVersion to akvAssemblyFileVersion and nugetPackageVersion to akvPackageVersion
eng/pipelines/steps/roslyn-analyzers-akv-step.yml	Added akvPackageVersion parameter and documentation
eng/pipelines/steps/compound-nuget-pack-step.yml	Added properties parameter for additional nuget properties
eng/pipelines/steps/compound-build-akv-step.yml	Updated to use akvAssemblyFileVersion and akvPackageVersion parameters
eng/pipelines/stages/stress-tests-ci-stage.yml	Reorganized parameters and improved documentation
eng/pipelines/sqlclient-pr-project-ref-pipeline.yml	Changed buildType to referenceType
eng/pipelines/sqlclient-pr-package-ref-pipeline.yml	Changed buildType to referenceType
eng/pipelines/libraries/variables.yml	Updated template path to absolute
eng/pipelines/libraries/mds-validation-variables.yml	Updated template paths and variable names
eng/pipelines/libraries/common-variables.yml	Added assemblyBuildNumber calculation and renamed version variables
eng/pipelines/libraries/ci-build-variables.yml	Updated variable names to akvPackageVersion and mdsPackageVersion
eng/pipelines/libraries/build-variables.yml	Updated template paths to absolute
eng/pipelines/jobs/stress-tests-ci-job.yml	Fixed comment (stage → job)
eng/pipelines/jobs/build-akv-official-job.yml	Updated parameter names and moved Roslyn analysis before build
eng/pipelines/dotnet-sqlclient-signing-pipeline.yml	Updated template paths and variable names
eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml	Added dotnetVerbosity parameter and renamed buildType to referenceType
eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml	Added dotnetVerbosity parameter and renamed buildType to referenceType
eng/pipelines/dotnet-sqlclient-ci-core.yml	Renamed buildType to referenceType, added dotnetVerbosity, reorganized stages
eng/pipelines/common/templates/steps/*	Multiple template files updated with parameter renames, absolute paths, and improved formatting
eng/pipelines/common/templates/stages/ci-run-tests-stage.yml	Reorganized parameters and updated template paths
eng/pipelines/common/templates/jobs/*	Multiple job files updated with parameter renames and mdsPackageVersion/mdsArtifactName support
eng/pipelines/akv-official-pipeline.yml	Updated template path and variable names
build.proj	Major refactoring: reorganized imports, properties, targets, and dependencies
NuGet.config.local	New file for package reference builds with local packages/ directory
NuGet.config	Updated with better documentation and renamed feed key
Directory.Packages.props	Added conditional MDS/AKV package references and updated Azure.Identity version
BUILDGUIDE.md	Comprehensive update explaining ReferenceType property and build workflows
.github/workflows/codeql.yml	Added feat/* branches and explicit project builds
.editorconfig	Added slnx and proj file extensions

- Fixed missing referenceType parameter.

- Fixed another missing referenceType.

- Fixed buildConfiguration parameter name.

- Removed non-existent projects from CodeQL Workflow.

Copilot

Pull request overview

Copilot reviewed 98 out of 98 changed files in this pull request and generated no new comments.

paulmedynski · 2026-01-19T17:54:14Z

eng/pipelines/common/templates/jobs/build-signed-package-job.yml


  variables:
-  - template: ../../../libraries/variables.yml@self
+  - template: /eng/pipelines/libraries/variables.yml@self


Making these paths absolute makes moving them around easier, and it allows the VS Code Azure Pipelines extension to validate them pre-commit.

paulmedynski · 2026-01-19T17:55:13Z

eng/pipelines/common/templates/jobs/ci-run-tests-job.yml

 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 parameters:
+  - name: configProperties


I started sorting parameter lists alphabetically, but decided that would just add a mess. This file and a few others remain re-sorted since backing it out would also be a pain.

paulmedynski · 2026-01-19T17:56:27Z

eng/pipelines/common/templates/jobs/build-signed-package-job.yml

  - ${{ if parameters.isPreview }}:
-    - name: NugetPackageVersion
-      value: $(PreviewNugetPackageVersion)
+    - name: mdsPackageVersion


NugetPackageVersion was being used for MDS and AKV throughout the pipelines, which was ambiguous. Now we have obvious names for these parameters and variables.

paulmedynski · 2026-01-19T17:57:41Z

eng/pipelines/common/templates/jobs/build-signed-package-job.yml

+      # These variables are sourced from common-variables.yml.
+      mdsAssemblyFileVersion: $(mdsAssemblyFileVersion)
+      mdsPackageVersion: $(mdsPackageVersion)
+      referenceType: Package


Our official MDS build used to use project-references; now it uses package references.

paulmedynski · 2026-01-19T17:59:49Z

eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml

+  - name: mdsArtifactName
    type: string
-    default: Artifacts
+    default: MDS.Artifact


We're going to have several groups of artifacts, some of which we will want to download individually. The new name here makes it clear what package the artifacts are for.

paulmedynski · 2026-01-19T18:38:49Z

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs

        {
            get => _federatedAuthenticationInfoRequested &&
-                   DateTime.FromFileTimeUtc(_fedAuthToken.expirationFileTime) < DateTime.UtcNow.AddSeconds(accessTokenExpirationBufferTime);
+                   DateTime.FromFileTimeUtc(_fedAuthToken.ExpirationFileTime) < DateTime.UtcNow.AddSeconds(accessTokenExpirationBufferTime);


I tidied up the FedAuthToken and FedAuthInfo classes, and this is the fallout.

paulmedynski · 2026-01-19T18:39:46Z

...osoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolIdentity.cs

 using System.Runtime.Versioning;
-#endif
-
-#if _WINDOWS


This was unnecessarily restrictive.

paulmedynski · 2026-01-19T18:40:17Z

...ta.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationTimeoutRetryHelper.cs


            // Here we mimic how ADAL calculates hash for token. They use UTF8 instead of Unicode.
-            var originalTokenString = SqlAuthenticationToken.AccessTokenStringFromBytes(token.accessToken);
+            var originalTokenString = Encoding.Unicode.GetString(token.AccessToken);


AccesTokenStringFromBytes() was a one-liner that did exactly this.

paulmedynski · 2026-01-19T18:44:06Z

src/Microsoft.Data.SqlClient/tests/Common/Common.csproj

  </ItemGroup>

+  <!-- Ensure SNI DLLs are made available for .NET Framework project reference builds. -->
+  <Import Project="$(ToolsDir)/targets/CopySniDllsForNetFxProjectReferenceBuilds.targets" />


I realize that @benrr101 has a different approach/solution for this problem. I think the root cause has something to do with the MDS projects' output directories being incompatible with the targets included in the SNI NuGet package. We will find a proper solution separate from this work.

paulmedynski · 2026-01-19T18:47:39Z

src/Directory.Build.props

+      See the BUILDGUIDE.md for more details.
    -->
-    <ReferenceType Condition="$(ReferenceType) == ''">Project</ReferenceType>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>


We don't want PDBs included in our NuGet packages. Developers can use the symbols packages that are generated beside the NuGet packages.

- Tweaks after reviewing the PR.

- Fixed Windows .NET compilation issue.

Copilot

Pull request overview

Copilot reviewed 98 out of 98 changed files in this pull request and generated no new comments.

paulmedynski · 2026-01-19T19:39:35Z

eng/pipelines/common/templates/steps/update-nuget-config-local-feed-step.yml

We're no longer editing the NuGet.config file. We are copying the NuGet.config.local file in its place whenever we need to source packages from the packages/ directory.

paulmedynski · 2026-01-19T19:40:26Z

eng/pipelines/common/templates/steps/ci-prebuild-step.yml

This file wasn't really adding any value. Its content was moved into the calling templates where appropriate.

- Fixed packages/ dir creation.

- Fixed missing MDS package version during Package builds.

Copilot

Pull request overview

Copilot reviewed 98 out of 98 changed files in this pull request and generated no new comments.

- Generating MDS NuGet package for subsequent AKV build in Package mode.

- Running Release build for Debug pipelines in Project mode to avoid NuGet packaging issues.

Copilot

Pull request overview

Copilot reviewed 98 out of 98 changed files in this pull request and generated no new comments.

- Restoring default mdsPackageVersion for Project based runs.

- Restoring inhibition of NuGet package generation.

Copilot

Pull request overview

Copilot reviewed 98 out of 98 changed files in this pull request and generated no new comments.

paulmedynski added 3 commits January 19, 2026 09:55

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

bc1a32e

Make all of the common changes that aren't directly related to the Azure Split work, but set the stage for it and will make subsequent PRs much easier to consume.

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

dd05d62

- Added a few more changes.

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

39c3ab1

- Fixed compilation issues.

Copilot AI review requested due to automatic review settings January 19, 2026 15:52

paulmedynski added the Area\Azure Connectivity Use this to tag issues that are related to Azure connectivity. label Jan 19, 2026

Copilot started reviewing on behalf of paulmedynski January 19, 2026 15:53 View session

paulmedynski mentioned this pull request Jan 19, 2026

[DO NOT MERGE] Visuazlie diffs of feat/azure split #3901

Draft

Copilot AI reviewed Jan 19, 2026

View reviewed changes

paulmedynski added 2 commits January 19, 2026 13:03

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

329e8b6

- Fixed missing referenceType parameter.

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

3b49dcb

- Fixed another missing referenceType.

Copilot AI review requested due to automatic review settings January 19, 2026 17:12

Copilot started reviewing on behalf of paulmedynski January 19, 2026 17:13 View session

paulmedynski added 2 commits January 19, 2026 13:14

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

2270970

- Fixed buildConfiguration parameter name.

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

595a5bd

- Removed non-existent projects from CodeQL Workflow.

Copilot AI reviewed Jan 19, 2026

View reviewed changes

paulmedynski commented Jan 19, 2026

View reviewed changes

paulmedynski added 2 commits January 19, 2026 14:59

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

9d8f74d

- Tweaks after reviewing the PR.

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

ae5d635

- Fixed Windows .NET compilation issue.

Copilot AI review requested due to automatic review settings January 19, 2026 19:31

Copilot started reviewing on behalf of paulmedynski January 19, 2026 19:31 View session

paulmedynski changed the title ~~[DRAFT] Azure Split - Step 1 - Common Changes~~ [DRAFT] Azure Split - Step 1 - Prep Work Jan 19, 2026

Copilot AI reviewed Jan 19, 2026

View reviewed changes

paulmedynski commented Jan 19, 2026

View reviewed changes

paulmedynski added 2 commits January 20, 2026 07:33

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

e4a230a

- Fixed packages/ dir creation.

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

be6bba0

- Fixed missing MDS package version during Package builds.

Copilot AI review requested due to automatic review settings January 20, 2026 14:11

Copilot started reviewing on behalf of paulmedynski January 20, 2026 14:12 View session

Copilot AI reviewed Jan 20, 2026

View reviewed changes

paulmedynski added 2 commits January 20, 2026 10:57

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

97336f6

- Generating MDS NuGet package for subsequent AKV build in Package mode.

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

91b54f9

- Running Release build for Debug pipelines in Project mode to avoid NuGet packaging issues.

Copilot AI review requested due to automatic review settings January 20, 2026 15:22

Copilot started reviewing on behalf of paulmedynski January 20, 2026 15:23 View session

Copilot AI reviewed Jan 20, 2026

View reviewed changes

paulmedynski added 2 commits January 20, 2026 11:45

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

d355c24

- Restoring default mdsPackageVersion for Project based runs.

Task 41424: Merge feat/azure-split to main: Step 1 - Common changes

b5fafcb

- Restoring inhibition of NuGet package generation.

Copilot AI review requested due to automatic review settings January 20, 2026 16:41

Copilot started reviewing on behalf of paulmedynski January 20, 2026 16:41 View session

Copilot AI reviewed Jan 20, 2026

View reviewed changes

[DRAFT] Azure Split - Step 1 - Prep Work #3902

Are you sure you want to change the base?

[DRAFT] Azure Split - Step 1 - Prep Work #3902

Conversation

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

Uh oh!

Description

Testing

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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!

Choose a reason for hiding this comment

Uh oh!

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!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

paulmedynski commented Jan 19, 2026 •

edited

Loading