[vcpkg] Download vcpkg.exe rather than building it in bootstrap on Windows. (#15474)

This reduces bootstrap cost for Windows customers, resolving the issue initially submitted as #12502 .

The `toolsrc` tree was extracted to https://github.com/microsoft/vcpkg-tool. `bootstrap.sh` was changed to download the right source tarball, extract, and build it. This was chosen over the previous attempt, a submodule, over concerns of accidentally destroying people's local modifications.

50 files changed, 45 insertions, 2466 deletions

diff --git a/scripts/Generate-SpdxLicenseList.ps1 b/scripts/Generate-SpdxLicenseList.ps1
deleted file mode 100644
index 8af5fd4de..000000000
--- a/scripts/Generate-SpdxLicenseList.ps1
+++ /dev/null
@@ -1,63 +0,0 @@
-<#
-#>
-[CmdletBinding(PositionalBinding=$False)]
-Param(
-    [Parameter(Mandatory=$True)]
-    [string]$Commit,
-
-    [Parameter()]
-    [string]$GithubRepository = "spdx/license-list-data",
-
-    [Parameter()]
-    [string]$LicensesOutFile = "$PSScriptRoot/../toolsrc/src/vcpkg/spdx-licenses.inc",
-
-    [Parameter()]
-    [string]$ExceptionsOutFile = "$PSScriptRoot/../toolsrc/src/vcpkg/spdx-exceptions.inc"
-)
-
-function Transform-JsonFile {
-    [CmdletBinding()]
-    Param(
-        [string]$Uri,
-        [string]$OutFile,
-        [string]$OuterName,
-        [string]$Id
-    )
-
-    $req = Invoke-WebRequest -Uri $Uri
-
-    if ($req.StatusCode -ne 200)
-    {
-        Write-Error "Failed to GET $Uri"
-        throw
-    }
-
-    $json = $req.Content | ConvertFrom-Json -Depth 10
-    Write-Verbose "Writing output to $OutFile"
-
-    $fileContent = @(
-        "// Data downloaded from $Uri",
-        "// Generated by scripts/Generate-SpdxLicenseList.ps1",
-        "{")
-    $json.$OuterName | ForEach-Object {
-        $fileContent += "    `"$($_.$Id)`","
-    }
-    $fileContent += "}"
-
-    $fileContent -join "`n" | Out-File -FilePath $OutFile -Encoding 'utf8'
-}
-
-$baseUrl = "https://raw.githubusercontent.com/$GithubRepository/$Commit/json"
-Write-Verbose "Getting json files from $baseUrl"
-
-Transform-JsonFile `
-    -Uri "$baseUrl/licenses.json" `
-    -OutFile $LicensesOutFile `
-    -OuterName 'licenses' `
-    -Id 'licenseId'
-
-Transform-JsonFile `
-    -Uri "$baseUrl/exceptions.json" `
-    -OutFile $ExceptionsOutFile `
-    -OuterName 'exceptions' `
-    -Id 'licenseExceptionId'
diff --git a/scripts/azure-pipelines/Create-FormatDiff.ps1 b/scripts/azure-pipelines/Create-PRDiff.ps1
index 599118089..599118089 100644
--- a/scripts/azure-pipelines/Create-FormatDiff.ps1
+++ b/scripts/azure-pipelines/Create-PRDiff.ps1
diff --git a/scripts/azure-pipelines/Format-CxxCode.ps1 b/scripts/azure-pipelines/Format-CxxCode.ps1
deleted file mode 100644
index 2653562a7..000000000
--- a/scripts/azure-pipelines/Format-CxxCode.ps1
+++ /dev/null
@@ -1,50 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory=$True)]
-    [string]$Root
-)
-
-$Root = Resolve-Path -LiteralPath $Root
-
-$clangFormat = Get-Command 'clang-format' -ErrorAction 'SilentlyContinue'
-if ($null -ne $clangFormat)
-{
-    $clangFormat = $clangFormat.Source
-}
-
-if ($IsWindows)
-{
-    if ([String]::IsNullOrEmpty($clangFormat) -or -not (Test-Path $clangFormat))
-    {
-        $clangFormat = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin\clang-format.exe'
-    }
-    if (-not (Test-Path $clangFormat))
-    {
-        $clangFormat = 'C:\Program Files\LLVM\bin\clang-format.exe'
-    }
-}
-
-if ([String]::IsNullOrEmpty($clangFormat) -or -not (Test-Path $clangFormat))
-{
-    Write-Error 'clang-format not found; is it installed?'
-    throw
-}
-
-$toolsrc = Get-Item "$Root/toolsrc"
-Push-Location $toolsrc
-
-try
-{
-    $files = Get-ChildItem -Recurse -LiteralPath "$toolsrc/src" -Filter '*.cpp'
-    $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/src" -Filter '*.c'
-    $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/include/vcpkg" -Filter '*.h'
-    $files += Get-ChildItem -Recurse -LiteralPath "$toolsrc/include/vcpkg-test" -Filter '*.h'
-    $files += Get-Item "$toolsrc/include/pch.h"
-    $fileNames = $files.FullName
-
-    & $clangFormat -style=file -i @fileNames
-}
-finally
-{
-    Pop-Location
-}
diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 7fce6a5c1..27db6a93d 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -21,30 +21,24 @@ stages:
       value: $(Build.ArtifactStagingDirectory)\format.diff

     steps:

     - task: Powershell@2

-      displayName: 'Format C++'

-      inputs:

-        filePath: 'scripts/azure-pipelines/Format-CxxCode.ps1'

-        arguments: '-Root .'

-        pwsh: true

-    - task: Powershell@2

       displayName: 'Generate Documentation'

       inputs:

         filePath: 'docs/regenerate.ps1'

         arguments: '-VcpkgRoot . -WarningAction Stop'

         pwsh: true

     - script: .\bootstrap-vcpkg.bat

-      displayName: 'Build vcpkg'

-    - script: '.\vcpkg format-manifest --all'

+      displayName: 'Bootstrap vcpkg'

+    - script: '.\vcpkg.exe format-manifest --all'

       displayName: 'Format Manifests'

     - task: Powershell@2

       displayName: 'Create Diff'

       inputs:

-        filePath: scripts/azure-pipelines/Create-FormatDiff.ps1

+        filePath: scripts/azure-pipelines/Create-PRDiff.ps1

         arguments: '-DiffFile $(DiffFile)'

         pwsh: true

     - task: PublishBuildArtifacts@1

       condition: failed()

-      displayName: 'Publish C++ Diff'

+      displayName: 'Publish Format and Documentation Diff'

       inputs:

         PathtoPublish: '$(DiffFile)'

         ArtifactName: 'format.diff'

diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1
deleted file mode 100644
index 704b52752..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/backcompat-helpers.ps1
+++ /dev/null
@@ -1,24 +0,0 @@
-. $PSScriptRoot/../end-to-end-tests-prelude.ps1

-

-# Test that prohibiting backcompat features actually prohibits

-$backcompatFeaturePorts = @('vcpkg-uses-test-cmake', 'vcpkg-uses-vcpkg-common-functions')

-foreach ($backcompatFeaturePort in $backcompatFeaturePorts) {

-    $succeedArgs = $commonArgs + @('install',$backcompatFeaturePort,'--no-binarycaching')

-    $failArgs = $succeedArgs + @('--x-prohibit-backcompat-features')

-    $CurrentTest = "Should fail: ./vcpkg $($failArgs -join ' ')"

-    Run-Vcpkg @failArgs

-    if ($LastExitCode -ne 0) {

-        Write-Host "... failed (this is good!)."

-    } else {

-        throw $CurrentTest

-    }

-

-    # Install failed when prohibiting backcompat features, so it should succeed if we allow them

-    $CurrentTest = "Should succeeed: ./vcpkg $($succeedArgs -join ' ')"

-    Run-Vcpkg @succeedArgs

-    if ($LastExitCode -ne 0) {

-        throw $CurrentTest

-    } else {

-        Write-Host "... succeeded."

-    }

-}

diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1
deleted file mode 100644
index e4ee6e698..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/binarycaching.ps1
+++ /dev/null
@@ -1,86 +0,0 @@
-if ($IsLinux) {

-    # The tests below need a mono installation not currently available on the Linux agents.

-    return

-}

-

-. $PSScriptRoot/../end-to-end-tests-prelude.ps1

-

-# Test simple installation

-Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--binarycaching", "--x-binarysource=clear;files,$ArchiveRoot,write;nuget,$NuGetRoot,readwrite"))

-Throw-IfFailed

-Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

-

-# Test simple removal

-Run-Vcpkg -TestArgs ($commonArgs + @("remove", "rapidjson"))

-Throw-IfFailed

-Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

-

-# Test restoring from files archive

-Remove-Item -Recurse -Force $installRoot

-Remove-Item -Recurse -Force $buildtreesRoot

-Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read"))

-Throw-IfFailed

-Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

-Require-FileNotExists "$buildtreesRoot/rapidjson/src"

-Require-FileExists "$buildtreesRoot/detect_compiler"

-

-# Test --no-binarycaching

-Remove-Item -Recurse -Force $installRoot

-Remove-Item -Recurse -Force $buildtreesRoot

-Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--no-binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read"))

-Throw-IfFailed

-Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

-Require-FileExists "$buildtreesRoot/rapidjson/src"

-Require-FileExists "$buildtreesRoot/detect_compiler"

-

-# Test --editable

-Remove-Item -Recurse -Force $installRoot

-Remove-Item -Recurse -Force $buildtreesRoot

-Run-Vcpkg -TestArgs ($commonArgs + @("install","rapidjson","--editable","--x-binarysource=clear;files,$ArchiveRoot,read"))

-Throw-IfFailed

-Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

-Require-FileExists "$buildtreesRoot/rapidjson/src"

-Require-FileNotExists "$buildtreesRoot/detect_compiler"

-

-# Test restoring from nuget

