From b81620abbd8a2ff710eb615e336b701cda199ca7 Mon Sep 17 00:00:00 2001
From: Leilei Zhang <leilzh@microsoft.com>
Date: Mon, 21 Jul 2025 14:17:50 +0800
Subject: [PATCH] install

---
 .../v2/templates/steps-build-installer-vnext.yml   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.pipelines/v2/templates/steps-build-installer-vnext.yml b/.pipelines/v2/templates/steps-build-installer-vnext.yml
index 12ef471cc1..280fc74538 100644
--- a/.pipelines/v2/templates/steps-build-installer-vnext.yml
+++ b/.pipelines/v2/templates/steps-build-installer-vnext.yml
@@ -16,6 +16,14 @@ parameters:
     default: ''
 
 steps:
+  # Install WiX 5.x tools needed for VNext installer
+  - task: DotNetCoreCLI@2
+    displayName: Install WiX 5.x tools
+    inputs:
+      command: 'custom'
+      custom: 'tool'
+      arguments: 'install --global wix'
+
   - pwsh: |-
       & git clean -xfd -e *exe -- .\installer\
     displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
@@ -83,7 +91,7 @@ steps:
       maximumCpuCount: true
 
   - script: |-
-      dotnet tool run wix msi decompile installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).msi -x $(build.sourcesdirectory)\extractedMsi
+      wix msi decompile installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).msi -x $(build.sourcesdirectory)\extractedMsi
       dir $(build.sourcesdirectory)\extractedMsi
     displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract and verify MSI"
 
@@ -133,7 +141,7 @@ steps:
   # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
   - ${{ if eq(parameters.codeSign, true) }}:
     - script: |-
-        dotnet tool run wix burn detach installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe
+        wix burn detach installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe
       displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract Engine from Bundle"
 
     - template: steps-esrp-signing.yml
@@ -169,7 +177,7 @@ steps:
             ]
 
     - script: |-
-        dotnet tool run wix burn attach installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe -o installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe
+        wix burn attach installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe -o installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe
       displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Merge Engine into Bundle"
 
     - template: steps-esrp-signing.yml