Skip to content

Commit 81a1a4b

Browse files
committed
Add back the tools changes that were reverted
1 parent 2cb72ab commit 81a1a4b

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

eng/common/tools.ps1

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,19 +547,25 @@ function LocateVisualStudio([object]$vsRequirements = $null){
547547
})
548548
}
549549

550-
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
550+
if (!$vsRequirements) {
551+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
552+
$vsRequirements = $GlobalJson.tools.vs
553+
} else {
554+
$vsRequirements = $null
555+
}
556+
}
551557
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
552558

553559
if (!$excludePrereleaseVS) {
554560
$args += '-prerelease'
555561
}
556562

557-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
563+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
558564
$args += '-version'
559565
$args += $vsRequirements.version
560566
}
561567

562-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
568+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
563569
foreach ($component in $vsRequirements.components) {
564570
$args += '-requires'
565571
$args += $component

0 commit comments

Comments
 (0)