Merge da09566a3c into 96aa56a6dc

Fix the issue by adding some extra functionality to the "Next" button on the welcome screen of the installer. When the user clicks it to proceed with the installation this:
1. Flips the install scope to "perUser" which is the default in WiX v3
2. Finds the older installation
3. And finally flips the scope back to "perMachine" which is the default in WiX v4 and newer

TODO: Revert this once we are reasonably certain there are no affected Dangerzone Installations?

.github/workflows/ci.yml

@@ -115,9 +115,9 @@ jobs:
         with:
           dotnet-version: "8.x"
       - name: Install WiX Toolset
-        run: dotnet tool install --global wix --version 5.0.1
+        run: dotnet tool install --global wix
       - name: Add WiX UI extension
-        run: wix extension add --global WixToolset.UI.wixext/5.0.1
+        run: wix extension add --global WixToolset.UI.wixext
       - name: Build the MSI installer
         # NOTE: This also builds the .exe internally.
         run: poetry run .\install\windows\build-app.bat

BUILD.md

@@ -476,20 +476,21 @@ poetry shell
 
 ### If you want to build the Windows installer
 
-Install [.NET SDK](https://dotnet.microsoft.com/en-us/download) version 6 or later. Then, open a terminal and install the [WiX Toolset .NET tool](https://wixtoolset.org/) v5.0.1.
+Install [.NET SDK](https://dotnet.microsoft.com/en-us/download) version 6 or later. Then, open a terminal and install the latest version of [WiX Toolset .NET tool](https://wixtoolset.org/) **v5** with:
 
 ```sh
-dotnet tool install --global wix --version 5.0.1
+dotnet tool install --global wix --version 5.*
 ```
 
-Install the WiX UI extension **in a new terminal**, in order to use the newly installed `wix` .NET tool:
+Install the WiX UI extension. You may need to open a new terminal in order to use the newly installed `wix` .NET tool:
 
 ```sh
-wix extension add --global WixToolset.UI.wixext/5.0.1
+wix extension add --global WixToolset.UI.wixext/5.x.y
 ```
 
 > [!IMPORTANT]  
-> To prevent compatibility issues, ensure that all WiX plugins you install match the version of WiX Toolset.
+> To avoid compatibility issues, ensure the WiX UI extension version matches the version of the WiX Toolset.
+> Run `wix --version` to check the version of WiX Toolset you have installed and replace `5.x.y` with the full version number without the Git revision.
 
 ### If you want to sign binaries with Authenticode
 

install/windows/build-wxs.py

@@ -167,7 +167,6 @@ def main():
     ET.SubElement(
         package_el,
         "MajorUpgrade",
-        AllowSameVersionUpgrades="yes",
         DowngradeErrorMessage="A newer version of [ProductName] is already installed. If you are sure you want to downgrade, remove the existing installation via Programs and Features.",
     )