Introduce Logging package and rework official pipelines

.github/instructions/ado-pipelines.instructions.md

@@ -74,7 +74,7 @@ Optional pipeline for long-running stress and endurance testing. Enabled via `en
 ## Build Stages
 
 1. **build_abstractions_package_stage**: Build and pack abstractions
-2. **build_mds_akv_packages_stage**: Build main driver and AKV packages
+2. **build_sqlclient_package_stage**: Build main driver and AKV packages
 3. **build_azure_package_stage**: Build Azure extensions package
 4. **stress_tests_stage**: Optional stress testing
 5. **run_tests_stage**: Execute all test suites

.github/prompts/update-build-pipelines.prompt.md

@@ -40,7 +40,7 @@ Follow this workflow step-by-step:
 - Modify YAML files following the existing patterns and indentation style.
 - When adding new stages, follow the existing stage ordering:
   1. `build_abstractions_package_stage`
-  2. `build_mds_akv_packages_stage`
+  2. `build_sqlclient_package_stage`
   3. `build_azure_package_stage`
   4. `stress_tests_stage` (optional)
   5. `run_tests_stage`

.vscode/mcp.json

@@ -28,4 +28,4 @@
 			]
 		}
 	}
-}
+}

AGENTS.md

@@ -22,6 +22,7 @@ The `.github/instructions/` directory contains comprehensive guides:
 | [architecture.instructions.md](.github/instructions/architecture.instructions.md) | Project structure, unified project model |
 | [tds-protocol.instructions.md](.github/instructions/tds-protocol.instructions.md) | TDS protocol, packet handling |
 | [ado-pipelines.instructions.md](.github/instructions/ado-pipelines.instructions.md) | Azure DevOps CI/CD pipelines |
+| [onebranch-pipeline-design.instructions.md](.github/instructions/onebranch-pipeline-design.instructions.md) | OneBranch multi-product pipeline design spec |
 | [testing.instructions.md](.github/instructions/testing.instructions.md) | Test framework, running tests |
 | [connection-pooling.instructions.md](.github/instructions/connection-pooling.instructions.md) | Connection pool internals |
 | [api-design.instructions.md](.github/instructions/api-design.instructions.md) | Public API design principles |

Directory.Packages.props

@@ -23,15 +23,18 @@
     <PackageVersion
       Include="Microsoft.Data.SqlClient"
       Version="$(MdsPackageVersion)" />
+    <PackageVersion
+      Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider"
+      Version="$(AkvPackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
       Version="$(AbstractionsPackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Extensions.Azure"
       Version="$(AzurePackageVersion)" />
     <PackageVersion
-      Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider"
-      Version="$(AkvPackageVersion)" />
+      Include="Microsoft.Data.SqlClient.Extensions.Logging"
+      Version="$(LoggingPackageVersion)" />
   </ItemGroup>
 
   <!-- ===================================================================== -->

build.proj

@@ -2,7 +2,6 @@
 <Project ToolsVersion="Current" DefaultTargets="BuildAllConfigurations" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Project="src/Directory.Build.props" />
-  <Import Project="$(ToolsDir)targets\GenerateSqlServerPackage.targets" />
   <Import Project="$(ToolsDir)targets\GenerateMdsPackage.targets" />
   <Import Project="$(ToolsDir)targets\add-ons\GenerateAkvPackage.targets" />
 
@@ -29,7 +28,6 @@
     <GenerateNuget Condition="'$(GenerateNuget)' == '' AND '$(IsEnabledWindows)' == 'true'">true</GenerateNuget>
 
     <CommonProperties>Configuration=$(Configuration);ReferenceType=$(ReferenceType);</CommonProperties>
-    <SqlServerLibProperties>$(CommonProperties);AssemblyVersion=$(SqlServerAssemblyVersion);AssemblyFileVersion=$(SqlServerAssemblyFileVersion);Version=$(SqlServerPackageVersion);</SqlServerLibProperties>
     <ProjectProperties>$(CommonProperties);AssemblyFileVersion=$(AssemblyFileVersion);TargetsWindows=$(TargetsWindows);TargetsUnix=$(TargetsUnix);</ProjectProperties>
     <TestProjectProperties>$(ProjectProperties);BuildForRelease=false;TargetNetCoreVersion=$(TargetNetCoreVersion);TargetNetFxVersion=$(TargetNetFxVersion)</TestProjectProperties>
     <ResultsDirectory Condition="$(ResultsDirectory) == ''">TestResults</ResultsDirectory>
@@ -74,9 +72,10 @@
   <!-- Populate all managed projects -->
   <ItemGroup>
     <Tools Include="tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj" />
-    <SqlServerLib Include="**/Microsoft.SqlServer.Server.csproj" />
+    <SqlServer Include="**/Microsoft.SqlServer.Server.csproj" />
     <Abstractions Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
     <Azure Include="src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
+    <Logging Include="src/Microsoft.Data.SqlClient.Extensions/Logging/src/Logging.csproj" />
     <NetFxDriver Include="**/netfx/**/Microsoft.Data.SqlClient*.csproj" Condition="'$(IsEnabledWindows)' == 'true'" />
     <NetCoreDriver Include="**/netcore/**/Microsoft.Data.SqlClient*.csproj" />
     <!-- Used to build .NET Standard DLL for lib folder from this project. -->
@@ -95,9 +94,33 @@
 
   <!-- Top Level Build targets -->
   <Target Name="Restore" DependsOnTargets="RestoreNetCore;RestoreNetFx" />
-  <Target Name="BuildAll" DependsOnTargets="BuildNetFx;BuildNetCore;BuildNetStandard" />
-  <Target Name="BuildAllConfigurations" DependsOnTargets="Restore;BuildTools;BuildSqlServerLib;BuildNetFx;BuildNetCoreAllOS;BuildNetStandard;GenerateMdsPackage" />
-  <Target Name="BuildSqlServerPackage" DependsOnTargets="BuildSqlServerLibAnyOS;GenerateSqlServerPackage"/>
+  <Target Name="BuildAll" DependsOnTargets="BuildNetFx;BuildNetCore;BuildNetStandard;BuildLogging;BuildAzure" />
+  <Target Name="BuildAllConfigurations" DependsOnTargets="Restore;BuildTools;BuildSqlServer;BuildNetFx;BuildNetCoreAllOS;BuildNetStandard;BuildLogging;BuildSqlServer;PackSqlServer;GenerateMdsPackage" />
+
+  <!-- SqlServer Targets -->
+  <PropertyGroup>
+    <SqlServerProperties>$(CommonProperties);AssemblyVersion=$(SqlServerAssemblyVersion);AssemblyFileVersion=$(SqlServerAssemblyFileVersion);Version=$(SqlServerPackageVersion);</SqlServerProperties>
+  </PropertyGroup>
+
+  <Target Name="RestoreSqlServer">
+    <MSBuild Projects="@(SqlServer)" Targets="restore" Properties="$(SqlServerProperties)" />
+  </Target>
+
+  <Target Name="BuildSqlServer" DependsOnTargets="RestoreSqlServer">
+    <MSBuild
+      Projects="@(SqlServer)"
+      Targets="Build"
+      Properties="$(CI);$(SqlServerProperties);Platform=AnyCPU;OSGroup=AnyOS"
+      RemoveProperties="TargetsWindows;TargetsUnix;" />
+  </Target>
+
+  <Target Name="PackSqlServer">
+    <MSBuild
+      Projects="@(SqlServer)"
+      Targets="Pack"
+      Properties="$(SqlServerProperties);Platform=AnyCPU;OSGroup=AnyOS;NoBuild=true"
+      RemoveProperties="TargetsWindows;TargetsUnix;" />
+  </Target>
 
   <!-- Abstractions Targets -->
   <PropertyGroup>
@@ -138,10 +161,60 @@
   <Target Name="BuildAbstractions" DependsOnTargets="RestoreAbstractions">
     <MSBuild
       Projects="@(Abstractions)"
-      Targets="Build;Pack"
+      Targets="Build"
       Properties="$(AbstractionsProperties)" />
   </Target>
 
+  <Target Name="PackAbstractions">
+    <MSBuild
+      Projects="@(Abstractions)"
+      Targets="Pack"
+      Properties="$(AbstractionsProperties);NoBuild=true" />
+  </Target>
+
+  <!-- Logging Targets -->
+  <PropertyGroup>
+    <LoggingProperties>$(CommonProperties)</LoggingProperties>
+
+    <!--
+      If the LoggingPackageVersion property was supplied on the command-line,
+      then pass it along to the Logging build.  Otherwise, omit it entirely
+      to avoid it expanding as empty here and thus overriding the default
+      behaviour in the Logging project.
+    -->
+    <LoggingProperties
+      Condition="'$(LoggingPackageVersion)' != ''">
+      $(LoggingProperties);LoggingPackageVersion=$(LoggingPackageVersion)
+    </LoggingProperties>
+
+    <!-- Do the same for the LoggingAssemblyFileVersion property. -->
+    <LoggingProperties
+      Condition="'$(LoggingAssemblyFileVersion)' != ''">
+      $(LoggingProperties);LoggingAssemblyFileVersion=$(LoggingAssemblyFileVersion)
+    </LoggingProperties>
+  </PropertyGroup>
+
+  <Target Name="RestoreLogging">
+    <MSBuild
+      Projects="@(Logging)"
+      Targets="Restore"
+      Properties="$(LoggingProperties)" />
+  </Target>
+
+  <Target Name="BuildLogging" DependsOnTargets="RestoreLogging">
+    <MSBuild
+      Projects="@(Logging)"
+      Targets="Build"
+      Properties="$(LoggingProperties)" />
+  </Target>
+
+  <Target Name="PackLogging">
+    <MSBuild
+      Projects="@(Logging)"
+      Targets="Pack"
+      Properties="$(LoggingProperties);NoBuild=true" />
+  </Target>
+
   <!-- Azure Targets -->
   <PropertyGroup>
     <AzureProperties>$(CommonProperties)</AzureProperties>
@@ -180,20 +253,23 @@
   <Target Name="BuildAzure" DependsOnTargets="RestoreAzure">
     <MSBuild
       Projects="@(Azure)"
-      Targets="Build;Pack"
+      Targets="Build"
       Properties="$(AzureProperties)" />
   </Target>
 
-  <!-- Other Targets -->
-  <Target Name="RestoreSqlServerLib">
-    <MSBuild Projects="@(SqlServerLib)" Targets="restore" Properties="$(SqlServerLibProperties)" />
+  <Target Name="PackAzure">
+    <MSBuild
+      Projects="@(Azure)"
+      Targets="Pack"
+      Properties="$(AzureProperties);NoBuild=true" />
   </Target>
 
-  <Target Name="RestoreNetCore" DependsOnTargets="RestoreSqlServerLib;RestoreAbstractions">
+  <!-- Other Targets -->
+  <Target Name="RestoreNetCore" DependsOnTargets="RestoreSqlServer;RestoreAbstractions;RestoreLogging">
     <MSBuild Projects="@(NetCoreDriver)" Targets="restore" Properties="$(ProjectProperties)" />
   </Target>
 
-  <Target Name="RestoreNetFx" DependsOnTargets="RestoreSqlServerLib;RestoreAbstractions" Condition="'$(IsEnabledWindows)' == 'true'">
+  <Target Name="RestoreNetFx" DependsOnTargets="RestoreSqlServer;RestoreAbstractions;RestoreLogging" Condition="'$(IsEnabledWindows)' == 'true'">
     <MSBuild Projects="@(NetFxDriver)" Targets="restore" Properties="$(ProjectProperties)" />
   </Target>
 
@@ -205,28 +281,15 @@
     <MSBuild Projects="@(Tools)" Properties="$(CommonProperties)" />
   </Target>
 
-  <Target Name="BuildNetFx" DependsOnTargets="RestoreNetFx;BuildSqlServerLib;BuildAbstractions" Condition="'$(IsEnabledWindows)' == 'true'">
+  <Target Name="BuildNetFx" DependsOnTargets="RestoreNetFx;BuildSqlServer;BuildAbstractions;BuildLogging" Condition="'$(IsEnabledWindows)' == 'true'">
     <MSBuild Projects="@(NetFxDriver)" Properties="$(CI);Platform=AnyCPU;$(ProjectProperties);$(NugetPackProperties);" />
   </Target>
 
-  <Target Name="BuildSqlServerLibAnyOS" DependsOnTargets="RestoreSqlServerLib">
-    <MSBuild Projects="@(SqlServerLib)" Properties="$(CI);$(SqlServerLibProperties);Platform=AnyCPU;OSGroup=AnyOS" RemoveProperties="TargetsWindows;TargetsUnix;" />
-  </Target>
-
-  <Target Name="BuildSqlServerLib" DependsOnTargets="RestoreSqlServerLib">
-    <Message Text=">>> Building SqlServerLib [$(CI);$(SqlServerLibProperties);Platform=AnyCPU] ..." Condition="!$(ReferenceType.Contains('Package'))" />
-    <MSBuild Projects="@(SqlServerLib)" Properties="$(CI);$(SqlServerLibProperties);Platform=AnyCPU;" RemoveProperties="TargetsWindows;TargetsUnix;" Condition="!$(ReferenceType.Contains('Package'))" />
-
-    <!-- Only build platform specific builds for Package reference types -->
-    <Message Text=">>> Building SqlServerLib [$(CI);$(SqlServerLibProperties);Platform=$(Platform)] ..." Condition="$(ReferenceType.Contains('Package'))" />
-    <MSBuild Projects="@(SqlServerLib)" Properties="$(CI);$(SqlServerLibProperties);Platform=$(Platform);" Condition="$(ReferenceType.Contains('Package'))" />
-  </Target>
-
-  <Target Name="BuildNetCore" DependsOnTargets="RestoreNetCore;BuildSqlServerLib;BuildAbstractions">
+  <Target Name="BuildNetCore" DependsOnTargets="RestoreNetCore;BuildSqlServer;BuildAbstractions;BuildLogging">
     <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);Platform=AnyCPU;$(ProjectProperties)" />
   </Target>
 
-  <Target Name="BuildNetCoreAllOS" DependsOnTargets="RestoreNetCore;BuildSqlServerLib;BuildAbstractions">
+  <Target Name="BuildNetCoreAllOS" DependsOnTargets="RestoreNetCore;BuildSqlServer;BuildAbstractions;BuildLogging">
     <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;" RemoveProperties="TargetsWindows;TargetsUnix;" />
     <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Windows_NT;" RemoveProperties="TargetsWindows;TargetsUnix;" Condition="'$(IsEnabledWindows)' == 'true'" />
     <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;" RemoveProperties="TargetsWindows;TargetsUnix;" />
@@ -271,7 +334,7 @@
       <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
     </PropertyGroup>
     <Message Text=">>> Running unit tests for Windows via command: $(TestCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(TestCommand)"/>
   </Target>
 
   <!-- Run all unit tests applicable to Unix. -->
@@ -372,7 +435,7 @@
       <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
     </PropertyGroup>
     <Message Text=">>> Running Manual test for Windows via command: $(TestCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
   </Target>
 
   <!-- Run all Manual tests applicable to Unix. -->