diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bootstrap.ps1 | 4 | ||||
| -rw-r--r-- | scripts/findAnyMSBuildWithCppPlatformToolset.ps1 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index f8e6dcaa0..f349dbecd 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param( [ValidateNotNullOrEmpty()][string]$disableMetrics = "0", - [Parameter(Mandatory=$False)][string]$explicitlyRequestedVSPath = "" + [Parameter(Mandatory=$False)][string]$withVSPath = "" ) $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition @@ -39,7 +39,7 @@ if (!(Test-Path $vcpkgSourcesPath)) try { pushd $vcpkgSourcesPath - $msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1 $explicitlyRequestedVSPath + $msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1 $withVSPath $msbuildExe = $msbuildExeWithPlatformToolset[0] $platformToolset = $msbuildExeWithPlatformToolset[1] $windowsSDK = & $scriptsDir\getWindowsSDK.ps1 diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 index d9ffbd32a..e58b58c04 100644 --- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 +++ b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 @@ -1,10 +1,10 @@ [CmdletBinding()] param( [Parameter(Mandatory=$False)] - [string]$explicitlyRequestedVSPath = "" + [string]$withVSPath = "" ) -$explicitlyRequestedVSPath = $explicitlyRequestedVSPath -replace "\\$" # Remove potential trailing backslash +$withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition $VisualStudioInstallationInstances = & $scriptsDir\findVisualStudioInstallationInstances.ps1 @@ -19,7 +19,7 @@ foreach ($instanceCandidateWithEOL in $VisualStudioInstallationInstances) $version = $split[2] $path = $split[3] - if ($explicitlyRequestedVSPath -ne "" -and $explicitlyRequestedVSPath -ne $path) + if ($withVSPath -ne "" -and $withVSPath -ne $path) { Write-Verbose "Skipping: $instanceCandidate" continue |