aboutsummaryrefslogtreecommitdiff
path: root/scripts/findVisualStudioInstallationInstances.ps1
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-10-31 17:06:07 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-10-31 17:31:10 -0700
commit7d0bcceaf028f28b0bc5ae666689f26d8de743a9 (patch)
treecead748e9fbc46b20f70a7f634fecc2aaf775c28 /scripts/findVisualStudioInstallationInstances.ps1
parenteb7e1e481bbebc13d277d6a89f0a270767962286 (diff)
downloadvcpkg-7d0bcceaf028f28b0bc5ae666689f26d8de743a9.tar.gz
vcpkg-7d0bcceaf028f28b0bc5ae666689f26d8de743a9.zip
[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.
Diffstat (limited to 'scripts/findVisualStudioInstallationInstances.ps1')
-rw-r--r--scripts/findVisualStudioInstallationInstances.ps14
1 files changed, 2 insertions, 2 deletions
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>"
}
}