From 5409470750459a69a69c35da6b27a74b10696941 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 18 Feb 2026 15:17:18 +0100 Subject: [PATCH] update wix --- .github/workflows/win-exe.yml | 17 +++++++++++------ dist/win/build.ps1 | 8 ++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 12ef4ab5e..c88d9d2ed 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -27,6 +27,7 @@ env: WINFSP_MSI: 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi' WINFSP_MSI_HASH: '073a70e00f77423e34bed98b86e600def93393ba5822204fac57a29324db9f7a' WINFSP_UNINSTALLER: 'https://github.com/cryptomator/winfsp-uninstaller/releases/latest/download/winfsp-uninstaller.exe' + WIX_VERSION: '6.0.2' defaults: run: @@ -62,9 +63,11 @@ jobs: cache: 'maven' - name: Install wix and extensions run: | - dotnet tool install --global wix --version 6.0.0 - wix.exe extension add WixToolset.UI.wixext/6.0.0 --global - wix.exe extension add WixToolset.Util.wixext/6.0.0 --global + dotnet tool install --global wix --version ${WIX_VERSION} + wix.exe extension add --global WixToolset.UI.wixext/${WIX_VERSION} + wix.exe extension add --global WixToolset.Util.wixext/${WIX_VERSION} + env: + WIX_VERSION: ${{ env.WIX_VERSION }} - name: Download and extract JavaFX jmods from Gluon if: matrix.arch == 'x64' #In the last step we move all jmods files a dir level up because jmods are placed inside a directory in the zip @@ -302,9 +305,11 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Install wix and extensions run: | - dotnet tool install --global wix --version 6.0.0 - wix.exe extension add WixToolset.BootstrapperApplications.wixext/6.0.0 --global - wix.exe extension add WixToolset.Util.wixext/6.0.0 --global + dotnet tool install --global wix --version ${WIX_VERSION} + wix.exe extension add --global WixToolset.BootstrapperApplications.wixext/${WIX_VERSION} + wix.exe extension add --global WixToolset.Util.wixext/${WIX_VERSION} + env: + WIX_VERSION: ${{ env.WIX_VERSION }} - name: Download .msi uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0 with: diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index a2fe38a92..b6934bfe0 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -34,20 +34,20 @@ if ((Get-Command "mvn" -ErrorAction SilentlyContinue) -eq $null) } if ((Get-Command 'wix' -ErrorAction SilentlyContinue) -eq $null) { - Write-Error 'Unable to find wix in your PATH (try: dotnet tool install --global wix --version 6.0.0)' + Write-Error 'Unable to find wix in your PATH (try: dotnet tool install --global wix --version 6.0.2)' exit 1 } $wixExtensions = & wix.exe extension list --global | Out-String if ($wixExtensions -notmatch 'WixToolset.UI.wixext') { - Write-Error 'Wix UI extension missing. Please install it with: wix.exe extension add WixToolset.UI.wixext/6.0.0 --global)' + Write-Error 'Wix UI extension missing. Please install it with: wix.exe extension add WixToolset.UI.wixext/6.0.2 --global)' exit 1 } if ($wixExtensions -notmatch 'WixToolset.Util.wixext') { - Write-Error 'Wix Util extension missing. Please install it with: wix.exe extension add WixToolset.Util.wixext/6.0.0 --global)' + Write-Error 'Wix Util extension missing. Please install it with: wix.exe extension add WixToolset.Util.wixext/6.0.2 --global)' exit 1 } if ($wixExtensions -notmatch 'WixToolset.BootstrapperApplications.wixext') { - Write-Error 'Wix Bootstrapper extension missing. Please install it with: wix.exe extension add WixToolset.BootstrapperApplications.wixext/6.0.0 --global)' + Write-Error 'Wix Bootstrapper extension missing. Please install it with: wix.exe extension add WixToolset.BootstrapperApplications.wixext/6.0.2 --global)' exit 1 }