Skip to content

Commit a3f92e8

Browse files
paulmedynskipaulmedynski
committed
Plumb SqlServerPackageVersion through all build and test pipelines
Add sqlServerPackageVersion and sqlServerArtifactsName parameters to every pipeline layer that already forwarded Abstractions/Logging versions but was missing SqlServer: Pipeline build/pack path: - ci-project-build-step.yml: forward to Build Driver and AKV Provider - ci-build-nugets-job.yml: add param, download artifact, forward to build steps and PackSqlClient - build-sqlclient-package-ci-stage.yml: add params, forward to job - dotnet-sqlclient-ci-core.yml: pass to MDS stage, add build_sqlserver_package_stage dependency Pipeline test path: - run-all-tests-step.yml: add param, pass -p:PackageVersionSqlServer to all 14 MSBuild test invocations - ci-run-tests-job.yml: add params, download SqlServer artifact, forward to run-all-tests-step - ci-run-tests-stage.yml: add params, forward to both job invocations - dotnet-sqlclient-ci-core.yml: pass to test stage, add build_sqlserver_package_stage dependency build.proj targets: - TestSqlClientFunctional, TestSqlClientManual, BuildAkvProvider, PackAkvProvider, TestAzure: add $(PackageVersionSqlServerArgument)
1 parent 02ec440 commit a3f92e8

8 files changed

Lines changed: 103 additions & 5 deletions

File tree

‎build.proj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,7 @@
620620
$(PackageVersionAbstractionsArgument)
621621
$(PackageVersionLoggingArgument)
622622
$(PackageVersionSqlClientArgument)
623+
$(PackageVersionSqlServerArgument)
623624
</DotnetCommand>
624625
<!-- Convert more than one whitespace character into one space -->
625626
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -651,6 +652,7 @@
651652
$(PackageVersionAbstractionsArgument)
652653
$(PackageVersionLoggingArgument)
653654
$(PackageVersionSqlClientArgument)
655+
$(PackageVersionSqlServerArgument)
654656
</DotnetCommand>
655657
<!-- Convert more than one whitespace character into one space -->
656658
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -716,6 +718,7 @@
716718
$(PackageVersionAbstractionsArgument)
717719
$(PackageVersionLoggingArgument)
718720
$(PackageVersionSqlClientArgument)
721+
$(PackageVersionSqlServerArgument)
719722
</DotnetCommand>
720723
<!-- Convert more than one whitespace character into one space -->
721724
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -744,6 +747,7 @@
744747
$(PackageVersionAbstractionsArgument)
745748
$(PackageVersionLoggingArgument)
746749
$(PackageVersionSqlClientArgument)
750+
$(PackageVersionSqlServerArgument)
747751
</DotnetCommand>
748752
<!-- Convert more than one whitespace character into one space -->
749753
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -959,14 +963,16 @@
959963

960964
<!-- Reference type arguments -->
961965
$(ReferenceTypeArgument)
962-
966+
$(PackageVersionAbstractionsArgument)
967+
$(PackageVersionLoggingArgument)
963968
$(PackageVersionSqlClientArgument)
969+
$(PackageVersionSqlServerArgument)
964970
</DotnetCommand>
965971
<!-- Convert more than one whitespace character into one space -->
966972
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
967973
</PropertyGroup>
968974

969-
<Message Text=">>> Running tests for Abstractions via command: $(DotnetCommand)" />
975+
<Message Text=">>> Running tests for Azure via command: $(DotnetCommand)" />
970976
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
971977
</Target>
972978

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ parameters:
7777
- name: akvPackageVersion
7878
type: string
7979

80+
# The version of the SqlServer package to depend on when referenceType is 'Package'.
81+
- name: sqlServerPackageVersion
82+
type: string
83+
default: $(sqlServerPackageVersion)
84+
85+
# The name of the SqlServer pipeline artifact to download when referenceType is 'Package'.
86+
- name: sqlServerArtifactsName
87+
type: string
88+
default: SqlServer.Artifacts
89+
8090
jobs:
8191
- job: build_mds_akv_packages_job
8292
displayName: Build MDS & AKV Packages
@@ -115,6 +125,12 @@ jobs:
115125
artifactName: ${{ parameters.loggingArtifactsName }}
116126
targetPath: $(localFeedPath)
117127

128+
- task: DownloadPipelineArtifact@2
129+
displayName: Download SqlServer Package Artifacts
130+
inputs:
131+
artifactName: ${{ parameters.sqlServerArtifactsName }}
132+
targetPath: $(localFeedPath)
133+
118134
# Install the .NET SDK.
119135
- template: /eng/pipelines/steps/install-dotnet.yml@self
120136

@@ -139,6 +155,7 @@ jobs:
139155
build: MDS
140156
abstractionsPackageVersion: ${{parameters.abstractionsPackageVersion}}
141157
loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
158+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
142159

