diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-31 17:23:09 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-31 17:31:10 -0700 |
| commit | 47bf4b6b5caf44adeaf582e5137377fb9d2cc5c4 (patch) | |
| tree | 2b1436d357bf18cfbdd47429365125965ac03d0b /scripts | |
| parent | 7d0bcceaf028f28b0bc5ae666689f26d8de743a9 (diff) | |
| download | vcpkg-47bf4b6b5caf44adeaf582e5137377fb9d2cc5c4.tar.gz vcpkg-47bf4b6b5caf44adeaf582e5137377fb9d2cc5c4.zip | |
[fetchDependency] Now also returns output in the form <sol>data<eol>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fetchDependency.ps1 | 4 | ||||
| -rw-r--r-- | scripts/findVisualStudioInstallationInstances.ps1 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index 6cd28ad8e..aec05457a 100644 --- a/scripts/fetchDependency.ps1 +++ b/scripts/fetchDependency.ps1 @@ -265,6 +265,6 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) return $executableFromDownload } -SelectProgram $Dependency - +$path = SelectProgram $Dependency Write-Verbose "Fetching dependency: $Dependency. Done." +return "<sol>::$path::<eol>" diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1 index 5470b57c0..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 |