Skip to content

Commit b4e0f08

Browse files
paulmedynskipaulmedynski
committed
User Story 38351: Add Debug CI runs
- Changed default build configuration from Release to Debug for CI-SqlClient[-Package] pipelines. - Plumbed 'builConfiguration' template parameter down through all of the pipeline YML files. - Removed the pipeline variable $(Configuration) in favour of buildConfiguration parameter. - Added environment variable override for unit test config file. - Removed triggers and schedules from existing CI pipelines. - Added new pipeline for triggers and schedules that uses Release configuration. - Commented out some failing assertions. - Inhibited the ConnectionPoolTestDebug tests from running since they are flaky. - Commented out more flaky tests. - Doubling the test job timeout for Debug builds. - Fixed a test that incorrectly consumes an exception when it shouldn't. - Added diagnostics to Enclave tests that are failing to help diagnose the issues. - Commented out a failing Debug.Assert(). - Expanded error detection in one test. - Commented out another failing Debug.Assert(). - Fixed exception type check to look for the actual exceptions being thrown. - Updated xUnit config to show complete strings and collections when different. - Updated CI pipelines to be triggered by pushes to main and a schedule only. - Added buildConfiguration all the way down through the test stages/jobs/steps.
1 parent d05100e commit b4e0f08

38 files changed

+609
-409
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ jobs:
6565
parameters:
6666
publishSymbols: ${{ parameters['PublishSymbols'] }}
6767
symbolsArtifactName: mds_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_$(NuGetPackageVersion)_$(System.TimelineId)
68+
buildConfiguration: Release

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ parameters:
2020
type: string
2121
default: $(Platform)
2222

23-
- name: configuration
23+
- name: buildConfiguration
2424
type: string
25-
default: $(Configuration)
25+
values:
26+
- Debug
27+
- Release
2628

2729
- name: prebuildSteps
2830
type: stepList
@@ -47,14 +49,14 @@ jobs:
4749
- template: ../steps/ci-project-build-step.yml@self
4850
parameters:
4951
platform: ${{ parameters.platform }}
50-
configuration: ${{ parameters.configuration }}
52+
buildConfiguration: ${{ parameters.buildConfiguration }}
5153
operatingSystem: Windows
5254
build: all
5355

5456
- template: ../steps/generate-nuget-package-step.yml@self
5557
parameters:
5658
NugetPackageVersion: $(NugetPackageVersion)
57-
configuration: $(Configuration)
59+
buildConfiguration: ${{ parameters.buildConfiguration }}
5860
nuspecPath: 'tools/specs/Microsoft.Data.SqlClient.nuspec'
5961
OutputDirectory: $(packagePath)
6062
generateSymbolsPackage: false
@@ -63,7 +65,7 @@ jobs:
6365
- template: ../steps/generate-nuget-package-step.yml@self
6466
parameters:
6567
NugetPackageVersion: $(NugetPackageVersion)
66-
configuration: $(Configuration)
68+
buildConfiguration: ${{ parameters.buildConfiguration }}
6769
nuspecPath: 'tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec'
6870
OutputDirectory: $(packagePath)
6971
generateSymbolsPackage: false

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,22 @@ parameters:
6565
- name: operatingSystem
6666
type: string
6767
default: ''
68+
69+
- name: buildConfiguration
70+
type: string
71+
values:
72+
- Debug
73+
- Release
6874

6975
- name: buildType
70-
displayName: 'Build Type'
7176
default: Project
7277
values:
7378
- Project
7479
- Package
7580

7681
# The timeout, in minutes, for this job.
7782
- name: timeout
78-
type: string
79-
default: 90
83+
type: number
8084

