mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-21 23:32:35 +00:00
Code Issues Releases Wiki Activity

Support WiX toolset versions other than 3.11 (#6689)

Browse source 
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).
This commit is contained in:
Mike Gelfand 2024-03-13 13:40:41 +00:00 committed by GitHub
parent 6909ec0bad
commit 991b0f0d3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/actions.yml vendored
View file

@ -387,7 +387,7 @@ jobs:
nodejs nodejs
& "C:\Program Files\OpenSSL\unins000.exe" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- | Out-Host & "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 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 Install-Module -Name Pscx -RequiredVersion 4.0.0-beta4 -AllowPrerelease -Force
- name: Get Source - name: Get Source

4
appveyor.yml
View file

@ -61,7 +61,7 @@ for:
choco install python3 --pre choco install python3 --pre
choco install nasm choco install nasm
choco install jom choco install jom
choco install wixtoolset --version 3.11.2 choco install wixtoolset --version 3.14.0
choco install ccache --version 4.8.3 choco install ccache --version 4.8.3
Remove-Item -Path (Join-Path $Env:SystemDrive OpenSSL-Win32) -Recurse Remove-Item -Path (Join-Path $Env:SystemDrive OpenSSL-Win32) -Recurse
@ -74,7 +74,7 @@ for:
$Env:PATH = @( $Env:PATH = @(
(Join-Path $Env:SystemDrive Strawberry perl bin) (Join-Path $Env:SystemDrive Strawberry perl bin)
(Join-Path $Env:ProgramFiles NASM) (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 $Env:PATH
) -join [System.IO.Path]::PathSeparator ) -join [System.IO.Path]::PathSeparator