From bf82f90e75991321e87e33c5659014700449969d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20=C3=85berg?= <anders@andersaberg.com>
Date: Fri, 7 Nov 2025 11:14:47 +0100
Subject: [PATCH] Use correct Publisher and targets

---
 apps/desktop/custom-appx-manifest.xml   | 2 +-
 apps/desktop/electron-builder.beta.json | 2 +-
 apps/desktop/electron-builder.json      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/desktop/custom-appx-manifest.xml b/apps/desktop/custom-appx-manifest.xml
index 74d5506a069..4eb84cde0e6 100644
--- a/apps/desktop/custom-appx-manifest.xml
+++ b/apps/desktop/custom-appx-manifest.xml
@@ -15,7 +15,7 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/re
     <!-- use single quotes to avoid double quotes escaping in the publisher value  -->
     <Identity Name="${applicationId}"
         ProcessorArchitecture="${arch}"
-        Publisher='CN=Bitwarden Inc., O=Bitwarden Inc., L=Santa Barbara, ST=California, C=US'
+        Publisher='${publisher}'
         Version="${version}" />
     <Properties>
         <DisplayName>Bitwarden</DisplayName>
diff --git a/apps/desktop/electron-builder.beta.json b/apps/desktop/electron-builder.beta.json
index 630a956560d..00af08b0b85 100644
--- a/apps/desktop/electron-builder.beta.json
+++ b/apps/desktop/electron-builder.beta.json
@@ -60,7 +60,7 @@
     "backgroundColor": "#175DDC",
     "applicationId": "BitwardenBeta",
     "identityName": "8bitSolutionsLLC.BitwardenBeta",
-    "publisher": "CN=14D52771-DE3C-4886-B8BF-825BA7690418",
+    "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",
     "publisherDisplayName": "Bitwarden Inc",
     "languages": [
       "en-US",
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 285ee91b039..0bd6d93970b 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -90,7 +90,7 @@
   },
   "win": {
     "electronUpdaterCompatibility": ">=0.0.1",
-    "target": ["appx"],
+    "target": ["portable", "nsis-web", "appx"],
     "signtoolOptions": {
       "sign": "./sign.js",
       "publisherName": "CN=com.bitwarden.localdevelopment"
@@ -178,7 +178,7 @@
     "customManifestPath": "./custom-appx-manifest.xml",
     "applicationId": "bitwardendesktop",
     "identityName": "8bitSolutionsLLC.bitwardendesktop",
-    "publisher": "CN=14D52771-DE3C-4886-B8BF-825BA7690418",
+    "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",
     "publisherDisplayName": "Bitwarden Inc",
     "languages": [
       "en-US",