Skip to content

Commit b608c0d

Browse files
stevapplecompnerd
authored andcommitted
vs2022: use latest MSVC toolset
1 parent a53245a commit b608c0d

File tree

1 file changed

+4
-27
lines changed

1 file changed

+4
-27
lines changed

.ci/vs2022.yml

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,6 @@ stages:
267267
fetchDepth: 1
268268
- checkout: apple/swift-syntax
269269
fetchDepth: 1
270-
- powershell: |
271-
if ("$(arch)" -eq "amd64") {
272-
$ArchComponent = ".x86.x64"
273-
$AtlArchComponent = ""
274-
} else {
275-
$ArchComponent = ".ARM64"
276-
$AtlArchComponent = ".ARM64"
277-
}
278-
$InstallerArguments = "modify --quiet --norestart --productId Microsoft.VisualStudio.Product.Enterprise --channelId VisualStudio.17.Release --add Microsoft.VisualStudio.Component.VC.14.31.17.1$ArchComponent --add Microsoft.VisualStudio.Component.VC.14.31.17.1.ATL$AtlArchComponent"
279-
Start-Process -FilePath "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vs_installer.exe" -Wait -ArgumentList $InstallerArguments
280270
- script: |
281271
SET vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
282272
FOR /f "usebackq delims=" %%i IN (`%vswhere% -latest -property installationPath`) DO (
@@ -290,7 +280,7 @@ stages:
290280
- task: BatchScript@1
291281
inputs:
292282
filename: $(VsDevCmd)
293-
arguments: -no_logo -arch=$(arch) -host_arch=amd64 -vcvars_ver=14.31
283+
arguments: -no_logo -arch=$(arch) -host_arch=amd64
294284
modifyEnvironment: true
295285
- task: UsePythonVersion@0
296286
inputs:
@@ -411,9 +401,6 @@ stages:
411401
fetchDepth: 1
412402
- script: |
413403
copy $(Build.SourcesDirectory)\swift-installer-scripts\shared\ICU\CMakeLists.txt $(Build.SourcesDirectory)\icu\icu4c\CMakeLists.txt
414-
- powershell: |
415-
$InstallerArguments = "modify --quiet --norestart --productId Microsoft.VisualStudio.Product.Enterprise --channelId VisualStudio.17.Release --add Microsoft.VisualStudio.Component.VC.14.31.17.1.x86.x64 --add Microsoft.VisualStudio.Component.VC.14.31.17.1.ARM64 --add Microsoft.VisualStudio.Component.VC.14.31.17.1.ATL --add Microsoft.VisualStudio.Component.VC.14.31.17.1.ATL.ARM64"
416-
Start-Process -FilePath "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vs_installer.exe" -Wait -ArgumentList $InstallerArguments
417404
- script: |
418405
SET vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
419406
FOR /f "usebackq delims=" %%i IN (`%vswhere% -latest -property installationPath`) DO (
@@ -427,7 +414,7 @@ stages:
427414
- task: BatchScript@1
428415
inputs:
429416
filename: $(VsDevCmd)
430-
arguments: -no_logo -arch=amd64 -host_arch=amd64 -vcvars_ver=14.31
417+
arguments: -no_logo -arch=amd64 -host_arch=amd64
431418
modifyEnvironment: true
432419
condition: eq(variables['BUILD_TOOLS'], 'NO')
433420
- task: CMake@1
@@ -454,7 +441,7 @@ stages:
454441
- task: BatchScript@1
455442
inputs:
456443
filename: $(VsDevCmd)
457-
arguments: -no_logo -arch=$(arch) -host_arch=amd64 -vcvars_ver=14.31
444+
arguments: -no_logo -arch=$(arch) -host_arch=amd64
458445
modifyEnvironment: true
459446
- task: CMake@1
460447
inputs:
@@ -820,16 +807,6 @@ stages:
820807
fetchDepth: 1
821808
- checkout: apple/swift-syntax
822809
fetchDepth: 1
823-
- powershell: |
824-
if ("$(arch)" -eq "amd64" -Or "$(arch)" -eq "x86") {
825-
$ArchComponent = ".x86.x64"
826-
$AtlArchComponent = ""
827-
} else {
828-
$ArchComponent = ".ARM64"
829-
$AtlArchComponent = ".ARM64"
830-
}
831-
$InstallerArguments = "modify --quiet --norestart --productId Microsoft.VisualStudio.Product.Enterprise --channelId VisualStudio.17.Release --add Microsoft.VisualStudio.Component.VC.14.31.17.1$ArchComponent --add Microsoft.VisualStudio.Component.VC.14.31.17.1.ATL$AtlArchComponent"
832-
Start-Process -FilePath "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vs_installer.exe" -Wait -ArgumentList $InstallerArguments
833810
- script: |
834811
SET vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
835812
FOR /f "usebackq delims=" %%i IN (`%vswhere% -latest -property installationPath`) DO (
@@ -843,7 +820,7 @@ stages:
843820
- task: BatchScript@1
844821
inputs:
845822
filename: $(VsDevCmd)
846-
arguments: -no_logo -arch=$(arch) -host_arch=amd64 -vcvars_ver=14.31
823+
arguments: -no_logo -arch=$(arch) -host_arch=amd64
847824
modifyEnvironment: true
848825
- task: PowerShell@2
849826
inputs:

0 commit comments

Comments
 (0)