-Remove-Item -Recurse -Force $installRoot

-Remove-Item -Recurse -Force $buildtreesRoot

-Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--binarycaching", "--x-binarysource=clear;nuget,$NuGetRoot"))

-Throw-IfFailed

-Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

-Require-FileNotExists "$buildtreesRoot/rapidjson/src"

-

-# Test four-phase flow

-Remove-Item -Recurse -Force $installRoot -ErrorAction SilentlyContinue

-Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--dry-run", "--x-write-nuget-packages-config=$TestingRoot/packages.config"))

-Throw-IfFailed

-Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

-Require-FileNotExists "$buildtreesRoot/rapidjson/src"

-Require-FileExists "$TestingRoot/packages.config"

-if ($IsLinux -or $IsMacOS) {

-    mono $(./vcpkg fetch nuget) restore $TestingRoot/packages.config -OutputDirectory "$NuGetRoot2" -Source "$NuGetRoot"

-} else {

-    & $(./vcpkg fetch nuget) restore $TestingRoot/packages.config -OutputDirectory "$NuGetRoot2" -Source "$NuGetRoot"

-}

-Throw-IfFailed

-Remove-Item -Recurse -Force $NuGetRoot -ErrorAction SilentlyContinue

-mkdir $NuGetRoot

-Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "tinyxml", "--binarycaching", "--x-binarysource=clear;nuget,$NuGetRoot2;nuget,$NuGetRoot,write"))

-Throw-IfFailed

-Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

-Require-FileExists "$installRoot/$Triplet/include/tinyxml.h"

-Require-FileNotExists "$buildtreesRoot/rapidjson/src"

-Require-FileExists "$buildtreesRoot/tinyxml/src"

-if ((Get-ChildItem $NuGetRoot -Filter '*.nupkg' | Measure-Object).Count -ne 1) {

-    throw "In '$CurrentTest': did not create exactly 1 NuGet package"

-}

-

-# Test export

-$CurrentTest = 'Exporting'

-Require-FileNotExists "$TestingRoot/vcpkg-export-output"

-Require-FileNotExists "$TestingRoot/vcpkg-export.1.0.0.nupkg"

-Require-FileNotExists "$TestingRoot/vcpkg-export-output.zip"

-Run-Vcpkg -TestArgs ($commonArgs + @("export", "rapidjson", "tinyxml", "--nuget", "--nuget-id=vcpkg-export", "--nuget-version=1.0.0", "--output=vcpkg-export-output", "--raw", "--zip", "--output-dir=$TestingRoot"))

-Require-FileExists "$TestingRoot/vcpkg-export-output"

-Require-FileExists "$TestingRoot/vcpkg-export.1.0.0.nupkg"

-Require-FileExists "$TestingRoot/vcpkg-export-output.zip"

diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1
deleted file mode 100644
index 5f318e6af..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/build-missing.ps1
+++ /dev/null
@@ -1,18 +0,0 @@
-. $PSScriptRoot/../end-to-end-tests-prelude.ps1

-

-$CurrentTest = "Build Missing tests"

-

-Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--only-binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read"))

-Throw-IfNotFailed

-Require-FileNotExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

-

-# Create the rapidjson archive

-Remove-Item -Recurse -Force $installRoot

-Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson","--x-binarysource=clear;files,$ArchiveRoot,write"))

-Throw-IfFailed

-Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

-

-Remove-Item -Recurse -Force $installRoot

-Run-Vcpkg -TestArgs ($commonArgs + @("install", "rapidjson", "--only-binarycaching","--x-binarysource=clear;files,$ArchiveRoot,read"))

-Throw-IfFailed

-Require-FileExists "$installRoot/$Triplet/include/rapidjson/rapidjson.h"

diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1
deleted file mode 100644
index 47f624fa8..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/cli.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-. $PSScriptRoot/../end-to-end-tests-prelude.ps1

-

-# Test bad command lines

-Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--vcpkg-rootttttt", "C:\"))

-Throw-IfNotFailed

-

-Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--vcpkg-rootttttt=C:\"))

-Throw-IfNotFailed

-

-Run-Vcpkg -TestArgs ($commonArgs + @("install", "zlib", "--fast")) # NB: --fast is not a switch

-Throw-IfNotFailed

diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1
deleted file mode 100644
index 9d59da539..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/create.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-. $PSScriptRoot/../end-to-end-tests-prelude.ps1

-

-# Test vcpkg create

-$Script:CurrentTest = "create zlib"

-Write-Host $Script:CurrentTest

-./vcpkg --x-builtin-ports-root=$TestingRoot/ports create zlib https://github.com/madler/zlib/archive/v1.2.11.tar.gz zlib-1.2.11.tar.gz

-Throw-IfFailed

-

-Require-FileExists "$TestingRoot/ports/zlib/portfile.cmake"

-Require-FileExists "$TestingRoot/ports/zlib/vcpkg.json"

diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1
deleted file mode 100644
index 5ad7616b4..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1
+++ /dev/null
@@ -1,67 +0,0 @@
-. $PSScriptRoot/../end-to-end-tests-prelude.ps1

-

-# Test that metrics are on by default

-$metricsTagName = 'vcpkg.disable-metrics'

-$metricsAreDisabledMessage = 'Warning: passed --sendmetrics, but metrics are disabled.'

-

-function Test-Metrics-Enabled() {

-    Param(

-        [Parameter(ValueFromRemainingArguments)]

-        [string[]]$TestArgs

-    )

-

-    $actualArgs = @('version', '--sendmetrics')

-    if ($TestArgs.Length -ne 0) {

-        $actualArgs += $TestArgs

-    }

-

-    $vcpkgOutput = Run-Vcpkg $actualArgs

-    if ($vcpkgOutput -contains $metricsAreDisabledMessage) {

-        Write-Host 'Metrics are disabled'

-        return $false

-    }

-

-    Write-Host 'Metrics are enabled'

-    return $true

-}

-

-# By default, metrics are enabled.

-Require-FileNotExists $metricsTagName

-if (-Not (Test-Metrics-Enabled)) {

-    throw "Metrics were not on by default."

-}

-

-if (Test-Metrics-Enabled '--disable-metrics') {

-    throw "Metrics were not disabled by switch."

-}

-

-$env:VCPKG_DISABLE_METRICS = 'ON'

-try {

-    if (Test-Metrics-Enabled) {

-        throw "Environment variable did not disable metrics."

-    }

-

-    # Also test that you get no message without --sendmetrics

-    $vcpkgOutput = Run-Vcpkg list

-    if ($vcpkgOutput -contains $metricsAreDisabledMessage) {

-        throw "Disabled metrics emit message even without --sendmetrics"

-    }

-

-    if (-Not (Test-Metrics-Enabled '--no-disable-metrics')) {

-        throw "Environment variable to disable metrics could not be overridden by switch."

-    }

-} finally {

-    Remove-Item env:VCPKG_DISABLE_METRICS

-}

-

-# If the disable-metrics tag file exists, metrics are disabled even if attempted to be enabled on

-# the command line.

-Set-Content -Path $metricsTagName -Value ""

-try {

-    if (Test-Metrics-Enabled '--disable-metrics') {

-        throw "Metrics were not force-disabled by the disable-metrics tag file."

-    }

-}

-finally {

-    Remove-Item $metricsTagName

-}

diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1
deleted file mode 100644
index 6de1335d7..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/env-passthrough.ps1
+++ /dev/null
@@ -1,21 +0,0 @@
-if (-not $IsLinux -and -not $IsMacOS) {

-    . $PSScriptRoot/../end-to-end-tests-prelude.ps1

-

-    $env:_VCPKG_TEST_TRACKED = "a"

-    $env:_VCPKG_TEST_UNTRACKED = "b"

-

-    $x = ./vcpkg "--overlay-triplets=$PSScriptRoot/../../testing/env-passthrough" env "echo %_VCPKG_TEST_TRACKED% %_VCPKG_TEST_TRACKED2% %_VCPKG_TEST_UNTRACKED% %_VCPKG_TEST_UNTRACKED2%"

-    if ($x -ne "%_VCPKG_TEST_TRACKED% %_VCPKG_TEST_TRACKED2% %_VCPKG_TEST_UNTRACKED% %_VCPKG_TEST_UNTRACKED2%")

-    {

-        throw "env should have cleaned the environment ($x)"

-    }

-

-    $y = ./vcpkg "--overlay-triplets=$PSScriptRoot/../../testing/env-passthrough" env --triplet passthrough "echo %_VCPKG_TEST_TRACKED% %_VCPKG_TEST_TRACKED2% %_VCPKG_TEST_UNTRACKED% %_VCPKG_TEST_UNTRACKED2%"

-    if ($y -ne "a %_VCPKG_TEST_TRACKED2% b %_VCPKG_TEST_UNTRACKED2%")

-    {

-        throw "env should have kept the environment ($y)"

-    }

-

-    rm env:_VCPKG_TEST_TRACKED

-    rm env:_VCPKG_TEST_UNTRACKED

-}
\ No newline at end of file
diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1
deleted file mode 100644
index 38362ba8c..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/integrate-install.ps1
+++ /dev/null
@@ -1,28 +0,0 @@
-if (-not $IsLinux -and -not $IsMacOS) {

-    . $PSScriptRoot/../end-to-end-tests-prelude.ps1

-

-    # Test msbuild props and targets

-    $Script:CurrentTest = "zlib:x86-windows-static msbuild scripts\testing\integrate-install\..."

-    Write-Host $Script:CurrentTest

-    ./vcpkg $commonArgs install zlib:x86-windows-static --x-binarysource=clear

-    Throw-IfFailed

-    foreach ($project in @("VcpkgTriplet", "VcpkgTriplet2", "VcpkgUseStatic", "VcpkgUseStatic2")) {

-        $Script:CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj"

-        ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ "

-        Throw-IfFailed

-        Remove-Item -Recurse -Force $TestingRoot\int

-        Remove-Item -Recurse -Force $TestingRoot\out

-    }

-    $Script:CurrentTest = "zlib:x86-windows msbuild scripts\testing\integrate-install\..."

-    Write-Host $Script:CurrentTest

-    ./vcpkg $commonArgs install zlib:x86-windows --x-binarysource=clear

-    Throw-IfFailed

-    foreach ($project in @("Project1", "NoProps")) {

-        $Script:CurrentTest = "msbuild scripts\testing\integrate-install\$project.vcxproj"

-        Write-Host $Script:CurrentTest

-        ./vcpkg $commonArgs env "msbuild scripts\testing\integrate-install\$project.vcxproj /p:VcpkgRoot=$TestingRoot /p:IntDir=$TestingRoot\int\ /p:OutDir=$TestingRoot\out\ "

-        Throw-IfFailed

-        Remove-Item -Recurse -Force $TestingRoot\int

-        Remove-Item -Recurse -Force $TestingRoot\out

-    }

-}

diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1
deleted file mode 100644
index bdeeb0a15..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1
+++ /dev/null
@@ -1,192 +0,0 @@
-. "$PSScriptRoot/../end-to-end-tests-prelude.ps1"
-
-
-$builtinRegistryArgs = $commonArgs + @("--x-builtin-registry-versions-dir=$PSScriptRoot/../../e2e_ports/versions")
-
-Run-Vcpkg install @builtinRegistryArgs 'vcpkg-internal-e2e-test-port'
-Throw-IfNotFailed
-
-# We should not look into the versions directory unless we have a baseline,
-# even if we pass the registries feature flag
-Run-Vcpkg install @builtinRegistryArgs --feature-flags=registries 'vcpkg-internal-e2e-test-port'
-Throw-IfNotFailed
-
-Run-Vcpkg install @builtinRegistryArgs --feature-flags=registries 'zlib'
-Throw-IfFailed
-
-Write-Trace "Test git and filesystem registries"
-Refresh-TestRoot
-$filesystemRegistry = "$TestingRoot/filesystem-registry"
-$gitRegistryUpstream = "$TestingRoot/git-registry-upstream"
-
-# build a filesystem registry
-Write-Trace "build a filesystem registry"
-New-Item -Path $filesystemRegistry -ItemType Directory
-$filesystemRegistry = (Get-Item $filesystemRegistry).FullName
-
-Copy-Item -Recurse `
-    -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" `
-    -Destination "$filesystemRegistry"
-New-Item `
-    -Path "$filesystemRegistry/versions" `
-    -ItemType Directory
-Copy-Item `
-    -LiteralPath "$PSScriptRoot/../../e2e_ports/versions/baseline.json" `
-    -Destination "$filesystemRegistry/versions/baseline.json"
-New-Item `
-    -Path "$filesystemRegistry/versions/v-" `
-    -ItemType Directory
-
-$vcpkgInternalE2eTestPortJson = @{
-    "versions" = @(
-        @{
-            "version-string" = "1.0.0";
-            "path" = "$/vcpkg-internal-e2e-test-port"
-        }
-    )
-}
-New-Item `
-    -Path "$filesystemRegistry/versions/v-/vcpkg-internal-e2e-test-port.json" `
-    -ItemType File `
-    -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgInternalE2eTestPortJson)
-
-
-# build a git registry
-Write-Trace "build a git registry"
-New-Item -Path $gitRegistryUpstream -ItemType Directory
-$gitRegistryUpstream = (Get-Item $gitRegistryUpstream).FullName
-
-Push-Location $gitRegistryUpstream
-try
-{
-    $gitConfigOptions = @(
-        '-c', 'user.name=Nobody',
-        '-c', 'user.email=nobody@example.com',
-        '-c', 'core.autocrlf=false'
-    )
-
-    $CurrentTest = 'git init .'
-    git @gitConfigOptions init .
-    Throw-IfFailed
-    Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" -Destination .
-    New-Item -Path './vcpkg-internal-e2e-test-port/foobar' -Value 'this is just to get a distinct git tree'
-
-    $CurrentTest = 'git add -A'
-    git @gitConfigOptions add -A
-    Throw-IfFailed
-    $CurrentTest = 'git commit'
-    git @gitConfigOptions commit -m 'initial commit'
-    Throw-IfFailed
-
-    $vcpkgInternalE2eTestPortGitTree = git rev-parse 'HEAD:vcpkg-internal-e2e-test-port'
-    $vcpkgInternalE2eTestPortVersionsJson = @{
-        "versions" = @(
-            @{
-                "version-string" = "1.0.0";
-                "git-tree" = $vcpkgInternalE2eTestPortGitTree
-            }
-        )
-    }
-    $vcpkgBaseline = @{
-        "default" = @{
-            "vcpkg-internal-e2e-test-port" = @{
-                "baseline" = "1.0.0"
-            }
-        }
-    }
-
-    New-Item -Path './versions' -ItemType Directory
-    New-Item -Path './versions/v-' -ItemType Directory
-
-    New-Item -Path './versions/baseline.json' -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgBaseline)
-    New-Item -Path './versions/v-/vcpkg-internal-e2e-test-port.json' -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgInternalE2eTestPortVersionsJson)
-
-    $CurrentTest = 'git add -A'
-    git @gitConfigOptions add -A
-    Throw-IfFailed
-    $CurrentTest = 'git commit'
-    git @gitConfigOptions commit --amend --no-edit
-    Throw-IfFailed
-}
-finally
-{
-    Pop-Location
-}
-
-# actually test the registries
-Write-Trace "actually test the registries"
-$vcpkgJson = @{
-    "name" = "manifest-test";
-    "version-string" = "1.0.0";
-    "dependencies" = @(
-        "vcpkg-internal-e2e-test-port"
-    )
-}
-
-# test the filesystem registry
-Write-Trace "test the filesystem registry"
-$manifestDir = "$TestingRoot/filesystem-registry-test-manifest-dir"
-
-New-Item -Path $manifestDir -ItemType Directory
-$manifestDir = (Get-Item $manifestDir).FullName
-
-Push-Location $manifestDir
-try
-{
-    New-Item -Path 'vcpkg.json' -ItemType File `
-        -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgJson)
-
-    $vcpkgConfigurationJson = @{
-        "default-registry" = $null;
-        "registries" = @(
-            @{
-                "kind" = "filesystem";
-                "path" = $filesystemRegistry;
-                "packages" = @( "vcpkg-internal-e2e-test-port" )
-            }
-        )
-    }
-    New-Item -Path 'vcpkg-configuration.json' -ItemType File `
-        -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgConfigurationJson)
-
-    Run-Vcpkg install @builtinRegistryArgs '--feature-flags=registries,manifests'
-    Throw-IfFailed
-}
-finally
-{
-    Pop-Location
-}
-
-# test the git registry
-Write-Trace "test the git registry"
-$manifestDir = "$TestingRoot/git-registry-test-manifest-dir"
-
-New-Item -Path $manifestDir -ItemType Directory
-$manifestDir = (Get-Item $manifestDir).FullName
-
-Push-Location $manifestDir
-try
-{
-    New-Item -Path 'vcpkg.json' -ItemType File `
-        -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgJson)
-
-    $vcpkgConfigurationJson = @{
-        "default-registry" = $null;
-        "registries" = @(
-            @{
-                "kind" = "git";
-                "repository" = $gitRegistryUpstream;
-                "packages" = @( "vcpkg-internal-e2e-test-port" )
-            }
-        )
-    }
-    New-Item -Path 'vcpkg-configuration.json' -ItemType File `
-        -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgConfigurationJson)
-
-    Run-Vcpkg install @builtinRegistryArgs '--feature-flags=registries,manifests'
-    Throw-IfFailed
-}
-finally
-{
-    Pop-Location
-}
diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1
deleted file mode 100644
index b7aaf6462..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/spaces.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-. $PSScriptRoot/../end-to-end-tests-prelude.ps1

-

-##### Test spaces in the path

-$Script:CurrentTest = "zlib with spaces in path"

-Write-Host $Script:CurrentTest

-./vcpkg install zlib "--triplet" $Triplet `

-    "--no-binarycaching" `

-    "--x-buildtrees-root=$TestingRoot/build Trees" `

