Split the Abstractions pipeline changes out into their own set of changes.

Author: paulmedynski

eng/pipelines/akv-official-pipeline.yml

@@ -113,7 +113,7 @@ extends:
             sbom:
                 enabled: ${{ parameters.runSdlTasks }}
                 packageName: 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
-                packageVersion: ${{ variables.nugetPackageVersion }}
+                packageVersion: ${{ variables.akvPackageVersion }}
 
             tsa:
                 # OneBranch publishes all sdl results to TSA. If TSA is disabled all SDL tools will
@@ -131,8 +131,7 @@ extends:
                         apiScanPdbPath: '${{ variables.apiScanPdbPath }}'
                         assemblyFileVersion: '${{ variables.assemblyFileVersion }}'
                         buildConfiguration: '${{ parameters.buildConfiguration }}'
-                        nugetPackageVersion: '${{ variables.nugetPackageVersion }}'
-                        mdsPackageVersion: '${{ variables.mdsPackageVersion }}'
+                        akvPackageVersion: '${{ variables.akvPackageVersion }}'
                         publishSymbols: '${{ parameters.publishSymbols }}'
                         signingAppRegistrationClientId: '$(SigningAppRegistrationClientId)'
                         signingAppRegistrationTenantId: '$(SigningAppRegistrationTenantId)'

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

@@ -27,8 +27,8 @@ jobs:
   variables:
   - template: ../../../libraries/variables.yml@self
   - ${{ if parameters.isPreview }}:
-    - name: NugetPackageVersion
-      value: $(PreviewNugetPackageVersion)
+    - name: mdsPackageVersion
+      value: $(previewMdsPackageVersion)
 
   steps:
   - script: SET
@@ -39,7 +39,15 @@ jobs:
     name: GetBuildType
   
   - template: ../steps/build-all-configurations-signed-dlls-step.yml@self
-  
+    parameters:
+      # These values are sourced from common-variables.yml.
+      ${{ if eq(parameters.isPreview, false) }}:
+        abstractionsPackageVersion: $(abstractionsPackageVersion)
+      ${{ else }}:
+        abstractionsPackageVersion: $(abstractionsPackagePreviewVersion)
+      abstractionsAssemblyFileVersion: $(abstractionsAssemblyFileVersion)
+      mdsAssemblyFileVersion: $(mdsAssemblyFileVersion)
+
   - template: ../steps/code-analyze-step.yml@self
     parameters:
       analyzeType: all
@@ -50,7 +58,10 @@ jobs:
 
   - template: ../steps/generate-nuget-package-step.yml@self
     parameters:
-      OutputDirectory: $(artifactDirectory)
+      nuspecPath: $(nuspecPath)
+      packageVersion: $(mdsPackageVersion)
+      outputDirectory: $(artifactDirectory)
+      displayName: 'Create MDS NuGet Package'
 
   - template: ../steps/esrp-code-signing-step.yml@self
     parameters:
@@ -64,4 +75,4 @@ jobs:
   - template: ../steps/publish-symbols-step.yml@self
     parameters:
       publishSymbols: ${{ parameters['PublishSymbols'] }}
-      symbolsArtifactName: mds_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_$(NuGetPackageVersion)_$(System.TimelineId)
+      symbolsArtifactName: mds_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_$(mdsPackageVersion)_$(System.TimelineId)

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

@@ -4,6 +4,13 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 parameters:
+
+  - name: referenceType
+    type: string
+    values:
+      - Project
+      - Package
+
   - name: poolName
     type: string
     default: $(ci_var_defaultPoolName)
@@ -12,9 +19,13 @@ parameters:
     type: string
     default: ADO-MMS22-SQL19
 
-  - name: artifactName
+  - name: abstractionsArtifactName
+    type: string
+    default: Abstractions.Artifact
+
+  - name: mdsArtifactName
     type: string
-    default: Artifacts
+    default: MDS.Artifact
 
   - name: platform
     type: string
@@ -28,8 +39,12 @@ parameters:
     type: stepList
     default: []
 
+  - name: abstractionsPackageVersion
+    type: string
+
 jobs:
-- job: build_nugets
+- job: build_mds_akv_packages_job
+  displayName: Build MDS & AKV Packages
 
   pool:
     name: ${{parameters.poolName }}
