Skip to content

Commit

Permalink
build: pass branding into the nuget variable template (#16122)
Browse files Browse the repository at this point in the history
This fixes a cosmetic issue with the version number in the unpackaged
builds and NuGet packages.

They were showing up as `-preview`, even when they were stable, because
the variable template didn't know about the branding.

(cherry picked from commit 544cdd7)
Service-Card-Id: 90786431
Service-Version: 1.18
  • Loading branch information
DHowett committed Nov 7, 2023
1 parent 9d521d7 commit bcd36ed
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions build/pipelines/ob-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)

variables:
- template: templates-v2/variables-nuget-package-version.yml
parameters:
branding: Canary
- template: templates-v2/variables-onebranch-config.yml

extends:
Expand Down
2 changes: 2 additions & 0 deletions build/pipelines/ob-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)

variables:
- template: templates-v2/variables-nuget-package-version.yml
parameters:
branding: ${{ parameters.branding }}
- template: templates-v2/variables-onebranch-config.yml

extends:
Expand Down
2 changes: 2 additions & 0 deletions build/pipelines/templates-v2/pipeline-full-release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ parameters:

variables:
- template: variables-nuget-package-version.yml
parameters:
branding: ${{ parameters.branding }}

resources:
repositories:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
parameters:
- name: branding
type: string

variables:
# If we are building a branch called "release-*", change the NuGet suffix
# to "preview". If we don't do that, XES will set the suffix to "release1"
Expand Down

0 comments on commit bcd36ed

Please sign in to comment.