Skip to content

Commit 0fa6eee

Browse files
authored
Repair livetest (Azure#37590)
* fix livetest targeting * remove extra parameter
1 parent 2baa02a commit 0fa6eee

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

eng/pipelines/templates/steps/resolve-package-targeting.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,19 @@ steps:
2121
$setting = "$(BuildTargetingString)"
2222
}
2323
else {
24-
if ("${{ parameters.IncludeIndirect }}" -eq "true") {
25-
$packageProperties = Get-ChildItem -Recurse -Force "${{ parameters.PackagePropertiesFolder }}/*.json" `
24+
if (Test-Path "${{ parameters.PackagePropertiesFolder }}") {
25+
if ("${{ parameters.IncludeIndirect }}" -eq "true") {
26+
$packageProperties = Get-ChildItem -Recurse -Force "${{ parameters.PackagePropertiesFolder }}/*.json" `
27+
| ForEach-Object { $_.Name.Replace(".json", "") }
28+
}
29+
else {
30+
$packageProperties = Get-ChildItem -Recurse -Force "${{ parameters.PackagePropertiesFolder }}/*.json" `
31+
| Where-Object { (Get-Content -Raw $_ | ConvertFrom-Json).IncludedForValidation -eq $false } `
2632
| ForEach-Object { $_.Name.Replace(".json", "") }
27-
}
28-
else {
29-
$packageProperties = Get-ChildItem -Recurse -Force "${{ parameters.PackagePropertiesFolder }}/*.json" `
30-
| Where-Object { (Get-Content -Raw $_ | ConvertFrom-Json).IncludedForValidation -eq $false } `
31-
| ForEach-Object { $_.Name.Replace(".json", "") }
32-
}
33+
}
3334
34-
$setting = $packageProperties -join ","
35+
$setting = $packageProperties -join ","
36+
}
3537
}
3638
3739
Write-Host "##vso[task.setvariable variable=TargetingString;]$setting"

0 commit comments

Comments
 (0)