Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions eng/pipelines/dotnet-sqlclient-ci-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ stages:
buildConfiguration: ${{ parameters.buildConfiguration }}
debug: ${{ parameters.debug }}
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
isInternalBuild: ${{ parameters.isInternalBuild }}
referenceType: ${{ parameters.referenceType }}

# Build the Logging package, and publish it to the pipeline artifacts
# under the given artifact name. This runs in parallel with the Secrets
Expand Down
27 changes: 26 additions & 1 deletion eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,19 @@ parameters:
- detailed
- diagnostic

# The C# project reference type to use when building and packing the packages.
- name: referenceType
type: string
default: Project
values:
- Package
- Project

# True when building on the internal ADO.Net project.
- name: isInternalBuild
type: boolean
default: false

jobs:

- job: pack_sqlserver_package_job
Expand Down Expand Up @@ -82,6 +95,14 @@ jobs:
- name: Configuration
value: ''

# Build properties passed to dotnet pack. Composed from a base set plus
# optional signing key path for internal Package-mode builds.
- name: buildProperties
${{ if and(eq(parameters.isInternalBuild, true), ne(parameters.referenceType, 'Project')) }}:
value: SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }};SigningKeyPath=$(driverKeyFile.secureFilePath)
${{ else }}:
value: SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }}

steps:

# Emit environment variables if debug is enabled.
Expand All @@ -94,6 +115,10 @@ jobs:
parameters:
debug: ${{ parameters.debug }}

# Download the assembly signing key for internal Package-mode builds.
- ${{ if and(eq(parameters.isInternalBuild, true), ne(parameters.referenceType, 'Project')) }}:
- template: /eng/pipelines/common/steps/download-assembly-signing-key.yml@self

# Create the NuGet packages.
- task: DotNetCoreCLI@2
displayName: Create NuGet Package
Expand All @@ -103,7 +128,7 @@ jobs:
configurationToPack: ${{ parameters.buildConfiguration }}
packDirectory: $(dotnetPackagesDir)
verbosityToPack: ${{ parameters.dotnetVerbosity }}
buildProperties: SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }}
buildProperties: $(buildProperties)

- task: PublishPipelineArtifact@1
displayName: Publish Pipeline Artifact
Expand Down
15 changes: 15 additions & 0 deletions eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,19 @@ parameters:
- detailed
- diagnostic

# True when building on the internal ADO.Net project.
- name: isInternalBuild
type: boolean
default: false

# The C# project reference type to use when building and packing the packages.
- name: referenceType
type: string
default: Project
values:
- Package
- Project

stages:

- stage: build_sqlserver_package_stage
Expand All @@ -81,3 +94,5 @@ stages:
sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
isInternalBuild: ${{ parameters.isInternalBuild }}
referenceType: ${{ parameters.referenceType }}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Version>$(SqlServerPackageVersion)</Version>
</PropertyGroup>

<!-- Strong name signing ============================================= -->
<!-- Assembly signing ============================================= -->
<!-- This is done in Directory.Build.props -->

<!-- Build Output ==================================================== -->
Expand Down
Loading