From 43522f7a765040e02a3549a086889c2f33345899 Mon Sep 17 00:00:00 2001
From: "Dustin L. Howett" <dustin@howett.net>
Date: Mon, 9 Oct 2023 20:11:15 -0500
Subject: [PATCH] build: pass branding into the nuget variable template

This fixes a cosmetic issue with the version number in the unpackaged
builds and NuGet packages.
---
 build/pipelines/ob-nightly.yml                                | 2 ++
 build/pipelines/ob-release.yml                                | 2 ++
 build/pipelines/templates-v2/pipeline-full-release-build.yml  | 2 ++
 .../templates-v2/variables-nuget-package-version.yml          | 4 ++++
 4 files changed, 10 insertions(+)

diff --git a/build/pipelines/ob-nightly.yml b/build/pipelines/ob-nightly.yml
index 8da37f18bd7..1c90866f9e2 100644
--- a/build/pipelines/ob-nightly.yml
+++ b/build/pipelines/ob-nightly.yml
@@ -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:
diff --git a/build/pipelines/ob-release.yml b/build/pipelines/ob-release.yml
index 9c81f570666..ca168e6d337 100644
--- a/build/pipelines/ob-release.yml
+++ b/build/pipelines/ob-release.yml
@@ -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:
diff --git a/build/pipelines/templates-v2/pipeline-full-release-build.yml b/build/pipelines/templates-v2/pipeline-full-release-build.yml
index 03826cac85d..06358de5c5b 100644
--- a/build/pipelines/templates-v2/pipeline-full-release-build.yml
+++ b/build/pipelines/templates-v2/pipeline-full-release-build.yml
@@ -62,6 +62,8 @@ parameters:
 
 variables:
   - template: variables-nuget-package-version.yml
+    parameters:
+      branding: ${{ parameters.branding }}
 
 resources:
   repositories:
diff --git a/build/pipelines/templates-v2/variables-nuget-package-version.yml b/build/pipelines/templates-v2/variables-nuget-package-version.yml
index af195c043f6..d3a137ba0e0 100644
--- a/build/pipelines/templates-v2/variables-nuget-package-version.yml
+++ b/build/pipelines/templates-v2/variables-nuget-package-version.yml
@@ -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"