143160
- task: DotNetCoreCLI@2
144161
displayName: 'Create MDS NuGet Package'
@@ -153,6 +170,7 @@ jobs:
153170
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
154171
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
155172
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
173+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
156174
157175
# PackSqlClient outputs to artifacts/Microsoft.Data.SqlClient/<ReferenceType>-<Configuration>/.
158176
# Downstream steps (local feed copy, AKV pack, artifact publish) all expect packages at
@@ -184,6 +202,7 @@ jobs:
184202
loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
185203
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
186204
akvPackageVersion: ${{ parameters.akvPackageVersion }}
205+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
187206

188207
- task: DotNetCoreCLI@2
189208
displayName: 'Create AKV Provider NuGet Package'

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,16 @@ parameters:
8888
- name: mdsPackageVersion
8989
type: string
9090

91+
# The name of the SqlServer pipeline artifact to download when referenceType is 'Package'.
92+
- name: sqlServerArtifactsName
93+
type: string
94+
default: SqlServer.Artifacts
95+
96+
# The version of the SqlServer package to depend on when referenceType is 'Package'.
97+
- name: sqlServerPackageVersion
98+
type: string
99+
default: $(sqlServerPackageVersion)
100+
91101
# TODO: What is this for?
92102
- name: netcoreVersionTestUtils
93103
type: string
@@ -194,6 +204,12 @@ jobs:
194204
artifactName: ${{ parameters.mdsArtifactsName }}
195205
targetPath: $(Build.SourcesDirectory)/packages
196206

207+
- task: DownloadPipelineArtifact@2
208+
displayName: Download SqlServer Package Artifacts
209+
inputs:
210+
artifactName: ${{ parameters.sqlServerArtifactsName }}
211+
targetPath: $(Build.SourcesDirectory)/packages
212+
197213
# Install the .NET SDK and Runtimes.
198214
- template: /eng/pipelines/steps/install-dotnet.yml@self
199215
parameters:
@@ -364,6 +380,7 @@ jobs:
364380
abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
365381
loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
366382
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
383+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
367384

368385
- ${{ if and(eq(parameters.enableX86Test, true), eq(parameters.operatingSystem, 'Windows')) }}:
369386
- template: /eng/pipelines/common/templates/steps/run-all-tests-step.yml@self
@@ -379,6 +396,7 @@ jobs:
379396
abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
380397
loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
381398
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
399+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
382400

383401
- template: /eng/pipelines/common/templates/steps/publish-test-results-step.yml@self
384402
parameters:

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,16 @@ parameters:
5050
- name: mdsPackageVersion
5151
type: string
5252

53+
# The name of the SqlServer pipeline artifacts to download.
54+
- name: sqlServerArtifactsName
55+
type: string
56+
default: SqlServer.Artifacts
57+
58+
# The version of the SqlServer package to depend on when referenceType is 'Package'.
59+
- name: sqlServerPackageVersion
60+
type: string
61+
default: $(sqlServerPackageVersion)
62+
5363
# Jobs to run after the test jobs complete, if any.
5464
- name: postTestJobs
5565
type: jobList
@@ -114,6 +124,8 @@ stages:
114124
loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
115125
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
116126
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
127+
sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
128+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
117129
prebuildSteps: ${{ parameters.prebuildSteps }}
118130
targetFramework: ${{ targetFramework }}
119131
netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
@@ -150,6 +162,8 @@ stages:
150162
loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
151163
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
152164
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
165+
sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
166+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
153167
prebuildSteps: ${{ parameters.prebuildSteps }}
154168
targetFramework: ${{ targetFramework }}
155169
netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ parameters:
6868
type: string
6969
default: $(akvPackageVersion)
7070

