@@ -267,16 +267,6 @@ stages:
267
267
fetchDepth : 1
268
268
- checkout : apple/swift-syntax
269
269
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
280
270
- script : |
281
271
SET vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
282
272
FOR /f "usebackq delims=" %%i IN (`%vswhere% -latest -property installationPath`) DO (
@@ -290,7 +280,7 @@ stages:
290
280
- task : BatchScript@1
291
281
inputs :
292
282
filename : $(VsDevCmd)
293
- arguments : -no_logo -arch=$(arch) -host_arch=amd64 -vcvars_ver=14.31
283
+ arguments : -no_logo -arch=$(arch) -host_arch=amd64
294
284
modifyEnvironment : true
295
285
- task : UsePythonVersion@0
296
286
inputs :
@@ -411,9 +401,6 @@ stages:
411
401
fetchDepth : 1
412
402
- script : |
413
403
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
417
404
- script : |
418
405
SET vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
419
406
FOR /f "usebackq delims=" %%i IN (`%vswhere% -latest -property installationPath`) DO (
@@ -427,7 +414,7 @@ stages:
427
414
- task : BatchScript@1
428
415
inputs :
429
416
filename : $(VsDevCmd)
430
- arguments : -no_logo -arch=amd64 -host_arch=amd64 -vcvars_ver=14.31
417
+ arguments : -no_logo -arch=amd64 -host_arch=amd64
431
418
modifyEnvironment : true
432
419
condition : eq(variables['BUILD_TOOLS'], 'NO')
433
420
- task : CMake@1
@@ -454,7 +441,7 @@ stages:
454
441
- task : BatchScript@1
455
442
inputs :
456
443
filename : $(VsDevCmd)
457
- arguments : -no_logo -arch=$(arch) -host_arch=amd64 -vcvars_ver=14.31
444
+ arguments : -no_logo -arch=$(arch) -host_arch=amd64
458
445
modifyEnvironment : true
459
446
- task : CMake@1
460
447
inputs :
@@ -820,16 +807,6 @@ stages:
820
807
fetchDepth : 1
821
808
- checkout : apple/swift-syntax
822
809
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
833
810
- script : |
834
811
SET vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
835
812
FOR /f "usebackq delims=" %%i IN (`%vswhere% -latest -property installationPath`) DO (
@@ -843,7 +820,7 @@ stages:
843
820
- task : BatchScript@1
844
821
inputs :
845
822
filename : $(VsDevCmd)
846
- arguments : -no_logo -arch=$(arch) -host_arch=amd64 -vcvars_ver=14.31
823
+ arguments : -no_logo -arch=$(arch) -host_arch=amd64
847
824
modifyEnvironment : true
848
825
- task : PowerShell@2
849
826
inputs :
0 commit comments