8185
jobs:
8286
- job: ${{ format('{0}', coalesce(parameters.jobDisplayName, parameters.image, 'unknown_image')) }}
@@ -227,6 +231,7 @@ jobs:
227231
- template: ../steps/build-all-tests-step.yml@self # build tests
228232
parameters:
229233
targetFramework: ${{ parameters.targetFramework }}
234+
buildConfiguration: ${{ parameters.buildConfiguration }}
230235
referenceType: ${{ parameters.buildType }}
231236
testSet: ${{ parameters.testSet }}
232237
${{ if ne(parameters.operatingSystem, 'Windows') }}:
@@ -237,6 +242,7 @@ jobs:
237242
parameters:
238243
debug: ${{ parameters.debug }}
239244
targetFramework: ${{ parameters.targetFramework }}
245+
buildConfiguration: ${{ parameters.buildConfiguration }}
240246
referenceType: ${{ parameters.buildType }}
241247
testSet: ${{ parameters.testSet }}
242248
operatingSystem: ${{ parameters.operatingSystem }}
@@ -279,6 +285,7 @@ jobs:
279285
parameters:
280286
debug: ${{ parameters.debug }}
281287
targetFramework: ${{ parameters.targetFramework }}
288+
buildConfiguration: ${{ parameters.buildConfiguration }}
282289
referenceType: ${{ parameters.buildType }}
283290
testSet: ${{ parameters.testSet }}
284291
msbuildArchitecture: x86
@@ -291,3 +298,4 @@ jobs:
291298
debug: ${{ parameters.debug }}
292299
targetFramework: ${{ parameters.targetFramework }}
293300
operatingSystem: ${{ parameters.operatingSystem }}
301+
buildConfiguration: ${{ parameters.buildConfiguration }}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ parameters:
2222

2323
# The timeout, in minutes, for this job.
2424
- name: timeout
25-
type: string
26-
default: 90
25+
type: number
2726

2827
jobs:
2928
- job: run_tests_package_reference

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@ parameters:
1616
default: ''
1717

1818
- name: buildType
19-
displayName: 'Build Type'
2019
default: Project
2120
values:
2221
- Project
2322
- Package
2423

24+
- name: buildConfiguration
25+
type: string
26+
values:
27+
- Debug
28+
- Release
29+
2530
- name: prebuildSteps
2631
type: stepList
2732
default: []
@@ -31,9 +36,8 @@ parameters:
3136
default: []
3237

3338
# The timeout, in minutes, for each test job.
34-
- name: testsTimeout
35-
type: string
36-
default: 90
39+
- name: testJobTimeout
40+
type: number
3741

3842
stages:
3943
- ${{ each config in parameters.testConfigurations }}:
@@ -51,8 +55,9 @@ stages:
5155
- template: ../jobs/ci-run-tests-job.yml@self
5256
parameters:
5357
debug: ${{ parameters.debug }}
58+
buildConfiguration: ${{ parameters.buildConfiguration }}
5459
buildType: ${{ parameters.buildType }}
55-
timeout: ${{ parameters.testsTimeout }}
60+
timeout: ${{ parameters.testJobTimeout }}
5661
poolName: ${{ config.value.pool }}
5762
hostedPool: ${{ eq(config.value.hostedPool, true) }}
5863
image: ${{ image.value }}
@@ -77,8 +82,9 @@ stages:
7782
- template: ../jobs/ci-run-tests-job.yml@self
7883
parameters:
7984
debug: ${{ parameters.debug }}
85+
buildConfiguration: ${{ parameters.buildConfiguration }}
8086
buildType: ${{ parameters.buildType }}
81-
timeout: ${{ parameters.testsTimeout }}
87+
timeout: ${{ parameters.testJobTimeout }}
8288
poolName: ${{ config.value.pool }}
8389
hostedPool: ${{ eq(config.value.hostedPool, true) }}
8490
image: ${{ image.value }}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ parameters:
88
type: string
99
default: $(AssemblyFileVersion)
1010

11-
- name: Configuration
11+
- name: buildConfiguration
1212
type: string
13-
default: '$(Configuration)'
13+
values:
14+
- Debug
15+
- Release
1416

1517
- name: packageRefMdsVersion
1618
type: string
@@ -46,5 +48,5 @@ steps:
4648
displayName: 'BuildAllConfigurations using build.proj'
4749
inputs:
4850
solution: '**/build.proj'
49-
configuration: '${{parameters.Configuration }}'
51+
configuration: '${{parameters.buildConfiguration }}'
5052
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‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ parameters:
1515
type: string
1616
default: $(Platform)
1717

18-
- name: configuration
18+
- name: buildConfiguration
1919
type: string
20-
default: '$(Configuration)'
20+
values:
21+
- Debug
22+
- Release
2123

2224
- name: referenceType
2325
default: Package
@@ -39,7 +41,7 @@ steps:
3941
inputs:
4042
solution: build.proj
4143
platform: '${{parameters.platform }}'
42-
configuration: '${{parameters.configuration }}'
44+
configuration: '${{parameters.buildConfiguration }}'
4345
msbuildArguments: '-t:BuildTestsNetFx -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
4446

