Skip to content

Commit 865cfce

Browse files
committed
User Story 37654: Create Abstractions package
- Fixed missing parameter when packing Abstractions.
1 parent 11a5e70 commit 865cfce

2 files changed

Lines changed: 11 additions & 14 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ stages:
108108
- template: stages/build-abstractions-package-ci-stage.yml@self
109109
parameters:
110110
buildConfiguration: Release
111-
packageVersion: $(abstractionsPackageVersion)
112-
buildNumber: $(buildNumber)
111+
abstractionsPackageVersion: $(abstractionsPackageVersion)
113112
artifactName: $(abstractionsArtifactName)
114113
${{if eq(parameters.debug, 'true')}}:
115114
verbosity: diagnostic

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,25 @@
1010
# The NuGet packages have the following properties:
1111
#
1212
# Name: Microsoft.Data.SqlClient.Extensions.Abstractions
13-
# Version: $(artifactsPackageVersion)
13+
# Version: ${{ abstractionsPackageVersion }} (from parameter)
1414
#
1515
# The following NuGet packages are published:
1616
#
1717
# Microsoft.Data.SqlClient.Extensions.Abstractions.<version>.nupkg
1818
# Microsoft.Data.SqlClient.Extensions.Abstractions.<version>.snupkg (symbols)
1919
#
2020
# The packages are published to pipeline artifacts with the name specified by
21-
# the 'artifactName' parameter.
21+
# the ${{ artifactName }} parameter.
2222
#
2323
# This template defines a stage named 'build_abstractions_package_stage' that
2424
# can be depended on by downstream stages.
2525

2626
parameters:
2727

28+
# The version to apply to the NuGet package and DLLs.
29+
- name: abstractionsPackageVersion
30+
type: string
31+
2832
# The name of the pipeline artifact to publish.
2933
- name: artifactName
3034
type: string
@@ -38,16 +42,6 @@ parameters:
3842
- Release
3943
- Debug
4044

41-
# The build number of the pipeline.
42-
- name: buildNumber
43-
type: string
44-
default: $(Build.BuildNumber)
45-
46-
# The version (Major.Minor.Patch) to apply to the package.
47-
- name: packageVersion
48-
type: string
49-
default: ''
50-
5145
# The verbosity level for the dotnet CLI commands.
5246
- name: verbosity
5347
type: string
@@ -78,6 +72,7 @@ stages:
7872
buildConfiguration: ${{ parameters.buildConfiguration }}
7973
netRuntimes: [net8.0, net9.0]
8074
netFrameworkRuntimes: []
75+
verbosity: ${{ parameters.verbosity }}
8176

8277
# ------------------------------------------------------------------------
8378
# Build and test on Windows
@@ -91,6 +86,7 @@ stages:
9186
buildConfiguration: ${{ parameters.buildConfiguration }}
9287
netRuntimes: [net8.0, net9.0]
9388
netFrameworkRuntimes: [net462, net47, net471, net472, net48, net481]
89+
verbosity: ${{ parameters.verbosity }}
9490

9591
# ------------------------------------------------------------------------
9692
# Build and test on macOS.
@@ -104,6 +100,7 @@ stages:
104100
buildConfiguration: ${{ parameters.buildConfiguration }}
105101
netRuntimes: [net8.0, net9.0]
106102
netFrameworkRuntimes: []
103+
verbosity: ${{ parameters.verbosity }}
107104

108105
# ------------------------------------------------------------------------
109106
# Create and publish the NuGet package.
@@ -112,6 +109,7 @@ stages:
112109
parameters:
113110
artifactName: ${{ parameters.artifactName }}
114111
buildConfiguration: ${{ parameters.buildConfiguration }}
112+
abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
115113
verbosity: ${{ parameters.verbosity }}
116114
dependsOn:
117115
# We depend on all of the test jobs to ensure the tests pass before

0 commit comments

Comments
 (0)