diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-19 19:50:23 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-19 19:57:58 -0700 |
| commit | 50ae9eec872a0802d2450b4ae2d640475d0d7889 (patch) | |
| tree | 21360604e45e37b652ae6c4005f57f7028d735b0 /scripts | |
| parent | 8cefb25bcb7edaedd20d8aa170b2e1b945fd1762 (diff) | |
| download | vcpkg-50ae9eec872a0802d2450b4ae2d640475d0d7889.tar.gz vcpkg-50ae9eec872a0802d2450b4ae2d640475d0d7889.zip | |
Do not depend on newlines when getting output from powershell
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/findAnyMSBuildWithCppPlatformToolset.ps1 | 3 | ||||
| -rw-r--r-- | scripts/findVisualStudioInstallationInstances.ps1 | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 index e9fb60cb2..3269562dc 100644 --- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 +++ b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 @@ -9,8 +9,9 @@ $explicitlyRequestedVSPath = $explicitlyRequestedVSPath -replace "\\$" # Remove $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition $VisualStudioInstallationInstances = & $scriptsDir\findVisualStudioInstallationInstances.ps1 Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstallationInstances))" -foreach ($instanceCandidate in $VisualStudioInstallationInstances) +foreach ($instanceCandidateWithEOL in $VisualStudioInstallationInstances) { + $instanceCandidate = $instanceCandidateWithEOL -replace "::<eol>" Write-Verbose "Inspecting: $instanceCandidate" $split = $instanceCandidate -split "::" # $preferenceWeight = $split[0] diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1 index 8a2adca10..566560cdb 100644 --- a/scripts/findVisualStudioInstallationInstances.ps1 +++ b/scripts/findVisualStudioInstallationInstances.ps1 @@ -29,7 +29,7 @@ foreach ($instance in $asXml.instances.instance) } # Placed like that for easy sorting according to preference - $results.Add("${releaseType}::${installationVersion}::${installationPath}") > $null + $results.Add("${releaseType}::${installationVersion}::${installationPath}::<eol>") > $null } # If nothing is found, attempt to find VS2015 Build Tools (not detected by vswhere.exe) @@ -42,7 +42,7 @@ if ($results.Count -eq 0) if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat)) { - return "PreferenceWeight1::Legacy::14.0::$installationPath" + return "PreferenceWeight1::Legacy::14.0::$installationPath::<eol>" } } |