@@ -44,34 +59,44 @@ jobs:
   - ${{ if ne(parameters.prebuildSteps, '') }}:
     - ${{ parameters.prebuildSteps }} # extra steps to run before the build like downloading sni and the required configuration
 
+  # If we're testing in Package mode, download the Abstractions package
+  # artifacts and put them in the packages/ directory in the repo root.
+  - ${{ if eq(parameters.referenceType, 'Package') }}:
+    - task: DownloadPipelineArtifact@2
+      displayName: Download Abstractions Package Artifact
+      inputs:
+        artifactName: ${{ parameters.abstractionsArtifactName }}
+        targetPath: $(Build.SourcesDirectory)/packages
+
   - template: ../steps/ci-project-build-step.yml@self
     parameters:
       platform: ${{ parameters.platform }}
       configuration: ${{ parameters.configuration }}
       operatingSystem: Windows
       build: all
+      abstractionsPackageVersion: ${{parameters.abstractionsPackageVersion}}
 
   - template: ../steps/generate-nuget-package-step.yml@self
     parameters:
-      NugetPackageVersion: $(NugetPackageVersion)
+      packageVersion: $(mdsPackageVersion)
       configuration: $(Configuration)
       nuspecPath: 'tools/specs/Microsoft.Data.SqlClient.nuspec'
-      OutputDirectory: $(packagePath)
+      outputDirectory: $(packagePath)
       generateSymbolsPackage: false
-      displayName: 'Generate NuGet package M.D.SqlClient'
+      displayName: 'Create MDS NuGet Package'
 
   - template: ../steps/generate-nuget-package-step.yml@self
     parameters:
-      NugetPackageVersion: $(NugetPackageVersion)
+      packageVersion: $(akvPackageVersion)
       configuration: $(Configuration)
       nuspecPath: 'tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec'
-      OutputDirectory: $(packagePath)
+      outputDirectory: $(packagePath)
       generateSymbolsPackage: false
       installNuget: false
-      displayName: 'Generate NuGet package AKV Provider'
+      displayName: 'Create AKV NuGet Package'
 
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: Artifacts'
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish Pipeline Artifact'
     inputs:
-      PathtoPublish: $(packagePath)
-      ArtifactName: ${{ parameters.artifactName }}
+      targetPath: $(packagePath)
+      artifactName: ${{ parameters.mdsArtifactName }}

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

@@ -4,12 +4,31 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 parameters:
+  - name: abstractionsArtifactName
+    type: string
+
+  - name: abstractionsPackageVersion
+    type: string
+
+  - name: configProperties
+    type: object
+    default: {} # - key: 'value'
+  
+  - name: configSqlFor
+    type: string # local, azure, or enclave
+    default: local
+
   - name: debug
     type: boolean
     default: false
 
-  - name: poolName
-    type: string
+  - name: enableX64Test
+    type: boolean
+    default: true
+
+  - name: enableX86Test
+    type: boolean
+    default: false
 
   - name: hostedPool
     type: boolean
@@ -21,63 +40,51 @@ parameters:
   - name: jobDisplayName
     type: string
 
-  - name: usemanagedSNI
-    type: boolean
-    default: false
-
-  - name: configProperties
-    type: object
-    default: {} # - key: 'value'
-
-  - name: prebuildSteps
-    type: stepList
-    default: []
-
-  - name: artifactName
+  - name: mdsArtifactName
     type: string
-    default: Artifacts
 
-  - name: targetFramework
+  - name: mdsPackageVersion
     type: string
 
   - name: netcoreVersionTestUtils
     type: string
+  
+  - name: operatingSystem
+    type: string
+    default: ''
 
-  - name: enableX86Test
-    type: boolean
-    default: false
-
-  - name: enableX64Test
-    type: boolean
-    default: true
-
-  - name: testSet
+  - name: poolName
     type: string
+
+  - name: prebuildSteps
+    type: stepList
+    default: []
 
   - name: publishTestResults
     type: boolean
     default: false
-  
-  - name: configSqlFor
-    type: string # local, azure, or enclave
-    default: local
-  
-  - name: operatingSystem
+
+  - name: referenceType
     type: string
-    default: ''
-  
-  - name: buildType
-    displayName: 'Build Type'
-    default: Project
     values:
       - Project
       - Package
 
