[DRAFT] Add Debug CI runs

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

@@ -39,6 +39,8 @@ jobs:
     name: GetBuildType
 
   - template: ../steps/build-all-configurations-signed-dlls-step.yml@self
+    parameters:
+      buildConfiguration: Release
 
   - template: ../steps/code-analyze-step.yml@self
     parameters:
@@ -50,6 +52,7 @@ jobs:
 
   - template: ../steps/generate-nuget-package-step.yml@self
     parameters:
+      buildConfiguration: Release
       OutputDirectory: $(artifactDirectory)
 
   - template: ../steps/esrp-code-signing-step.yml@self
@@ -58,10 +61,12 @@ jobs:
 
   - template: ../steps/copy-dlls-for-test-step.yml@self
     parameters:
+      buildConfiguration: Release
       product: MDS
 
   # Publish symbols to servers
   - template: ../steps/publish-symbols-step.yml@self
     parameters:
+      buildConfiguration: Release
       publishSymbols: ${{ parameters['PublishSymbols'] }}
       symbolsArtifactName: mds_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_$(NuGetPackageVersion)_$(System.TimelineId)

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

@@ -20,9 +20,11 @@ parameters:
     type: string
     default: $(Platform)
 
-  - name: configuration
+  - name: buildConfiguration
     type: string
-    default: $(Configuration)
+    values:
+      - Debug
+      - Release
 
   - name: prebuildSteps
     type: stepList
@@ -47,14 +49,14 @@ jobs:
   - template: ../steps/ci-project-build-step.yml@self
     parameters:
       platform: ${{ parameters.platform }}
-      configuration: ${{ parameters.configuration }}
+      buildConfiguration: ${{ parameters.buildConfiguration }}
       operatingSystem: Windows
       build: all
 
   - template: ../steps/generate-nuget-package-step.yml@self
     parameters:
       NugetPackageVersion: $(NugetPackageVersion)
-      configuration: $(Configuration)
+      buildConfiguration: ${{ parameters.buildConfiguration }}
       nuspecPath: 'tools/specs/Microsoft.Data.SqlClient.nuspec'
       OutputDirectory: $(packagePath)
       generateSymbolsPackage: false
@@ -63,7 +65,7 @@ jobs:
   - template: ../steps/generate-nuget-package-step.yml@self
     parameters:
       NugetPackageVersion: $(NugetPackageVersion)
-      configuration: $(Configuration)
+      buildConfiguration: ${{ parameters.buildConfiguration }}
       nuspecPath: 'tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec'
       OutputDirectory: $(packagePath)
       generateSymbolsPackage: false

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

@@ -65,18 +65,22 @@ parameters:
   - name: operatingSystem
     type: string
     default: ''
+
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
 
   - name: buildType
-    displayName: 'Build Type'
     default: Project
     values:
       - Project
       - Package
 
   # The timeout, in minutes, for this job.
   - name: timeout
-    type: string
-    default: 90
+    type: number
 
 jobs:
 - job: ${{ format('{0}', coalesce(parameters.jobDisplayName, parameters.image, 'unknown_image')) }}
@@ -227,6 +231,7 @@ jobs:
     - template: ../steps/build-all-tests-step.yml@self # build tests
       parameters:
         targetFramework: ${{ parameters.targetFramework }}
+        buildConfiguration: ${{ parameters.buildConfiguration }}
         referenceType: ${{ parameters.buildType }}
         testSet: ${{ parameters.testSet }}
         ${{ if ne(parameters.operatingSystem, 'Windows') }}:
@@ -237,6 +242,7 @@ jobs:
       parameters:
         debug: ${{ parameters.debug }}
         targetFramework: ${{ parameters.targetFramework }}
+        buildConfiguration: ${{ parameters.buildConfiguration }}
         referenceType: ${{ parameters.buildType }}
         testSet: ${{ parameters.testSet }}
         operatingSystem: ${{ parameters.operatingSystem }}
@@ -279,6 +285,7 @@ jobs:
       parameters:
         debug: ${{ parameters.debug }}
         targetFramework: ${{ parameters.targetFramework }}
+        buildConfiguration: ${{ parameters.buildConfiguration }}
         referenceType: ${{ parameters.buildType }}
         testSet: ${{ parameters.testSet }}
         msbuildArchitecture: x86
