@@ -436,21 +436,21 @@ function Ensure-WindowsSDK {
436436}
437437
438438function Ensure-SwiftToolchain ($Arch ) {
439- if (-not (Test-Path $BinaryCache \wix- 4.0 .1 . zip)) {
439+ if (-not (Test-Path $BinaryCache \wix- 4.0 .3 . zip)) {
440440 Write-Output " WiX not found. Downloading from nuget.org..."
441- Invoke-Program curl.exe - sL https:// www.nuget.org/ api/ v2/ package/ wix/ 4.0 .1 -- output $BinaryCache \wix- 4.0 .1 . zip -- create- dirs
441+ Invoke-Program curl.exe - sL https:// www.nuget.org/ api/ v2/ package/ wix/ 4.0 .3 -- output $BinaryCache \wix- 4.0 .3 . zip -- create- dirs
442442 }
443443
444444 if (-not $ToBatch ) {
445- $SHA256 = Get-FileHash - Path " $BinaryCache \wix-4.0.1 .zip" - Algorithm SHA256
446- if ($SHA256.Hash -ne " 756AD3115F0CE808313266F4E401C0F520D319211DE0B9D8D7E7697020E0C461 " ) {
447- throw " WiX SHA256 mismatch ($ ( $SHA256.Hash ) vs 756AD3115F0CE808313266F4E401C0F520D319211DE0B9D8D7E7697020E0C461 )"
445+ $SHA256 = Get-FileHash - Path " $BinaryCache \wix-4.0.3 .zip" - Algorithm SHA256
446+ if ($SHA256.Hash -ne " 33B3F28556F2499D10E0E0382ED481BD71BCB6178A20E7AF15A6879571B6BD41 " ) {
447+ throw " WiX SHA256 mismatch ($ ( $SHA256.Hash ) vs 33B3F28556F2499D10E0E0382ED481BD71BCB6178A20E7AF15A6879571B6BD41 )"
448448 }
449449 }
450450
451- New-Item - ItemType Directory - ErrorAction Ignore $BinaryCache \wix- 4.0 .1 | Out-Null
451+ New-Item - ItemType Directory - ErrorAction Ignore $BinaryCache \wix- 4.0 .3 | Out-Null
452452 Write-Output " Extracting WiX..."
453- Expand-Archive - Path $BinaryCache \wix- 4.0 .1 . zip - Destination $BinaryCache \wix- 4.0 .1 - Force
453+ Expand-Archive - Path $BinaryCache \wix- 4.0 .3 . zip - Destination $BinaryCache \wix- 4.0 .3 - Force
454454
455455 if (-not (Test-Path " $BinaryCache \${PinnedToolchain} .exe" )) {
456456 Write-Output " Swift toolchain not found. Downloading from swift.org..."
@@ -467,7 +467,7 @@ function Ensure-SwiftToolchain($Arch) {
467467
468468 New-Item - ItemType Directory - ErrorAction Ignore " $BinaryCache \toolchains" | Out-Null
469469 Write-Output " Extracting Swift toolchain..."
470- Invoke-Program " $BinaryCache \wix-4.0.1 \tools\net6.0\any\wix.exe" -- burn extract " $BinaryCache \${PinnedToolchain} .exe" - out " $BinaryCache \toolchains\"
470+ Invoke-Program " $BinaryCache \wix-4.0.3 \tools\net6.0\any\wix.exe" -- burn extract " $BinaryCache \${PinnedToolchain} .exe" - out " $BinaryCache \toolchains\"
471471 if ($PinnedLayout -eq " New" ) {
472472 [string []] $Packages = @ (" UNUSED" ,
473473 " rtl.msi" , " bld.msi" , " cli.msi" , " dbg.msi" , " ide.msi" ,
@@ -1748,7 +1748,7 @@ function Stage-BuildArtifacts($Arch) {
17481748 } else {
17491749 New-Item - Type Directory - Path " $ ( $Arch.BinaryCache ) \installer\$ ( $Arch.VSName ) \" - ErrorAction Ignore | Out-Null
17501750 }
1751- Invoke-Program " $BinaryCache \wix-4.0.1 \tools\net6.0\any\wix.exe" -- burn detach " $ ( $Arch.BinaryCache ) \installer\Release\$ ( $Arch.VSName ) \installer.exe" - engine " $Stage \installer-engine.exe" - intermediateFolder " $ ( $Arch.BinaryCache ) \installer\$ ( $Arch.VSName ) \"
1751+ Invoke-Program " $BinaryCache \wix-4.0.3 \tools\net6.0\any\wix.exe" -- burn detach " $ ( $Arch.BinaryCache ) \installer\Release\$ ( $Arch.VSName ) \installer.exe" - engine " $Stage \installer-engine.exe" - intermediateFolder " $ ( $Arch.BinaryCache ) \installer\$ ( $Arch.VSName ) \"
17521752}
17531753
17541754# -------------------------------------------------------------------
0 commit comments