- Added separate MDS and AKV project builds to support Package mode.

Author: paulmedynski

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

@@ -46,6 +46,9 @@ parameters:
   - name: abstractionsPackageVersion
     type: string
 
+  - name: mdsPackageVersion
+    type: string
+
 jobs:
 - job: build_mds_akv_packages_job
   displayName: Build MDS & AKV Packages
@@ -71,7 +74,7 @@ jobs:
       displayName: Download Abstractions Package Artifact
       inputs:
         artifactName: ${{ parameters.abstractionsArtifactName }}
-        targetPath: $(Build.SourcesDirectory)/packages
+        targetPath: $(packagePath)
     # Note that packages/ will have been created by the above step, which is a
     # pre-requisite for configuring NuGet.
     - template: ../steps/ci-prebuild-step.yml@self
@@ -85,12 +88,12 @@ jobs:
       configuration: ${{ parameters.configuration }}
       referenceType: ${{ parameters.referenceType }}
       operatingSystem: Windows
-      build: all
+      build: MDS
       abstractionsPackageVersion: ${{parameters.abstractionsPackageVersion}}
 
   - template: ../steps/generate-nuget-package-step.yml@self
     parameters:
-      packageVersion: $(mdsPackageVersion)
+      packageVersion: ${{ parameters.mdsPackageVersion }}
       configuration: $(Configuration)
       nuspecPath: 'tools/specs/Microsoft.Data.SqlClient.nuspec'
       outputDirectory: $(packagePath)
@@ -99,6 +102,15 @@ jobs:
       properties: 'AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}'
       displayName: 'Create MDS NuGet Package'
 
+  - template: ../steps/ci-project-build-step.yml@self
+    parameters:
+      platform: ${{ parameters.platform }}
+      configuration: ${{ parameters.configuration }}
+      referenceType: ${{ parameters.referenceType }}
+      operatingSystem: Windows
+      build: AKV
+      mdsPackageVersion: ${{parameters.mdsPackageVersion}}
+
   - template: ../steps/generate-nuget-package-step.yml@self
     parameters:
       packageVersion: $(akvPackageVersion)
@@ -107,7 +119,7 @@ jobs:
       outputDirectory: $(packagePath)
       generateSymbolsPackage: false
       referenceType: ${{ parameters.referenceType }}
-      properties: 'MdsPackageVersion=$(mdsPackageVersion)'
+      properties: 'MdsPackageVersion=${{ parameters.mdsPackageVersion }}'
       installNuget: false
       displayName: 'Create AKV NuGet Package'
 

eng/pipelines/common/templates/steps/ci-project-build-step.yml

@@ -40,20 +40,22 @@ parameters:
       - all
       - allNoDocs
 
+  # Used when MDS is built with ReferenceType = Package.
   - name: abstractionsPackageVersion
     type: string
+    default: ''
+  
+  # Used when AKV is built with ReferenceType = Package.
+  - name: mdsPackageVersion
+    type: string
+    default: ''
 
 steps:
 - template: ./ensure-dotnet-version.yml@self
   parameters:
       packageType: 'sdk'
       version: '9.0'
 
-- template: ./ensure-dotnet-version.yml@self
-  parameters:
-      packageType: 'runtime'
-      version: '8.0'
-
 - ${{ if or(eq(parameters.operatingSystem, 'Windows'), eq(parameters.operatingSystem, 'deferedToRuntime')) }}:
   - ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
     - task: MSBuild@1
@@ -98,7 +100,7 @@ steps:
         msbuildArchitecture: x64
         platform: '${{ parameters.platform }}'
         configuration: '${{ parameters.configuration }}'
-        msbuildArguments: '-t:BuildAKVNetFx -p:ReferenceType=${{ parameters.ReferenceType }} -p:BuildNumber=${{ parameters.buildNumber }} -p:AbstractionsPackageVersion=${{parameters.abstractionsPackageVersion}}'
+        msbuildArguments: '-t:BuildAKVNetFx -p:ReferenceType=${{ parameters.ReferenceType }} -p:BuildNumber=${{ parameters.buildNumber }} -p:MdsPackageVersion=${{parameters.mdsPackageVersion}}'
 
     - task: MSBuild@1
       displayName: 'Build AKV Provider NetCore All OS [Win]'
@@ -108,7 +110,7 @@ steps:
         msbuildArchitecture: x64
         platform: '${{ parameters.platform }}'
         configuration: '${{ parameters.configuration }}'
-        msbuildArguments: '-t:BuildAKVNetCoreAllOS -p:ReferenceType=${{ parameters.ReferenceType }} -p:BuildNumber=${{ parameters.buildNumber }} -p:AbstractionsPackageVersion=${{parameters.abstractionsPackageVersion}}'
+        msbuildArguments: '-t:BuildAKVNetCoreAllOS -p:ReferenceType=${{ parameters.ReferenceType }} -p:BuildNumber=${{ parameters.buildNumber }} -p:MdsPackageVersion=${{parameters.mdsPackageVersion}}'
 
 - ${{ if or(eq(parameters.operatingSystem, 'Linux'), eq(parameters.operatingSystem, 'MacOS'), eq(parameters.operatingSystem, 'deferedToRuntime')) }}:
   - task: DotNetCoreCLI@2

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

@@ -132,6 +132,7 @@ stages:
         configuration: ${{ parameters.buildConfiguration }}
         abstractionsPackageVersion: $(abstractionsPackageVersion)
         abstractionsArtifactName: $(abstractionsArtifactName)
+        mdsPackageVersion: $(mdsPackageVersion)
         mdsArtifactName: $(mdsArtifactName)
         ${{if ne(parameters.SNIVersion, '')}}:
           prebuildSteps: