aboutsummaryrefslogtreecommitdiff
path: root/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
diff options
context:
space:
mode:
authorBarath Kannan <barathsotd@gmail.com>2017-11-06 00:33:04 +1100
committerBarath Kannan <barathsotd@gmail.com>2017-11-06 00:33:04 +1100
commitb959f70a9969551a132d691fbd12046d5ea0702e (patch)
treed15d129bd480b1ba173322a0e50140ccf1ff487a /scripts/findAnyMSBuildWithCppPlatformToolset.ps1
parent3a5b383bbec74dbaf0f1056e1a5d315e43d79375 (diff)
parent330b8d8bab6a3d07165bf7c05fea09a8e0d56348 (diff)
downloadvcpkg-b959f70a9969551a132d691fbd12046d5ea0702e.tar.gz
vcpkg-b959f70a9969551a132d691fbd12046d5ea0702e.zip
merge from master
Diffstat (limited to 'scripts/findAnyMSBuildWithCppPlatformToolset.ps1')
-rw-r--r--scripts/findAnyMSBuildWithCppPlatformToolset.ps13
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
index e9fb60cb2..d9ffbd32a 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 "<sol>::" -replace "::<eol>"
Write-Verbose "Inspecting: $instanceCandidate"
$split = $instanceCandidate -split "::"
# $preferenceWeight = $split[0]