From fffba26e21acae39c2a57e408f1e812b7b5fb15a Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Tue, 29 Dec 2020 20:04:15 +0000
Subject: [PATCH] slimming down to single signing task

---
 .az-pipelines/sign-windows-artifacts.yml | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/.az-pipelines/sign-windows-artifacts.yml b/.az-pipelines/sign-windows-artifacts.yml
index 737d5e0b2b..b7dcfc82f3 100644
--- a/.az-pipelines/sign-windows-artifacts.yml
+++ b/.az-pipelines/sign-windows-artifacts.yml
@@ -39,26 +39,15 @@ steps:
   displayName: 'show artifacts'
 
 - script: |
-    azuresigntool sign -kvu "$(SigningVaultURL)" -kvi "$(SigningClientId)" -kvs "$(SigningClientSecret)" -kvc "$(SigningCertName)" -tr http://timestamp.digicert.com "$(System.ArtifactsDirectory)\Bitwarden-$(git_release_version)-ia32-store.appx"
-  displayName: 'Sign artifacts 32-bit'
-
-- script: |
-    azuresigntool sign ^
-    -kvu "$(SigningVaultURL)" ^
-    -kvi "$(SigningClientId)" ^
-    -kvs "$(SigningClientSecret)" ^
-    -kvc "$(SigningCertName)" ^
-    -tr http://timestamp.digicert.com
-    -v ^
-    "$(System.ArtifactsDirectory)\Bitwarden-$(git_release_version)-x64-store.appx"
-  displayName: 'Sign artifacts 64-bit'
+    azuresigntool sign -kvu "$(SigningVaultURL)" -kvi "$(SigningClientId)" -kvs "$(SigningClientSecret)" -kvc "$(SigningCertName)" -tr http://timestamp.digicert.com "$(System.ArtifactsDirectory)\Bitwarden-$(git_release_version)-ia32-store.appx" "$(System.ArtifactsDirectory)\Bitwarden-$(git_release_version)-x64-store.appx"
+  displayName: 'Sign artifacts'
 
 - task: PublishPipelineArtifact@1
   inputs:
-    pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-$(git_release_version)-ia32.appx'
-    artifactName: 'Bitwarden-$(git_release_version)-ia32.appx'
+    pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-$(git_release_version)-ia32-store.appx'
+    artifactName: 'Bitwarden-$(git_release_version)-ia32-store.appx'
 
 - task: PublishPipelineArtifact@1
   inputs:
-    pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-$(git_release_version)-x64.appx'
-    artifactName: 'Bitwarden-$(git_release_version)-x64.appx'
+    pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-$(git_release_version)-x64-store.appx'
+    artifactName: 'Bitwarden-$(git_release_version)-x64-store.appx'