Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425

1 files changed, 0 insertions, 58 deletions

diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
deleted file mode 100644
index d7fd24e24..000000000
--- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
+++ /dev/null
@@ -1,58 +0,0 @@
-[CmdletBinding()]
-param(
-    [Parameter(Mandatory=$False)]
-    [string]$withVSPath = ""
-)
-
-Set-StrictMode -Version Latest
-$scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
-
-$withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash
-
-$VisualStudioInstallationInstances = & $scriptsDir\findVisualStudioInstallationInstances.ps1
-if ($VisualStudioInstallationInstances -eq $null)
-{
-    throw "Could not find Visual Studio. VS2015 or VS2017 (with C++) needs to be installed."
-}
-
-Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstallationInstances))"
-foreach ($instanceCandidateWithEOL in $VisualStudioInstallationInstances)
-{
-    $instanceCandidate = $instanceCandidateWithEOL -replace "<sol>::" -replace "::<eol>"
-    Write-Verbose "Inspecting: $instanceCandidate"
-    $split = $instanceCandidate -split "::"
-    # $preferenceWeight = $split[0]
-    # $releaseType = $split[1]
-    $version = $split[2]
-    $path = $split[3]
-
-    if ($withVSPath -ne "" -and $withVSPath -ne $path)
-    {
-        Write-Verbose "Skipping: $instanceCandidate"
-        continue
-    }
-
-    $majorVersion = $version.Substring(0,2);
-    if ($majorVersion -eq "15")
-    {
-        $VCFolder= "$path\VC\Tools\MSVC\"
-        if (Test-Path $VCFolder)
-        {
-            Write-Verbose "Picking: $instanceCandidate"
-            return "$path\MSBuild\15.0\Bin\MSBuild.exe", "v141"
-        }
-    }
-
-    if ($majorVersion -eq "14")
-    {
-        $clExe= "$path\VC\bin\cl.exe"
-        if (Test-Path $clExe)
-        {
-            Write-Verbose "Picking: $instanceCandidate"
-            $programFilesPath = & $scriptsDir\getProgramFiles32bit.ps1
-            return "$programFilesPath\MSBuild\14.0\Bin\MSBuild.exe", "v140"
-        }
-    }
-}
-
-throw "Could not find MSBuild version with C++ support. VS2015 or VS2017 (with C++) needs to be installed."
\ No newline at end of file