Skip to content

Commit 0c803eb

Browse files
committed
User Story 37654: Create Extensions base package
- Updated to use Azure Pipelines pool and ubuntu-latest image. - Testing stages now depend on Extensions package state. - Testing pre-builds now specify Extensions package version.
1 parent 741c13a commit 0c803eb

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ stages:
3434
- ${{ each config in parameters.testConfigurations }}:
3535
- ${{ each image in config.value.images }}:
3636
- stage: ${{ image.key }}
37+
dependsOn:
38+
- build_extensions_package_stage
3739
${{ if ne(parameters.dependsOn, '') }}:
38-
dependsOn: ${{ parameters.dependsOn }}
39-
${{ else }}:
40-
dependsOn: []
40+
- ${{ parameters.dependsOn }}
41+
4142
jobs:
4243
- ${{ each targetFramework in config.value.TargetFrameworks }}:
4344
- ${{ each platform in config.value.buildPlatforms }}:

eng/pipelines/common/templates/steps/ci-prebuild-step.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ parameters:
1919
- Project
2020
- Package
2121

22+
- name: extensionsPackageVersion
23+
displayName: Extensions Package Version Override
24+
type: string
25+
default: ''
26+
2227
steps:
2328
- template: ensure-dotnet-version.yml
2429
parameters:
@@ -55,3 +60,4 @@ steps:
5560
- template: ci-project-build-step.yml@self
5661
parameters:
5762
build: allNoDocs
63+
extensionsPackageVersion: ${{parameters.extensionsPackageVersion}}

eng/pipelines/common/templates/steps/update-nuget-config-local-feed-step.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
[Xml] $nugetConfig = Get-Content -Path "NuGet.config"
3535
$Value = Resolve-Path ${{parameters.downloadedNugetPath }}
3636
$newAdd = $nugetConfig.CreateElement("add")
37-
$newAdd.SetAttribute("key","Package source")
37+
$newAdd.SetAttribute("key","pipeline")
3838
$newAdd.SetAttribute("value", "$Value/" )
3939
$nugetConfig.configuration.packageSources.AppendChild($newAdd)
4040
$nugetConfig.Save("$rootFolder/NuGet.config")

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,15 @@ stages:
133133
debug: ${{ parameters.debug }}
134134
artifactName: $(artifactName)
135135
buildType: ${{ parameters.buildType }}
136+
extensionsPackageVersion: ${{parameters.extensionsPackageVersion}}
136137
${{else}}:
137138
prebuildSteps: # steps to run prior to building and running tests on each job
138139
- template: common/templates/steps/ci-prebuild-step.yml@self
139140
parameters:
140141
debug: ${{ parameters.debug }}
141142
artifactName: $(artifactName)
142143
buildType: ${{ parameters.buildType }}
144+
extensionsPackageVersion: ${{parameters.extensionsPackageVersion}}
143145

144146
${{ if eq(parameters.buildType, 'Project') }}: # only run the code coverage job if the build type is project
145147
postTestJobs: # jobs to run after the tests are done

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
#
1818
# The pipeline artifact name is the value of the 'pipelineArtifactsName'
1919
# parameter.
20+
#
21+
# This exposes a stage named 'build_extensions_package_stage' that can be
22+
# depended on by downstream stages.
2023

2124
parameters:
2225
# The type of build to produce (Release or Debug)
@@ -52,16 +55,16 @@ parameters:
5255
- diagnostic
5356

5457
stages:
55-
- stage: extensions_package_stage
58+
- stage: build_extensions_package_stage
5659
displayName: Build Extensions Package
5760

5861
jobs:
5962

60-
- job: extensions_package_job
63+
- job: build_extensions_package_job
6164
displayName: Build Extensions Package
6265
pool:
63-
name: ADO-CI-1ES-Pool
64-
vmImage: ADO-UB20-SQL22
66+
name: Azure Pipelines
67+
vmImage: ubuntu-latest
6568

6669
variables:
6770
# The directory where dotnet artifacts will be staged. Not to be

0 commit comments

Comments
 (0)