Merged PR 4847: eng | Add support preview on MDS

Author: DavoudEshtehari

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

@@ -31,14 +31,14 @@ jobs:
   - template: ../steps/build-all-configurations-signed-dlls-step.yml@self
     parameters:
       product: AKV
-      nugetPackageRefVersion: $(MDS_PackageRef_Version)
+      packageRefMdsVersion: $(MDS_PackageRef_Version)
       AssemblyFileVersion: $(AKVAssemblyFileVersion)
 
   - template: ../steps/code-analyze-step.yml@self
     parameters:
       analyzeType: all
       product: AKV
-      nugetPackageRefVersion: $(MDS_PackageRef_Version)
+      packageRefMdsVersion: $(MDS_PackageRef_Version)
 
   - template: ../steps/esrp-code-signing-step.yml@self
     parameters:

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

@@ -7,22 +7,28 @@ parameters:
   - name: symbolsFolder
     type: string
     default: symbols
-  
+
   - name: softwareFolder
     type: string
     default: software
 
   - name: publishSymbols
     type: boolean
 
+  - name: isPreview
+    type: boolean
+
 jobs:
 - job: build_signed_package
   displayName: 'Build Signed MDS Package'
   pool:
     type: windows  # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
 
   variables:
-  - template: ../../../libraries/variables.yml@self 
+  - template: ../../../libraries/variables.yml@self
+  - ${{ if parameters.isPreview }}:
+    - name: NugetPackageVersion
+      value: $(PreviewNugetPackageVersion)
 
   steps:
   - script: SET

eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml

@@ -12,7 +12,7 @@ parameters:
     type: string
     default: '$(Configuration)'
 
-  - name: nugetPackageRefVersion
+  - name: packageRefMdsVersion
     type: string
     default: ''
 
@@ -44,11 +44,11 @@ steps:
     inputs:
       solution: '**/build.proj'
       configuration: '${{parameters.Configuration }}'