+  - name: targetFramework
+    type: string
+
+  - name: testSet
+    type: string
+  
   # The timeout, in minutes, for this job.
   - name: timeout
     type: string
     default: 90
 
+  - name: usemanagedSNI
+    type: boolean
+    default: false
+
 jobs:
 - job: ${{ format('{0}', coalesce(parameters.jobDisplayName, parameters.image, 'unknown_image')) }}
 
@@ -98,6 +105,22 @@ jobs:
       value: '$(dotnetx86Path)'
 
   steps:
+
+  # If we're testing in Package mode, download the Abstractions and MDS package
+  # artifacts and put them in the packages/ directory in the repo root.
+  - ${{ if eq(parameters.referenceType, 'Package') }}:
+    - task: DownloadPipelineArtifact@2
+      displayName: Download Abstractions Package Artifact
+      inputs:
+        artifactName: ${{ parameters.abstractionsArtifactName }}
+        targetPath: $(Build.SourcesDirectory)/packages
+
+    - task: DownloadPipelineArtifact@2
+      displayName: Download MDS Package Artifact
+      inputs:
+        artifactName: ${{ parameters.mdsArtifactName }}
+        targetPath: $(Build.SourcesDirectory)/packages
+
   - ${{ if ne(parameters.prebuildSteps, '') }}:
     - ${{ parameters.prebuildSteps }} # extra steps to run before the build like downloading sni and the required configuration
 
@@ -227,8 +250,10 @@ jobs:
     - template: ../steps/build-all-tests-step.yml@self # build tests
       parameters:
         targetFramework: ${{ parameters.targetFramework }}
-        referenceType: ${{ parameters.buildType }}
+        referenceType: ${{ parameters.referenceType }}
         testSet: ${{ parameters.testSet }}
+        abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
+        mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
         ${{ if ne(parameters.operatingSystem, 'Windows') }}:
           OSGroup: Unix
 
@@ -237,7 +262,7 @@ jobs:
       parameters:
         debug: ${{ parameters.debug }}
         targetFramework: ${{ parameters.targetFramework }}
-        referenceType: ${{ parameters.buildType }}
+        referenceType: ${{ parameters.referenceType }}
         testSet: ${{ parameters.testSet }}
         operatingSystem: ${{ parameters.operatingSystem }}
 
@@ -279,13 +304,13 @@ jobs:
       parameters:
         debug: ${{ parameters.debug }}
         targetFramework: ${{ parameters.targetFramework }}
-        referenceType: ${{ parameters.buildType }}
+        referenceType: ${{ parameters.referenceType }}
         testSet: ${{ parameters.testSet }}
         msbuildArchitecture: x86
         dotnetx86RootPath: $(dotnetx86RootPath)
         operatingSystem: ${{ parameters.operatingSystem }}
 
-  - ${{ if and(eq(parameters.publishTestResults, true), eq(parameters.buildType, 'Project')) }}: # publish test results if build type is project
+  - ${{ if and(eq(parameters.publishTestResults, true), eq(parameters.referenceType, 'Project')) }}: # publish test results if build type is project
     - template: ../steps/publish-test-results-step.yml@self
       parameters:
         debug: ${{ parameters.debug }}

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

@@ -52,8 +52,6 @@ jobs:
   - template: ../steps/update-nuget-config-local-feed-step.yml
     parameters:
       downloadedNugetPath: $(Pipeline.Workspace)\${{parameters.packageFolderName }}
-      ${{ if parameters.isPreview }}:
-        nugetPackageVersion: $(PreviewNugetPackageVersion)
 
   - template: ../steps/update-config-file-step.yml
     parameters: 
@@ -68,11 +66,11 @@ jobs:
     parameters:
       referenceType: Package
       ${{ if parameters.isPreview }}:
-        nugetPackageVersion: $(PreviewNugetPackageVersion)
+        mdsPackageVersion: $(previewMdsPackageVersion)
 
   - template: ../steps/build-and-run-tests-netcore-step.yml
     parameters:
       referenceType: Package
       cleanFirst: true
       ${{ if parameters.isPreview }}:
-        nugetPackageVersion: $(PreviewNugetPackageVersion)
+        mdsPackageVersion: $(previewMdsPackageVersion)