Build: Fix a check to avoid null argument in case 'vcvarsall.bat' is absent (#7218) (#5)

iSazonov · adityapatwardhan · commit 4dfff732e34a · 2018-11-13T15:30:44.000-08:00
diff --git a/build.psm1 b/build.psm1
@@ -261,7 +261,7 @@ function Start-BuildNativeWindowsBinaries {
         $vcvarsallbatPath = $vcvarsallbatPathVS2017
     }
 
-    if ((Test-Path -Path $vcvarsallbatPath) -eq $false) {
+    if ([string]::IsNullOrEmpty($vcvarsallbatPath) -or (Test-Path -Path $vcvarsallbatPath) -eq $false) {
         throw "Could not find Visual Studio vcvarsall.bat at $vcvarsallbatPath. Please ensure the optional feature 'Common Tools for Visual C++' is installed."
     }
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ function Start-BuildNativeWindowsBinaries {`
`261`	`261`	`$vcvarsallbatPath = $vcvarsallbatPathVS2017`
`262`	`262`	`}`
`263`	`263`
`264`		`- if ((Test-Path -Path $vcvarsallbatPath) -eq $false) {`
	`264`	`+ if ([string]::IsNullOrEmpty($vcvarsallbatPath) -or (Test-Path -Path $vcvarsallbatPath) -eq $false) {`
`265`	`265`	`throw "Could not find Visual Studio vcvarsall.bat at $vcvarsallbatPath. Please ensure the optional feature 'Common Tools for Visual C++' is installed."`
`266`	`266`	`}`
`267`	`267`