@@ -291,3 +298,4 @@ jobs:
         debug: ${{ parameters.debug }}
         targetFramework: ${{ parameters.targetFramework }}
         operatingSystem: ${{ parameters.operatingSystem }}
+        buildConfiguration: ${{ parameters.buildConfiguration }}

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

@@ -22,8 +22,7 @@ parameters:
 
   # The timeout, in minutes, for this job.
   - name: timeout
-    type: string
-    default: 90
+    type: number
 
 jobs:
 - job: run_tests_package_reference
@@ -67,12 +66,14 @@ jobs:
   - template: ../steps/build-and-run-tests-netfx-step.yml
     parameters:
       referenceType: Package
+      buildConfiguration: Release
       ${{ if parameters.isPreview }}:
         nugetPackageVersion: $(PreviewNugetPackageVersion)
 
   - template: ../steps/build-and-run-tests-netcore-step.yml
     parameters:
       referenceType: Package
+      buildConfiguration: Release
       cleanFirst: true
       ${{ if parameters.isPreview }}:
         nugetPackageVersion: $(PreviewNugetPackageVersion)

eng/pipelines/common/templates/stages/ci-run-tests-stage.yml

@@ -16,12 +16,17 @@ parameters:
     default: ''
 
   - name: buildType
-    displayName: 'Build Type'
     default: Project
     values:
       - Project
       - Package
 
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
   - name: prebuildSteps
     type: stepList
     default: []
@@ -31,9 +36,8 @@ parameters:
     default: []
 
   # The timeout, in minutes, for each test job.
-  - name: testsTimeout
-    type: string
-    default: 90
+  - name: testJobTimeout
+    type: number
 
 stages:
 - ${{ each config in parameters.testConfigurations }}:
@@ -51,8 +55,9 @@ stages:
               - template: ../jobs/ci-run-tests-job.yml@self
                 parameters:
                   debug: ${{ parameters.debug }}
+                  buildConfiguration: ${{ parameters.buildConfiguration }}
                   buildType: ${{ parameters.buildType }}
-                  timeout: ${{ parameters.testsTimeout }}
+                  timeout: ${{ parameters.testJobTimeout }}
                   poolName: ${{ config.value.pool }}
                   hostedPool: ${{ eq(config.value.hostedPool, true) }}
                   image: ${{ image.value }}
@@ -77,8 +82,9 @@ stages:
                 - template: ../jobs/ci-run-tests-job.yml@self
                   parameters:
                     debug: ${{ parameters.debug }}
+                    buildConfiguration: ${{ parameters.buildConfiguration }}
                     buildType: ${{ parameters.buildType }}
-                    timeout: ${{ parameters.testsTimeout }}
+                    timeout: ${{ parameters.testJobTimeout }}
                     poolName: ${{ config.value.pool }}
                     hostedPool: ${{ eq(config.value.hostedPool, true) }}
                     image: ${{ image.value }}

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

@@ -8,9 +8,11 @@ parameters:
     type: string
     default: $(AssemblyFileVersion)
 
-  - name: Configuration
+  - name: buildConfiguration
     type: string
-    default: '$(Configuration)'
+    values:
+      - Debug
+      - Release
 
   - name: packageRefMdsVersion
     type: string
@@ -46,5 +48,5 @@ steps:
     displayName: 'BuildAllConfigurations using build.proj'
     inputs:
       solution: '**/build.proj'
-      configuration: '${{parameters.Configuration }}'
+      configuration: '${{parameters.buildConfiguration }}'
       msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'

eng/pipelines/common/templates/steps/build-all-tests-step.yml

@@ -15,9 +15,11 @@ parameters:
     type: string
     default: $(Platform)
 
-  - name: configuration
+  - name: buildConfiguration
     type: string
-    default: '$(Configuration)'
+    values:
+      - Debug
+      - Release
 
   - name: referenceType
     default: Package
@@ -39,7 +41,7 @@ steps:
     inputs:
       solution: build.proj
       platform: '${{parameters.platform }}'
-      configuration: '${{parameters.configuration }}'
+      configuration: '${{parameters.buildConfiguration }}'
       msbuildArguments: '-t:BuildTestsNetFx -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
 
 # - ${{else if contains(parameters.targetFramework, 'netstandard')}}: # .NET Standard
@@ -48,7 +50,7 @@ steps:
 #     inputs:
 #       solution: build.proj
 #       platform: '${{parameters.platform }}'
