From 6035587728194a8bf37fbd187a0ab27b1eeb1cf2 Mon Sep 17 00:00:00 2001
From: Marc Greisen <marc@greisen.org>
Date: Tue, 1 Dec 2020 13:52:25 -0800
Subject: [PATCH] Update variables for production build

---
 ado/production-build.yml            | 9 +++++----
 ado/variables/version-variables.yml | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ado/production-build.yml b/ado/production-build.yml
index 7bb51182..500c17bd 100644
--- a/ado/production-build.yml
+++ b/ado/production-build.yml
@@ -5,10 +5,11 @@ trigger:
       - 'main'
 
 variables:
-  versionNumber: 1.0.0
-  imageTag: 'v1.0.0'
-  imageTagWithBuildDate: $(imageTag)-$(Build.BuildNumber)
-  imageTagLatest: 'v1.latest'
+  - template: 'variables/version-variables.yml'
+  - name: versionNumber
+    value: $(version.major).$(version.minor).$(version.revision)
+  - name: imageTagWithBuildDate
+    value: $(imageTag)-$(Build.BuildNumber)
 
 stages:
   - template: stages/build/build.yml
\ No newline at end of file
diff --git a/ado/variables/version-variables.yml b/ado/variables/version-variables.yml
index f49722f8..8ac24f2a 100644
--- a/ado/variables/version-variables.yml
+++ b/ado/variables/version-variables.yml
@@ -3,6 +3,8 @@ variables:
     value: 1
   - name: version.minor
     value: 1
+  - name: version.revision
+    value: 0
   - name: imageTag
     value: 'v1.1.0'
   - name: imageTagLatest