Skip to content

Commit 6e06e51

Browse files
authored
Merge pull request #70703 from hjyamauchi/buildps1
Fix the pinned toolchain extraction.
2 parents 77c26a7 + 30b6ab9 commit 6e06e51

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

utils/build.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,9 @@ function Fetch-Dependencies {
444444
# The new runtime MSI is built to expand files into the immediate directory. So, setup the installation location.
445445
New-Item -ItemType Directory -ErrorAction Ignore $BinaryCache\toolchains\$PinnedToolchain\LocalApp\Programs\Swift\Runtimes\0.0.0\usr\bin | Out-Null
446446
Invoke-Program $BinaryCache\WiX-$WiXVersion\tools\net6.0\any\wix.exe -- burn extract $BinaryCache\$PinnedToolchain.exe -out $BinaryCache\toolchains\ -outba $BinaryCache\toolchains\
447-
Get-ChildItem "$BinaryCache\toolchains\WixAttachedContainer" | % {
447+
Get-ChildItem "$BinaryCache\toolchains\WixAttachedContainer" -Filter "*.msi" | % {
448448
$LogFile = [System.IO.Path]::ChangeExtension($_.Name, "log")
449-
$TARGETDIR = if ($_.Name -eq "rti.msi") { "$BinaryCache\toolchains\$PinnedToolchain\LocalApp\Programs\Swift\Runtimes\0.0.0\usr\bin" } else { "$BinaryCache\toolchains\$PinnedToolchain" }
449+
$TARGETDIR = if ($_.Name -eq "rtl.msi") { "$BinaryCache\toolchains\$PinnedToolchain\LocalApp\Programs\Swift\Runtimes\0.0.0\usr\bin" } else { "$BinaryCache\toolchains\$PinnedToolchain" }
450450
Invoke-Program -OutNull msiexec.exe /lvx! $LogFile /qn /a $BinaryCache\toolchains\WixAttachedContainer\$_ ALLUSERS=0 TARGETDIR=$TARGETDIR
451451
}
452452

0 commit comments

Comments
 (0)