4547
# - ${{else if contains(parameters.targetFramework, 'netstandard')}}: # .NET Standard
@@ -48,7 +50,7 @@ steps:
4850
# inputs:
4951
# solution: build.proj
5052
# platform: '${{parameters.platform }}'
51-
# configuration: '${{parameters.configuration }}'
53+
# configuration: '${{parameters.buildConfiguration }}'
5254
# msbuildArguments: '-t:BuildTestsNetCore -p:ReferenceType=NetStandard -p:TargetNetStandardVersion=${{parameters.targetNetStandardVersion }} -p:TF=${{parameters.targetFramework }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
5355
# condition: and(succeeded(), not(startsWith(variables['TF'], 'net4')), startsWith(variables['TargetNetStandardVersion'], 'netstandard'))
5456

@@ -58,7 +60,7 @@ steps:
5860
inputs:
5961
solution: build.proj
6062
platform: '${{parameters.platform }}'
61-
configuration: '${{parameters.configuration }}'
63+
configuration: '${{parameters.buildConfiguration }}'
6264
msbuildArguments: '-t:BuildTestsNetCore -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }}'
6365
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
6466

@@ -69,7 +71,7 @@ steps:
6971
command: custom
7072
projects: build.proj
7173
custom: msbuild
72-
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 }}'
74+
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 }}'
7375
verbosityRestore: Detailed
7476
verbosityPack: Detailed
7577
condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ parameters:
88
type: string
99
default: $(TargetNetCoreVersion)
1010

11-
- name: configuration
11+
- name: buildConfiguration
1212
type: string
13-
default: $(Configuration)
13+
values:
14+
- Debug
15+
- Release
1416

1517
- name: referenceType
1618
default: Project
@@ -55,14 +57,14 @@ steps:
5557
inputs:
5658
solution: build.proj
5759
msbuildArchitecture: x64
58-
msbuildArguments: '-p:Configuration=${{parameters.configuration }} -t:BuildAKVNetCore -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }}'
60+
msbuildArguments: '-p:Configuration=${{parameters.buildConfiguration }} -t:BuildAKVNetCore -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }}'
5961

6062
- task: MSBuild@1
6163
displayName: 'MSBuild Build Tests for ${{parameters.TargetNetCoreVersion }}'
6264
inputs:
6365
solution: build.proj
6466
msbuildArchitecture: x64
65-
msbuildArguments: '-t:BuildTestsNetCore -p:ReferenceType=${{parameters.referenceType }} -p:TargetNetCoreVersion=${{parameters.TargetNetCoreVersion }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} -p:Configuration=${{parameters.configuration }}'
67+
msbuildArguments: '-t:BuildTestsNetCore -p:ReferenceType=${{parameters.referenceType }} -p:TargetNetCoreVersion=${{parameters.TargetNetCoreVersion }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} -p:Configuration=${{parameters.buildConfiguration }}'
6668

6769
# Don't run unit tests using package reference. Unit tests are only run using project reference.
6870

@@ -71,12 +73,12 @@ steps:
7173
inputs:
7274
command: test
7375
projects: 'src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.FunctionalTests.csproj'
74-
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"'
76+
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"'
7577

7678
- task: DotNetCoreCLI@2
7779
displayName: 'Run Manual Tests for ${{parameters.TargetNetCoreVersion }}'
7880
inputs:
7981
command: test
8082
projects: 'src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj'
81-
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"'
83+
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"'
8284
retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ parameters:
88
type: string
99
default: $(TargetNetFxVersion)
1010

11-
- name: configuration
11+
- name: buildConfiguration
1212
type: string
13-
default: $(Configuration)
13+
values:
14+
- Debug
15+
- Release
1416

1517
- name: referenceType
1618
default: Project
@@ -55,13 +57,13 @@ steps:
5557
inputs:
5658
solution: build.proj
5759
msbuildArchitecture: x64
58-
msbuildArguments: '-p:Configuration=${{parameters.configuration }} -t:BuildAKVNetFx -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }}'
60+
msbuildArguments: '-p:Configuration=${{parameters.buildConfiguration }} -t:BuildAKVNetFx -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }}'
5961

