From 48583a2b6e8f95848ff284e6bd7ecc5eb32dc562 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Thu, 11 Dec 2025 23:41:37 +0100 Subject: [PATCH] build: Go back to WiX 4 again for ARM64 support --- .github/workflows/build.yml | 13 +++++++++++++ cmake/build_helpers.cmake | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45fa1a3ad..d30799568 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,6 +95,7 @@ jobs: -DIMHEX_GENERATE_PDBS=ON \ -DIMHEX_REPLACE_DWARF_WITH_PDB=ON \ -DDOTNET_EXECUTABLE="C:/Program Files/dotnet/dotnet.exe" \ + -DCPACK_WIX_ROOT="$(echo "$USERPROFILE" | tr '\\' '/')/.dotnet/tools" \ .. - name: 🛠️ Build @@ -102,6 +103,11 @@ jobs: cd build ninja install + - name: 🕯️ Install WiX Toolkit + run: | + "C:/Program Files/dotnet/dotnet.exe" tool install --global wix + "$(echo "$USERPROFILE" | tr '\\' '/')/.dotnet/tools/wix" extension add -g WixToolset.UI.wixext + - name: 🪲 Create PDBs for MSI run: | cd build @@ -273,12 +279,19 @@ jobs: -DIMHEX_COMMIT_HASH_LONG="$env:GITHUB_SHA" ` -DIMHEX_COMMIT_BRANCH="$($env:GITHUB_REF -replace '.*/', '')" ` -DDOTNET_EXECUTABLE="C:/Program Files/dotnet/dotnet.exe" ` + -DCPACK_WIX_ROOT="$($env:USERPROFILE -replace '\\','/')/.dotnet/tools" ` . - name: 🛠️ Build run: | cd build ninja install + + - name: 🕯️ Install WiX Toolkit + run: | + & "C:/Program Files/dotnet/dotnet.exe" tool install --global wix + & "$($env:USERPROFILE -replace '\\','/')/.dotnet/tools/wix" extension add -g WixToolset.UI.wixext + - name: 📦 Bundle MSI run: | cd build diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index dda2fc97e..28992aa58 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -205,7 +205,7 @@ macro(configurePackingResources) set(CPACK_GENERATOR "WIX") set(CPACK_PACKAGE_NAME "ImHex") set(CPACK_PACKAGE_VENDOR "WerWolv") - set(CPACK_WIX_VERSION 3) + set(CPACK_WIX_VERSION 4) set(CPACK_WIX_UPGRADE_GUID "05000E99-9659-42FD-A1CF-05C554B39285") set(CPACK_WIX_PRODUCT_ICON "${PROJECT_SOURCE_DIR}/resources/dist/windows/icon.ico") set(CPACK_WIX_UI_BANNER "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_banner.png")