Azure Split - Use MDS Common Project

.github/workflows/codeql.yml

@@ -13,9 +13,9 @@ name: "CodeQL Advanced"
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "feat/*" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "feat/*" ]
   schedule:
     - cron: '33 23 * * 6'
 
@@ -60,9 +60,8 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v5.0.1
       with:
-        # TODO: Update this to .NET 10 once PR #3686 is complete.
         # TODO: Replace this with global-json-file once PR #3797 is complete.
-        dotnet-version: 9.x
+        dotnet-version: 10.x
         dotnet-quality: ga
         #global-json-file: global.json
 
@@ -88,9 +87,26 @@ jobs:
     - name: Run manual build steps
       if: matrix.build-mode == 'manual'
       shell: bash
+      # TODO(https://sqlclientdrivers.visualstudio.com/ADO.Net/_workitems/edit/38655):
+      # For some reason, the StressTests projects fail to restore in this
+      # environment, so we skip them by explicitly building all of the other
+      # projects instead of the main solution file.
       run: |
-        mkdir packages
-        dotnet build src/
+        dotnet build src/Microsoft.SqlServer.Server
+        dotnet build src/Microsoft.Data.SqlClient.Extensions/Abstractions/src
+        dotnet build src/Microsoft.Data.SqlClient.Extensions/Abstractions/test
+        dotnet build src/Microsoft.Data.SqlClient/netcore/ref
+        dotnet build src/Microsoft.Data.SqlClient/netcore/src
+        dotnet build src/Microsoft.Data.SqlClient/netfx/ref
+        dotnet build src/Microsoft.Data.SqlClient/netfx/src
+        dotnet build src/Microsoft.Data.SqlClient/src
+        dotnet build src/Microsoft.Data.SqlClient.Extensions/Azure/src
+        dotnet build src/Microsoft.Data.SqlClient.Extensions/Azure/test
+        dotnet build src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider
+        dotnet build src/Microsoft.Data.SqlClient/tests/UnitTests
+        dotnet build src/Microsoft.Data.SqlClient/tests/FunctionalTests
+        dotnet build src/Microsoft.Data.SqlClient/tests/ManualTests
+        dotnet build src/Microsoft.Data.SqlClient/tests/PerformanceTests
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v4

Directory.Packages.props

@@ -83,6 +83,11 @@
 
   <!-- None -->
 
+  <!-- ===================================================================== -->
+  <!-- Abstractions Dependencies -->
+
+  <!-- None -->
+
   <!-- ===================================================================== -->
   <!-- MDS Dependencies -->
 

build.proj

@@ -489,7 +489,7 @@
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</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. -->
@@ -521,7 +521,7 @@
     <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "bin", SearchOption.AllDirectories))' />
     <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", ".nuget", SearchOption.AllDirectories))' />
     <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "obj", SearchOption.AllDirectories))' />
-</Target>
+  </Target>
 
   <!-- AKV Targets ========================================================= -->
   <Target Name="BuildAkv">

eng/pipelines/akv-official-pipeline.yml

@@ -49,7 +49,7 @@ resources:
           ref: 'refs/heads/main'
 
 extends:
-    template: 'v2/OneBranch.${{ parameters.oneBranchType }}.CrossPlat.yml@templates'
+    template: /v2/OneBranch.${{ parameters.oneBranchType }}.CrossPlat.yml@templates
 
     parameters:
         featureFlags:

eng/pipelines/common/templates/steps/ensure-dotnet-version.yml

@@ -10,6 +10,13 @@
 # Reason for not using UseDotNet task:
 #   [BUG]: UseDotNet task installs x86 build on Windows arm64
 #   https://github.com/microsoft/azure-pipelines-tasks/issues/20300
+#
+# A possible workaround is discussed here:
+#
+#   https://github.com/microsoft/azure-pipelines-tasks/issues/16501
+#
+# TODO: See if we can eliminate this template and just use the above workaround
+# for the Windows x86 builds.
 
 parameters:
     - # Directory where dotnet binaries should be installed. If not specified, defaults to the

eng/pipelines/common/templates/steps/update-config-file-step.yml

@@ -124,6 +124,10 @@ parameters:
     type: boolean
     default: true
 
+  - name: WorkloadIdentityFederationServiceConnectionId
+    type: string
+    default: ''
+
 steps:
 # All properties should be added here, and this template should be used for any manipulation of the config.json file.
 - pwsh: |
