[CI] Fix WIX integration. (#6)

Author: andywolk

.github/workflows/build-sounds.yml

@@ -136,14 +136,31 @@ jobs:
         shell: pwsh
         run: |
           choco install wixtoolset -y --no-progress
-          # Discover the install dir (version may vary) and expose it via WIX so
-          # build-msi.ps1 / the wixproj resolve Wix.targets and the WiX tools.
-          $root = Get-ChildItem "C:\Program Files (x86)" -Directory -Filter "WiX Toolset v3*" |
+
+          $pf86 = ${env:ProgramFiles(x86)}
+
+          # Toolset install dir (bin\heat.exe, candle.exe, light.exe). Export as WIX.
+          $root = Get-ChildItem $pf86 -Directory -Filter "WiX Toolset v3*" |
                   Sort-Object Name -Descending | Select-Object -First 1
           if (-not $root) { throw "WiX Toolset v3 not found after install" }
-          "WIX=$($root.FullName)\" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          "WIX=$($root.FullName)\" | Out-File $env:GITHUB_ENV -Append -Encoding utf8
           Write-Host "WIX=$($root.FullName)\"
 
+          # The WiX v3 MSBuild integration (wix.targets) location varies by
+          # installer; the standard spot is MSBuild\Microsoft\WiX\v3.x. Find it.
+          $candidates = @(
+            (Join-Path $pf86 "MSBuild\Microsoft\WiX\v3.x\wix.targets"),
+            (Join-Path $root.FullName "Wix.targets")
+          )
+          $targets = $candidates | Where-Object { Test-Path $_ } | Select-Object -First 1
+          if (-not $targets) {
+            $targets = Get-ChildItem (Join-Path $pf86 "MSBuild"), $root.FullName -Recurse -Filter "wix.targets" -ErrorAction SilentlyContinue |
+                       Select-Object -First 1 -ExpandProperty FullName
+          }
+          if (-not $targets) { throw "Could not locate WiX v3 wix.targets after install" }
+          Write-Host "WixTargetsPath=$targets"
+          "WixTargetsPath=$targets" | Out-File $env:GITHUB_ENV -Append -Encoding utf8
+
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@v3
 

windows/build-msi.ps1

@@ -26,7 +26,7 @@
 #>
 param(
   [Parameter(Mandatory = $true)][string]$Tarball,
-  [string]$WixTargetsPath,
+  [string]$WixTargetsPath = $env:WixTargetsPath,
   [string]$Configuration = "Release",
   [string]$Platform = "x64"
 )
@@ -55,9 +55,16 @@ if (Test-Path $dest) { Remove-Item -Recurse -Force $dest }
 
 # 3. Build the MSI. The project's EnsureSoundFiles target extracts $SoundTarball
 #    (built-in tar) into libs/sounds/<suffix> before heat runs.
-if (-not $WixTargetsPath -and $env:WIX) {
+# Only override WixTargetsPath with a file that actually exists; otherwise leave
+# it empty so the wixproj's own fallback ($(MSBuildExtensionsPath32)\Microsoft\
+# WiX\v3.x\Wix.targets) resolves the standard install location.
+if (-not $WixTargetsPath -and $env:WIX -and (Test-Path (Join-Path $env:WIX "Wix.targets"))) {
   $WixTargetsPath = Join-Path $env:WIX "Wix.targets"
 }
+if ($WixTargetsPath -and -not (Test-Path $WixTargetsPath)) {
+  Write-Host "WixTargetsPath '$WixTargetsPath' not found; deferring to the project's default."
+  $WixTargetsPath = ""
+}
 
 $sln = Join-Path $here "Setup.Sounds.2017.sln"
 $msbuildArgs = @(