From 5a17e32b0bcb4f310ec29b730baf344127fb6782 Mon Sep 17 00:00:00 2001 From: yuyoyuppe Date: Thu, 26 May 2022 18:43:27 +0300 Subject: [PATCH] [CI] Install WiX 3.14 --- .github/actions/spell-check/expect.txt | 1 + .pipelines/ci/templates/build-powertoys-steps.yml | 6 ++++++ .pipelines/installWiX.ps1 | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 .pipelines/installWiX.ps1 diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index cfcb712ed9c8..f5877b1a4d45 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -1649,6 +1649,7 @@ rects recyclebin redirectedfrom Redist +Redistributable reencode reencoded refactor diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index 17c9e783e277..153f0e813836 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -95,6 +95,12 @@ steps: msbuildArgs: ${{ parameters.additionalBuildArguments }} maximumCpuCount: true +- task: PowerShell@2 + displayName: Download and install WiX 3.14 development build + inputs: + targetType: filePath + filePath: '$(build.sourcesdirectory)\.pipelines\installWiX.ps1' + - task: NuGetCommand@2 displayName: Restore NuGet packages for PowerToysSetup.sln inputs: diff --git a/.pipelines/installWiX.ps1 b/.pipelines/installWiX.ps1 new file mode 100644 index 000000000000..5c1f6589981f --- /dev/null +++ b/.pipelines/installWiX.ps1 @@ -0,0 +1,13 @@ +$WixDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.5722/wix314.exe" +$WixBinariesDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.5722/wix314-binaries.zip" + +# Download WiX binaries +Invoke-WebRequest -Uri $WixDownloadUrl -OutFile "$($ENV:Temp)\wix314.exe" +Invoke-WebRequest -Uri $WixBinariesDownloadUrl -OutFile "$($ENV:Temp)\wix314-binaries.zip" + +# Install WiX +Start-Process -Wait -FilePath "$($ENV:Temp)\wix314.exe" -ArgumentList "/install /quiet" + +# Extract WiX binaries and copy wix.targets to the installed dir +Expand-Archive -Path "$($ENV:Temp)\wix314-binaries.zip" -Force -DestinationPath "$($ENV:Temp)" +Copy-Item -Path "$($ENV:Temp)\wix.targets" -Destination "C:\Program Files (x86)\WiX Toolset v3.14\" \ No newline at end of file