Skip to content
Merged
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
15 changes: 13 additions & 2 deletions eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,19 @@ jobs:
- ${{ parameters.prebuildSteps }}

# If we're testing in Package mode, then we must download dependent package artifacts.
# Downloads go to localFeedPath (local NuGet source), not $(packagePath) (build output).
- ${{ if eq(parameters.referenceType, 'Package') }}:
- task: DownloadPipelineArtifact@2
displayName: Download Abstractions Package Artifacts
inputs:
artifactName: ${{ parameters.abstractionsArtifactsName }}
targetPath: $(packagePath)
targetPath: $(localFeedPath)

- task: DownloadPipelineArtifact@2
displayName: Download Logging Package Artifacts
inputs:
artifactName: ${{ parameters.loggingArtifactsName }}
targetPath: $(packagePath)
targetPath: $(localFeedPath)

# Install the .NET SDK.
- template: /eng/pipelines/steps/install-dotnet.yml@self
Expand Down Expand Up @@ -149,6 +150,16 @@ jobs:
properties: 'AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};LoggingPackageVersion=${{ parameters.loggingPackageVersion }}'
referenceType: ${{ parameters.referenceType }}

# When building in Package mode, the AKV restore needs to find the MDS package
# we just built. Copy it to the local NuGet feed so NuGet.config can resolve it.
- ${{ if eq(parameters.referenceType, 'Package') }}:
- task: CopyFiles@2
displayName: Copy MDS Package to Local Feed
inputs:
sourceFolder: $(packagePath)
contents: 'Microsoft.Data.SqlClient.*.nupkg'
targetFolder: $(localFeedPath)

- template: /eng/pipelines/common/templates/steps/ci-project-build-step.yml@self
parameters:
platform: ${{ parameters.platform }}
Expand Down
15 changes: 14 additions & 1 deletion eng/pipelines/jobs/pack-azure-package-ci-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ parameters:
type: string
default: Abstractions.Artifacts

# The name of the Logging pipeline artifacts to download.
#
# This is used when the referenceType is 'Package'.
- name: loggingArtifactsName
type: string
default: Logging.Artifacts

# The Abstractions package verion to depend on.
#
# This is used when the referenceType is 'Package'.
Expand Down Expand Up @@ -126,14 +133,20 @@ jobs:
- pwsh: 'Get-ChildItem Env: | Sort-Object Name'
displayName: '[Debug] Print Environment Variables'

# For Package reference builds, we must first download the Abstractions package artifacts.
# For Package reference builds, we must first download the dependency package artifacts.
- ${{ if eq(parameters.referenceType, 'Package') }}:
- task: DownloadPipelineArtifact@2
displayName: Download Abstractions Package Artifacts
inputs:
artifactName: ${{ parameters.abstractionsArtifactsName }}
targetPath: $(Build.SourcesDirectory)/packages

- task: DownloadPipelineArtifact@2
displayName: Download Logging Package Artifacts
inputs:
artifactName: ${{ parameters.loggingArtifactsName }}
targetPath: $(Build.SourcesDirectory)/packages

# Install the .NET SDK.
- template: /eng/pipelines/steps/install-dotnet.yml@self
parameters:
Expand Down
14 changes: 14 additions & 0 deletions eng/pipelines/jobs/test-azure-package-ci-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ parameters:
type: string
default: Abstractions.Artifacts

# The name of the Logging pipeline artifacts to download.
#
# This is used when the referenceType is 'Package'.
- name: loggingArtifactsName
type: string
default: Logging.Artifacts

# The Abstractions package verion to depend on.
#
# This is used when the referenceType is 'Package'.
Expand Down Expand Up @@ -187,6 +194,13 @@ jobs:
artifactName: ${{ parameters.abstractionsArtifactsName }}
targetPath: $(Build.SourcesDirectory)/packages

# Download the Logging package artifacts into packages/.
- task: DownloadPipelineArtifact@2
displayName: Download Logging Package Artifacts
inputs:
artifactName: ${{ parameters.loggingArtifactsName }}
targetPath: $(Build.SourcesDirectory)/packages

# Download the MDS package artifacts into packages/.
#
# The Azure project doesn't depend on MDS, but the test project does.
Expand Down
11 changes: 9 additions & 2 deletions eng/pipelines/libraries/ci-build-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,17 @@ variables:
- name: mdsPackageVersion
value: 7.0.0.$(Build.BuildNumber)-ci

# Output path for built NuGet packages
- name: packagePath
# Local NuGet feed directory where downloaded pipeline artifacts are placed.
# NuGet.config references this as a local package source for restore.
- name: localFeedPath
value: $(Build.SourcesDirectory)/packages

# Output path for built NuGet packages. This is intentionally separate from
# localFeedPath (where downloaded pipeline artifacts go) so that artifact
# publishing only uploads packages built by the current job.
- name: packagePath
value: $(Build.SourcesDirectory)/output

# Disable codesign validation injection for CI builds
- name: runCodesignValidationInjection
value: false
Expand Down
Loading