-#       configuration: '${{parameters.configuration }}'
+#       configuration: '${{parameters.buildConfiguration }}'
 #       msbuildArguments: '-t:BuildTestsNetCore -p:ReferenceType=NetStandard -p:TargetNetStandardVersion=${{parameters.targetNetStandardVersion }} -p:TF=${{parameters.targetFramework }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
 #     condition: and(succeeded(), not(startsWith(variables['TF'], 'net4')), startsWith(variables['TargetNetStandardVersion'], 'netstandard'))
 
@@ -58,7 +60,7 @@ steps:
     inputs:
       solution: build.proj
       platform: '${{parameters.platform }}'
-      configuration: '${{parameters.configuration }}'
+      configuration: '${{parameters.buildConfiguration }}'
       msbuildArguments: '-t:BuildTestsNetCore -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
     condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
 
@@ -69,7 +71,7 @@ steps:
       command: custom
       projects: build.proj
       custom: msbuild
-      arguments: '-t:BuildTestsNetCore -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:OSGroup=${{parameters.OSGroup }} -p:platform=${{parameters.platform }} -p:Configuration=${{parameters.configuration }}'
+      arguments: '-t:BuildTestsNetCore -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:OSGroup=${{parameters.OSGroup }} -p:platform=${{parameters.platform }} -p:Configuration=${{parameters.buildConfiguration }}'
       verbosityRestore: Detailed
       verbosityPack: Detailed
     condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))

eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml

@@ -8,9 +8,11 @@ parameters:
     type: string
     default: $(TargetNetCoreVersion)
 
-  - name: configuration
+  - name: buildConfiguration
     type: string
-    default: $(Configuration)
+    values:
+      - Debug
+      - Release
 
   - name: referenceType
     default: Project
@@ -55,14 +57,14 @@ steps:
   inputs:
     solution: build.proj
     msbuildArchitecture: x64
-    msbuildArguments: '-p:Configuration=${{parameters.configuration }} -t:BuildAKVNetCore -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }}'
+    msbuildArguments: '-p:Configuration=${{parameters.buildConfiguration }} -t:BuildAKVNetCore -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }}'
 
 - task: MSBuild@1
   displayName: 'MSBuild Build Tests for ${{parameters.TargetNetCoreVersion }}'
   inputs:
     solution: build.proj
     msbuildArchitecture: x64
-    msbuildArguments: '-t:BuildTestsNetCore -p:ReferenceType=${{parameters.referenceType }} -p:TargetNetCoreVersion=${{parameters.TargetNetCoreVersion }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} -p:Configuration=${{parameters.configuration }}'
+    msbuildArguments: '-t:BuildTestsNetCore -p:ReferenceType=${{parameters.referenceType }} -p:TargetNetCoreVersion=${{parameters.TargetNetCoreVersion }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} -p:Configuration=${{parameters.buildConfiguration }}'
 
 # Don't run unit tests using package reference. Unit tests are only run using project reference.
 
@@ -71,12 +73,12 @@ steps:
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.FunctionalTests.csproj'
-    arguments: '-p:Platform=${{parameters.platform }} -p:TestTargetOS="${{parameters.TestTargetOS }}" -p:TargetNetCoreVersion=${{parameters.TargetNetCoreVersion }}  -p:ReferenceType=${{parameters.referenceType }} -p:Configuration=${{parameters.configuration }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests"'
+    arguments: '-p:Platform=${{parameters.platform }} -p:TestTargetOS="${{parameters.TestTargetOS }}" -p:TargetNetCoreVersion=${{parameters.TargetNetCoreVersion }}  -p:ReferenceType=${{parameters.referenceType }} -p:Configuration=${{parameters.buildConfiguration }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} --no-build -v n --filter "category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests"'
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Manual Tests for ${{parameters.TargetNetCoreVersion }}'
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj'
-    arguments: '-p:Platform=${{parameters.platform }} -p:TestTargetOS="${{parameters.TestTargetOS }}" -p:TargetNetCoreVersion=${{parameters.TargetNetCoreVersion }} -p:ReferenceType=${{parameters.referenceType }} -p:Configuration=${{parameters.configuration }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} --no-build -v n --filter  category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests  --collect "Code Coverage"'
+    arguments: '-p:Platform=${{parameters.platform }} -p:TestTargetOS="${{parameters.TestTargetOS }}" -p:TargetNetCoreVersion=${{parameters.TargetNetCoreVersion }} -p:ReferenceType=${{parameters.referenceType }} -p:Configuration=${{parameters.buildConfiguration }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} --no-build -v n --filter  category!=nonnetcoreapptests&category!=failing&category!=nonwindowstests  --collect "Code Coverage"'
   retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}

eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml

@@ -8,9 +8,11 @@ parameters:
     type: string
     default: $(TargetNetFxVersion)
 
-  - name: configuration
+  - name: buildConfiguration
     type: string
-    default: $(Configuration)
+    values:
+      - Debug
+      - Release
 
   - name: referenceType
     default: Project
@@ -55,13 +57,13 @@ steps:
   inputs:
     solution: build.proj
     msbuildArchitecture: x64
-    msbuildArguments: '-p:Configuration=${{parameters.configuration }} -t:BuildAKVNetFx -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }}'
+    msbuildArguments: '-p:Configuration=${{parameters.buildConfiguration }} -t:BuildAKVNetFx -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }}'
 
 - task: MSBuild@1
   displayName: 'MSBuild Build Tests for ${{parameters.TargetNetFxVersion }}'
   inputs:
     solution: build.proj
-    msbuildArguments: ' -t:BuildTestsNetFx -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} -p:TargetNetFxVersion=${{parameters.TargetNetFxVersion }} -p:Configuration=${{parameters.configuration }} -p:Platform=${{parameters.platform }}'
+    msbuildArguments: ' -t:BuildTestsNetFx -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} -p:TargetNetFxVersion=${{parameters.TargetNetFxVersion }} -p:Configuration=${{parameters.buildConfiguration }} -p:Platform=${{parameters.platform }}'
 
 # Don't run unit tests using package reference. Unit tests are only run using project reference.
 
@@ -70,12 +72,12 @@ steps:
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.FunctionalTests.csproj'
-    arguments: '-p:Platform=${{parameters.platform }} -p:TestTargetOS="${{parameters.TestTargetOS }}" -p:TargetNetFxVersion=${{parameters.TargetNetFxVersion }} -p:ReferenceType=${{parameters.referenceType }} -p:Configuration=${{parameters.configuration }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} --no-build -v n --filter "category!=nonnetfxtests&category!=failing&category!=nonwindowstests" --collect "Code Coverage"'
+    arguments: '-p:Platform=${{parameters.platform }} -p:TestTargetOS="${{parameters.TestTargetOS }}" -p:TargetNetFxVersion=${{parameters.TargetNetFxVersion }} -p:ReferenceType=${{parameters.referenceType }} -p:Configuration=${{parameters.buildConfiguration }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} --no-build -v n --filter "category!=nonnetfxtests&category!=failing&category!=nonwindowstests" --collect "Code Coverage"'
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Manual Tests for ${{parameters.TargetNetFxVersion }}'
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj'
-    arguments: '-p:Platform=${{parameters.platform }} -p:TestTargetOS="${{parameters.TestTargetOS }}" -p:TargetNetFxVersion=${{parameters.TargetNetFxVersion }} -p:ReferenceType=${{parameters.referenceType }} -p:Configuration=${{parameters.configuration }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} --no-build -v n --filter "category!=nonnetfxtests&category!=failing&category!=nonwindowstests" --collect "Code Coverage"'
+    arguments: '-p:Platform=${{parameters.platform }} -p:TestTargetOS="${{parameters.TestTargetOS }}" -p:TargetNetFxVersion=${{parameters.TargetNetFxVersion }} -p:ReferenceType=${{parameters.referenceType }} -p:Configuration=${{parameters.buildConfiguration }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} --no-build -v n --filter "category!=nonnetfxtests&category!=failing&category!=nonwindowstests" --collect "Code Coverage"'
   retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}

eng/pipelines/common/templates/steps/ci-prebuild-step.yml

@@ -11,9 +11,14 @@ parameters:
   - name: artifactName
     type: string
     default: Artifacts
+
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
 
   - name: buildType
-    displayName: 'Build Type'
     default: Project
     values:
       - Project
@@ -55,3 +60,4 @@ steps:
   - template: ci-project-build-step.yml@self
     parameters:
       build: allNoDocs
+      buildConfiguration: ${{ parameters.buildConfiguration }}