71+
# Necessary when referenceType is Package. Ignored when referenceType is Project.
72+
- name: sqlServerPackageVersion
73+
type: string
74+
default: $(sqlServerPackageVersion)
75+
7176
steps:
7277
# Build MDS
7378
- ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
@@ -85,6 +90,7 @@ steps:
8590
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
8691
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
8792
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
93+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
8894
8995
# Build AKV Provider
9096
- ${{ if or(eq(parameters.build, 'AkvProvider'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
@@ -103,3 +109,4 @@ steps:
103109
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
104110
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
105111
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
112+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ parameters:
2222
- name: mdsPackageVersion
2323
type: string
2424

25+
- name: sqlServerPackageVersion
26+
type: string
27+
default: $(sqlServerPackageVersion)
28+
2529
- name: platform
2630
type: string
2731
default: $(Platform)
@@ -137,6 +141,7 @@ steps:
137141
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
138142
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
139143
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
144+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
140145
-p:TestResultsFolderPath=TestResults
141146
${{ else }}: # x86
142147
arguments: >-
@@ -147,6 +152,7 @@ steps:
147152
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
148153
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
149154
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
155+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
150156
-p:DotnetPath=${{ parameters.dotnetx86RootPath }}
151157
-p:TestResultsFolderPath=TestResults
152158
@@ -165,6 +171,7 @@ steps:
165171
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
166172
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
167173
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
174+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
168175
-p:TestFilters="category=flaky"
169176
-p:TestResultsFolderPath=TestResults
170177
-p:TestCodeCoverage=false
@@ -177,6 +184,7 @@ steps:
177184
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
178185
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
179186
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
187+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
180188
-p:DotnetPath=${{ parameters.dotnetx86RootPath }}
181189
-p:TestFilters="category=flaky"
182190
-p:TestResultsFolderPath=TestResults
@@ -199,6 +207,7 @@ steps:
199207
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
200208
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
201209
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
210+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
202211
-p:TestResultsFolderPath=TestResults
203212
${{ else }}: # x86
204213
arguments: >-
@@ -210,6 +219,7 @@ steps:
210219
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
211220
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
212221
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
222+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
213223
-p:DotnetPath=${{ parameters.dotnetx86RootPath }}
214224
-p:TestResultsFolderPath=TestResults
215225
retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
@@ -230,6 +240,7 @@ steps:
230240
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
231241
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
232242
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
243+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
233244
-p:TestFilters="category=flaky"
234245
-p:TestResultsFolderPath=TestResults
235246
-p:TestCodeCoverage=false
@@ -243,6 +254,7 @@ steps:
243254
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
244255
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
245256
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
257+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
246258
-p:DotnetPath=${{ parameters.dotnetx86RootPath }}
247259
-p:TestFilters="category=flaky"
248260
-p:TestResultsFolderPath=TestResults
@@ -292,6 +304,7 @@ steps:
292304
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
293305
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
294306
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
307+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
295308
-p:TestResultsFolderPath=TestResults
296309
297310
- task: DotNetCoreCLI@2
@@ -308,6 +321,7 @@ steps:
308321
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
309322
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
310323
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
324+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
311325
-p:TestFilters="category=flaky"
312326
-p:TestResultsFolderPath=TestResults
313327
-p:TestCodeCoverage=false
@@ -327,6 +341,7 @@ steps:
327341
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
328342
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
329343
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
344+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
330345
-p:TestResultsFolderPath=TestResults
331346
retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
332347

@@ -345,6 +360,7 @@ steps:
345360
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
346361
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
347362
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
363+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
348364
-p:TestFilters="category=flaky"
349365
-p:TestResultsFolderPath=TestResults
350366
-p:TestCodeCoverage=false

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,17 @@ stages:
185185
mdsPackageVersion: $(mdsPackageVersion)
186186
akvPackageVersion: $(akvPackageVersion)
187187
referenceType: ${{ parameters.referenceType }}
188+
sqlServerArtifactsName: $(sqlServerArtifactsName)
189+
sqlServerPackageVersion: $(sqlServerPackageVersion)
188190
SNIVersion: ${{ parameters.SNIVersion }}
189191
SNIValidationFeed: ${{ parameters.SNIValidationFeed }}
190-
# When building SqlClient via packages, we must depend on the Abstractions and Logging
191-
# packages.
192+
# When building SqlClient via packages, we must depend on the Abstractions, Logging,
193+
# and SqlServer packages.
192194
${{ if eq(parameters.referenceType, 'Package') }}:
193195
additionalDependsOn:
194196
- build_abstractions_package_stage
195197
- build_logging_package_stage
198+
- build_sqlserver_package_stage
196199

197200
# Build the Azure package, and publish it to the pipeline artifacts under the
198201
# given artifact name.
@@ -242,14 +245,17 @@ stages:
242245
loggingPackageVersion: $(loggingPackageVersion)
243246
mdsArtifactsName: $(mdsArtifactsName)
244247
mdsPackageVersion: $(mdsPackageVersion)
248+
sqlServerArtifactsName: $(sqlServerArtifactsName)
249+
sqlServerPackageVersion: $(sqlServerPackageVersion)
245250
testJobTimeout: ${{ parameters.testJobTimeout }}
246251

247252
# When testing MDS via packages, we must depend on the Abstractions,
248-
# Logging, MDS, and Azure packages.
253+
# Logging, SqlServer, MDS, and Azure packages.
249254
${{ if eq(parameters.referenceType, 'Package') }}:
250255
additionalDependsOn:
251256
- build_abstractions_package_stage
252257
- build_logging_package_stage
258+
- build_sqlserver_package_stage
253259
- build_sqlclient_package_stage
254260
- build_azure_package_stage
255261

‎eng/pipelines/stages/build-sqlclient-package-ci-stage.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,16 @@ parameters:
5656
- name: akvPackageVersion
5757
type: string
5858

59+
# The name of the SqlServer pipeline artifacts to download.
60+
- name: sqlServerArtifactsName
61+
type: string
62+
default: SqlServer.Artifacts
63+
64+
# The SqlServer package version.
65+
- name: sqlServerPackageVersion
66+
type: string
67+
default: $(sqlServerPackageVersion)
68+
5969
# The C# project reference type to use when building and packing the packages.
6070
- name: referenceType
6171
type: string
@@ -97,6 +107,8 @@ stages:
97107
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
98108
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
99109
akvPackageVersion: ${{ parameters.akvPackageVersion }}
110+
sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
111+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
100112
${{ if ne(parameters.SNIVersion, '') }}:
101113
prebuildSteps:
102114
- template: /eng/pipelines/common/templates/steps/override-sni-version.yml@self

0 commit comments

Comments
 (0)