@@ -180,6 +184,7 @@ steps:
         $p.IsDNSCachingSupportedCR=[System.Convert]::ToBoolean("${{parameters.IsDNSCachingSupportedCR }}")
         $p.TracingEnabled=[System.Convert]::ToBoolean("${{parameters.TracingEnabled }}")
         $p.EnclaveEnabled=[System.Convert]::ToBoolean("${{parameters.EnclaveEnabled }}")
+        $p.WorkloadIdentityFederationServiceConnectionId="${{parameters.WorkloadIdentityFederationServiceConnectionId }}"
     }
     $jdata | ConvertTo-Json | Set-Content "config.json"
   workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
@@ -196,4 +201,4 @@ steps:
           }
       }
     workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
-    displayName: 'Read config.json [debug]'
+    displayName: '[Debug] Read config.json'

eng/pipelines/dotnet-sqlclient-ci-core.yml

@@ -103,6 +103,17 @@ parameters:
   type: boolean
   default: true
 
+- name: dotnetVerbosity
+  displayName: dotnet CLI Verbosity
+  type: string
+  default: normal
+  values:
+    - quiet
+    - minimal
+    - normal
+    - detailed
+    - diagnostic
+
 variables:
   - template: /eng/pipelines/libraries/ci-build-variables.yml@self
 
@@ -121,11 +132,11 @@ stages:
   # under the given artifact name.
   - template: /eng/pipelines/stages/build-abstractions-package-ci-stage.yml@self
     parameters:
-      buildConfiguration: ${{ parameters.buildConfiguration }}
+      abstractionsArtifactName: $(abstractionsArtifactName)
       abstractionsPackageVersion: $(abstractionsPackageVersion)
-      artifactName: $(abstractionsArtifactName)
-      ${{if eq(parameters.debug, 'true')}}:
-        verbosity: diagnostic
+      buildConfiguration: ${{ parameters.buildConfiguration }}
+      debug: ${{ parameters.debug }}
+      dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
 
   # Build MDS and its NuGet packages.
   - stage: build_mds_akv_packages_stage
@@ -164,25 +175,31 @@ stages:
       azureArtifactName: $(azureArtifactName)
       azurePackageVersion: $(azurePackageVersion)
       buildConfiguration: ${{ parameters.buildConfiguration }}
+      debug: ${{ parameters.debug }}
+      mdsArtifactName: $(mdsArtifactName)
+      mdsPackageVersion: $(mdsPackageVersion)
       # When building via package references, we must depend on the Abstractions
-      # package.
+      # and MDS packages
       ${{ if eq(parameters.referenceType, 'Package') }}:
         dependsOn:
           - build_abstractions_package_stage
+          - build_mds_akv_packages_stage
       referenceType: ${{ parameters.referenceType }}
       ${{if eq(parameters.debug, 'true')}}:
-        verbosity: diagnostic
+        dotnetVerbosity: diagnostic
 
   # Run the stress tests, if desired.
   - ${{ if eq(parameters.enableStressTests, true) }}:
     - template: /eng/pipelines/stages/stress-tests-ci-stage.yml@self
       parameters:
         buildConfiguration: ${{ parameters.buildConfiguration }}
-        dependsOn: [build_mds_akv_packages_stage]
+        dependsOn:
+          - build_mds_akv_packages_stage
+          - build_azure_package_stage
         pipelineArtifactName: $(artifactName)
         mdsPackageVersion: $(mdsPackageVersion)
-        ${{ if eq(parameters.debug, 'true') }}:
-          verbosity: 'detailed'
+        azurePackageVersion: $(azurePackageVersion)
+        dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
 
   # Run the MDS and AKV tests.
   - template: /eng/pipelines/common/templates/stages/ci-run-tests-stage.yml@self

eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml

@@ -168,14 +168,27 @@ parameters:
     type: object
     default: [false, true]
 
+  # Dotnet CLI verbosity level.
+  - name: dotnetVerbosity
+    displayName: dotnet CLI Verbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
 extends:
-  template: dotnet-sqlclient-ci-core.yml@self
+  template: /eng/pipelines/dotnet-sqlclient-ci-core.yml@self
   parameters:
     buildConfiguration: ${{ parameters.buildConfiguration }}
     buildPlatforms: ${{ parameters.buildPlatforms }}
     referenceType: Package
     codeCovTargetFrameworks: ${{ parameters.codeCovTargetFrameworks }}
     debug: ${{ parameters.debug }}
