From 7d0bcceaf028f28b0bc5ae666689f26d8de743a9 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 31 Oct 2017 17:06:07 -0700
Subject: [findVSInstances] Data lines are now placed within <sol><eol> tags.
 Text outside these tags is ignored

This means we can print text in powershell now and it won't break vcpkg.
---
 scripts/findAnyMSBuildWithCppPlatformToolset.ps1  | 2 +-
 scripts/findVisualStudioInstallationInstances.ps1 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
index 3269562dc..d9ffbd32a 100644
--- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
+++ b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
@@ -11,7 +11,7 @@ $VisualStudioInstallationInstances = & $scriptsDir\findVisualStudioInstallationI
 Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstallationInstances))"
 foreach ($instanceCandidateWithEOL in $VisualStudioInstallationInstances)
 {
-    $instanceCandidate = $instanceCandidateWithEOL -replace "::<eol>"
+    $instanceCandidate = $instanceCandidateWithEOL -replace "<sol>::" -replace "::<eol>"
     Write-Verbose "Inspecting: $instanceCandidate"
     $split = $instanceCandidate -split "::"
     # $preferenceWeight = $split[0]
diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1
index 566560cdb..5470b57c0 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}::<eol>") > $null
+    $results.Add("<sol>::${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::<eol>"
+        return "<sol>::PreferenceWeight1::Legacy::14.0::$installationPath::<eol>"
     }
 }
 
-- 
cgit v1.2.3