Skip to content

Commit ab7394f

Browse files
[ci]Proper workaround for the vc tools version check (#37130)
* Revert "[ci]Remove vc tools version workaround (#37098)" This reverts commit 2c069ce. * Adopt the same workaround as in Terminal
1 parent fd28080 commit ab7394f

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

.pipelines/v2/templates/job-build-project.yml

+7
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,13 @@ jobs:
204204
- ${{ if eq(parameters.useLatestWinAppSDK, false)}}:
205205
- template: .\steps-restore-nuget.yml
206206

207+
- pwsh: |-
208+
& "$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1"
209+
displayName: Work around DD-1541167 (VCToolsVersion)
210+
${{ if eq(parameters.useVSPreview, true) }}:
211+
env:
212+
VCWhereExtraVersionTarget: '-prerelease'
213+
207214
- pwsh: |-
208215
& "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
209216
displayName: Download and install WiX 3.14 development build
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
$VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
2+
$VSPackages = $VSInstances.instances.instance.packages.package
3+
$LatestVCPackage = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
4+
$LatestVCToolsVersion = $LatestVCPackage.version;
5+
Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
6+
Write-Output "Updating VCToolsVersion environment variable for job"
7+
Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"

0 commit comments

Comments
 (0)