diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-05-19 18:07:09 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-05-19 19:23:33 -0700 |
| commit | bc96c069aced70a51a04a5e009f7c7931c488028 (patch) | |
| tree | 5b1be333dce3f3691b7297ead9858ba2742ed785 /scripts | |
| parent | 8549a095a8707c2aa38e9ee1642bef2cf0a90d81 (diff) | |
| download | vcpkg-bc96c069aced70a51a04a5e009f7c7931c488028.tar.gz vcpkg-bc96c069aced70a51a04a5e009f7c7931c488028.zip | |
[bootstrap.ps1] Remove unneeded <sol> <eol>
it was used for communication with vcpkg
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bootstrap.ps1 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 09c138bb3..0427ce2ba 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -7,6 +7,7 @@ Set-StrictMode -Version Latest $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition $vcpkgRootDir = $scriptsDir $withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash + function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName) { if ($object -eq $null) @@ -84,7 +85,7 @@ function getVisualStudioInstances() } # Placed like that for easy sorting according to preference - $results.Add("<sol>::${releaseType}::${installationVersion}::${installationPath}::<eol>") > $null + $results.Add("${releaseType}::${installationVersion}::${installationPath}") > $null } } else @@ -100,7 +101,7 @@ function getVisualStudioInstances() if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat)) { - $results.Add("<sol>::PreferenceWeight1::Legacy::14.0::$installationPath::<eol>") > $null + $results.Add("PreferenceWeight1::Legacy::14.0::$installationPath") > $null } } @@ -110,7 +111,7 @@ function getVisualStudioInstances() if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat)) { - $results.Add("<sol>::PreferenceWeight1::Legacy::14.0::$installationPath::<eol>") > $null + $results.Add("PreferenceWeight1::Legacy::14.0::$installationPath") > $null } $results.Sort() @@ -128,9 +129,8 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath) } Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstances))" - foreach ($instanceCandidateWithEOL in $VisualStudioInstances) + foreach ($instanceCandidate in $VisualStudioInstances) { - $instanceCandidate = $instanceCandidateWithEOL -replace "<sol>::" -replace "::<eol>" Write-Verbose "Inspecting: $instanceCandidate" $split = $instanceCandidate -split "::" # $preferenceWeight = $split[0] |