From cf5e19463937c72f48bc3e8275558181de854bd2 Mon Sep 17 00:00:00 2001
From: Isaiah Inuwa <iinuwa@bitwarden.com>
Date: Wed, 18 Feb 2026 06:57:29 -0600
Subject: [PATCH] [BRE-1621] Fix Appx Release (#19043)

* Revert to electron-builder appx manifest template
* Remove comments
* Remove unnecessary namespaces
* Re-include Tamil translation files
* Reinstate bitwarden protocol handler
* Set minimum version to Windows 10 2016 Anniversary Update

* Fix spacing
---
 apps/desktop/custom-appx-manifest.xml     | 25 ++++++++++++-----------
 apps/desktop/electron-builder.beta.json   |  1 -
 apps/desktop/electron-builder.json        |  1 -
 apps/desktop/scripts/appx-cross-build.ps1 |  3 ++-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/desktop/custom-appx-manifest.xml b/apps/desktop/custom-appx-manifest.xml
index 166b852588b..8a5c36e7da6 100644
--- a/apps/desktop/custom-appx-manifest.xml
+++ b/apps/desktop/custom-appx-manifest.xml
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--suppress XmlUnusedNamespaceDeclaration -->
-<!-- <Package
-    xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-    xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-    xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"> -->
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
     xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-    xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-    xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
-    xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
-    IgnorableNamespaces="uap rescap com uap10 build"
-    xmlns:build="http://schemas.microsoft.com/developer/appx/2015/build">
+    xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+    xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
     <!-- use single quotes to avoid double quotes escaping in the publisher value  -->
     <Identity Name="${identityName}"
         ProcessorArchitecture="${arch}"
@@ -78,6 +70,7 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/re
         <Resource Language="sl" />
         <Resource Language="sr-cyrl" />
         <Resource Language="sv" />
+        <Resource Language="ta" />
         <Resource Language="te" />
         <Resource Language="th" />
         <Resource Language="tr" />
@@ -87,8 +80,9 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/re
         <Resource Language="zh-tw" />
     </Resources>
     <Dependencies>
-        <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.26200.7019"
-            MaxVersionTested="10.0.26200.7171" />
+        <!-- MinVersion 10.0.14316.0 = Windows 10 2016 Anniversary Update (April 2016) -->
+        <TargetDeviceFamily Name="Windows.Desktop"
+          MinVersion="10.0.14316.0" MaxVersionTested="10.0.14316.0" />
     </Dependencies>
     <Capabilities>
         <rescap:Capability Name="runFullTrust" />
@@ -106,6 +100,13 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/re
                 <uap:DefaultTile Wide310x150Logo="assets\Wide310x150Logo.png" />
                 <uap:SplashScreen Image="assets\SplashScreen.png" />
             </uap:VisualElements>
+            <Extensions>
+                <uap:Extension Category="windows.protocol">
+                    <uap:Protocol Name="bitwarden">
+                        <uap:DisplayName>Bitwarden</uap:DisplayName>
+                    </uap:Protocol>
+                </uap:Extension>
+            </Extensions>
         </Application>
     </Applications>
 </Package>
diff --git a/apps/desktop/electron-builder.beta.json b/apps/desktop/electron-builder.beta.json
index 9c66b17aa1f..f0746e6d408 100644
--- a/apps/desktop/electron-builder.beta.json
+++ b/apps/desktop/electron-builder.beta.json
@@ -61,7 +61,6 @@
   "appx": {
     "artifactName": "Bitwarden-Beta-${version}-${arch}.${ext}",
     "backgroundColor": "#175DDC",
-    "customManifestPath": "./custom-appx-manifest.xml",
     "applicationId": "BitwardenBeta",
     "identityName": "8bitSolutionsLLC.BitwardenBeta",
     "publisher": "CN=14D52771-DE3C-4886-B8BF-825BA7690418",
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 151ce72182d..f876b7ff680 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -176,7 +176,6 @@
   "appx": {
     "artifactName": "${productName}-${version}-${arch}.${ext}",
     "backgroundColor": "#175DDC",
-    "customManifestPath": "./custom-appx-manifest.xml",
     "applicationId": "bitwardendesktop",
     "identityName": "8bitSolutionsLLC.bitwardendesktop",
     "publisher": "CN=14D52771-DE3C-4886-B8BF-825BA7690418",
diff --git a/apps/desktop/scripts/appx-cross-build.ps1 b/apps/desktop/scripts/appx-cross-build.ps1
index ef2ab09104c..c47567695ed 100755
--- a/apps/desktop/scripts/appx-cross-build.ps1
+++ b/apps/desktop/scripts/appx-cross-build.ps1
@@ -72,6 +72,7 @@ param(
     # Whether to build in release mode.
     $Release=$false
 )
+
 $ErrorActionPreference = "Stop"
 $PSNativeCommandUseErrorActionPreference = $true
 $startTime = Get-Date
@@ -113,7 +114,7 @@ else {
 
 $builderConfig = Get-Content $electronConfigFile | ConvertFrom-Json
 $packageConfig = Get-Content package.json | ConvertFrom-Json
-$manifestTemplate = Get-Content $builderConfig.appx.customManifestPath
+$manifestTemplate = Get-Content ($builderConfig.appx.customManifestPath ?? "custom-appx-manifest.xml")
 
 $srcDir = Get-Location
 $assetsDir = Get-Item $builderConfig.directories.buildResources