Skip to content

Commit 1289c96

Browse files
authored
Merge pull request #80092 from compnerd/versioning
utils: version testing frameworks
2 parents 2086df0 + 179dc98 commit 1289c96

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

utils/build.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -2417,7 +2417,7 @@ function Build-XCTest([Platform]$Platform, $Arch) {
24172417
Build-CMakeProject `
24182418
-Src $SourceCache\swift-corelibs-xctest `
24192419
-Bin $(Get-ProjectBinaryCache $Arch XCTest) `
2420-
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform), "Developer", "Library", "XCTest-development", "usr"))" `
2420+
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform), "Developer", "Library", "XCTest-$ProductVersion", "usr"))" `
24212421
-Arch $Arch `
24222422
-Platform $Platform `
24232423
-UseBuiltCompilers Swift `
@@ -2461,7 +2461,7 @@ function Build-Testing([Platform]$Platform, $Arch) {
24612461
Build-CMakeProject `
24622462
-Src $SourceCache\swift-testing `
24632463
-Bin (Get-ProjectBinaryCache $Arch Testing) `
2464-
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform), "Developer", "Library", "Testing-development", "usr"))" `
2464+
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform), "Developer", "Library", "Testing-$ProductVersion", "usr"))" `
24652465
-Arch $Arch `
24662466
-Platform $Platform `
24672467
-UseBuiltCompilers C,CXX,Swift `
@@ -2485,8 +2485,8 @@ function Test-Testing {
24852485
function Write-PlatformInfoPlist([Platform] $Platform) {
24862486
$Settings = @{
24872487
DefaultProperties = @{
2488-
SWIFT_TESTING_VERSION = "development"
2489-
XCTEST_VERSION = "development"
2488+
SWIFT_TESTING_VERSION = "$ProductVersion"
2489+
XCTEST_VERSION = "$ProductVersion"
24902490
}
24912491
}
24922492
if ($Platform -eq [Platform]::Windows) {

0 commit comments

Comments
 (0)