6062
- task: MSBuild@1
6163
displayName: 'MSBuild Build Tests for ${{parameters.TargetNetFxVersion }}'
6264
inputs:
6365
solution: build.proj
64-
msbuildArguments: ' -t:BuildTestsNetFx -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} -p:TargetNetFxVersion=${{parameters.TargetNetFxVersion }} -p:Configuration=${{parameters.configuration }} -p:Platform=${{parameters.platform }}'
66+
msbuildArguments: ' -t:BuildTestsNetFx -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.NugetPackageVersion }} -p:TargetNetFxVersion=${{parameters.TargetNetFxVersion }} -p:Configuration=${{parameters.buildConfiguration }} -p:Platform=${{parameters.platform }}'
6567

6668
# Don't run unit tests using package reference. Unit tests are only run using project reference.
6769

@@ -70,12 +72,12 @@ steps:
7072
inputs:
7173
command: test
7274
projects: 'src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.FunctionalTests.csproj'
73-
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"'
75+
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"'
7476

7577
- task: DotNetCoreCLI@2
7678
displayName: 'Run Manual Tests for ${{parameters.TargetNetFxVersion }}'
7779
inputs:
7880
command: test
7981
projects: 'src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj'
80-
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"'
82+
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"'
8183
retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ parameters:
88
type: string
99
default: $(Platform)
1010

11-
- name: configuration
11+
- name: buildConfiguration
1212
type: string
13-
default: $(Configuration)
14-
13+
values:
14+
- Debug
15+
- Release
16+
1517
- name: buildNumber
1618
type: string
1719
default: $(BuildNumber)
@@ -64,7 +66,7 @@ steps:
6466
solution: build.proj
6567
msbuildArchitecture: x64
6668
platform: '${{ parameters.platform }}'
67-
configuration: '${{ parameters.configuration }}'
69+
configuration: '${{ parameters.buildConfiguration }}'
6870
msbuildArguments: '-t:BuildAllConfigurations -p:GenerateDocumentationFile=false -p:GenerateNuGet=false -p:BuildNumber=${{ parameters.buildNumber }}'
6971
clean: true
7072

@@ -76,7 +78,7 @@ steps:
7678
solution: build.proj
7779
msbuildArchitecture: x64
7880
platform: '${{ parameters.platform }}'
79-
configuration: '${{ parameters.configuration }}'
81+
configuration: '${{ parameters.buildConfiguration }}'
8082
msbuildArguments: '-t:BuildAllConfigurations -p:GenerateNuGet=false -p:BuildNumber=${{ parameters.buildNumber }}'
8183
clean: true
8284

@@ -88,7 +90,7 @@ steps:
8890
solution: build.proj
8991
msbuildArchitecture: x64
9092
platform: '${{ parameters.platform }}'
91-
configuration: '${{ parameters.configuration }}'
93+
configuration: '${{ parameters.buildConfiguration }}'
9294
msbuildArguments: '-t:BuildAKVNetFx -p:BuildNumber=${{ parameters.buildNumber }}'
9395

9496
- task: MSBuild@1
@@ -98,7 +100,7 @@ steps:
98100
solution: build.proj
99101
msbuildArchitecture: x64
100102
platform: '${{ parameters.platform }}'
101-
configuration: '${{ parameters.configuration }}'
103+
configuration: '${{ parameters.buildConfiguration }}'
102104
msbuildArguments: '-t:BuildAKVNetCoreAllOS -p:BuildNumber=${{ parameters.buildNumber }}'
103105

104106
- ${{ if or(eq(parameters.operatingSystem, 'Linux'), eq(parameters.operatingSystem, 'MacOS'), eq(parameters.operatingSystem, 'deferedToRuntime')) }}:
@@ -109,7 +111,7 @@ steps:
109111
command: custom
110112
projects: build.proj
111113
custom: msbuild
112-
arguments: '-t:BuildAll -p:TestEnabled=true -p:GenerateDocumentationFile=false -p:configuration=${{ parameters.configuration }}'
114+
arguments: '-t:BuildAll -p:TestEnabled=true -p:GenerateDocumentationFile=false -p:configuration=${{ parameters.buildConfiguration }}'
113115
verbosityRestore: Detailed
114116
verbosityPack: Detailed
115117
retryCountOnTaskFailure: 1

0 commit comments

Comments
 (0)