From 4c206e338f4e50796a5bafb3be636f4bc0edfdb5 Mon Sep 17 00:00:00 2001
From: Zhiyuan Zheng <zhizhen@microsoft.com>
Date: Sun, 24 Jan 2021 14:01:00 +0800
Subject: [PATCH 1/2] Add ARM64 distribution

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0b6d033067..538a5fc16a 100644
--- a/package.json
+++ b/package.json
@@ -40,8 +40,8 @@
     "pack:mac": "npm run clean:dist && electron-builder --mac -p never",
     "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas -p never",
     "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev -p never",
-    "pack:win": "npm run clean:dist && electron-builder --win --x64 --ia32 -p never -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
-    "pack:win:ci": "npm run clean:dist && electron-builder --win --x64 --ia32 -p never",
+    "pack:win": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
+    "pack:win:ci": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never",
     "dist:dir": "npm run build && npm run pack:dir",
     "dist:lin": "npm run build && npm run pack:lin",
     "dist:mac": "npm run build && npm run pack:mac",
@@ -52,7 +52,7 @@
     "publish:lin": "npm run build && npm run clean:dist && electron-builder --linux --x64 -p always",
     "publish:mac": "npm run build && npm run clean:dist && electron-builder --mac -p always",
     "publish:mac:mas": "npm run dist:mac:mas && npm run upload:mas",
-    "publish:win": "npm run build && npm run clean:dist && electron-builder --win --x64 --ia32 -p always -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
+    "publish:win": "npm run build && npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p always -c.win.certificateSubjectName=\"8bit Solutions LLC\"",
     "upload:mas": "xcrun altool --upload-app --type osx --file \"$(find ./dist/mas/Bitwarden*.pkg)\" --username $APPLE_ID_USERNAME --password $APPLE_ID_PASSWORD"
   },
   "build": {

From 2e1588ebdce727746386aa603889eed7ca87e7d8 Mon Sep 17 00:00:00 2001
From: Zhiyuan Zheng <zhizhen@microsoft.com>
Date: Tue, 26 Jan 2021 11:16:19 +0800
Subject: [PATCH 2/2] Update Github Action.

---
 .github/workflows/build.yml   |  9 +++++++++
 .github/workflows/release.yml | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 95817329a5..11341fba44 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -183,6 +183,8 @@ jobs:
             -Destination "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx"
           Copy-Item "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx" `
             -Destination "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx"
+          Copy-Item "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-arm64.appx" `
+            -Destination "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx"
 
       - name: Deploy to Chocolatey
         shell: pwsh
@@ -223,6 +225,13 @@ jobs:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx
 
+      - name: Upload store appx ARM64 artifact
+        if: github.ref == 'refs/heads/master'
+        uses: actions/upload-artifact@v2
+        with:
+          name: Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx
+          path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx
+
       - name: Upload nupkg artifact
         if: github.ref == 'refs/heads/master'
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bd251d3dbd..c886a3aae4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -251,6 +251,16 @@ jobs:
           asset_path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx
           asset_content_type: application
 
+      - name: Upload unsigned ARM64 Windows Store release asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.setup.outputs.release_upload_url }}
+          asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx
+          asset_path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-arm64.appx
+          asset_content_type: application
+
   macos:
     runs-on: macos-latest
     needs: setup