@@ -134,8 +134,8 @@ if ($null -eq $BuildArchName) { $BuildArchName = $env:PROCESSOR_ARCHITECTURE }
134134if ($PinnedBuild -eq " " ) {
135135 switch ($BuildArchName ) {
136136 " AMD64" {
137- $PinnedBuild = " https://download.swift.org/swift-5.10-branch /windows10/swift-5.10-DEVELOPMENT-SNAPSHOT-2024-01-18-a /swift-5.10-DEVELOPMENT-SNAPSHOT-2024-01-18-a -windows10.exe"
138- $PinnedSHA256 = " 006266d8c2a6a9c70e21b9d161ec35c07bcbb8a452b17e145899d814d07a29e7 "
137+ $PinnedBuild = " https://download.swift.org/swift-5.10.1-release /windows10/swift-5.10.1-RELEASE /swift-5.10.1-RELEASE -windows10.exe"
138+ $PinnedSHA256 = " 3027762138ACFA1BBE3050FF6613BBE754332E84C9EFA5C23984646009297286 "
139139 }
140140 " ARM64" {
141141 # TODO(hjyamauchi) once we have an arm64 release, fill in PinnedBuild and PinnedSHA256.
@@ -526,7 +526,7 @@ function Fetch-Dependencies {
526526 Invoke-Program $BinaryCache \WiX- $WiXVersion \tools\net6.0 \any\wix.exe -- burn extract $BinaryCache \$PinnedToolchain.exe - out $BinaryCache \toolchains\ - outba $BinaryCache \toolchains\
527527 Get-ChildItem " $BinaryCache \toolchains\WixAttachedContainer" - Filter " *.msi" | % {
528528 $LogFile = [System.IO.Path ]::ChangeExtension($_.Name , " log" )
529- $TARGETDIR = if ($_.Name -eq " rtl.msi" ) { " $BinaryCache \toolchains\$PinnedToolchain \LocalApp\Programs\Swift\Runtimes\0.0.0 \usr\bin" } else { " $BinaryCache \toolchains\$PinnedToolchain " }
529+ $TARGETDIR = if ($_.Name -eq " rtl.msi" ) { " $BinaryCache \toolchains\$PinnedToolchain \LocalApp\Programs\Swift\Runtimes\5.10.1 \usr\bin" } else { " $BinaryCache \toolchains\$PinnedToolchain " }
530530 Invoke-Program - OutNull msiexec.exe / lvx! $BinaryCache \toolchains\$LogFile / qn / a $BinaryCache \toolchains\WixAttachedContainer\$_ ALLUSERS= 0 TARGETDIR= $TARGETDIR
531531 }
532532
@@ -580,22 +580,22 @@ function Fetch-Dependencies {
580580}
581581
582582function Get-PinnedToolchainTool () {
583- if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Toolchains\0.0.0 +Asserts\usr\bin" ) {
584- return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Toolchains\0.0.0 +Asserts\usr\bin"
583+ if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Toolchains\5.10.1 +Asserts\usr\bin" ) {
584+ return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Toolchains\5.10.1 +Asserts\usr\bin"
585585 }
586586 return " $BinaryCache \toolchains\${PinnedToolchain} \Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin"
587587}
588588
589589function Get-PinnedToolchainSDK () {
590- if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Platforms\0.0.0 \Windows.platform\Developer\SDKs\Windows.sdk" ) {
591- return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Platforms\0.0.0 \Windows.platform\Developer\SDKs\Windows.sdk"
590+ if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Platforms\5.10.1 \Windows.platform\Developer\SDKs\Windows.sdk" ) {
591+ return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Platforms\5.10.1 \Windows.platform\Developer\SDKs\Windows.sdk"
592592 }
593593 return " $BinaryCache \toolchains\${PinnedToolchain} \Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk"
594594}
595595
596596function Get-PinnedToolchainRuntime () {
597- if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Runtimes\0.0.0 \usr\bin\swiftCore.dll" ) {
598- return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Runtimes\0.0.0 \usr\bin"
597+ if (Test-Path " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Runtimes\5.10.1 \usr\bin\swiftCore.dll" ) {
598+ return " $BinaryCache \toolchains\${PinnedToolchain} \LocalApp\Programs\Swift\Runtimes\5.10.1 \usr\bin"
599599 }
600600 return " $BinaryCache \toolchains\${PinnedToolchain} \PFiles64\Swift\runtime-development\usr\bin"
601601}
0 commit comments