-    "--x-install-root=$TestingRoot/instalL ed" `

-    "--x-packages-root=$TestingRoot/packaG es"

-Throw-IfFailed

diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1
deleted file mode 100644
index 8f512ae7a..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/vcpkg-minimum-required.ps1
+++ /dev/null
@@ -1,22 +0,0 @@
-. $PSScriptRoot/../end-to-end-tests-prelude.ps1
-
-$successCases = @('vcpkg-requires-current-date', 'vcpkg-requires-old-date')
-foreach ($successCase in $successCases) {
-    $CurrentTest = "Should succeeed: ./vcpkg install $successCase"
-    Write-Host $CurrentTest
-    Run-Vcpkg install $successCase @commonArgs
-    if ($LastExitCode -ne 0) {
-        throw $CurrentTest
-    } else {
-        Write-Host "... succeeded."
-    }
-}
-
-$CurrentTest = "Should fail: ./vcpkg install vcpkg-requires-future-date"
-Write-Host $CurrentTest
-Run-Vcpkg install vcpkg-requires-future-date @commonArgs
-if ($LastExitCode -ne 0) {
-    Write-Host "... failed (this is good!)."
-} else {
-    throw $CurrentTest
-}
diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1
deleted file mode 100644
index 7f927759f..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1
+++ /dev/null
@@ -1,98 +0,0 @@
-. $PSScriptRoot/../end-to-end-tests-prelude.ps1

-

-# Test verify versions

-mkdir $VersionFilesRoot

-Copy-Item -Recurse "scripts/testing/version-files/versions_incomplete" $VersionFilesRoot

-$portsRedirectArgsOK = @(

-    "--feature-flags=versions",

-    "--x-builtin-ports-root=scripts/testing/version-files/ports",

-    "--x-builtin-registry-versions-dir=scripts/testing/version-files/versions"

-)

-$portsRedirectArgsIncomplete = @(

-    "--feature-flags=versions",

-    "--x-builtin-ports-root=scripts/testing/version-files/ports_incomplete",

-    "--x-builtin-registry-versions-dir=$VersionFilesRoot/versions_incomplete"

-)

-$CurrentTest = "x-verify-ci-versions (All files OK)"

-Write-Host $CurrentTest

-./vcpkg $portsRedirectArgsOK x-ci-verify-versions --verbose

-Throw-IfFailed

-

-$CurrentTest = "x-verify-ci-versions (Incomplete)"

-./vcpkg $portsRedirectArgsIncomplete x-ci-verify-versions --verbose 

-Throw-IfNotFailed

-

-$CurrentTest = "x-add-version cat"

-# Do not fail if there's nothing to update

-./vcpkg $portsRedirectArgsIncomplete x-add-version cat 

-Throw-IfFailed

-

-$CurrentTest = "x-add-version dog"

-# Local version is not in baseline and versions file

-./vcpkg $portsRedirectArgsIncomplete x-add-version dog 

-Throw-IfFailed

-

-$CurrentTest = "x-add-version duck"

-# Missing versions file

-./vcpkg $portsRedirectArgsIncomplete x-add-version duck

-Throw-IfFailed

-

-$CurrentTest = "x-add-version ferret"

-# Missing versions file and missing baseline entry

-./vcpkg $portsRedirectArgsIncomplete x-add-version ferret

-Throw-IfFailed

-

-$CurrentTest = "x-add-version fish (must fail)"

-# Discrepancy between local SHA and SHA in fish.json. Requires --overwrite-version.

-$out = ./vcpkg $portsRedirectArgsIncomplete x-add-version fish

-Throw-IfNotFailed

-$CurrentTest = "x-add-version fish --overwrite-version"

-./vcpkg $portsRedirectArgsIncomplete x-add-version fish --overwrite-version

-Throw-IfFailed

-

-$CurrentTest = "x-add-version mouse"

-# Missing baseline entry

-./vcpkg $portsRedirectArgsIncomplete x-add-version mouse

-Throw-IfFailed

-# Validate changes

-./vcpkg $portsRedirectArgsIncomplete x-ci-verify-versions --verbose

-Throw-IfFailed

-

-$CurrentTest = "default baseline"

-$out = ./vcpkg $commonArgs "--feature-flags=versions" install --x-manifest-root=scripts/testing/version-files/default-baseline-1 2>&1 | Out-String

-Throw-IfNotFailed

-if ($out -notmatch ".*Error: while checking out baseline.*")

-{

-    $out

-    throw "Expected to fail due to missing baseline"

-}

-

-git fetch https://github.com/vicroms/test-registries

-foreach ($opt_registries in @("",",registries"))

-{

-    Write-Trace "testing baselines: $opt_registries"

-    Refresh-TestRoot

-    $CurrentTest = "without default baseline 2 -- enabling versions should not change behavior"

-    Remove-Item -Recurse $buildtreesRoot/versioning -ErrorAction SilentlyContinue

-    ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install `

-        "--dry-run" `

-        "--x-manifest-root=scripts/testing/version-files/without-default-baseline-2" `

-        "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions"

-    Throw-IfFailed

-    Require-FileNotExists $buildtreesRoot/versioning

-

-    $CurrentTest = "default baseline 2"

-    ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install `

-        "--dry-run" `

-        "--x-manifest-root=scripts/testing/version-files/default-baseline-2" `

-        "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions"

-    Throw-IfFailed

-    Require-FileExists $buildtreesRoot/versioning

-

-    $CurrentTest = "using version features fails without flag"

-    ./vcpkg $commonArgs "--feature-flags=-versions$opt_registries" install `

-        "--dry-run" `

-        "--x-manifest-root=scripts/testing/version-files/default-baseline-2" `

-        "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions"

-    Throw-IfNotFailed

-}

diff --git a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1 b/scripts/azure-pipelines/end-to-end-tests-prelude.ps1
deleted file mode 100644
index 29718bf76..000000000
--- a/scripts/azure-pipelines/end-to-end-tests-prelude.ps1
+++ /dev/null
@@ -1,80 +0,0 @@
-$TestingRoot = Join-Path $WorkingRoot 'testing'

-$buildtreesRoot = Join-Path $TestingRoot 'buildtrees'

-$installRoot = Join-Path $TestingRoot 'installed'

-$packagesRoot = Join-Path $TestingRoot 'packages'

-$NuGetRoot = Join-Path $TestingRoot 'nuget'

-$NuGetRoot2 = Join-Path $TestingRoot 'nuget2'

-$ArchiveRoot = Join-Path $TestingRoot 'archives'

-$VersionFilesRoot = Join-Path $TestingRoot 'version-test'

-$commonArgs = @(

-    "--triplet",

-    $Triplet,

-    "--x-buildtrees-root=$buildtreesRoot",

-    "--x-install-root=$installRoot",

-    "--x-packages-root=$packagesRoot",

-    "--overlay-ports=$PSScriptRoot/../e2e_ports/overlays"

-)

-$Script:CurrentTest = 'unassigned'

-

-if ($IsWindows)

-{

-    $VcpkgExe = Get-Item './vcpkg.exe'

-}

-else

-{

-    $VcpkgExe = Get-Item './vcpkg'

-}

-

-function Refresh-TestRoot {

-    Remove-Item -Recurse -Force $TestingRoot -ErrorAction SilentlyContinue

-    mkdir $TestingRoot | Out-Null

-    mkdir $NuGetRoot | Out-Null

-}

-

-function Require-FileExists {

-    [CmdletBinding()]

-    Param(

-        [string]$File

-    )

-    if (-Not (Test-Path $File)) {

-        throw "'$Script:CurrentTest' failed to create file '$File'"

-    }

-}

-

-function Require-FileNotExists {

-    [CmdletBinding()]

-    Param(

-        [string]$File

-    )

-    if (Test-Path $File) {

-        throw "'$Script:CurrentTest' should not have created file '$File'"

-    }

-}

-

-function Throw-IfFailed {

-    if ($LASTEXITCODE -ne 0) {

-        throw "'$Script:CurrentTest' had a step with a nonzero exit code"

-    }

-}

-

-function Throw-IfNotFailed {

-    if ($LASTEXITCODE -eq 0) {

-        throw "'$Script:CurrentTest' had a step with an unexpectedly zero exit code"

-    }

-}

-

-function Write-Trace ([string]$text) {

-    Write-Host (@($MyInvocation.ScriptName, ":", $MyInvocation.ScriptLineNumber, ": ", $text) -join "")

-}

-

-function Run-Vcpkg {

-    Param(

-        [Parameter(ValueFromRemainingArguments)]

-        [string[]]$TestArgs

-    )

-    $Script:CurrentTest = "vcpkg $($testArgs -join ' ')"

-    Write-Host $Script:CurrentTest

-    & $VcpkgExe @testArgs

-}

-

-Refresh-TestRoot

diff --git a/scripts/azure-pipelines/end-to-end-tests.ps1 b/scripts/azure-pipelines/end-to-end-tests.ps1
deleted file mode 100644
index 8858b362e..000000000
--- a/scripts/azure-pipelines/end-to-end-tests.ps1
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) Microsoft Corporation.

-# SPDX-License-Identifier: MIT

-#

-<#

-.SYNOPSIS

-End-to-End tests for the vcpkg executable.

-

-.DESCRIPTION

-These tests cover the command line interface and broad functions of vcpkg, including `install`, `remove` and certain

-binary caching scenarios. They use the vcpkg executable in the current directory.

-

-.PARAMETER Triplet

-The triplet to use for testing purposes.

-

-.PARAMETER WorkingRoot

-The location used as scratch space for testing.

-

-#>

-

-[CmdletBinding()]

-Param(

-    [Parameter(Mandatory = $true)]

-    [ValidateNotNullOrEmpty()]

-    [string]$Triplet,

-    [Parameter(Mandatory = $true)]

-    [ValidateNotNullOrEmpty()]

-    [string]$WorkingRoot,

-    [Parameter(Mandatory = $false)]

-    [ValidateNotNullOrEmpty()]

-    [string]$Filter

-)

-

-$ErrorActionPreference = "Stop"

-

-if (-Not (Test-Path $WorkingRoot)) {

-    New-Item -Path $WorkingRoot -ItemType Directory

-}

-

-$WorkingRoot = (Get-Item $WorkingRoot).FullName

-

