From 18cd087511b90ef1211b40fbace34e4713611932 Mon Sep 17 00:00:00 2001
From: Isaiah Inuwa <iinuwa@bitwarden.com>
Date: Mon, 10 Nov 2025 07:15:16 -0600
Subject: [PATCH] Use custom appx manifest for Beta build

---
 apps/desktop/custom-appx-manifest.xml   | 12 ++++++------
 apps/desktop/electron-builder.beta.json |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/desktop/custom-appx-manifest.xml b/apps/desktop/custom-appx-manifest.xml
index 4eb84cde0e6..dce447ea2bf 100644
--- a/apps/desktop/custom-appx-manifest.xml
+++ b/apps/desktop/custom-appx-manifest.xml
@@ -18,8 +18,8 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/re
         Publisher='${publisher}'
         Version="${version}" />
     <Properties>
-        <DisplayName>Bitwarden</DisplayName>
-        <PublisherDisplayName>Bitwarden Inc</PublisherDisplayName>
+        <DisplayName>${displayName}</DisplayName>
+        <PublisherDisplayName>${publisherDisplayName}</PublisherDisplayName>
         <Description>A secure and free password manager for all of your devices.</Description>
         <Logo>assets\StoreLogo.png</Logo>
     </Properties>
@@ -94,11 +94,11 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/re
         <rescap:Capability Name="runFullTrust" />
     </Capabilities>
     <Applications>
-        <Application Id="bitwardendesktop" Executable="app\Bitwarden.exe"
+        <Application Id="bitwardendesktop" Executable="${executable}"
             EntryPoint="Windows.FullTrustApplication">
             <uap:VisualElements
                 BackgroundColor="#175DDC"
-                DisplayName="Bitwarden"
+                DisplayName="${displayName}"
                 Square150x150Logo="assets\Square150x150Logo.png"
                 Square44x44Logo="assets\Square44x44Logo.png"
                 Description="A secure and free password manager for all of your devices.">
@@ -109,12 +109,12 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/re
             <Extensions>
                 <uap:Extension Category="windows.protocol">
                     <uap:Protocol Name="bitwarden">
-                        <uap:DisplayName>Bitwarden</uap:DisplayName>
+                        <uap:DisplayName>${displayName}</uap:DisplayName>
                     </uap:Protocol>
                 </uap:Extension>
                 <com:Extension Category="windows.comServer">
                     <com:ComServer>
-                        <com:ExeServer Executable="app\Bitwarden.exe"
+                        <com:ExeServer Executable='${executable}'
                             DisplayName="Bitwarden Passkey Manager">
                             <com:Class Id="0f7dc5d9-69ce-4652-8572-6877fd695062"
                                 DisplayName="Bitwarden Passkey Manager" />
diff --git a/apps/desktop/electron-builder.beta.json b/apps/desktop/electron-builder.beta.json
index 51a32fe39fa..71850804cbd 100644
--- a/apps/desktop/electron-builder.beta.json
+++ b/apps/desktop/electron-builder.beta.json
@@ -58,6 +58,7 @@
   "appx": {
     "artifactName": "Bitwarden-Beta-${version}-${arch}.${ext}",
     "backgroundColor": "#175DDC",
+    "customManifestPath": "./custom-appx-manifest.xml",
     "applicationId": "BitwardenBeta",
     "identityName": "8bitSolutionsLLC.BitwardenBeta",
     "publisher": "CN=Bitwarden Inc., O=Bitwarden Inc., L=Santa Barbara, S=California, C=US, SERIALNUMBER=7654941, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.2=Delaware, OID.1.3.6.1.4.1.311.60.2.1.3=US",