-      msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetFx -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
+      msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetFx -p:NugetPackageVersion=${{parameters.packageRefMdsVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
 
   - task: MSBuild@1
     displayName: 'BuildAKVNetCoreAllOS using build.proj'
     inputs:
       solution: '**/build.proj'
       configuration: '${{parameters.Configuration }}'
-      msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetCoreAllOS -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'
+      msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAKVNetCoreAllOS -p:NugetPackageVersion=${{parameters.packageRefMdsVersion }} -p:ReferenceType=Package -p:SignAssembly=true -p:AssemblyOriginatorKeyFile=$(Agent.TempDirectory)\netfxKeypair.snk'

eng/pipelines/common/templates/steps/code-analyze-step.yml

@@ -14,7 +14,7 @@ parameters:
     type: string
     default: $(REPOROOT)
 
-  - name: nugetPackageRefVersion
+  - name: packageRefMdsVersion
     type: string
     default: ''
 
@@ -42,7 +42,7 @@ steps:
         msBuildVersion: 17.0
         msBuildArchitecture: x64
         setupCommandlinePicker: vs2022
-        msBuildCommandline: 'msbuild  ${{parameters.sourceRoot}}\build.proj -p:configuration=Release -p:GenerateNuget=false -p:BuildTools=false -p:NugetPackageVersion=${{parameters.nugetPackageRefVersion }} -p:ReferenceType=Package -t:BuildAKVNetCoreAllOS'
+        msBuildCommandline: 'msbuild  ${{parameters.sourceRoot}}\build.proj -p:configuration=Release -p:GenerateNuget=false -p:BuildTools=false -p:NugetPackageVersion=${{parameters.packageRefMdsVersion }} -p:ReferenceType=Package -t:BuildAKVNetCoreAllOS'
 
 - ${{ if or(eq(parameters.analyzeType, 'inspect'), eq(parameters.analyzeType, 'all')) }}:
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-codeinspector.CodeInspector@2

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

@@ -4,7 +4,7 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-name: $(Year:YY)$(DayOfYear)$(Rev:.rr)
+name: $(Year:YY)$(DayOfYear)$(Rev:.r)
 trigger:
   branches:
     include:
@@ -44,21 +44,29 @@ parameters: # parameters are shown up in ADO UI in a build queue time
   displayName: 'Publish symbols'
   type: boolean
   default: false
+
 - name: MDS_PackageRef_Version
   displayName: 'MDS package version of AKV Provider (build AKV)'
   type: string
   default: 5.1.5
+
 - name: CurrentNetFxVersion
   displayName: 'Lowest supported .NET Framework version (MDS validation)'
   type: string
   default: 'net462'
+
 - name: oneBranchType
   displayName: 'Select OneBranch template'
   default: Official
   values:
   - NonOfficial
   - Official
 
+- name: isPreview
+  displayName: 'Is this a preview build?'
+  type: boolean
+  default: false
+
 variables:
   - template: /eng/pipelines/libraries/variables.yml@self
   - name: packageFolderName
@@ -86,41 +94,41 @@ extends:
       WindowsHostVersion: 1ESWindows2022
     globalSdl: # https://aka.ms/obpipelines/sdl
       apiscan:
-        enabled: true
+        enabled: ${{ not(parameters['isPreview']) }}
         softwareFolder: $(softwareFolder)
         symbolsFolder: $(symbolsFolder)
         softwarename: Microsoft.Data.SqlClient
         versionNumber: $(AssemblyFileVersion)
       tsa:
-        enabled: true # onebranch publish all sdl results to TSA. If TSA is disabled all SDL tools will forced into 'break' build mode.
+        enabled: ${{ not(parameters['isPreview']) }} # onebranch publish all sdl results to TSA. If TSA is disabled all SDL tools will forced into 'break' build mode.
       codeql:
         compiled:
-        enabled: true
+        enabled: ${{ not(parameters['isPreview']) }}
       sbom:
-        enabled: true
+        enabled: ${{ not(parameters['isPreview']) }}
         packageName: Microsoft.Data.SqlClient
         packageVersion: $(NugetPackageVersion)
       policheck:
-        enabled: true
+        enabled: ${{ not(parameters['isPreview']) }}
         break: true # always break the build on policheck issues. You can disable it by setting to 'false'
         exclusionsFile: $(REPOROOT)\.config\PolicheckExclusions.xml
       asyncSdl:
         enabled: false        
         credscan:
-          enabled: true
+          enabled: ${{ not(parameters['isPreview']) }}
           suppressionsFile: $(REPOROOT)/.config/CredScanSuppressions.json
         binskim:
-          enabled: true
+          enabled: ${{ not(parameters['isPreview']) }}
         armory:
-          enabled: true
+          enabled: ${{ not(parameters['isPreview']) }}
           break: true
         eslint: # TypeScript and JavaScript
           enabled: false
         roslyn:
-          enabled: true
+          enabled: ${{ not(parameters['isPreview']) }}
           break: true
         publishLogs:
-          enabled: true
+          enabled: ${{ not(parameters['isPreview']) }}
         tsaOptionsPath: $(REPOROOT)\.config\tsaoptions.json
         disableLegacyManifest: true
     stages:
@@ -141,6 +149,7 @@ extends:
           symbolsFolder: $(symbolsFolder)
           softwareFolder: $(softwareFolder)
           publishSymbols: ${{ parameters['publishSymbols'] }}
+          isPreview: ${{ parameters['isPreview'] }}
 
     - stage: mds_package_validation
       displayName: 'MDS Package Validation'

eng/pipelines/libraries/mds-variables.yml

@@ -9,6 +9,8 @@ variables:
 
   - name: NugetPackageVersion
     value: $(Major).$(Minor).$(Patch)
+  - name: PreviewNugetPackageVersion
+    value: $(Major).$(Minor).$(Patch)$(Preview)$(Revision).$(Build.BuildNumber)
   - name: AssemblyFileVersion
     value: '$(Major).$(Minor)$(Patch).$(Build.BuildNumber)'
   - name: nuspecPath