-$AllTests = Get-ChildItem $PSScriptRoot/end-to-end-tests-dir/*.ps1

-if ($Filter -ne $Null) {

-    $AllTests = $AllTests | ? { $_.Name -match $Filter }

-}

-$n = 1

-$m = $AllTests.Count

-

-$AllTests | % {

-    Write-Host "[end-to-end-tests.ps1] [$n/$m] Running suite $_"

-    & $_

-    $n += 1

-}

-

-Write-Host "[end-to-end-tests.ps1] All tests passed."

-$LASTEXITCODE = 0

diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml
index b20908f97..df5cceda6 100644
--- a/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/scripts/azure-pipelines/linux/azure-pipelines.yml
@@ -30,20 +30,9 @@ jobs:
       exit 0

     displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}'

   - task: Bash@3

-    displayName: 'Build vcpkg'

+    displayName: 'Bootstrap vcpkg'

     inputs:

       filePath: bootstrap-vcpkg.sh

-      arguments: '-buildTests'

-  - bash: toolsrc/build.rel/vcpkg-test

-    displayName: 'Run vcpkg tests'

-    env:

-      VCPKG_DEBUG: 1

-  - task: PowerShell@2

-    displayName: 'Run vcpkg end-to-end tests'

-    inputs:

-      filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1'

-      arguments: '-Triplet x64-linux -WorkingRoot ${{ variables.WORKING_ROOT }}'

-      pwsh: true

   - task: PowerShell@2

     displayName: '*** Test Modified Ports and Prepare Test Logs ***'

     inputs:

diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml
index 50bba080f..52e974c93 100644
--- a/scripts/azure-pipelines/osx/azure-pipelines.yml
+++ b/scripts/azure-pipelines/osx/azure-pipelines.yml
@@ -30,17 +30,6 @@ jobs:
     displayName: 'Build vcpkg'

     inputs:

       filePath: bootstrap-vcpkg.sh

-      arguments: '-buildTests'

-  - bash: toolsrc/build.rel/vcpkg-test

-    displayName: 'Run vcpkg tests'

-    env:

-      VCPKG_DEBUG: 1

-  - task: PowerShell@2

-    displayName: 'Run vcpkg end-to-end tests'

-    inputs:

-      filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1'

-      arguments: '-Triplet x64-osx -WorkingRoot ${{ variables.WORKING_ROOT }}'

-      pwsh: true

   - task: PowerShell@2

     displayName: '*** Test Modified Ports and Prepare Test Logs ***'

     inputs:

diff --git a/scripts/azure-pipelines/signing.yml b/scripts/azure-pipelines/signing.yml
deleted file mode 100644
index b7a3137d9..000000000
--- a/scripts/azure-pipelines/signing.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-# This script is used internally to produce signed vcpkg builds.

-# It uses machines / tasks that are not exposed here on GitHub, as

-# the hardware on which we allow signing is restricted.

-

-trigger: none

-

-variables:

-  TeamName: vcpkg

-jobs:

-  - job: windows

-    displayName: "Windows"

-    dependsOn:

-    pool:

-      name: 'VSEng-MicroBuildVS2019'

-      demands:

-        - CMAKE

-    steps:

-    - task: PoliCheck@1

-      inputs:

-        inputType: 'Basic'

-        targetType: 'F'

-        targetArgument: '$(Build.SourcesDirectory)'

-        result: 'PoliCheck.xml'

-    - task: CmdLine@2

-      displayName: "Build vcpkg with CMake"

-      inputs:

-        failOnStderr: true

-        script: |

-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x86

-          cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B "$(Build.StagingDirectory)" -S toolsrc

-          ninja.exe -C "$(Build.StagingDirectory)"

-    - task: MicroBuildSigningPlugin@2

-      inputs:

-        signType: 'real'

-        feedSource: 'https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json'

-    - task: NuGetToolInstaller@1

-      inputs:

-        versionSpec: 5.7

-    - task: NuGetCommand@2

-      displayName: 'NuGet Restore MicroBuild Signing Extension'

-      inputs:

-        command: 'restore'

-        restoreSolution: 'scripts/azure-pipelines/windows/signing.signproj'

-        feedsToUse: 'config'

-        restoreDirectory: '$(Build.SourcesDirectory)\scripts\azure-pipelines\packages'

-    - task: MSBuild@1

-      displayName: 'Sign vcpkg.exe'

-      inputs:

-        solution: 'scripts\azure-pipelines\windows\signing.signproj'

-        msbuildArguments: '/p:OutDir=$(Build.ArtifactStagingDirectory)\ /p:IntermediateOutputPath=$(Build.StagingDirectory)\'

-    - task: BinSkim@3

-      inputs:

-        InputType: 'CommandLine'

-        arguments: 'analyze "$(Build.StagingDirectory)\vcpkg.exe"'

-    - task: BinSkim@3

-      inputs:

-        InputType: 'CommandLine'

-        arguments: 'analyze "$(Build.StagingDirectory)\tls12-download.exe"'

-    - task: PublishBuildArtifacts@1

-      displayName: 'Publish vcpkg.exe'

-      inputs:

-        PathtoPublish: '$(Build.ArtifactStagingDirectory)\vcpkg.exe'

-        ArtifactName: 'Windows'

-        publishLocation: 'Container'

-    - task: PublishBuildArtifacts@1

-      displayName: 'Publish vcpkg.pdb'

-      inputs:

-        PathtoPublish: '$(Build.ArtifactStagingDirectory)\vcpkg.pdb'

-        ArtifactName: 'Windows'

-        publishLocation: 'Container'

-    - task: PublishBuildArtifacts@1

-      displayName: 'Publish tls12-download.exe'

-      inputs:

-        PathtoPublish: '$(Build.ArtifactStagingDirectory)\tls12-download.exe'

-        ArtifactName: 'Windows'

-        publishLocation: 'Container'

-    - task: PublishBuildArtifacts@1

-      displayName: 'Publish tls12-download.pdb'

-      inputs:

-        PathtoPublish: '$(Build.ArtifactStagingDirectory)\tls12-download.pdb'

-        ArtifactName: 'Windows'

-        publishLocation: 'Container'

-    - task: MicroBuildCleanup@1

-      condition: succeededOrFailed()

-      displayName: MicroBuild Cleanup

-  - job: macos_build

-    displayName: 'MacOS Build'

-    pool:

-      vmImage: macOS-10.15

-    steps:

-    - task: CmdLine@2

-      displayName: "Build vcpkg with CMake"

-      inputs:

-        failOnStderr: true

-        script: |

-          cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B "$(Build.StagingDirectory)" -S toolsrc

-          make -j 8 -C "$(Build.StagingDirectory)"

-          zip "$(Build.StagingDirectory)/vcpkg.zip" "$(Build.StagingDirectory)/vcpkg"

-    - task: PublishBuildArtifacts@1

-      displayName: "Publish Unsigned MacOS Binary"

-      inputs:

-        PathtoPublish: '$(Build.StagingDirectory)/vcpkg.zip'

-        ArtifactName: 'staging'

-        publishLocation: 'Container'

-  - job: macos_sign

-    displayName: 'MacOS Sign'

-    dependsOn: macos_build

-    pool:

-      name: VSEng-MicroBuildVS2019

-    steps:

-      - checkout: none

-      - task: DownloadBuildArtifacts@0

-        displayName: 'Download Unsigned Binary'

-        inputs:

-          artifactName: staging

-      - task: ms-vseng.MicroBuildTasks.7973a23b-33e3-4b00-a7d9-c06d90f8297f.MicroBuildSignMacFiles@1

-        displayName: 'Sign Mac Files'

-        inputs:

-          SigningTarget: '$(Build.ArtifactStagingDirectory)\staging\vcpkg.zip'

-          SigningCert: 8003

-      - task: PublishBuildArtifacts@1

-        displayName: 'Publish Signed Binary'

-        inputs:

-          PathtoPublish: '$(Build.ArtifactStagingDirectory)\staging\vcpkg.zip'

-          ArtifactName: 'MacOS'

diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml
index 4c46e86a7..c2d74b8bc 100644
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@@ -24,34 +24,7 @@ jobs:
       pwsh: true

   # Note: D: is the Azure machines' temporary disk.

   - script: .\bootstrap-vcpkg.bat

-    displayName: 'Build vcpkg'

-  - task: PowerShell@2

-    displayName: 'Run vcpkg end-to-end tests'

-    condition: eq('${{ parameters.triplet }}', 'x86-windows')

-    inputs:

-      filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1'

-      arguments: '-Triplet ${{ parameters.triplet }} -WorkingRoot ${{ variables.WORKING_ROOT }}'

-      pwsh: true

-  - task: CmdLine@2

-    displayName: "Build vcpkg with CMake, with older VS, and Run Tests"

-    condition: eq('${{ parameters.triplet }}', 'x86-windows')

-    inputs:

-      script: |

-        :: TRANSITION, get these tools on the VMs next time we roll them

-        .\vcpkg.exe fetch cmake

-        .\vcpkg.exe fetch ninja

-        set PATH=${{ variables.VCPKG_DOWNLOADS }}\tools\cmake-3.19.2-windows\cmake-3.19.2-win32-x86\bin;${{ variables.VCPKG_DOWNLOADS }}\tools\ninja-1.10.1-windows;%PATH%

-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x86

-        rmdir /s /q build.x86.debug > nul 2> nul

-        cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DVCPKG_DEVELOPMENT_WARNINGS=ON -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=ON -B build.x86.debug -S toolsrc

-        ninja.exe -C build.x86.debug

-        set VCPKG_DEBUG=1

-        build.x86.debug\vcpkg-test.exe

-        cmake -G "Visual Studio 16 2019" -A Win32 -T v140 -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B build.x86.vs2015 -S toolsrc

-        cmake --build build.x86.vs2015

-        cmake -G "Visual Studio 16 2019" -A Win32 -T v141 -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B build.x86.vs2017 -S toolsrc

-        cmake --build build.x86.vs2017

-      failOnStderr: true

+    displayName: 'Bootstrap vcpkg'

   - task: PowerShell@2

     displayName: '*** Test Modified Ports and Prepare Test Logs ***'

     inputs:

diff --git a/scripts/azure-pipelines/windows/packages.config b/scripts/azure-pipelines/windows/packages.config
deleted file mode 100644
index d48977f79..000000000
--- a/scripts/azure-pipelines/windows/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<packages>

-  <package id="Microsoft.VisualStudioEng.MicroBuild.Core" version="0.4.1" targetFramework="native" developmentDependency="true" />

-</packages>
\ No newline at end of file
diff --git a/scripts/azure-pipelines/windows/signing.signproj b/scripts/azure-pipelines/windows/signing.signproj
deleted file mode 100644
index 9382e0a0e..000000000
--- a/scripts/azure-pipelines/windows/signing.signproj
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-

-  <Import Project="$(MSBuildThisFileDirectory)..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props" Condition="Exists('..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props')" />

-

-  <ItemGroup>

-    <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">

-      <PrivateAssets>all</PrivateAssets>

-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

-    </PackageReference>

-  </ItemGroup>

-

-  <ItemGroup>

-    <FilesToSign Include="$(IntermediateOutputPath)\vcpkg.exe">

-      <Authenticode>Microsoft400</Authenticode>

-    </FilesToSign>

-    <FilesToSign Include="$(IntermediateOutputPath)\tls12-download.exe">

-      <Authenticode>Microsoft400</Authenticode>

-    </FilesToSign>

-  </ItemGroup>

-

-  <ImportGroup Label="ExtensionTargets">

-    <Import Project="$(MSBuildThisFileDirectory)..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets" Condition="Exists('..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets')" />

-  </ImportGroup>

-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="Build">

-    <PropertyGroup>

-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

-    </PropertyGroup>

-    <Error Condition="!Exists('$(MSBuildThisFileDirectory)..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisFileDirectory)..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props'))" />

-    <Error Condition="!Exists('$(MSBuildThisFileDirectory)..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisFileDirectory)..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets'))" />

-  </Target>

-

-  <!-- Define an empty build target as we don't really build anything -->

-  <Target Name="Build" />

-

-  <!-- Target AfterBuild is required to trigger signing -->

-  <Target Name="AfterBuild" AfterTargets="Build" />

-

-</Project>

diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index b4c6295c0..e4153aad4 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -1,10 +1,10 @@
 [CmdletBinding()]
 param(
     $badParam,
-    [Parameter(Mandatory=$False)][switch]$disableMetrics = $false,
     [Parameter(Mandatory=$False)][switch]$win64 = $false,
     [Parameter(Mandatory=$False)][string]$withVSPath = "",
-    [Parameter(Mandatory=$False)][string]$withWinSDK = ""
+    [Parameter(Mandatory=$False)][string]$withWinSDK = "",
+    [Parameter(Mandatory=$False)][switch]$disableMetrics = $false
 )
 Set-StrictMode -Version Latest
 # Powershell2-compatible way of forcing named-parameters
@@ -12,407 +12,48 @@ if ($badParam)
 {
     if ($disableMetrics -and $badParam -eq "1")
     {
-        Write-Warning "'disableMetrics 1' is deprecated, please change to 'disableMetrics' (without '1')"
+        Write-Warning "'disableMetrics 1' is deprecated, please change to 'disableMetrics' (without '1')."
     }
     else
     {
-        throw "Only named parameters are allowed"
+        throw "Only named parameters are allowed."
     }
 }
 
-$scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
-$withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash
-
-function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName)
+if ($win64)
 {
-    if ($null -eq $object)
-    {
-        return $false
-    }
-
-    return [bool]($object.psobject.Properties | Where-Object { $_.Name -eq "$propertyName"})
+    Write-Warning "-win64 no longer has any effect; ignored."
 }
 
-function getProgramFiles32bit()
+if (-Not [string]::IsNullOrWhiteSpace($withVSPath))
 {
-    $out = ${env:PROGRAMFILES(X86)}
-    if ($null -eq $out)
-    {
-        $out = ${env:PROGRAMFILES}
-    }
-
-    if ($null -eq $out)
-    {
-        throw "Could not find [Program Files 32-bit]"
-    }
+    Write-Warning "-withVSPath no longer has any effect; ignored."
+}
 
-    return $out
+if (-Not [string]::IsNullOrWhiteSpace($withWinSDK))
+{
+    Write-Warning "-withWinSDK no longer has any effect; ignored."
 }
 
+$scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
 $vcpkgRootDir = $scriptsDir
 while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
 {
     Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root"
     $vcpkgRootDir = Split-path $vcpkgRootDir -Parent
 }
-Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
-
-$vcpkgBootstrapPath = "$vcpkgRootDir\toolsrc\windows-bootstrap"
-
-if (-not (Test-Path $vcpkgBootstrapPath))
-{
-    Write-Error "Unable to determine vcpkg build directory. '$vcpkgBootstrapPath' does not exist."
-    throw
-}
-
-function getVisualStudioInstances()
-{
-    $programFiles = getProgramFiles32bit
-    $results = New-Object System.Collections.ArrayList
-    $vswhereExe = "$programFiles\Microsoft Visual Studio\Installer\vswhere.exe"
-    if (Test-Path $vswhereExe)
-    {
-        $output = & $vswhereExe -prerelease -legacy -products * -format xml
-        [xml]$asXml = $output
-
-        foreach ($instance in $asXml.instances.instance)
-        {
-            $installationPath = $instance.InstallationPath -replace "\\$" # Remove potential trailing backslash
-            $installationVersion = $instance.InstallationVersion
-
-            $isPrerelease = -7
-            if (vcpkgHasProperty -object $instance -propertyName "isPrerelease")
-            {
-                $isPrerelease = $instance.isPrerelease
-            }
-
-            if ($isPrerelease -eq 0)
-            {
-                $releaseType = "PreferenceWeight3::StableRelease"
-            }
-            elseif ($isPrerelease -eq 1)
-            {
-                $releaseType = "PreferenceWeight2::PreRelease"
-            }
-            else
-            {
-                $releaseType = "PreferenceWeight1::Legacy"
-            }
-
-            # Placed like that for easy sorting according to preference
-            $results.Add("${releaseType}::${installationVersion}::${installationPath}") > $null
-        }
-    }
-    else
-    {
-        Write-Verbose "Could not locate vswhere at $vswhereExe"
-    }
-
-    if ("$env:vs140comntools" -ne "")
-    {
-        $installationPath = Split-Path -Parent $(Split-Path -Parent "$env:vs140comntools")
-        $clExe = "$installationPath\VC\bin\cl.exe"
-        $vcvarsallbat = "$installationPath\VC\vcvarsall.bat"
-
-        if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat))
-        {
-            $results.Add("PreferenceWeight1::Legacy::14.0::$installationPath") > $null
-        }
-    }
-
-    $installationPath = "$programFiles\Microsoft Visual Studio 14.0"
-    $clExe = "$installationPath\VC\bin\cl.exe"
-    $vcvarsallbat = "$installationPath\VC\vcvarsall.bat"
-
-    if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat))
-    {
-        $results.Add("PreferenceWeight1::Legacy::14.0::$installationPath") > $null
-    }
-
-    $results.Sort()
-    $results.Reverse()
-
-    return $results
-}
-
-function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
-{
-    $VisualStudioInstances = getVisualStudioInstances
-    if ($null -eq $VisualStudioInstances)
-    {
-        throw "Could not find Visual Studio. VS2015, VS2017, or VS2019 (with C++) needs to be installed."
-    }
-
-    Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstances))"
-    foreach ($instanceCandidate in $VisualStudioInstances)
-    {
-        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 "16")
-        {
-            $VCFolder= "$path\VC\Tools\MSVC\"
-            if (Test-Path $VCFolder)
-            {
-                Write-Verbose "Picking: $instanceCandidate"
-                return "$path\MSBuild\Current\Bin\MSBuild.exe", "v142"
-            }
-        }
-
-        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 = getProgramFiles32bit
-                return "$programFilesPath\MSBuild\14.0\Bin\MSBuild.exe", "v140"
-            }
-        }
-    }
-
-    throw "Could not find MSBuild version with C++ support. VS2015, VS2017, or VS2019 (with C++) needs to be installed."
-}
-function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK = $False,
-                        [Parameter(Mandatory=$False)][switch]$DisableWin81SDK = $False,
-                        [Parameter(Mandatory=$False)][string]$withWinSDK)
-{
-    if ($DisableWin10SDK -and $DisableWin81SDK)
-    {
-        throw "Both Win10SDK and Win81SDK were disabled."
-    }
-
-    Write-Verbose "Finding WinSDK"
-
-    $validInstances = New-Object System.Collections.ArrayList
 
-    # Windows 10 SDK
-    function CheckWindows10SDK($path)
-    {
-        if ($null -eq $path)
-        {
-            return
-        }
-
-        $folder = (Join-Path $path "Include")
-        if (!(Test-Path $folder))
-        {
-            Write-Verbose "$folder - Not Found"
-            return
-        }
-
-        Write-Verbose "$folder - Found"
-        $win10sdkVersions = @(Get-ChildItem $folder | Where-Object {$_.Name -match "^10"} | Sort-Object)
-        [array]::Reverse($win10sdkVersions) # Newest SDK first
-
-        foreach ($win10sdk in $win10sdkVersions)
-        {
-            $win10sdkV = $win10sdk.Name
-            $windowsheader = "$folder\$win10sdkV\um\windows.h"
-            if (!(Test-Path $windowsheader))
-            {
-                Write-Verbose "$windowsheader - Not Found"
-                continue
-            }
-            Write-Verbose "$windowsheader - Found"
-
-            $ddkheader = "$folder\$win10sdkV\shared\sdkddkver.h"
-            if (!(Test-Path $ddkheader))
-            {
-                Write-Verbose "$ddkheader - Not Found"
-                continue
-            }
-
-            Write-Verbose "$ddkheader - Found"
-            $win10sdkVersionString = $win10sdkV.ToString()
-            Write-Verbose "Found $win10sdkVersionString"
-            $validInstances.Add($win10sdkVersionString) > $null
-        }
-    }
-
-    Write-Verbose "`n"
-    Write-Verbose "Looking for Windows 10 SDK"
-    $regkey10 = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot10' -ErrorAction SilentlyContinue
-    $regkey10Wow6432 = Get-ItemProperty -Path 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot10' -ErrorAction SilentlyContinue
-    if (vcpkgHasProperty -object $regkey10 "KitsRoot10") { CheckWindows10SDK($regkey10.KitsRoot10) }
-    if (vcpkgHasProperty -object $regkey10Wow6432 "KitsRoot10") { CheckWindows10SDK($regkey10Wow6432.KitsRoot10) }
-    CheckWindows10SDK("$env:ProgramFiles\Windows Kits\10")
-    CheckWindows10SDK("${env:ProgramFiles(x86)}\Windows Kits\10")
-
-    # Windows 8.1 SDK
-    function CheckWindows81SDK($path)
-    {
-        if ($null -eq $path)
-        {
-            return
-        }
-
-        $folder = "$path\Include"
-        if (!(Test-Path $folder))
-        {
-            Write-Verbose "$folder - Not Found"
-            return
-        }
-
-        Write-Verbose "$folder - Found"
-        $win81sdkVersionString = "8.1"
-        Write-Verbose "Found $win81sdkVersionString"
-        $validInstances.Add($win81sdkVersionString) > $null
-    }
-
-    Write-Verbose "`n"
-    Write-Verbose "Looking for Windows 8.1 SDK"
-    $regkey81 = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot81' -ErrorAction SilentlyContinue
-    $regkey81Wow6432 = Get-ItemProperty -Path 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots\' -Name 'KitsRoot81' -ErrorAction SilentlyContinue
-    if (vcpkgHasProperty -object $regkey81 "KitsRoot81") { CheckWindows81SDK($regkey81.KitsRoot81) }
-    if (vcpkgHasProperty -object $regkey81Wow6432 "KitsRoot81") { CheckWindows81SDK($regkey81Wow6432.KitsRoot81) }
-    CheckWindows81SDK("$env:ProgramFiles\Windows Kits\8.1")
-    CheckWindows81SDK("${env:ProgramFiles(x86)}\Windows Kits\8.1")
-
-    Write-Verbose "`n`n`n"
-    Write-Verbose "The following Windows SDKs were found:"
-    foreach ($instance in $validInstances)
-    {
-        Write-Verbose $instance
-    }
-
-    # Selecting
-    if ($withWinSDK -ne "")
-    {
-        foreach ($instance in $validInstances)
-        {
-            if ($instance -eq $withWinSDK)
-            {
-                return $instance
-            }
-        }
-
-        throw "Could not find the requested Windows SDK version: $withWinSDK"
-    }
-
-    foreach ($instance in $validInstances)
-    {
-        if (!$DisableWin10SDK -and $instance -match "10.")
-        {
-            return $instance
-        }
-
-        if (!$DisableWin81SDK -and $instance -match "8.1")
-        {
-            return $instance
-        }
-    }
-
-    throw "Could not detect a Windows SDK / TargetPlatformVersion"
-}
-
-$msbuildExeWithPlatformToolset = findAnyMSBuildWithCppPlatformToolset $withVSPath
-$msbuildExe = $msbuildExeWithPlatformToolset[0]
-$platformToolset = $msbuildExeWithPlatformToolset[1]
-$windowsSDK = getWindowsSDK -withWinSDK $withWinSDK
-
-$disableMetricsValue = "0"
-if ($disableMetrics)
-{
-    $disableMetricsValue = "1"
-}
-
-$platform = "x86"
-$vcpkgReleaseDir = "$vcpkgBootstrapPath\msbuild.x86.release"
-if($PSVersionTable.PSVersion.Major -le 2)
-{
-    $architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture
-}
-else
-{
-    $architecture=(Get-CimInstance win32_operatingsystem | Select-Object osarchitecture).osarchitecture
-}
-if ($win64)
-{
-    if (-not $architecture -like "*64*")
-    {
-        throw "Cannot build 64-bit on non-64-bit system"
-    }
-
-    $platform = "x64"
-    $vcpkgReleaseDir = "$vcpkgBootstrapPath\msbuild.x64.release"
-}
-
-if ($architecture -like "*64*")
-{
-    $PreferredToolArchitecture = "x64"
-}
-else
-{
-    $PreferredToolArchitecture = "x86"
-}
-
-$arguments = (
-"`"/p:VCPKG_VERSION=unknownhash`"",
-"`"/p:VCPKG_BASE_VERSION=2021-01-13`"",  # Note: This duplicate date version will be short lived. See https://github.com/microsoft/vcpkg/pull/15474
-"/p:Configuration=Release",
-"/p:Platform=$platform",
-"/p:PlatformToolset=$platformToolset",
-"/p:TargetPlatformVersion=$windowsSDK",
-"/p:PreferredToolArchitecture=$PreferredToolArchitecture",
-"/verbosity:minimal",
-"/m",
-"/nologo",
-"`"$vcpkgBootstrapPath\vcpkg.vcxproj`"") -join " "
-
-function vcpkgInvokeCommandClean()
-{
-    param ( [Parameter(Mandatory=$true)][string]$executable,
-                                        [string]$arguments = "")
-
-    Write-Verbose "Clean-Executing: ${executable} ${arguments}"
-    $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
-    $cleanEnvScript = "$scriptsDir\cleanEnvironmentHelper.ps1"
-    $tripleQuotes = "`"`"`""
-    $argumentsWithEscapedQuotes = $arguments -replace "`"", $tripleQuotes
-    $command = ". $tripleQuotes$cleanEnvScript$tripleQuotes; & $tripleQuotes$executable$tripleQuotes $argumentsWithEscapedQuotes"
-    $arg = "-NoProfile", "-ExecutionPolicy Bypass", "-command $command"
-
-    $process = Start-Process -FilePath powershell.exe -ArgumentList $arg -PassThru -NoNewWindow
-    Wait-Process -InputObject $process
-    $ec = $process.ExitCode
-    Write-Verbose "Execution terminated with exit code $ec."
-    return $ec
-}
+Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
 
-# vcpkgInvokeCommandClean cmd "/c echo %PATH%"
-Write-Host "`nBuilding vcpkg.exe ...`n"
-$ec = vcpkgInvokeCommandClean $msbuildExe $arguments
+& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-01-13-768d8f95c9e752603d2c5901c7a7c7fbdb08af35/vcpkg.exe" "$vcpkgRootDir/vcpkg.exe"
+Write-Host ""
 
-if ($ec -ne 0)
+if ($LASTEXITCODE -ne 0)
 {
-    Write-Error "Building vcpkg.exe failed. Please ensure you have installed Visual Studio with the Desktop C++ workload and the Windows SDK for Desktop C++."
+    Write-Error "Downloading vcpkg.exe failed. Please check your internet connection, or consider downloading a recent vcpkg.exe from https://github.com/microsoft/vcpkg-tool with a browser."
     throw
 }
 
-Write-Host "`nBuilding vcpkg.exe... done.`n"
-
 if ($disableMetrics)
 {
     Set-Content -Value "" -Path "$vcpkgRootDir\vcpkg.disable-metrics" -Force
@@ -433,9 +74,3 @@ or by setting the VCPKG_DISABLE_METRICS environment variable.
 Read more about vcpkg telemetry at docs/about/privacy.md
 "@
 }
-
-Write-Verbose "Placing vcpkg.exe in the correct location"
-
-Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
-
-Remove-Item "$vcpkgReleaseDir" -Force -Recurse -ErrorAction SilentlyContinue
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index b7d889f9e..2188b8af7 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -276,11 +276,29 @@ else
 fi
 
 # Do the build
-buildDir="$vcpkgRootDir/toolsrc/build.rel"
-rm -rf "$buildDir"
+vcpkgToolReleaseTag="2021-01-13-768d8f95c9e752603d2c5901c7a7c7fbdb08af35"
+vcpkgToolReleaseSha="99c9949637f83bf361ee23557edc889e2865c2105c45306c39c40855a3e1440e2f6fb5ec59e95176fca61eff33929462d23c7b49feb1975f24adb8ca443a98a6"
+vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
+vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"
+baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg"
+buildDir="$baseBuildDir/build"
+tarballPath="$downloadsDir/$vcpkgToolReleaseTarball"
+srcBaseDir="$baseBuildDir/src"
+srcDir="$srcBaseDir/vcpkg-tool-$vcpkgToolReleaseTag"
+
+if [ -e "$tarballPath" ]; then
+    vcpkgCheckEqualFileHash "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha"
+else
+    echo "Downloading vcpkg tool sources"
+    vcpkgDownloadFile "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha"
+fi
+
+echo "Building vcpkg-tool..."
+rm -rf "$baseBuildDir"
 mkdir -p "$buildDir"
+vcpkgExtractArchive "$tarballPath" "$srcBaseDir"
 
-(cd "$buildDir" && CXX="$CXX" "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1
+(cd "$buildDir" && CXX="$CXX" "$cmakeExe" "$srcDir" -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1
 (cd "$buildDir" && "$cmakeExe" --build .) || exit 1
 
 rm -rf "$vcpkgRootDir/vcpkg"
diff --git a/scripts/cleanEnvironmentHelper.ps1 b/scripts/cleanEnvironmentHelper.ps1
deleted file mode 100644
index fa5fe869d..000000000
--- a/scripts/cleanEnvironmentHelper.ps1
+++ /dev/null
@@ -1,52 +0,0 @@
-# Capture environment variables for the System and User. Also add some special/built-in variables.
-# These will be used to synthesize a clean environment
-$specialEnvironmentMap = @{ "SystemDrive"=$env:SystemDrive; "SystemRoot"=$env:SystemRoot; "UserProfile"=$env:UserProfile; "TMP"=$env:TMP } # These are built-in and not set in the registry
-$machineEnvironmentMap = [Environment]::GetEnvironmentVariables('Machine') # HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment
-$userEnvironmentMap = [Environment]::GetEnvironmentVariables('User') # HKEY_CURRENT_USER\Environment
-
-# Identify the keySet of environment variable names
-$nameSet = ($specialEnvironmentMap.Keys + $machineEnvironmentMap.Keys + $userEnvironmentMap.Keys) | Sort-Object | Select-Object -Unique
-
-# Any environment variable in the $nameSet should be restored to its original value
-foreach ($name in $nameSet)
-{
-    if ($specialEnvironmentMap.ContainsKey($name))
-    {
-        [Environment]::SetEnvironmentVariable($name, $specialEnvironmentMap[$name], 'Process')
-        continue;
-    }
-
-    # PATH needs to be concatenated as it has values in both machine and user environment. Any other values should be set.
-    if ($name -eq 'path')
-    {
-        $pathValuePartial = @()
-        # Machine values before user values
-        $pathValuePartial += $machineEnvironmentMap[$name] -split ';'
-        $pathValuePartial += $userEnvironmentMap[$name] -split ';'
-        $pathValue = $pathValuePartial -join ';'
-        [Environment]::SetEnvironmentVariable($name, $pathValue, 'Process')
-        continue;
-    }
-
-    if ($userEnvironmentMap.ContainsKey($name))
-    {
-        [Environment]::SetEnvironmentVariable($name, $userEnvironmentMap[$name], 'Process')
-        continue;
-    }
-
-    if ($machineEnvironmentMap.ContainsKey($name))
-    {
-        [Environment]::SetEnvironmentVariable($name, $machineEnvironmentMap[$name], 'Process')
-        continue;
-    }
-
-    throw "Unreachable: Unknown variable $name"
-}
-
-# Any environment variable NOT in the $nameSet should be removed
-$processEnvironmentMap = [Environment]::GetEnvironmentVariables('Process')
-$variablesForRemoval = $processEnvironmentMap.Keys | Where-Object {$nameSet -notcontains $_}
-foreach ($name in $variablesForRemoval)
-{
-    [Environment]::SetEnvironmentVariable($name, $null, 'Process')
-}
diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake
deleted file mode 100644
index 68dc779a8..000000000
--- a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/portfile.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-vcpkg_minimum_required(VERSION ${VCPKG_BASE_VERSION})
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json
deleted file mode 100644
index 48debf1e7..000000000
--- a/scripts/e2e_ports/overlays/vcpkg-requires-current-date/vcpkg.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "vcpkg-requires-current-date",
-  "version-string": "1.0.0",
-  "description": "A test port that verifies that vcpkg_minimum_required is inclusive by using the current base version value.",
-  "homepage": ""
-}
diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake
deleted file mode 100644
index b68e53e95..000000000
--- a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/portfile.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-vcpkg_minimum_required(VERSION 2999-12-31)
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json
deleted file mode 100644
index f60901998..000000000
--- a/scripts/e2e_ports/overlays/vcpkg-requires-future-date/vcpkg.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "vcpkg-requires-future-date",
-  "version-string": "1.0.0",
-  "description": "A test port that requires a vcpkg version from an impossibly far future.",
-  "homepage": ""
-}
diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake
deleted file mode 100644
index 5a4fbf421..000000000
--- a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/portfile.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-vcpkg_minimum_required(VERSION 2020-01-12)
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json
deleted file mode 100644
index 31e6fb62f..000000000
--- a/scripts/e2e_ports/overlays/vcpkg-requires-old-date/vcpkg.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "vcpkg-requires-old-date",
-  "version-string": "1.0.0",
-  "description": "A test port that requires a vcpkg version from before vcpkg_minimum_required's introduction.",
-  "homepage": ""
-}
diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake
deleted file mode 100644
index 571ae3b7a..000000000
--- a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

-

-vcpkg_test_cmake(args args args)

diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json
deleted file mode 100644
index 9f34e058d..000000000
--- a/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{

-  "name": "vcpkg-uses-test-cmake",

-  "version-string": "1.0.0",

-  "description": "A test port that uses the deprecated function vcpkg_test_cmake.",

-  "homepage": ""

-}

diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake
deleted file mode 100644
index 9207d30b1..000000000
--- a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

-

-include(vcpkg_common_functions)

diff --git a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json
deleted file mode 100644
index 7c16ffe82..000000000
--- a/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{

-  "name": "vcpkg-uses-vcpkg-common-functions",

-  "version-string": "1.0.0",

-  "description": "A test port that uses the deprecated file vcpkg_common_functions.",

-  "homepage": ""

-}

diff --git a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake
deleted file mode 100644
index 065116c27..000000000
--- a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json
deleted file mode 100644
index a25da6d23..000000000
--- a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"name": "vcpkg-internal-e2e-test-port",
-	"version-string": "1.0.0"
-}
diff --git a/scripts/e2e_ports/versions/baseline.json b/scripts/e2e_ports/versions/baseline.json
deleted file mode 100644
index 2413f8afc..000000000
--- a/scripts/e2e_ports/versions/baseline.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "default": {
-        "vcpkg-internal-e2e-test-port": { "baseline": "1.0.0" }
-    }
-}
diff --git a/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json b/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json
deleted file mode 100644
index ce7698ebb..000000000
--- a/scripts/e2e_ports/versions/v-/vcpkg-internal-e2e-test-port.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "versions": [
-    {
-      "version-string": "1.0.0",
-      "git-tree": "1dc3e42a3c0cafe2884d379af4399273238b986e"
-    }
-  ]
-}
diff --git a/scripts/testing/env-passthrough/passthrough.cmake b/scripts/testing/env-passthrough/passthrough.cmake
deleted file mode 100644
index 071b8381e..000000000
--- a/scripts/testing/env-passthrough/passthrough.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(VCPKG_TARGET_ARCHITECTURE x64)

-set(VCPKG_CRT_LINKAGE dynamic)

-set(VCPKG_LIBRARY_LINKAGE dynamic)

-

-set(VCPKG_ENV_PASSTHROUGH _VCPKG_TEST_TRACKED _VCPKG_TEST_TRACKED2)

-set(VCPKG_ENV_PASSTHROUGH_UNTRACKED _VCPKG_TEST_UNTRACKED _VCPKG_TEST_UNTRACKED2)

diff --git a/scripts/testing/integrate-install/NoProps.vcxproj b/scripts/testing/integrate-install/NoProps.vcxproj
deleted file mode 100644
index 5b75d0961..000000000
--- a/scripts/testing/integrate-install/NoProps.vcxproj
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <VCProjectVersion>16.0</VCProjectVersion>

-    <ProjectGuid>{5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A}</ProjectGuid>

-    <RootNamespace>Project1</RootNamespace>

-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="Shared">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="Source.cpp" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.targets" />

-</Project>
\ No newline at end of file
diff --git a/scripts/testing/integrate-install/Project1.vcxproj b/scripts/testing/integrate-install/Project1.vcxproj
deleted file mode 100644
index a8896fe29..000000000
--- a/scripts/testing/integrate-install/Project1.vcxproj
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <VCProjectVersion>16.0</VCProjectVersion>

-    <ProjectGuid>{5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A}</ProjectGuid>

-    <RootNamespace>Project1</RootNamespace>

-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="Shared">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="Source.cpp" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.targets" />

-</Project>
\ No newline at end of file
diff --git a/scripts/testing/integrate-install/Source.cpp b/scripts/testing/integrate-install/Source.cpp
deleted file mode 100644
index 24a84e4d7..000000000
--- a/scripts/testing/integrate-install/Source.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <zlib.h>

-

-int main() {

-    zlibVersion();

-    return 0;

-}
\ No newline at end of file
diff --git a/scripts/testing/integrate-install/VcpkgTriplet.vcxproj b/scripts/testing/integrate-install/VcpkgTriplet.vcxproj
deleted file mode 100644
index 883fc8ec1..000000000
--- a/scripts/testing/integrate-install/VcpkgTriplet.vcxproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <VCProjectVersion>16.0</VCProjectVersion>

-    <ProjectGuid>{5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A}</ProjectGuid>

-    <RootNamespace>VcpkgUseStatic</RootNamespace>

-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="Shared">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <VcpkgTriplet>x86-windows-static</VcpkgTriplet>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="Source.cpp" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.targets" />

-</Project>
\ No newline at end of file
diff --git a/scripts/testing/integrate-install/VcpkgTriplet2.vcxproj b/scripts/testing/integrate-install/VcpkgTriplet2.vcxproj
deleted file mode 100644
index d3352e195..000000000
--- a/scripts/testing/integrate-install/VcpkgTriplet2.vcxproj
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <VCProjectVersion>16.0</VCProjectVersion>

-    <ProjectGuid>{5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A}</ProjectGuid>

-    <RootNamespace>VcpkgUseStatic</RootNamespace>

-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

-    <VcpkgTriplet>x86-windows-static</VcpkgTriplet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="Shared">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="Source.cpp" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.targets" />

-</Project>
\ No newline at end of file
diff --git a/scripts/testing/integrate-install/VcpkgUseStatic.vcxproj b/scripts/testing/integrate-install/VcpkgUseStatic.vcxproj
deleted file mode 100644
index 28c4fc715..000000000
--- a/scripts/testing/integrate-install/VcpkgUseStatic.vcxproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <VCProjectVersion>16.0</VCProjectVersion>

-    <ProjectGuid>{5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A}</ProjectGuid>

-    <RootNamespace>VcpkgUseStatic</RootNamespace>

-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="Shared">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <VcpkgUseStatic>true</VcpkgUseStatic>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="Source.cpp" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.targets" />

-</Project>
\ No newline at end of file
diff --git a/scripts/testing/integrate-install/VcpkgUseStatic2.vcxproj b/scripts/testing/integrate-install/VcpkgUseStatic2.vcxproj
deleted file mode 100644
index 98beaee4b..000000000
--- a/scripts/testing/integrate-install/VcpkgUseStatic2.vcxproj
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <VCProjectVersion>16.0</VCProjectVersion>

-    <ProjectGuid>{5AFB7AF5-D8FC-4A86-B0D2-3BBD039ED03A}</ProjectGuid>

-    <RootNamespace>VcpkgUseStatic</RootNamespace>

-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

-    <VcpkgUseStatic>true</VcpkgUseStatic>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <PlatformToolset>v142</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="Shared">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ConformanceMode>true</ConformanceMode>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="Source.cpp" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <Import Project="..\..\buildsystems\msbuild\vcpkg.targets" />

-</Project>
\ No newline at end of file
diff --git a/scripts/tls12-download.exe b/scripts/tls12-download.exe
new file mode 100644
index 000000000..3eff1dd4e
--- /dev/null
+++ b/scripts/tls12-download.exe