+    dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
     enableStressTests: ${{ parameters.enableStressTests }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
     targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}

eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml

@@ -168,14 +168,27 @@ parameters:
     type: object
     default: [false, true]
 
+  # Dotnet CLI verbosity level.
+  - name: dotnetVerbosity
+    displayName: dotnet CLI Verbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
 extends:
-  template: dotnet-sqlclient-ci-core.yml@self
+  template: /eng/pipelines/dotnet-sqlclient-ci-core.yml@self
   parameters:
     buildConfiguration: ${{ parameters.buildConfiguration }}
     buildPlatforms: ${{ parameters.buildPlatforms }}
     referenceType: Project
     codeCovTargetFrameworks: ${{ parameters.codeCovTargetFrameworks }}
     debug: ${{ parameters.debug }}
+    dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
     enableStressTests: ${{ parameters.enableStressTests }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
     targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}

eng/pipelines/dotnet-sqlclient-signing-pipeline.yml

@@ -88,7 +88,7 @@ resources:
       ref: refs/heads/main
 
 extends:
-  template: v2/OneBranch.${{parameters.oneBranchType }}.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
+  template: /v2/OneBranch.${{parameters.oneBranchType }}.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
   parameters:
     featureFlags:
       # Suggested by MerlinBot (https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient/pullrequest/4882)

eng/pipelines/jobs/pack-abstractions-package-ci-job.yml

@@ -12,29 +12,34 @@
 
 parameters:
 
-  # The version to apply to the Abstractions NuGet package and its assemblies.
-  - name: abstractionsPackageVersion
-    type: string
-
   # The name to apply to the published pipeline artifact.
-  - name: artifactName
+  - name: abstractionsArtifactName
     type: string
     default: Abstractions.Artifact
 
+  # The version to apply to the Abstractions NuGet package and its assemblies.
+  - name: abstractionsPackageVersion
+    type: string
+
   # The type of build to test (Release or Debug)
   - name: buildConfiguration
     type: string
     values:
     - Release
     - Debug
+
+  # True to enable extra debug steps and logging.
+  - name: debug
+    type: boolean
+    default: false
 
   # The list of upstream jobs to depend on.
   - name: dependsOn
     type: object
     default: []
 
   # The verbosity level for the dotnet CLI commands.
-  - name: verbosity
+  - name: dotnetVerbosity
     type: string
     default: normal
     values:
@@ -69,7 +74,7 @@ jobs:
       # dotnet CLI arguments common to all commands.
       - name: commonArguments
         value: >-
-          --verbosity ${{ parameters.verbosity }}
+          --verbosity ${{ parameters.dotnetVerbosity }}
 
       # dotnet CLI arguments for build/test/pack commands
       - name: buildArguments
@@ -102,6 +107,11 @@ jobs:
 
     steps:
 
+      # Emit environment variables if debug is enabled.
+      - ${{ if eq(parameters.debug, true) }}:
+        - pwsh: 'Get-ChildItem Env: | Sort-Object Name'
+          displayName: '[Debug] Print Environment Variables'
+
       # Install the .NET 10.0 SDK.
       - task: UseDotNet@2
         displayName: Install .NET 10.0 SDK
@@ -112,18 +122,18 @@ jobs:
       # We use the 'custom' command because the DotNetCoreCLI@2 task doesn't
       # support all of our argument combinations for the different build steps.
 
-      # Restore the solution.
+      # Restore the project.
       - task: DotNetCoreCLI@2
-        displayName: Restore Solution
+        displayName: Restore Project
         inputs:
           command: custom
           custom: restore
           projects: $(project)
           arguments: $(commonArguments)
 
-      # Build the solution.
+      # Build the project.
       - task: DotNetCoreCLI@2
-        displayName: Build Solution
+        displayName: Build Project
         inputs:
           command: custom
           custom: build
@@ -144,5 +154,5 @@ jobs:
         displayName: Publish Pipeline Artifact
         inputs:
           targetPath: $(dotnetPackagesDir)
-          artifactName: ${{ parameters.artifactName }}
+          artifactName: ${{ parameters.abstractionsArtifactName }}
           publishLocation: pipeline