From df8cd1a7c80193a1993c39c98d76dd44ebbf9706 Mon Sep 17 00:00:00 2001
From: Samson <16504129+sagudev@users.noreply.github.com>
Date: Sun, 17 Sep 2023 08:58:59 +0200
Subject: [PATCH] use newer wix in CI (#30378)

* Install wixtoolset via chocolatey

* choco install wixtoolset in CI

* Update windows.yml
---
 .github/workflows/windows.yml     | 10 ++++------
 support/windows/chocolatey.config |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index d8f0d3501df..f93930673fc 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -53,14 +53,12 @@ jobs:
         with:
           ref: refs/pull/${{ github.event.issue.number }}/head
           fetch-depth: 2
-      - name: wix311-binaries
-        shell: powershell
-        run: |
-          Start-BitsTransfer -Source https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip -Destination C:\\wix311-binaries.zip
-          Expand-Archive C:\\wix311-binaries.zip -DestinationPath C:\\wix
-          echo "C:\\wix" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
+      - name: Install wixtoolset
+        run: |
+          choco install wixtoolset
+          echo "C:\\Program Files (x86)\\WiX Toolset v3.11\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Bootstrap
         run: |
           python -m pip install --upgrade pip virtualenv
diff --git a/support/windows/chocolatey.config b/support/windows/chocolatey.config
index f69736afc99..363ef5eec3c 100644
--- a/support/windows/chocolatey.config
+++ b/support/windows/chocolatey.config
@@ -3,6 +3,7 @@
   <package id="cmake" version="3.26.4" installArguments="ADD_CMAKE_TO_PATH=System"/>
   <package id="git"/>
   <package id="llvm"/>
+  <package id="wixtoolset" version="3.11.2"/>
   <package id="ninja"/>
   <package id="python"/>
   <package id="python3-virtualenv"/>