@@ -17,36 +17,44 @@ variables:
     value: 1
   - group: Azure Blob variable group
 
-jobs:
-- job: rename
-  displayName: Name the build
-  condition: succeeded()
-  pool:
-    vmImage: 'windows-latest'
-  steps:
-  - checkout: self
-    clean: true
-
-  - template: ./templates/SetVersionVariables.yml
+stages:
+- stage: prep
+  displayName: Create buildInfo and name the Pipeline
+  jobs:
+  - job: rename
+    displayName: Name the build
+    condition: succeeded()
+    pool:
+      vmImage: 'windows-latest'
+    steps:
+    - checkout: self
+      clean: true
+
+    - template: ./templates/SetVersionVariables.yml
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+        CreateJson: yes
+        UseJson: no
+
+    - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
+      displayName: Set Build Name for Non-PR
+      condition: ne(variables['Build.Reason'], 'PullRequest')
+
+- stage: release
+  displayName: Release
+  jobs:
+  - template: ./templates/vpackReleaseJob.yml
     parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
+      architecture: x64
 
-  - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
-    displayName: Set Build Name for Non-PR
-    condition: ne(variables['Build.Reason'], 'PullRequest')
-
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: x64
-
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: x86
+  - template: ./templates/vpackReleaseJob.yml
+    parameters:
+      architecture: x86
 
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: arm32
+  - template: ./templates/vpackReleaseJob.yml
+    parameters:
+      architecture: arm32
 
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: arm64
+  - template: ./templates/vpackReleaseJob.yml
+    parameters:
+      architecture: arm64