Skip to content

Commit 2e1fc83

Browse files
committed
Plumb SqlServerPackageVersion to AKV pack and Azure test pipelines
1 parent d9d6217 commit 2e1fc83

4 files changed

Lines changed: 22 additions & 0 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ jobs:
218218
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
219219
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
220220
-p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
221+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
221222
-p:PackageVersionAkvProvider=${{ parameters.akvPackageVersion }}
222223
223224
- task: CopyFiles@2

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ stages:
221221
mdsPackageVersion: $(mdsPackageVersion)
222222
referenceType: ${{ parameters.referenceType }}
223223
sqlServerArtifactsName: $(sqlServerArtifactsName)
224+
sqlServerPackageVersion: $(sqlServerPackageVersion)
224225

225226
# Verify that all NuGet packages comply with Microsoft metadata requirements.
226227
# This runs on a Windows agent after all packages have been built and

eng/pipelines/jobs/test-azure-package-ci-job.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,13 @@ parameters:
8787
type: string
8888
default: SqlServer.Artifacts
8989

90+
# The SqlServer package version to depend on.
91+
#
92+
# This is used when the referenceType is 'Package'.
93+
- name: sqlServerPackageVersion
94+
type: string
95+
default: ''
96+
9097
# The list of .NET Framework runtimes to test against.
9198
- name: netFrameworkRuntimes
9299
type: object
@@ -162,6 +169,7 @@ jobs:
162169
-p:ReferenceType=${{ parameters.referenceType }}
163170
-p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
164171
-p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
172+
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
165173
166174
# Explicitly unset the $PLATFORM environment variable that is set by the
167175
# 'ADO Build properties' Library in the ADO SqlClientDrivers public

eng/pipelines/stages/build-azure-package-ci-stage.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,13 @@ parameters:
122122
type: string
123123
default: SqlServer.Artifacts
124124

125+
# The SqlServer package version to depend on.
126+
#
127+
# This is used when the referenceType is 'Package'.
128+
- name: sqlServerPackageVersion
129+
type: string
130+
default: ''
131+
125132
# The C# project reference type to use when building and packing the packages.
126133
- name: referenceType
127134
type: string
@@ -163,6 +170,7 @@ stages:
163170
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
164171
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
165172
sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
173+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
166174
netFrameworkRuntimes: []
167175
netRuntimes: [net8.0, net9.0, net10.0]
168176
poolName: ${{ parameters.azurePoolName }}
@@ -182,6 +190,7 @@ stages:
182190
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
183191
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
184192
sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
193+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
185194
netFrameworkRuntimes: []
186195
netRuntimes: [net8.0, net9.0, net10.0]
187196
poolName: ${{ parameters.adoPoolName }}
@@ -210,6 +219,7 @@ stages:
210219
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
211220
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
212221
sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
222+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
213223
netFrameworkRuntimes: [net462]
214224
netRuntimes: [net8.0, net9.0, net10.0]
215225
poolName: ${{ parameters.azurePoolName }}
@@ -229,6 +239,7 @@ stages:
229239
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
230240
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
231241
sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
242+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
232243
netFrameworkRuntimes: [net462]
233244
netRuntimes: [net8.0, net9.0, net10.0]
234245
poolName: ${{ parameters.adoPoolName }}
@@ -266,6 +277,7 @@ stages:
266277
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
267278
mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
268279
sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
280+
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
269281
netFrameworkRuntimes: []
270282
netRuntimes: [net8.0, net9.0, net10.0]
271283
poolName: ${{ parameters.azurePoolName }}

0 commit comments

Comments
 (0)