merge from master

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1
index 8a2adca10..e3bc67ff6 100644
--- a/scripts/findVisualStudioInstallationInstances.ps1
+++ b/scripts/findVisualStudioInstallationInstances.ps1
@@ -4,7 +4,7 @@ param(
 )
 
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
-$vswhereExe = & $scriptsDir\fetchDependency.ps1 "vswhere"
+$vswhereExe = (& $scriptsDir\fetchDependency.ps1 "vswhere") -replace "<sol>::" -replace "::<eol>"
 
 $output = & $vswhereExe -prerelease -legacy -products * -format xml
 [xml]$asXml = $output
@@ -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("<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"
+        return "<sol>::PreferenceWeight1::Legacy::14.0::$installationPath::<eol>"
     }
 }