Merge 5c9f5fe34c into 96aa56a6dc

Fix: Dangerzone installed using an msi built with WiX Toolset v3 is not uninstalled by an msi built with WiX Toolset v5
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?
2025-05-04 12:41:50 +02:00 · 2024-11-06 16:30:54 +01:00 · 2024-10-31 19:18:08 +02:00 · 2024-10-31 19:18:08 +02:00 · 2024-10-31 19:18:08 +02:00 · 2024-10-31 19:18:08 +02:00
3 changed files with 8 additions and 8 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -115,9 +115,9 @@ jobs:
        with:
          dotnet-version: "8.x"
      - name: Install WiX Toolset
-        run: dotnet tool install --global wix
+        run: dotnet tool install --global wix --version 5.0.1
      - name: Add WiX UI extension
-        run: wix extension add --global WixToolset.UI.wixext
+        run: wix extension add --global WixToolset.UI.wixext/5.0.1
      - name: Build the MSI installer
        # NOTE: This also builds the .exe internally.
        run: poetry run .\install\windows\build-app.bat
--- a/BUILD.md
+++ b/BUILD.md
@ -476,21 +476,20 @@ 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 latest version of [WiX Toolset .NET tool](https://wixtoolset.org/) **v5** with:
+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.
 ```sh
-dotnet tool install --global wix --version 5.*
+dotnet tool install --global wix --version 5.0.1
 ```
-Install the WiX UI extension. You may need to open a new terminal in order to use the newly installed `wix` .NET tool:
+Install the WiX UI extension **in a new terminal**, in order to use the newly installed `wix` .NET tool:
 ```sh
-wix extension add --global WixToolset.UI.wixext/5.x.y
+wix extension add --global WixToolset.UI.wixext/5.0.1
 ```
 > [!IMPORTANT]  
-> To avoid compatibility issues, ensure the WiX UI extension version matches the version of the WiX Toolset.
+> To prevent compatibility issues, ensure that all WiX plugins you install match the version of 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
--- a/install/windows/build-wxs.py
+++ b/install/windows/build-wxs.py
@ -167,6 +167,7 @@ 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.",
    )
Author	SHA1	Message	Date
jkarasti	4acf88de9c	Merge `5c9f5fe34c` into `96aa56a6dc`	2024-11-06 16:30:54 +01:00
jkarasti	5c9f5fe34c	Fix: Dangerzone installed using an msi built with WiX Toolset v3 is not uninstalled by an msi built with WiX Toolset v5 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?	2024-10-31 19:18:08 +02:00
jkarasti	5bb09f7c03	Change: Wrap installer ui related things in a `UI` element	2024-10-31 19:18:08 +02:00
JKarasti	2149ad8963	Change: Build 64bit installer	2024-10-31 19:18:08 +02:00
JKarasti	096b075126	Docs: Documentation for WiX Toolset 5	2024-10-31 19:18:08 +02:00
JKarasti	5ecfbcd323	Change: Update the `build-app.bat` script to work with WiX Toolset v5 - WiX Toolset v3 used to validate the msi package by default. In v5 that has moved to a new command, so add a new validation step to the script. - Also emove the step that uses `insignia.exe` to sign the Dangerzone.msi with the digital signatures from its external cab archives. In WiX Toolset v4 and newer, insignia is replaced with a new command `wix msi inscribe`, but we tell wix to embed the cabinets into the .msi (That's what`EmbedCab="yes"` in the Media / MediaTemplate element does) so singning them separately is not necessary. [0] [0] https://wixtoolset.org/docs/tools/signing/	2024-10-31 19:18:08 +02:00
JKarasti	2d95c078d3	Change: Use WiX Toolset v5 to build the msi in CI	2024-10-31 19:18:08 +02:00
JKarasti	b1d9bfccab	Change: Write Dangerzone.wxs inside the script directly Also reduce duplication slightly by definig `build_dir`, `cx_freeze_dir` and `dist_dir`	2024-10-31 19:18:08 +02:00
JKarasti	31e865a347	Fix: Make GUIDs uppercase See [1] [1] https://learn.microsoft.com/en-us/windows/win32/msi/guid	2024-10-31 19:18:08 +02:00
JKarasti	b9c9dbccae	Change: Write dangerzone version and upgradecode into Package and SummaryInformation elements directly	2024-10-31 19:18:08 +02:00
JKarasti	a78f0a7000	Refactor: `build_dir_xml()` function - rename for clarity - remove unnecessary checks	2024-10-31 19:18:08 +02:00
JKarasti	cd9eafbd63	Change: Wrap all files to be included in the .msi in a `ComponentGroupRef` With this, all the files are organised into Components, each of which points to a Directory defined in the StandardDirectory element. This simplifies the Feature element considerable as only thing it needs to include everything in the built msi is a reference to `ApplicationComponents`	2024-10-31 19:18:08 +02:00
JKarasti	e8202759f1	Refactor: Simplify `build_data()` function - Rename variables to be more clear about what they do: - reorganise code - simplify a few checks	2024-10-31 19:18:08 +02:00
JKarasti	1a84fbe998	Change: Swap Media element with MediaTemplate This is a new default and makes authoring slightly simpler without any functional changes.	2024-10-31 19:18:08 +02:00
JKarasti	287bd55c2e	Change: Convert Wix UI extension authoring to WiX Toolset v5 Due to limitations of the xml.etree.ElementTree library, add the items in the root element as a dictionary	2024-10-31 19:18:08 +02:00
JKarasti	6ca30a39b2	Change: Wrap `ProgramFilesFolder` component with a `StandardDirectory` component	2024-10-31 19:18:08 +02:00
JKarasti	0f2a385913	Change: Wrap `ProgramMenuFolder` component with a `StandardDirectory` component	2024-10-31 19:18:08 +02:00