@@ -649,11 +649,11 @@ function Fetch-Dependencies {
649
649
Write-Output " Extracting $PinnedToolchain ..."
650
650
New-Item - ItemType Directory - ErrorAction Ignore $BinaryCache \toolchains | Out-Null
651
651
# The new runtime MSI is built to expand files into the immediate directory. So, setup the installation location.
652
- New-Item - ItemType Directory - ErrorAction Ignore $BinaryCache \toolchains\$PinnedToolchain \LocalApp\Programs\Swift\Runtimes\0.0 . 0 \usr\bin | Out-Null
652
+ New-Item - ItemType Directory - ErrorAction Ignore $BinaryCache \toolchains\$PinnedToolchain \LocalApp\Programs\Swift\Runtimes\5.10 . 1 \usr\bin | Out-Null
653
653
Invoke-Program $BinaryCache \WiX- $WiXVersion \tools\net6.0 \any\wix.exe -- burn extract $BinaryCache \$PinnedToolchain.exe - out $BinaryCache \toolchains\ - outba $BinaryCache \toolchains\
654
654
Get-ChildItem " $BinaryCache \toolchains\WixAttachedContainer" - Filter " *.msi" | % {
655
655
$LogFile = [System.IO.Path ]::ChangeExtension($_.Name , " log" )
656
- $TARGETDIR = if ($_.Name -eq " rtl.msi" ) { " $BinaryCache \toolchains\$PinnedToolchain \LocalApp\Programs\Swift\Runtimes\0.0.0 \usr\bin" } else { " $BinaryCache \toolchains\$PinnedToolchain " }
656
+ $TARGETDIR = if ($_.Name -eq " rtl.msi" ) { " $BinaryCache \toolchains\$PinnedToolchain \LocalApp\Programs\Swift\Runtimes\5.10.1 \usr\bin" } else { " $BinaryCache \toolchains\$PinnedToolchain " }
657
657
Invoke-Program - OutNull msiexec.exe / lvx! $BinaryCache \toolchains\$LogFile / qn / a $BinaryCache \toolchains\WixAttachedContainer\$_ ALLUSERS= 0 TARGETDIR= $TARGETDIR
658
658
}
659
659
@@ -719,22 +719,22 @@ function Fetch-Dependencies {
719
719
}
720
720
721
721
function Get-PinnedToolchainTool () {
722
- if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Toolchains\0.0.0 +Asserts\usr\bin" ) {
723
- return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Toolchains\0.0.0 +Asserts\usr\bin"
722
+ if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Toolchains\5.10.1 +Asserts\usr\bin" ) {
723
+ return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Toolchains\5.10.1 +Asserts\usr\bin"
724
724
}
725
725
return " $BinaryCache \toolchains\${PinnedToolchain} \Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin"
726
726
}
727
727
728
728
function Get-PinnedToolchainSDK () {
729
- if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Platforms\0.0.0 \Windows.platform\Developer\SDKs\Windows.sdk" ) {
730
- return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Platforms\0.0.0 \Windows.platform\Developer\SDKs\Windows.sdk"
729
+ if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Platforms\5.10.1 \Windows.platform\Developer\SDKs\Windows.sdk" ) {
730
+ return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Platforms\5.10.1 \Windows.platform\Developer\SDKs\Windows.sdk"
731
731
}
732
732
return " $BinaryCache \toolchains\${PinnedToolchain} \Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk"
733
733
}
734
734
735
735
function Get-PinnedToolchainRuntime () {
736
- if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Runtimes\0.0.0 \usr\bin\swiftCore.dll" ) {
737
- return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Runtimes\0.0.0 \usr\bin"
736
+ if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Runtimes\5.10.1 \usr\bin\swiftCore.dll" ) {
737
+ return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Runtimes\5.10.1 \usr\bin"
738
738
}
739
739
return " $BinaryCache \toolchains\${PinnedToolchain} \PFiles64\Swift\runtime-development\usr\bin"
740
740
}
0 commit comments