Merged PR 4888: eng | Fix package validation stage against the preview

Author: DavoudEshtehari

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

@@ -17,6 +17,9 @@ parameters:
     type: string
     default: empty
 
+  - name: isPreview
+    type: boolean
+
 jobs:
 - job: run_tests_package_reference
   displayName: 'Run tests with package reference'
@@ -39,6 +42,8 @@ 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: 
@@ -52,8 +57,12 @@ jobs:
   - template: ../steps/build-and-run-tests-netfx-step.yml
     parameters:
       referenceType: Package
+      ${{ if parameters.isPreview }}:
+        nugetPackageVersion: $(PreviewNugetPackageVersion)
 
   - template: ../steps/build-and-run-tests-netcore-step.yml
     parameters:
       referenceType: Package
       cleanFirst: true
+      ${{ if parameters.isPreview }}:
+        nugetPackageVersion: $(PreviewNugetPackageVersion)

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

@@ -33,6 +33,9 @@ parameters:
     type: string
     default: $(AssemblyFileVersion)
 
+  - name: isPreview
+    type: boolean
+
 jobs:
 - job: validate_signed_package
   displayName: 'Verify signed package'
@@ -49,6 +52,17 @@ jobs:
 
   - name: pathToDownloadedNuget # path to the downloaded nuget files
     value: $(Pipeline.Workspace)\${{parameters.packageFolderName }}
+  
+  - name: ProductVersion    #MDS product version (MDS validation)
+    value: $(NugetPackageVersion)
+
+  - ${{ if parameters.isPreview }}:
+    - name: extractedNugetPath
+      value: $(extractedNugetRootPath).$(PreviewNugetPackageVersion)
+    - name: NugetPackageVersion
+      value: $(PreviewNugetPackageVersion)
+    - name: ProductVersion
+      value: $(PreviewNugetPackageVersion)
 
   steps:
   - script: SET

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

@@ -77,8 +77,6 @@ variables:
     value: ${{ parameters['MDS_PackageRef_Version'] }}
   - name: CurrentNetFxVersion
     value: ${{ parameters['CurrentNetFxVersion'] }}
-  - name: ProductVersion    #MDS product version (MDS validation)
-    value: $(NUGETPACKAGEVERSION)
 
 resources:
   repositories: 
@@ -158,6 +156,7 @@ extends:
       - template: eng/pipelines/common/templates/jobs/validate-signed-package-job.yml@self
         parameters:
           packageFolderName: $(packageFolderName)
+          isPreview: ${{ parameters['isPreview'] }}
           downloadPackageStep:
             download: current
             artifact: $(packageFolderName)
@@ -167,6 +166,7 @@ extends:
       - template: eng/pipelines/common/templates/jobs/run-tests-package-reference-job.yml@self
         parameters:
           packageFolderName: $(packageFolderName)
+          isPreview: ${{ parameters['isPreview'] }}
           downloadPackageStep:
             download: current
             artifact: $(packageFolderName)

eng/pipelines/libraries/mds-validation-variables.yml

@@ -10,8 +10,10 @@ variables:
 
   - name: TempFolderName # extract the nuget package here
     value: temp
+  - name: extractedNugetRootPath
+    value: $(Build.SourcesDirectory)\$(TempFolderName)\Microsoft.Data.SqlClient
   - name: extractedNugetPath
-    value: $(Build.SourcesDirectory)\$(TempFolderName)\Microsoft.Data.SqlClient.$(NugetPackageVersion)
+    value: $(extractedNugetRootPath).$(NugetPackageVersion)
   - name: expectedFolderNames
     value: lib,ref,runtimes
   - name: expectedDotnetVersions