From a5c3b138cbebe144be3d85edd47e1ebaf62cee35 Mon Sep 17 00:00:00 2001
From: Tian Liao <tilia@microsoft.com>
Date: Thu, 18 Aug 2022 13:46:44 +0800
Subject: [PATCH] add ARM64 config

---
 build/pipelines/azure-pipelines.ci-internal.yaml         | 6 ++++++
 build/pipelines/azure-pipelines.release.yaml             | 7 +++++++
 build/pipelines/templates/build-single-architecture.yaml | 2 +-
 build/pipelines/templates/package-msixbundle.yaml        | 6 ++++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/build/pipelines/azure-pipelines.ci-internal.yaml b/build/pipelines/azure-pipelines.ci-internal.yaml
index 93c5caef..dcfbadaa 100644
--- a/build/pipelines/azure-pipelines.ci-internal.yaml
+++ b/build/pipelines/azure-pipelines.ci-internal.yaml
@@ -31,6 +31,12 @@ jobs:
     useReleaseAppxManifest: false
     platform: ARM
 
+- template: ./templates/build-single-architecture.yaml
+  parameters:
+    isReleaseBuild: true
+    useReleaseAppxManifest: false
+    platform: ARM64
+
 - template: ./templates/run-ui-tests.yaml
   parameters:
     platform: x64
diff --git a/build/pipelines/azure-pipelines.release.yaml b/build/pipelines/azure-pipelines.release.yaml
index 0615d446..6106a018 100644
--- a/build/pipelines/azure-pipelines.release.yaml
+++ b/build/pipelines/azure-pipelines.release.yaml
@@ -36,6 +36,13 @@ jobs:
     useReleaseAppxmanifest: true
     condition: not(eq(variables['Build.Reason'], 'PullRequest'))
 
+- template: ./templates/build-single-architecture.yaml
+  parameters:
+    platform: ARM64
+    isReleaseBuild: true
+    useReleaseAppxmanifest: true
+    condition: not(eq(variables['Build.Reason'], 'PullRequest'))
+
 - template: ./templates/run-ui-tests.yaml
   parameters:
     platform: x64
diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml
index 547dc083..38ebded8 100644
--- a/build/pipelines/templates/build-single-architecture.yaml
+++ b/build/pipelines/templates/build-single-architecture.yaml
@@ -45,7 +45,7 @@ jobs:
         downloadDirectory: $(Build.SourcesDirectory)
         vstsFeed: WindowsInboxApps
         vstsFeedPackage: calculator-internals
-        vstsPackageVersion: 0.0.103
+        vstsPackageVersion: 0.0.105
 
   - task: NuGetToolInstaller@1
     displayName: Use NuGet 6.x
diff --git a/build/pipelines/templates/package-msixbundle.yaml b/build/pipelines/templates/package-msixbundle.yaml
index 9701cb8d..683c5b2d 100644
--- a/build/pipelines/templates/package-msixbundle.yaml
+++ b/build/pipelines/templates/package-msixbundle.yaml
@@ -13,12 +13,14 @@ jobs:
     - Buildx64
     - Buildx86
     - BuildARM
+    - BuildARM64
   condition: |
     and
     (
       in(dependencies.Buildx64.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
       in(dependencies.Buildx86.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
-      in(dependencies.BuildARM.result, 'Succeeded', 'SucceededWithIssues', 'Skipped')
+      in(dependencies.BuildARM.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
+      in(dependencies.BuildARM64.result, 'Succeeded', 'SucceededWithIssues', 'Skipped')
     ) 
   pool:
     ${{ if eq(parameters.isOSSBuild, true) }}:
@@ -47,7 +49,7 @@ jobs:
         downloadDirectory: $(Build.SourcesDirectory)
         vstsFeed: WindowsInboxApps
         vstsFeedPackage: calculator-internals
-        vstsPackageVersion: 0.0.103
+        vstsPackageVersion: 0.0.105
 
   - task: PowerShell@2
     displayName: Generate MsixBundle mapping