From 991b0f0d3ddfc7125ce4f551b858190fb6bc2d21 Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@users.noreply.github.com>
Date: Wed, 13 Mar 2024 13:40:41 +0000
Subject: [PATCH] Support WiX toolset versions other than 3.11 (#6689)

Version 3.14 was recently released with security fixes, and GitHub
runners have been updated to use it. Don't hardcode the version in
Program Files directory name to support any 3.x. Since 3.x support will
be dropped within a year, need to plan migration to 5.x when it's
released (4.x isn't suitable because of missing heat replacement).
---
 .github/workflows/actions.yml | 2 +-
 appveyor.yml                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 9383c14da..f884d69f1 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -387,7 +387,7 @@ jobs:
             nodejs
           & "C:\Program Files\OpenSSL\unins000.exe" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- | Out-Host
           (Join-Path $Env:ProgramFiles NASM) | Out-File $Env:GITHUB_PATH -Append
-          (Join-Path ${Env:ProgramFiles(x86)} 'WiX Toolset v3.11' bin) | Out-File $Env:GITHUB_PATH -Append
+          (Join-Path (Get-Item -Path "${Env:ProgramFiles(x86)}\WiX Toolset v3.*")[0].FullName bin) | Out-File $Env:GITHUB_PATH -Append
 
           Install-Module -Name Pscx -RequiredVersion 4.0.0-beta4 -AllowPrerelease -Force
       - name: Get Source
diff --git a/appveyor.yml b/appveyor.yml
index 77086e149..cdacf14b7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -61,7 +61,7 @@ for:
       choco install python3 --pre
       choco install nasm
       choco install jom
-      choco install wixtoolset --version 3.11.2
+      choco install wixtoolset --version 3.14.0
       choco install ccache --version 4.8.3
 
       Remove-Item -Path (Join-Path $Env:SystemDrive OpenSSL-Win32) -Recurse
@@ -74,7 +74,7 @@ for:
       $Env:PATH = @(
           (Join-Path $Env:SystemDrive Strawberry perl bin)
           (Join-Path $Env:ProgramFiles NASM)
-          (Join-Path ${Env:ProgramFiles(x86)} 'WiX Toolset v3.11' bin)
+          (Join-Path (Get-Item -Path "${Env:ProgramFiles(x86)}\WiX Toolset v3.*")[0].FullName bin)
           $Env:PATH
       ) -join [System.IO.Path]::PathSeparator