From 1cc59480647cd463d18964365c28cb615741d0aa Mon Sep 17 00:00:00 2001
From: Quentin Al-Timimi <27322516+quentin987@users.noreply.github.com>
Date: Thu, 19 Aug 2021 15:18:39 -0700
Subject: [PATCH] calc updates

---
 .../templates/package-appxbundle.yaml         | 21 ++++++++++---------
 build/pipelines/templates/release-store.yaml  |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/build/pipelines/templates/package-appxbundle.yaml b/build/pipelines/templates/package-appxbundle.yaml
index f117cd34..26fdb34f 100644
--- a/build/pipelines/templates/package-appxbundle.yaml
+++ b/build/pipelines/templates/package-appxbundle.yaml
@@ -34,6 +34,16 @@ jobs:
       artifactName: drop
       itemPattern: '**/*.appx'
 
+  - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:
+    - task: UniversalPackages@0
+      displayName: Download internals package
+      inputs:
+        command: download
+        downloadDirectory: $(Build.SourcesDirectory)
+        vstsFeed: WindowsInboxApps
+        vstsFeedPackage: calculator-internals
+        vstsPackageVersion: 0.0.66
+
   - task: PowerShell@2
     displayName: Generate AppxBundle mapping
     inputs:
@@ -103,16 +113,7 @@ jobs:
         pathtoPublish: $(Build.ArtifactStagingDirectory)\appxBundle
         artifactName: appxBundleSigned
 
-    - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:
-      - task: UniversalPackages@0
-        displayName: Download internals package
-        inputs:
-          command: download
-          downloadDirectory: $(Build.SourcesDirectory)
-          vstsFeed: WindowsInboxApps
-          vstsFeedPackage: calculator-internals
-          vstsPackageVersion: 0.0.66
-      
+    - ${{ if eq(parameters.createStoreBrokerPackages, true) }}:      
       - powershell: |
           # Just modify this line to indicate where your en-us PDP file is. Leave the other lines alone.
           $enUSPdpFilePath = "$(Build.SourcesDirectory)\PDP\en-US\PDP.xml"
diff --git a/build/pipelines/templates/release-store.yaml b/build/pipelines/templates/release-store.yaml
index 8a85ebb9..0550d5de 100644
--- a/build/pipelines/templates/release-store.yaml
+++ b/build/pipelines/templates/release-store.yaml
@@ -57,7 +57,7 @@ jobs:
 
   # This must be the first task in the job definition, since it modifies the build environment
   # in ways other tasks would not expect (for example, it clears the artifacts directory).
-  - task: PkgESSetupBuild@10
+  - task: PkgESSetupBuild@12
     displayName: Initialize Package ES
     inputs:
       productName: Calculator