Skip to content

Commit d43252f

Browse files
Fix CI build 3
1 parent 2ebbf24 commit d43252f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.config/tsaoptions.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"instanceUrl": "https://msazure.visualstudio.com",
33
"TSADocumentation": "https://aka.ms/OBTSA",
44
"projectName": "One",
5-
"areaPath": "One\\MGMT\\Compute\\Powershell\\Powershell\\PowerShell Core\\pwsh",
65
"notificationAliases": [
76
"adityap@microsoft.com",
87
"dongbow@microsoft.com",

build.psm1

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,13 @@ function Start-BuildNativeWindowsBinaries {
288288

289289
# vcvarsall.bat is used to setup environment variables
290290
$vcvarsallbatPath = "$vcPath\vcvarsall.bat"
291-
$vcvarsallbatPathVS2017 = ( Get-ChildItem $alternateVCPath -Filter vcvarsall.bat -Recurse -File -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName)
291+
Write-Verbose -Verbose "vcvarsallbatPath: $vcvarsallbatPath"
292+
293+
if ($alternateVCPath)
294+
{
295+
$vcvarsallbatPathVS2017 = ( Get-ChildItem $alternateVCPath -Filter vcvarsall.bat -Recurse -File -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName)
296+
Write-Vebose -Verbose "vcvarsallbatPathVS2017: $vcvarsallbatPathVS2017"
297+
}
292298

293299
if(Test-Path $vcvarsallbatPathVS2017)
294300
{

0 commit comments

Comments
 (0)