Merge pull request #1 from Microsoft/master

update

18 files changed, 693 insertions, 217 deletions

diff --git a/scripts/SHA256Hash.ps1 b/scripts/SHA256Hash.ps1
deleted file mode 100644
index 348d461b7..000000000
--- a/scripts/SHA256Hash.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-[CmdletBinding()]

-Param(

-    [Parameter(Mandatory=$True)]

-    [String]$Value

-)

-

-$sha256 = New-Object -TypeName System.Security.Cryptography.SHA256CryptoServiceProvider

-$utf8 = New-Object -TypeName System.Text.UTF8Encoding

-[System.BitConverter]::ToString($sha256.ComputeHash($utf8.GetBytes($Value)))

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index 73a3fc9ad..3ea18116b 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -84,22 +84,28 @@ function vcpkgGetCredentials()
     }
 }
 
-function vcpkgGetSHA256([Parameter(Mandatory=$true)][string]$filePath)
+function vcpkgGetSHA512([Parameter(Mandatory=$true)][string]$filePath)
 {
     if (vcpkgHasCommand -commandName 'Microsoft.PowerShell.Utility\Get-FileHash')
     {
         Write-Verbose("Hashing with Microsoft.PowerShell.Utility\Get-FileHash")
-        $hash = (Microsoft.PowerShell.Utility\Get-FileHash -Path $filePath -Algorithm SHA256).Hash
+        $hashresult = Microsoft.PowerShell.Utility\Get-FileHash -Path $filePath -Algorithm SHA512 -ErrorVariable hashError
+        if ($hashError)
+        {
+            Start-Sleep 3
+            $hashresult = Microsoft.PowerShell.Utility\Get-FileHash -Path $filePath -Algorithm SHA512 -ErrorVariable Stop
+        }
+        $hash = $hashresult.Hash
     }
     elseif(vcpkgHasCommand -commandName 'Pscx\Get-Hash')
     {
         Write-Verbose("Hashing with Pscx\Get-Hash")
-        $hash = (Pscx\Get-Hash -Path $filePath -Algorithm SHA256).HashString
+        $hash = (Pscx\Get-Hash -Path $filePath -Algorithm SHA512).HashString
     }
     else
     {
         Write-Verbose("Hashing with .NET")
-        $hashAlgorithm = [Security.Cryptography.HashAlgorithm]::Create("SHA256")
+        $hashAlgorithm = [Security.Cryptography.HashAlgorithm]::Create("SHA512")
         $fileAsByteArray = [io.File]::ReadAllBytes($filePath)
         $hashByteArray = $hashAlgorithm.ComputeHash($fileAsByteArray)
         $hash = -Join ($hashByteArray | ForEach-Object {"{0:x2}" -f $_})
@@ -108,28 +114,26 @@ function vcpkgGetSHA256([Parameter(Mandatory=$true)][string]$filePath)
     return $hash.ToLower()
 }
 
-function vcpkgCheckEqualFileHash(   [Parameter(Mandatory=$true)][string]$filePath,
-                                    [Parameter(Mandatory=$true)][string]$expectedHash,
-                                    [Parameter(Mandatory=$true)][string]$actualHash )
+function vcpkgCheckEqualFileHash(   [Parameter(Mandatory=$true)][string]$url,
+                                    [Parameter(Mandatory=$true)][string]$filePath,
+                                    [Parameter(Mandatory=$true)][string]$expectedHash)
 {
-    if ($expectedDownloadedFileHash -ne $downloadedFileHash)
+    $actualHash = vcpkgGetSHA512 $filePath
+    if ($expectedHash -ne $actualHash)
     {
         Write-Host ("`nFile does not have expected hash:`n" +
+        "              url: [ $url ]`n" +
         "        File path: [ $filePath ]`n" +
         "    Expected hash: [ $expectedHash ]`n" +
         "      Actual hash: [ $actualHash ]`n")
-        throw "Invalid Hash for file $filePath"
+        throw
     }
 }
 
 function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
-                            [Parameter(Mandatory=$true)][string]$downloadPath)
+                            [Parameter(Mandatory=$true)][string]$downloadPath,
+                            [Parameter(Mandatory=$true)][string]$sha512)
 {
-    if (Test-Path $downloadPath)
-    {
-        return
-    }
-
     if ($url -match "github")
     {
         if ([System.Enum]::IsDefined([Net.SecurityProtocolType], "Tls12"))
@@ -140,6 +144,7 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
         {
             Write-Warning "Github has dropped support for TLS versions prior to 1.2, which is not available on your system"
             Write-Warning "Please manually download $url to $downloadPath"
+            Write-Warning "To solve this issue for future downloads, you can also install Windows Management Framework 5.1+"
             throw "Download failed"
         }
     }
@@ -149,7 +154,6 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
     $downloadPartPath = "$downloadPath.part"
     vcpkgRemoveItem $downloadPartPath
 
-
     $wc = New-Object System.Net.WebClient
     if (!$wc.Proxy.IsBypassed($url))
     {
@@ -157,36 +161,85 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
     }
 
     $wc.DownloadFile($url, $downloadPartPath)
+    vcpkgCheckEqualFileHash -url $url -filePath $downloadPartPath -expectedHash $sha512
+    Move-Item -Path $downloadPartPath -Destination $downloadPath
+}
+
+function vcpkgDownloadFileWithAria2(    [Parameter(Mandatory=$true)][string]$aria2exe,
+                                        [Parameter(Mandatory=$true)][string]$url,
+                                        [Parameter(Mandatory=$true)][string]$downloadPath,
+                                        [Parameter(Mandatory=$true)][string]$sha512)
+{
+    vcpkgCreateParentDirectoryIfNotExists $downloadPath
+    $downloadPartPath = "$downloadPath.part"
+    vcpkgRemoveItem $downloadPartPath
+
+    $parentDir = split-path -parent $downloadPath
+    $filename = split-path -leaf $downloadPath
+
+    if ((Test-Path $url) -or ($url.StartsWith("file://"))) # if is local file
+    {
+        vcpkgDownloadFile $url $downloadPath $sha512
+        return
+    }
+
+    $ec = vcpkgInvokeCommand "$aria2exe" "--dir=`"$parentDir`" --out=`"$filename.part`" $url"
+    if ($ec -ne 0)
+    {
+        Write-Host "Could not download $url"
+        throw
+    }
+
+    vcpkgCheckEqualFileHash -url $url -filePath $downloadPartPath -expectedHash $sha512
     Move-Item -Path $downloadPartPath -Destination $downloadPath
 }
 
-function vcpkgExtractFile(  [Parameter(Mandatory=$true)][string]$file,
-                            [Parameter(Mandatory=$true)][string]$destinationDir,
-                            [Parameter(Mandatory=$true)][string]$outFilename)
+function vcpkgExtractFileWith7z([Parameter(Mandatory=$true)][string]$sevenZipExe,
+                                [Parameter(Mandatory=$true)][string]$archivePath,
+                                [Parameter(Mandatory=$true)][string]$destinationDir)
 {
-    vcpkgCreateDirectoryIfNotExists $destinationDir
-    $output = "$destinationDir\$outFilename"
-    vcpkgRemoveItem $output
-    $destinationPartial = "$destinationDir\partially-extracted"
+    vcpkgRemoveItem $destinationDir
+    $destinationPartial = "$destinationDir.partial"
+    vcpkgRemoveItem $destinationPartial
+    vcpkgCreateDirectoryIfNotExists $destinationPartial
+    $ec = vcpkgInvokeCommand "$sevenZipExe" "x `"$archivePath`" -o`"$destinationPartial`" -y"
+    if ($ec -ne 0)
+    {
+        Write-Host "Could not extract $archivePath"
+        throw
+    }
+    Rename-Item -Path "$destinationPartial" -NewName $destinationDir -ErrorVariable renameResult
+    if ($renameResult)
+    {
+        Start-Sleep 3
+        Rename-Item -Path "$destinationPartial" -NewName $destinationDir -ErrorAction Stop
+    }
+}
 
+function vcpkgExtractZipFile(  [Parameter(Mandatory=$true)][string]$archivePath,
+                               [Parameter(Mandatory=$true)][string]$destinationDir)
+{
+    vcpkgRemoveItem $destinationDir
+    $destinationPartial = "$destinationDir.partial"
     vcpkgRemoveItem $destinationPartial
     vcpkgCreateDirectoryIfNotExists $destinationPartial
 
+
     if (vcpkgHasCommand -commandName 'Microsoft.PowerShell.Archive\Expand-Archive')
     {
         Write-Verbose("Extracting with Microsoft.PowerShell.Archive\Expand-Archive")
-        Microsoft.PowerShell.Archive\Expand-Archive -path $file -destinationpath $destinationPartial
+        Microsoft.PowerShell.Archive\Expand-Archive -path $archivePath -destinationpath $destinationPartial
     }
     elseif (vcpkgHasCommand -commandName 'Pscx\Expand-Archive')
     {
         Write-Verbose("Extracting with Pscx\Expand-Archive")
-        Pscx\Expand-Archive -path $file -OutputPath $destinationPartial
+        Pscx\Expand-Archive -path $archivePath -OutputPath $destinationPartial
     }
     else
     {
         Write-Verbose("Extracting via shell")
         $shell = new-object -com shell.application
-        $zip = $shell.NameSpace($(Get-Item $file).fullname)
+        $zip = $shell.NameSpace($(Get-Item $archivePath).fullname)
         foreach($item in $zip.items())
         {
             # Piping to Out-Null is used to block until finished
@@ -194,17 +247,7 @@ function vcpkgExtractFile(  [Parameter(Mandatory=$true)][string]$file,
         }
     }
 
-    $itemCount = @(Get-ChildItem "$destinationPartial").Count
-
-    if ($itemCount -eq 1)
-    {
-        Move-Item -Path "$destinationPartial\*" -Destination $output
-        vcpkgRemoveItem $destinationPartial
-    }
-    else
-    {
-        Move-Item -Path "$destinationPartial" -Destination $output
-    }
+    Rename-Item -Path "$destinationPartial" -NewName $destinationDir
 }
 
 function vcpkgInvokeCommand()
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
new file mode 100644
index 000000000..037a9136d
--- /dev/null
+++ b/scripts/bootstrap.sh
@@ -0,0 +1,195 @@
+#!/bin/sh
+
+# Find vcpkg-root
+vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
+while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do
+    vcpkgRootDir="$(dirname "$vcpkgRootDir")"
+done
+
+downloadsDir="$vcpkgRootDir/downloads"
+
+extractStringBetweenDelimiters()
+{
+    input=$1;leftDelim=$2;rightDelim=$3
+    output="${input##*$leftDelim}"
+    output="${output%%$rightDelim*}"
+    echo "$output"
+}
+
+vcpkgCheckRepoTool()
+{
+    __tool=$1
+    if ! command -v "$__tool" >/dev/null 2>&1 ; then
+        echo "Could not find $__tool. Please install it (and other dependencies) with:"
+        echo "sudo apt-get install curl unzip tar"
+        exit 1
+    fi
+}
+
+vcpkgCheckEqualFileHash()
+{
+    url=$1; filePath=$2; expectedHash=$3
+
+    if command -v "sha512sum" >/dev/null 2>&1 ; then
+        actualHash=$(sha512sum "$filePath")
+    else
+        # sha512sum is not available by default on osx
+        # shasum is not available by default on Fedora
+        actualHash=$(shasum -a 512 "$filePath")
+    fi
+
+    actualHash="${actualHash%% *}" # shasum returns [hash filename], so get the first word
+
+    if ! [ "$expectedHash" = "$actualHash" ]; then
+        echo ""
+        echo "File does not have expected hash:"
+        echo "              url: [ $url ]"
+        echo "        File path: [ $downloadPath ]"
+        echo "    Expected hash: [ $sha512 ]"
+        echo "      Actual hash: [ $actualHash ]"
+        exit
+    fi
+}
+
+vcpkgDownloadFile()
+{
+    url=$1; downloadPath=$2 sha512=$3
+    vcpkgCheckRepoTool "curl"
+    rm -rf "$downloadPath.part"
+    curl -L $url --create-dirs --output "$downloadPath.part" || exit 1
+
+    vcpkgCheckEqualFileHash $url "$downloadPath.part" $sha512
+    mv "$downloadPath.part" "$downloadPath"
+}
+
+vcpkgExtractArchive()
+{
+    archive=$1; toPath=$2
+    rm -rf "$toPath" "$toPath.partial"
+    mkdir -p "$toPath.partial"
+
+    archiveType="${archive##*.}"
+    if [ "$archiveType" = "zip" ]; then
+        vcpkgCheckRepoTool "unzip"
+        $(cd "$toPath.partial" && unzip -qqo "$archive")
+    else
+        vcpkgCheckRepoTool "tar"
+        $(cd "$toPath.partial" && tar xzf "$archive")
+    fi
+    mv "$toPath.partial" "$toPath"
+}
+
+fetchTool()
+{
+    tool=$1; UNAME=$2; __output=$3
+
+    if [ "$tool" = "" ]; then
+        echo "No tool name provided"
+        return 1
+    fi
+
+    if [ "$UNAME" = "Linux" ]; then
+        os="linux"
+    elif [ "$UNAME" = "Darwin" ]; then
+        os="osx"
+    else
+        echo "Unknown uname: $UNAME"
+        return 1
+    fi
+
+    xmlFileAsString=`cat $vcpkgRootDir/scripts/vcpkgTools.xml`
+    toolRegexStart="<tool name=\"$tool\" os=\"$os\">"
+    toolData="$(extractStringBetweenDelimiters "$xmlFileAsString" "$toolRegexStart" "</tool>")"
+    if [ "$toolData" = "" ]; then
+        echo "Unknown tool: $tool"
+        return 1
+    fi
+
+    version="$(extractStringBetweenDelimiters "$toolData" "<version>" "</version>")"
+
+    toolPath="$downloadsDir/tools/$tool-$version-$os"
+
+    exeRelativePath="$(extractStringBetweenDelimiters "$toolData" "<exeRelativePath>" "</exeRelativePath>")"
+    exePath="$toolPath/$exeRelativePath"
+
+    if [ -e "$exePath" ]; then
+        eval $__output="'$exePath'"
+        return 0
+    fi
+
+    isArchive=true
+    if [ $isArchive = true ]; then
+        archiveName="$(extractStringBetweenDelimiters "$toolData" "<archiveName>" "</archiveName>")"
+        downloadPath="$downloadsDir/$archiveName"
+    else
+        echo "Non-archives not supported yet"
+        return 1
+    fi
+
+    url="$(extractStringBetweenDelimiters "$toolData" "<url>" "</url>")"
+    sha512="$(extractStringBetweenDelimiters "$toolData" "<sha512>" "</sha512>")"
+    if ! [ -e "$downloadPath" ]; then
+        echo "Downloading $tool..."
+        vcpkgDownloadFile $url "$downloadPath" $sha512
+        echo "Downloading $tool... done."
+    else
+        vcpkgCheckEqualFileHash $url "$downloadPath" $sha512
+    fi
+
+    if [ $isArchive = true ]; then
+        echo "Extracting $tool..."
+        vcpkgExtractArchive "$downloadPath" "$toolPath"
+        echo "Extracting $tool... done."
+    fi
+
+    if ! [ -e "$exePath" ]; then
+        echo "Could not detect or download $tool"
+        return 1
+    fi
+
+    eval $__output="'$exePath'"
+    return 0
+}
+
+selectCXX()
+{
+    __output=$1
+
+    if [ "x$CXX" = "x" ]; then
+        CXX=g++
+        if which g++-7 >/dev/null 2>&1; then
+            CXX=g++-7
+        elif which g++-6 >/dev/null 2>&1; then
+            CXX=g++-6
+        fi
+    fi
+
+    gccversion="$("$CXX" -v 2>&1)"
+    gccversion="$(extractStringBetweenDelimiters "$gccversion" "gcc version " ".")"
+    if [ "$gccversion" -lt "6" ]; then
+        echo "CXX ($CXX) is too old; please install a newer compiler such as g++-7."
+        echo "sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y"
+        echo "sudo apt-get update -y"
+        echo "sudo apt-get install g++-7 -y"
+        return 1
+    fi
+
+    eval $__output="'$CXX'"
+}
+
+# Preparation
+UNAME="$(uname)"
+fetchTool "cmake" "$UNAME" cmakeExe || exit 1
+fetchTool "ninja" "$UNAME" ninjaExe || exit 1
+selectCXX CXX || exit 1
+
+# Do the build
+buildDir="$vcpkgRootDir/toolsrc/build.rel"
+rm -rf "$buildDir"
+mkdir -p "$buildDir"
+
+(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe")
+(cd "$buildDir" && "$cmakeExe" --build .)
+
+rm -rf "$vcpkgRootDir/vcpkg"
+cp "$buildDir/vcpkg" "$vcpkgRootDir/"
diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1
index 3f0f2ef37..e5f3c3dd0 100644
--- a/scripts/buildsystems/msbuild/applocal.ps1
+++ b/scripts/buildsystems/msbuild/applocal.ps1
@@ -4,6 +4,7 @@ param([string]$targetBinary, [string]$installedDir, [string]$tlogFile, [string]$
 $g_searched = @{}
 # Note: installedDir is actually the bin\ directory.
 $g_install_root = Split-Path $installedDir -parent
+$g_is_debug = $g_install_root -match '(.*\\)?debug(\\)?$'
 
 # Ensure we create the copied files log, even if we don't end up copying any files
 if ($copiedFilesLog)
@@ -63,6 +64,13 @@ function resolve([string]$targetBinary) {
             deployBinary $baseTargetBinaryDir $installedDir "$_"
             if (Test-Path function:\deployPluginsIfQt) { deployPluginsIfQt $targetBinaryDir "$g_install_root\plugins" "$_" }
             if (Test-Path function:\deployOpenNI2) { deployOpenNI2 $targetBinaryDir "$g_install_root" "$_" }
+            if (Test-Path function:\deployPluginsIfMagnum) {
+                if ($g_is_debug) {
+                    deployPluginsIfMagnum $targetBinaryDir "$g_install_root\bin\magnum-d" "$_"
+                } else {
+                    deployPluginsIfMagnum $targetBinaryDir "$g_install_root\bin\magnum" "$_"
+                }
+            }
             resolve "$baseTargetBinaryDir\$_"
         } elseif (Test-Path "$targetBinaryDir\$_") {
             Write-Verbose "  ${_}: $_ not found in vcpkg; locally deployed"
@@ -85,5 +93,12 @@ if (Test-Path "$g_install_root\bin\OpenNI2\openni2deploy.ps1") {
     . "$g_install_root\bin\OpenNI2\openni2deploy.ps1"
 }
 
+# Note: This is a hack to make Magnum work.
+if (Test-Path "$g_install_root\bin\magnum\magnumdeploy.ps1") {
+    . "$g_install_root\bin\magnum\magnumdeploy.ps1"
+} elseif (Test-Path "$g_install_root\bin\magnum-d\magnumdeploy.ps1") {
+    . "$g_install_root\bin\magnum-d\magnumdeploy.ps1"
+}
+
 resolve($targetBinary)
-Write-Verbose $($g_searched | out-string)
\ No newline at end of file
+Write-Verbose $($g_searched | out-string)
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 1d1977e6a..91c196fb9 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -44,7 +44,7 @@ else()
         elseif(_VCPKG_CL MATCHES "arm/cl.exe$")
             set(_VCPKG_TARGET_TRIPLET_ARCH arm)
         elseif(_VCPKG_CL MATCHES "arm64/cl.exe$")
-            set(_VCPKG_TARGET_TRIPLET_ARCH arm64)            
+            set(_VCPKG_TARGET_TRIPLET_ARCH arm64)
         elseif(_VCPKG_CL MATCHES "bin/cl.exe$" OR _VCPKG_CL MATCHES "x86/cl.exe$")
             set(_VCPKG_TARGET_TRIPLET_ARCH x86)
         elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
@@ -57,12 +57,14 @@ endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone")
     set(_VCPKG_TARGET_TRIPLET_PLAT uwp)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux"))
     set(_VCPKG_TARGET_TRIPLET_PLAT linux)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin"))
     set(_VCPKG_TARGET_TRIPLET_PLAT osx)
-else()
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows"))
     set(_VCPKG_TARGET_TRIPLET_PLAT windows)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD"))
+    set(_VCPKG_TARGET_TRIPLET_PLAT freebsd)
 endif()
 
 set(VCPKG_TARGET_TRIPLET ${_VCPKG_TARGET_TRIPLET_ARCH}-${_VCPKG_TARGET_TRIPLET_PLAT} CACHE STRING "Vcpkg target triplet (ex. x86-windows)")
@@ -108,16 +110,6 @@ list(APPEND CMAKE_LIBRARY_PATH
     ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link
 )
 
-if (NOT DEFINED CMAKE_SYSTEM_VERSION AND _VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp")
-    include(${_VCPKG_ROOT_DIR}/scripts/cmake/vcpkg_get_windows_sdk.cmake)
-    # This is used as an implicit parameter for vcpkg_get_windows_sdk
-    set(VCPKG_ROOT_DIR ${_VCPKG_ROOT_DIR})
-    vcpkg_get_windows_sdk(WINDOWS_SDK_VERSION)
-    unset(VCPKG_ROOT_DIR)
-    set(CMAKE_SYSTEM_VERSION ${WINDOWS_SDK_VERSION} CACHE STRING "Windows SDK version")
-    message(STATUS "Found Windows SDK ${WINDOWS_SDK_VERSION}")
-endif()
-
 file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
 set(CMAKE_SYSTEM_IGNORE_PATH
     "${_programfiles}/OpenSSL"
@@ -188,24 +180,14 @@ macro(find_package name)
     if(EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/${_vcpkg_lowercase_name}/vcpkg-cmake-wrapper.cmake")
         set(ARGS "${ARGV}")
         include(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/${_vcpkg_lowercase_name}/vcpkg-cmake-wrapper.cmake)
-    elseif("${name}" STREQUAL "Boost")
-        set(_Boost_USE_STATIC_LIBS ${Boost_USE_STATIC_LIBS})
-        set(_Boost_USE_MULTITHREADED ${Boost_USE_MULTITHREADED})
-        set(_Boost_USE_STATIC_RUNTIME ${Boost_USE_STATIC_RUNTIME})
-        set(_Boost_COMPILER ${Boost_COMPILER})
+    elseif("${name}" STREQUAL "Boost" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/boost")
+        # Checking for the boost headers disables this wrapper unless the user has installed at least one boost library
         unset(Boost_USE_STATIC_LIBS)
         unset(Boost_USE_MULTITHREADED)
         unset(Boost_USE_STATIC_RUNTIME)
         set(Boost_COMPILER "-vc140")
         _find_package(${ARGV})
-        if(NOT Boost_FOUND)
-            set(Boost_USE_STATIC_LIBS ${_Boost_USE_STATIC_LIBS})
-            set(Boost_USE_MULTITHREADED ${_Boost_USE_MULTITHREADED})
-            set(Boost_USE_STATIC_RUNTIME ${_Boost_USE_STATIC_RUNTIME})
-            set(Boost_COMPILER ${_Boost_COMPILER})
-            _find_package(${ARGV})
-        endif()
-    elseif("${name}" STREQUAL "ICU")
+    elseif("${name}" STREQUAL "ICU" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/unicode/utf.h")
         function(_vcpkg_find_in_list)
             list(FIND ARGV "COMPONENTS" COMPONENTS_IDX)
             set(COMPONENTS_IDX ${COMPONENTS_IDX} PARENT_SCOPE)
@@ -216,7 +198,7 @@ macro(find_package name)
         else()
             _find_package(${ARGV})
         endif()
-    elseif("${name}" STREQUAL "TIFF")
+    elseif("${name}" STREQUAL "TIFF" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/tiff.h")
         _find_package(${ARGV})
         find_package(LibLZMA)
         if(TARGET TIFF::TIFF)
@@ -225,24 +207,7 @@ macro(find_package name)
         if(TIFF_LIBRARIES)
             list(APPEND TIFF_LIBRARIES ${LIBLZMA_LIBRARIES})
         endif()
-    elseif("${name}" STREQUAL "Freetype")
-        _find_package(${ARGV})
-        find_package(ZLIB)
-        find_package(PNG)
-        find_package(BZip2)
-        if(TARGET Freetype::Freetype)
-            set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2 PNG::PNG ZLIB::ZLIB)
-        endif()
-        if(FREETYPE_LIBRARIES)
-            list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
-        endif()
-    elseif("${name}" STREQUAL "tinyxml2")
-        _find_package(${ARGV})
-        if(TARGET tinyxml2_static AND NOT TARGET tinyxml2)
-            _add_library(tinyxml2 INTERFACE IMPORTED)
-            set_target_properties(tinyxml2 PROPERTIES INTERFACE_LINK_LIBRARIES "tinyxml2_static")
-        endif()
-    elseif(("${name}" STREQUAL "HDF5" OR "${name}" STREQUAL "hdf5") AND NOT PROJECT_NAME STREQUAL "VTK")
+    elseif(("${name}" STREQUAL "HDF5" OR "${name}" STREQUAL "hdf5") AND NOT PROJECT_NAME STREQUAL "VTK" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/hdf5.h")
         # This is a hack to make VTK work. TODO: find another way to suppress the built-in find module.
         _find_package(${ARGV} CONFIG)
         # Fill in missing static/shared targets
@@ -255,7 +220,7 @@ macro(find_package name)
                 set_target_properties(hdf5::${HDF5TARGET}-static PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5::${HDF5TARGET}-shared")
             endif()
         endforeach()
-    elseif("${name}" STREQUAL "GSL")
+    elseif("${name}" STREQUAL "GSL" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/gsl")
         _find_package(${ARGV})
         if(GSL_FOUND AND TARGET GSL::gsl)
             set_property( TARGET GSL::gslcblas APPEND PROPERTY IMPORTED_CONFIGURATIONS Release )
@@ -267,7 +232,7 @@ macro(find_package name)
                 set_target_properties( GSL::gslcblas PROPERTIES IMPORTED_LOCATION_DEBUG "${GSL_CBLAS_LIBRARY_DEBUG}" )
             endif()
         endif()
-    elseif("${name}" STREQUAL "CURL")
+    elseif("${name}" STREQUAL "CURL" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/curl")
         _find_package(${ARGV})
         if(CURL_FOUND)
             if(EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/nghttp2.lib")
@@ -276,16 +241,8 @@ macro(find_package name)
                     "optimized" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/nghttp2.lib")
             endif()
         endif()
-    elseif("${name}" STREQUAL "LibXml2")
-        _find_package(${ARGV})
-        if(LibXml2_FOUND AND (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
-            list(APPEND LIBXML2_LIBRARIES
-                debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libiconv.lib
-                optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libiconv.lib
-                debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libcharset.lib
-                optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libcharset.lib
-                ws2_32)
-        endif()
+    elseif("${_vcpkg_lowercase_name}" STREQUAL "grpc" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/grpc")
+        _find_package(gRPC ${ARGN})
     else()
         _find_package(${ARGV})
     endif()
diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake
index bdf192792..983ac9221 100644
--- a/scripts/cmake/vcpkg_build_cmake.cmake
+++ b/scripts/cmake/vcpkg_build_cmake.cmake
@@ -15,6 +15,9 @@
 ## The target passed to the cmake build command (`cmake --build . --target <target>`). If not specified, no target will
 ## be passed.
 ##
+## ### ADD_BIN_TO_PATH
+## Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs.
+##
 ## ## Notes:
 ## This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
 ## You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the
@@ -27,7 +30,7 @@
 ## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake)
 ## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
 function(vcpkg_build_cmake)
-    cmake_parse_arguments(_bc "DISABLE_PARALLEL" "TARGET;LOGFILE_ROOT" "" ${ARGN})
+    cmake_parse_arguments(_bc "DISABLE_PARALLEL;ADD_BIN_TO_PATH" "TARGET;LOGFILE_ROOT" "" ${ARGN})
 
     if(NOT _bc_LOGFILE_ROOT)
         set(_bc_LOGFILE_ROOT "build")
@@ -65,20 +68,24 @@ function(vcpkg_build_cmake)
         if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL BUILDTYPE)
             if(BUILDTYPE STREQUAL "debug")
                 set(SHORT_BUILDTYPE "dbg")
+                set(CONFIG "Debug")
             else()
                 set(SHORT_BUILDTYPE "rel")
+                set(CONFIG "Release")
             endif()
 
             message(STATUS "Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}")
             set(LOGPREFIX "${CURRENT_BUILDTREES_DIR}/${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}")
             set(LOGS)
 
-            if(BUILDTYPE STREQUAL "release")
-                set(CONFIG "Release")
-            else()
-                set(CONFIG "Debug")
+            if(_bc_ADD_BIN_TO_PATH)
+                set(_BACKUP_ENV_PATH "$ENV{PATH}")
+                if(BUILDTYPE STREQUAL "debug")
+                    set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin;$ENV{PATH}")
+                else()
+                    set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin;$ENV{PATH}")
+                endif()
             endif()
-
             execute_process(
                 COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${PARALLEL_ARG}
                 OUTPUT_FILE "${LOGPREFIX}-out.log"
@@ -98,6 +105,7 @@ function(vcpkg_build_cmake)
 
                 if(out_contents MATCHES "LINK : fatal error LNK1102:" OR out_contents MATCHES " fatal error C1060: ")
                     # The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled.
+                    message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} without parallelism because memory exceeded")
                     execute_process(
                         COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG}
                         OUTPUT_FILE "${LOGPREFIX}-out-1.log"
@@ -116,6 +124,39 @@ function(vcpkg_build_cmake)
                             list(APPEND LOGS "${LOGPREFIX}-err-1.log")
                         endif()
                     endif()
+                elseif(out_contents MATCHES ": No such file or directory")
+                    # WSL workaround - WSL occassionally fails with no such file or directory. Detect if we are running in WSL and restart.
+                    execute_process(COMMAND "uname" "-r"
+                        OUTPUT_VARIABLE UNAME_R ERROR_VARIABLE UNAME_R
+                        OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
+
+                    if (UNAME_R MATCHES "Microsoft")
+                        set(ITERATION 0)
+                        while (ITERATION LESS 10 AND out_contents MATCHES ": No such file or directory")
+                            MATH(EXPR ITERATION "${ITERATION}+1")
+                            message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of wsl subsystem issue. Iteration: ${ITERATION}")
+                            execute_process(
+                                COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS}
+                                OUTPUT_FILE "${LOGPREFIX}-out-${ITERATION}.log"
+                                ERROR_FILE "${LOGPREFIX}-err-${ITERATION}.log"
+                                RESULT_VARIABLE error_code
+                                WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE})
+
+                            if(error_code)
+                                file(READ "${LOGPREFIX}-out-${ITERATION}.log" out_contents)
+                                file(READ "${LOGPREFIX}-err-${ITERATION}.log" err_contents)
+
+                                if(out_contents)
+                                    list(APPEND LOGS "${LOGPREFIX}-out-${ITERATION}.log")
+                                endif()
+                                if(err_contents)
+                                    list(APPEND LOGS "${LOGPREFIX}-err-${ITERATION}.log")
+                                endif()
+                            else()
+                                break()
+                            endif()
+                        endwhile()
+                    endif()
                 endif()
 
                 if(error_code)
@@ -134,6 +175,9 @@ function(vcpkg_build_cmake)
                 endif()
             endif()
             message(STATUS "Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} done")
+            if(_bc_ADD_BIN_TO_PATH)
+                set(ENV{PATH} "${_BACKUP_ENV_PATH}")
+            endif()
         endif()
     endforeach()
 endfunction()
diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake
index b8403d277..db04530ef 100644
--- a/scripts/cmake/vcpkg_build_msbuild.cmake
+++ b/scripts/cmake/vcpkg_build_msbuild.cmake
@@ -19,6 +19,11 @@
 ## ```
 ##
 ## ## Parameters
+## ### USE_VCPKG_INTEGRATION
+## Apply the normal `integrate install` integration for building the project.
+##
+## By default, projects built with this command will not automatically link libraries or have header paths set.
+##
 ## ### PROJECT_PATH
 ## The path to the solution (`.sln`) or project (`.vcxproj`) file.
 ##
@@ -56,7 +61,13 @@
 ## * [cppunit](https://github.com/Microsoft/vcpkg/blob/master/ports/cppunit/portfile.cmake)
 
 function(vcpkg_build_msbuild)
-    cmake_parse_arguments(_csc "" "PROJECT_PATH;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION;PLATFORM;PLATFORM_TOOLSET;TARGET_PLATFORM_VERSION;TARGET" "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG" ${ARGN})
+    cmake_parse_arguments(
+        _csc
+        "USE_VCPKG_INTEGRATION"
+        "PROJECT_PATH;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION;PLATFORM;PLATFORM_TOOLSET;TARGET_PLATFORM_VERSION;TARGET"
+        "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG"
+        ${ARGN}
+    )
 
     if(NOT DEFINED _csc_RELEASE_CONFIGURATION)
         set(_csc_RELEASE_CONFIGURATION Release)
@@ -87,6 +98,16 @@ function(vcpkg_build_msbuild)
         /m
     )
 
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        # Disable LTCG for static libraries because this setting introduces ABI incompatibility between minor compiler versions
+        # TODO: Add a way for the user to override this if they want to opt-in to incompatibility
+        list(APPEND _csc_OPTIONS /p:WholeProgramOptimization=false)
+    endif()
+
+    if(_csc_USE_VCPKG_INTEGRATION)
+        list(APPEND _csc_OPTIONS /p:ForceImportBeforeCppTargets=${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/vcpkg.targets)
+    endif()
+
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         message(STATUS "Building ${_csc_PROJECT_PATH} for Release")
         file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 951b6443f..3e0922428 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -115,6 +115,7 @@ function(vcpkg_configure_cmake)
         vcpkg_find_acquire_program(NINJA)
         get_filename_component(NINJA_PATH ${NINJA} DIRECTORY)
         set(ENV{PATH} "$ENV{PATH};${NINJA_PATH}")
+        list(APPEND _csc_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}")
     endif()
 
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
@@ -164,6 +165,7 @@ function(vcpkg_configure_cmake)
 
     list(APPEND _csc_OPTIONS
         "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
+        "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}"
         "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
         "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
         "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON"
@@ -180,6 +182,8 @@ function(vcpkg_configure_cmake)
         "-DVCPKG_C_FLAGS_DEBUG=${VCPKG_C_FLAGS_DEBUG}"
         "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}"
         "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}"
+        "-DCMAKE_INSTALL_LIBDIR:STRING=lib"
+        "-DCMAKE_INSTALL_BINDIR:STRING=bin"
     )
 
     if(DEFINED ARCH)
diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake
index 4b111f3f0..9fc0a0c9a 100644
--- a/scripts/cmake/vcpkg_download_distfile.cmake
+++ b/scripts/cmake/vcpkg_download_distfile.cmake
@@ -103,19 +103,53 @@ function(vcpkg_download_distfile VAR)
         endif()
 
         # Tries to download the file.
-        foreach(url IN LISTS vcpkg_download_distfile_URLS)
-            message(STATUS "Downloading ${url}...")
-            file(DOWNLOAD ${url} "${download_file_path_part}" STATUS download_status)
-            list(GET download_status 0 status_code)
-            if (NOT "${status_code}" STREQUAL "0")
-                message(STATUS "Downloading ${url}... Failed. Status: ${download_status}")
+        list(GET vcpkg_download_distfile_URLS 0 SAMPLE_URL)
+        if(${_VCPKG_DOWNLOAD_TOOL} MATCHES "ARIA2" AND NOT ${SAMPLE_URL} MATCHES "aria2")
+            vcpkg_find_acquire_program("ARIA2")
+            message(STATUS "Downloading ${vcpkg_download_distfile_FILENAME}...")
+            execute_process(
+                COMMAND ${ARIA2} ${vcpkg_download_distfile_URLS}
+                -o temp/${vcpkg_download_distfile_FILENAME}
+                -l download-${vcpkg_download_distfile_FILENAME}-detailed.log
+                OUTPUT_FILE download-${vcpkg_download_distfile_FILENAME}-out.log
+                ERROR_FILE download-${vcpkg_download_distfile_FILENAME}-err.log
+                RESULT_VARIABLE error_code
+                WORKING_DIRECTORY ${DOWNLOADS}
+            )
+            if (NOT "${error_code}" STREQUAL "0")
+                message(STATUS
+                    "Downloading ${vcpkg_download_distfile_FILENAME}... Failed.\n"
+                    "    Exit Code: ${error_code}\n"
+                    "    See logs for more information:\n"
+                    "        ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-out.log\n"
+                    "        ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-err.log\n"
+                    "        ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-detailed.log\n"
+                )
                 set(download_success 0)
             else()
-                message(STATUS "Downloading ${url}... OK")
+                message(STATUS "Downloading ${vcpkg_download_distfile_FILENAME}... OK")
+                file(REMOVE
+                    ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-out.log
+                    ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-err.log
+                    ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-detailed.log
+                )
                 set(download_success 1)
-                break()
             endif()
-        endforeach(url)
+        else()
+            foreach(url IN LISTS vcpkg_download_distfile_URLS)
+                message(STATUS "Downloading ${url}...")
+                file(DOWNLOAD ${url} "${download_file_path_part}" STATUS download_status)
+                list(GET download_status 0 status_code)
+                if (NOT "${status_code}" STREQUAL "0")
+                    message(STATUS "Downloading ${url}... Failed. Status: ${download_status}")
+                    set(download_success 0)
+                else()
+                    message(STATUS "Downloading ${url}... OK")
+                    set(download_success 1)
+                    break()
+                endif()
+            endforeach(url)
+        endif()
 
         if (NOT download_success)
             message(FATAL_ERROR
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 21d7ecd8f..39a722d93 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -25,6 +25,7 @@
 ## - NASM
 ## - NINJA
 ## - YASM
+## - ARIA2 (Downloader)
 ##
 ## Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md).
 ##
@@ -40,6 +41,7 @@ function(vcpkg_find_acquire_program VAR)
   endif()
 
   unset(NOEXTRACT)
+  unset(_vfa_RENAME)
   unset(SUBDIR)
   unset(REQUIRED_INTERPRETER)
 
@@ -49,12 +51,16 @@ function(vcpkg_find_acquire_program VAR)
   if(VAR MATCHES "PERL")
     set(PROGNAME perl)
     set(PATHS ${DOWNLOADS}/tools/perl/perl/bin)
+    set(BREW_PACKAGE_NAME "perl")
+    set(APT_PACKAGE_NAME "perl")
     set(URL "http://strawberryperl.com/download/5.24.1.1/strawberry-perl-5.24.1.1-32bit-portable.zip")
     set(ARCHIVE "strawberry-perl-5.24.1.1-32bit-portable.zip")
     set(HASH a6e685ea24376f50db5f06c5b46075f1d3be25168fa1f27fa9b02e2ac017826cee62a2b43562f9b6c989337a231ba914416c110075457764de2d11f99d5e0f26)
   elseif(VAR MATCHES "NASM")
     set(PROGNAME nasm)
     set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.12.02)
+    set(BREW_PACKAGE_NAME "nasm")
+    set(APT_PACKAGE_NAME "nasm")
     set(URL
       "http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip"
       "http://mirrors.kodi.tv/build-deps/win32/nasm-2.12.02-win32.zip"
@@ -63,11 +69,13 @@ function(vcpkg_find_acquire_program VAR)
     set(HASH df7aaba094e17832688c88993997612a2e2c96cc3dc14ca3e8347b44c7762115f5a7fc6d7f20be402553aaa4c9e43ddfcf6228f581cfe89289bae550de151b36)
   elseif(VAR MATCHES "YASM")
     set(PROGNAME yasm)
-    set(PATHS ${DOWNLOADS}/tools/yasm)
-    set(URL "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe")
-    set(ARCHIVE "yasm.exe")
+    set(SUBDIR 1.3.0.6)
+    set(PATHS ${DOWNLOADS}/tools/yasm/${SUBDIR})
+    set(URL "https://www.tortall.net/projects/yasm/snapshots/v1.3.0.6.g1962/yasm-1.3.0.6.g1962.exe")
+    set(ARCHIVE "yasm-1.3.0.6.g1962.exe")
+    set(_vfa_RENAME "yasm.exe")
     set(NOEXTRACT ON)
-    set(HASH 850b26be5bbbdaeaf45ac39dd27f69f1a85e600c35afbd16b9f621396b3c7a19863ea3ff316b025b578fce0a8280eef2203306a2b3e46ee1389abb65313fb720)
+    set(HASH c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b)
   elseif(VAR MATCHES "PYTHON3")
     set(PROGNAME python)
     set(SUBDIR "python3")
@@ -98,14 +106,20 @@ function(vcpkg_find_acquire_program VAR)
     set(HASH 830cd94ed6518fbe4604a0f5a3322671b4674b87d25a71349c745500d38e85c0fac4f6995242fc5521eb048e3966bb5ec2a96a06b041343ed8da9bba78124f34)
   elseif(VAR MATCHES "7Z")
     set(PROGNAME 7z)
-    set(PATHS "${PROGRAM_FILES_PLATFORM_BITNESS}/7-Zip" "${PROGRAM_FILES_32_BIT}/7-Zip" ${DOWNLOADS}/tools/7z/Files/7-Zip)
+    set(PATHS "${PROGRAM_FILES_PLATFORM_BITNESS}/7-Zip" "${PROGRAM_FILES_32_BIT}/7-Zip" "${DOWNLOADS}/tools/7z/Files/7-Zip")
     set(URL "http://7-zip.org/a/7z1604.msi")
     set(ARCHIVE "7z1604.msi")
     set(HASH 556f95f7566fe23704d136239e4cf5e2a26f939ab43b44145c91b70d031a088d553e5c21301f1242a2295dcde3143b356211f0108c68e65eef8572407618326d)
   elseif(VAR MATCHES "NINJA")
     set(PROGNAME ninja)
     set(SUBDIR "ninja-1.8.2")
-    set(PATHS ${DOWNLOADS}/tools/ninja/${SUBDIR})
+    if(CMAKE_HOST_WIN32)
+      set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}")
+    elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+      set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-osx")
+    else()
+      set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-linux")
+    endif()
     set(BREW_PACKAGE_NAME "ninja")
     set(APT_PACKAGE_NAME "ninja-build")
     set(URL "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip")
@@ -167,6 +181,13 @@ function(vcpkg_find_acquire_program VAR)
     set(URL "http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.14.windows.bin.zip")
     set(ARCHIVE "doxygen-1.8.14.windows.bin.zip")
     set(HASH d0d706501e7112045b1f401f22d12a2c8d9b7728edee9ad1975a17dff914c16494ae48a70beab6f6304643779935843f268c7afed3b9da7d403b5cb11cac0c50)
+  # Download Tools
+  elseif(VAR MATCHES "ARIA2")
+    set(PROGNAME aria2c)
+    set(PATHS ${DOWNLOADS}/tools/aria2c/aria2-1.33.1-win-32bit-build1)
+    set(URL "https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip")
+    set(ARCHIVE "aria2-1.33.1-win-32bit-build1.zip")
+    set(HASH 2456176ba3d506a07cf0cc4f61f080e1ff8cb4106426d66f354c5bb67a9a8720b5ddb26904275e61b1f623c932355f7dcde4cd17556cc895f11293c23c3a9bf3)
   else()
     message(FATAL "unknown tool ${VAR} -- unable to acquire.")
   endif()
@@ -199,15 +220,20 @@ function(vcpkg_find_acquire_program VAR)
         FILENAME ${ARCHIVE}
     )
 
-    file(MAKE_DIRECTORY ${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR})
+    set(PROG_PATH_SUBDIR "${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR}")
+    file(MAKE_DIRECTORY ${PROG_PATH_SUBDIR})
     if(DEFINED NOEXTRACT)
-      file(COPY ${ARCHIVE_PATH} DESTINATION ${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR})
+      if(DEFINED _vfa_RENAME)
+        file(INSTALL ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} RENAME ${_vfa_RENAME})
+      else()
+        file(COPY ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR})
+      endif()
     else()
       get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} EXT)
       string(TOLOWER "${ARCHIVE_EXTENSION}" ARCHIVE_EXTENSION)
       if(ARCHIVE_EXTENSION STREQUAL ".msi")
         file(TO_NATIVE_PATH "${ARCHIVE_PATH}" ARCHIVE_NATIVE_PATH)
-        file(TO_NATIVE_PATH "${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR}" DESTINATION_NATIVE_PATH)
+        file(TO_NATIVE_PATH "${PROG_PATH_SUBDIR}" DESTINATION_NATIVE_PATH)
         execute_process(
           COMMAND msiexec /a ${ARCHIVE_NATIVE_PATH} /qn TARGETDIR=${DESTINATION_NATIVE_PATH}
           WORKING_DIRECTORY ${DOWNLOADS}
@@ -215,7 +241,7 @@ function(vcpkg_find_acquire_program VAR)
       else()
         execute_process(
           COMMAND ${CMAKE_COMMAND} -E tar xzf ${ARCHIVE_PATH}
-          WORKING_DIRECTORY ${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR}
+          WORKING_DIRECTORY ${PROG_PATH_SUBDIR}
         )
       endif()
     endif()
diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
index 7f1f827c2..47c91f83c 100644
--- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
+++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake
@@ -28,6 +28,12 @@ function(vcpkg_fixup_cmake_targets)
     set(RELEASE_SHARE ${CURRENT_PACKAGES_DIR}/${_vfct_TARGET_PATH})
 
     if(_vfct_CONFIG_PATH AND NOT RELEASE_SHARE STREQUAL "${CURRENT_PACKAGES_DIR}/${_vfct_CONFIG_PATH}")
+        if(_vfct_CONFIG_PATH STREQUAL "share")
+            file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/debug/share2)
+            file(RENAME ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/share2)
+            set(_vfct_CONFIG_PATH share2)
+        endif()
+
         set(DEBUG_CONFIG ${CURRENT_PACKAGES_DIR}/debug/${_vfct_CONFIG_PATH})
         set(RELEASE_CONFIG ${CURRENT_PACKAGES_DIR}/${_vfct_CONFIG_PATH})
 
@@ -36,6 +42,7 @@ function(vcpkg_fixup_cmake_targets)
                 message(FATAL_ERROR "'${DEBUG_CONFIG}' does not exist.")
             endif()
 
+            # This roundabout handling enables CONFIG_PATH share
             file(MAKE_DIRECTORY ${DEBUG_SHARE})
             file(GLOB FILES ${DEBUG_CONFIG}/*)
             file(COPY ${FILES} DESTINATION ${DEBUG_SHARE})
@@ -76,12 +83,12 @@ function(vcpkg_fixup_cmake_targets)
     endif()
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        if(NOT EXISTS ${DEBUG_SHARE})
+        if(NOT EXISTS "${DEBUG_SHARE}")
             message(FATAL_ERROR "'${DEBUG_SHARE}' does not exist.")
         endif()
     endif()
 
-    file(GLOB UNUSED_FILES
+    file(GLOB_RECURSE UNUSED_FILES
         "${DEBUG_SHARE}/*[Tt]argets.cmake"
         "${DEBUG_SHARE}/*[Cc]onfig.cmake"
         "${DEBUG_SHARE}/*[Cc]onfigVersion.cmake"
@@ -91,10 +98,10 @@ function(vcpkg_fixup_cmake_targets)
         file(REMOVE ${UNUSED_FILES})
     endif()
 
-    file(GLOB RELEASE_TARGETS
+    file(GLOB_RECURSE RELEASE_TARGETS
         "${RELEASE_SHARE}/*-release.cmake"
     )
-    foreach(RELEASE_TARGET ${RELEASE_TARGETS})
+    foreach(RELEASE_TARGET IN LISTS RELEASE_TARGETS)
         file(READ ${RELEASE_TARGET} _contents)
         string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" _contents "${_contents}")
         string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+\\.exe)" "\${_IMPORT_PREFIX}/tools/${PORT}/\\1" _contents "${_contents}")
@@ -102,25 +109,25 @@ function(vcpkg_fixup_cmake_targets)
     endforeach()
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(GLOB DEBUG_TARGETS
+        file(GLOB_RECURSE DEBUG_TARGETS
             "${DEBUG_SHARE}/*-debug.cmake"
             )
-        foreach(DEBUG_TARGET ${DEBUG_TARGETS})
-            get_filename_component(DEBUG_TARGET_NAME ${DEBUG_TARGET} NAME)
+        foreach(DEBUG_TARGET IN LISTS DEBUG_TARGETS)
+            file(RELATIVE_PATH DEBUG_TARGET_REL "${DEBUG_SHARE}" "${DEBUG_TARGET}")
 
             file(READ ${DEBUG_TARGET} _contents)
             string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" _contents "${_contents}")
             string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+\\.exe)" "\${_IMPORT_PREFIX}/tools/${PORT}/\\1" _contents "${_contents}")
             string(REPLACE "\${_IMPORT_PREFIX}/lib" "\${_IMPORT_PREFIX}/debug/lib" _contents "${_contents}")
             string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/debug/bin" _contents "${_contents}")
-            file(WRITE ${CURRENT_PACKAGES_DIR}/${_vfct_TARGET_PATH}/${DEBUG_TARGET_NAME} "${_contents}")
+            file(WRITE ${RELEASE_SHARE}/${DEBUG_TARGET_REL} "${_contents}")
 
             file(REMOVE ${DEBUG_TARGET})
         endforeach()
     endif()
 
-    file(GLOB MAIN_TARGETS "${RELEASE_SHARE}/*[Tt]argets.cmake")
-    foreach(MAIN_TARGET ${MAIN_TARGETS})
+    file(GLOB_RECURSE MAIN_TARGETS "${RELEASE_SHARE}/*[Tt]argets.cmake")
+    foreach(MAIN_TARGET IN LISTS MAIN_TARGETS)
         file(READ ${MAIN_TARGET} _contents)
         string(REGEX REPLACE
             "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*"
@@ -133,8 +140,8 @@ function(vcpkg_fixup_cmake_targets)
         file(WRITE ${MAIN_TARGET} "${_contents}")
     endforeach()
 
-    file(GLOB MAIN_CONFIGS "${RELEASE_SHARE}/*[Cc]onfig.cmake")
-    foreach(MAIN_CONFIG ${MAIN_CONFIGS})
+    file(GLOB_RECURSE MAIN_CONFIGS "${RELEASE_SHARE}/*[Cc]onfig.cmake")
+    foreach(MAIN_CONFIG IN LISTS MAIN_CONFIGS)
         file(READ ${MAIN_CONFIG} _contents)
         string(REGEX REPLACE
             "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*"
diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake
index c6a23cff6..28ada0631 100644
--- a/scripts/cmake/vcpkg_from_github.cmake
+++ b/scripts/cmake/vcpkg_from_github.cmake
@@ -51,7 +51,7 @@
 ## * [beast](https://github.com/Microsoft/vcpkg/blob/master/ports/beast/portfile.cmake)
 function(vcpkg_from_github)
     set(oneValueArgs OUT_SOURCE_PATH REPO REF SHA512 HEAD_REF)
-    set(multipleValuesArgs)
+    set(multipleValuesArgs PATCHES)
     cmake_parse_arguments(_vdud "" "${oneValueArgs}" "${multipleValuesArgs}" ${ARGN})
 
     if(NOT DEFINED _vdud_OUT_SOURCE_PATH)
@@ -73,21 +73,17 @@ function(vcpkg_from_github)
     string(REGEX REPLACE ".*/" "" REPO_NAME ${_vdud_REPO})
     string(REGEX REPLACE "/.*" "" ORG_NAME ${_vdud_REPO})
 
-    macro(set_SOURCE_PATH BASE BASEREF)
-        set(SOURCE_PATH "${BASE}/${REPO_NAME}-${BASEREF}")
-        if(EXISTS ${SOURCE_PATH})
-            set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
-        else()
-            # Sometimes GitHub strips a leading 'v' off the REF.
-            string(REGEX REPLACE "^v" "" REF ${BASEREF})
-            string(REPLACE "/" "-" REF ${REF})
-            set(SOURCE_PATH "${BASE}/${REPO_NAME}-${REF}")
-            if(EXISTS ${SOURCE_PATH})
-                set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
-            else()
-                message(FATAL_ERROR "Could not determine source path: '${BASE}/${REPO_NAME}-${BASEREF}' does not exist")
-            endif()
+    macro(set_TEMP_SOURCE_PATH BASE BASEREF)
+    set(TEMP_SOURCE_PATH "${BASE}/${REPO_NAME}-${BASEREF}")
+    if(NOT EXISTS ${TEMP_SOURCE_PATH})
+        # Sometimes GitHub strips a leading 'v' off the REF.
+        string(REGEX REPLACE "^v" "" REF ${BASEREF})
+        string(REPLACE "/" "-" REF ${REF})
+        set(TEMP_SOURCE_PATH "${BASE}/${REPO_NAME}-${REF}")
+        if(NOT EXISTS ${TEMP_SOURCE_PATH})
+            message(FATAL_ERROR "Could not determine source path: '${BASE}/${REPO_NAME}-${BASEREF}' does not exist")
         endif()
+    endif()
     endmacro()
 
     if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED _vdud_HEAD_REF)
@@ -108,8 +104,44 @@ function(vcpkg_from_github)
             SHA512 "${_vdud_SHA512}"
             FILENAME "${ORG_NAME}-${REPO_NAME}-${SANITIZED_REF}.tar.gz"
         )
-        vcpkg_extract_source_archive_ex(ARCHIVE "${ARCHIVE}")
-        set_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src ${SANITIZED_REF})
+
+        # Take the last 10 chars of the REF
+        set(REF_MAX_LENGTH 10)
+        string(LENGTH ${SANITIZED_REF} REF_LENGTH)
+        math(EXPR FROM_REF ${REF_LENGTH}-${REF_MAX_LENGTH})
+        if(FROM_REF LESS 0)
+            set(FROM_REF 0)
+        endif()
+        string(SUBSTRING ${SANITIZED_REF} ${FROM_REF} ${REF_LENGTH} SHORTENED_SANITIZED_REF)
+
+        # Hash the archive hash along with the patches. Take the first 10 chars of the hash
+        set(PATCHSET_HASH "${_vdud_SHA512}")
+        foreach(PATCH IN LISTS _vdud_PATCHES)
+            file(SHA512 ${PATCH} CURRENT_HASH)
+            string(APPEND PATCHSET_HASH ${CURRENT_HASH})
+        endforeach()
+
+        string(SHA512 PATCHSET_HASH ${PATCHSET_HASH})
+        string(SUBSTRING ${PATCHSET_HASH} 0 10 PATCHSET_HASH)
+        set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/${SHORTENED_SANITIZED_REF}-${PATCHSET_HASH}")
+
+        if(NOT EXISTS ${SOURCE_PATH})
+            set(TEMP_DIR "${CURRENT_BUILDTREES_DIR}/src/TEMP")
+            file(REMOVE_RECURSE ${TEMP_DIR})
+            vcpkg_extract_source_archive_ex(ARCHIVE "${ARCHIVE}" WORKING_DIRECTORY ${TEMP_DIR})
+            set_TEMP_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src/TEMP ${SANITIZED_REF})
+
+            vcpkg_apply_patches(
+                SOURCE_PATH ${TEMP_SOURCE_PATH}
+                PATCHES ${_vdud_PATCHES}
+            )
+
+            file(RENAME ${TEMP_SOURCE_PATH} ${SOURCE_PATH})
+            file(REMOVE_RECURSE ${TEMP_DIR})
+        endif()
+
+        set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
+
         return()
     endif()
 
@@ -167,5 +199,10 @@ function(vcpkg_from_github)
         set(VCPKG_HEAD_VERSION ${_version} PARENT_SCOPE)
     endif()
 
-    set_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src/head ${SANITIZED_HEAD_REF})
+    set_TEMP_SOURCE_PATH(${CURRENT_BUILDTREES_DIR}/src/head ${SANITIZED_HEAD_REF})
+    vcpkg_apply_patches(
+        SOURCE_PATH ${TEMP_SOURCE_PATH}
+        PATCHES ${_vdud_PATCHES}
+    )
+    set(${_vdud_OUT_SOURCE_PATH} "${TEMP_SOURCE_PATH}" PARENT_SCOPE)
 endfunction()
diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index 2c2f599ef..eca405b62 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -4,6 +4,7 @@ param(
 )
 
 Set-StrictMode -Version Latest
+
 $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
 . "$scriptsDir\VcpkgPowershellUtils.ps1"
 
@@ -12,6 +13,7 @@ $vcpkgRootDir = vcpkgFindFileRecursivelyUp $scriptsDir .vcpkg-root
 
 $downloadsDir = "$vcpkgRootDir\downloads"
 vcpkgCreateDirectoryIfNotExists $downloadsDir
+$downloadsDir = Resolve-Path $downloadsDir
 
 function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
 {
@@ -22,49 +24,81 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
 
     if ($toolData -eq $null)
     {
-        throw "Unkown tool $tool"
+        throw "Unknown tool $tool"
     }
 
-    $exePath = "$downloadsDir\$($toolData.exeRelativePath)"
+    $toolPath="$downloadsDir\tools\$tool-$($toolData.version)-windows"
+    $exePath = "$toolPath\$($toolData.exeRelativePath)"
 
     if (Test-Path $exePath)
     {
         return $exePath
     }
 
-    $isArchive = vcpkgHasProperty -object $toolData -propertyName "archiveRelativePath"
+    $isArchive = vcpkgHasProperty -object $toolData -propertyName "archiveName"
     if ($isArchive)
     {
-        $downloadPath = "$downloadsDir\$($toolData.archiveRelativePath)"
+        $downloadPath = "$downloadsDir\$($toolData.archiveName)"
     }
     else
     {
-        $downloadPath = "$downloadsDir\$($toolData.exeRelativePath)"
+        $downloadPath = "$toolPath\$($toolData.exeRelativePath)"
     }
 
-    $url = $toolData.url
+    [String]$url = $toolData.url
     if (!(Test-Path $downloadPath))
     {
         Write-Host "Downloading $tool..."
-        vcpkgDownloadFile $url $downloadPath
-        Write-Host "Downloading $tool has completed successfully."
-    }
 
-    $expectedDownloadedFileHash = $toolData.sha256
-    $downloadedFileHash = vcpkgGetSHA256 $downloadPath
-    vcpkgCheckEqualFileHash -filePath $downloadPath -expectedHash $expectedDownloadedFileHash -actualHash $downloadedFileHash
+        # Download aria2 with .NET. aria2 will be used to download everything else.
+        if ($tool -eq "aria2")
+        {
+            vcpkgDownloadFile $url $downloadPath $toolData.sha512
+        }
+        else
+        {
+            $aria2exe = fetchToolInternal "aria2"
+            vcpkgDownloadFileWithAria2 $aria2exe $url $downloadPath $toolData.sha512
+        }
+
+        Write-Host "Downloading $tool... done."
+    }
+    else
+    {
+        vcpkgCheckEqualFileHash -url $url -filePath $downloadPath -expectedHash $toolData.sha512
+    }
 
     if ($isArchive)
     {
-        $outFilename = (Get-ChildItem $downloadPath).BaseName
         Write-Host "Extracting $tool..."
-        vcpkgExtractFile -File $downloadPath -DestinationDir $downloadsDir -outFilename $outFilename
-        Write-Host "Extracting $tool has completed successfully."
+        # Extract 7zip920 with shell because we need it to extract 7zip
+        # Extract aria2 with shell because we need it to download 7zip
+        if ($tool -eq "7zip920" -or $tool -eq "aria2")
+        {
+            vcpkgExtractZipFile -ArchivePath $downloadPath -DestinationDir $toolPath
+        }
+        elseif ($tool -eq "7zip")
+        {
+            $sevenZip920 = fetchToolInternal "7zip920"
+            $ec = vcpkgInvokeCommand "$sevenZip920" "x `"$downloadPath`" -o`"$toolPath`" -y"
+            if ($ec -ne 0)
+            {
+                Write-Host "Could not extract $downloadPath"
+                throw
+            }
+        }
+        else
+        {
+            $sevenZipExe = fetchToolInternal "7zip"
+            vcpkgExtractFileWith7z -sevenZipExe "$sevenZipExe" -ArchivePath $downloadPath -DestinationDir $toolPath
+        }
+        Write-Host "Extracting $tool... done."
     }
 
     if (-not (Test-Path $exePath))
     {
-        throw ("Could not detect or download " + $tool)
+        Write-Error "Could not detect or download $tool"
+        throw
     }
 
     return $exePath
diff --git a/scripts/toolchains/freebsd.cmake b/scripts/toolchains/freebsd.cmake
new file mode 100644
index 000000000..bfeabe18b
--- /dev/null
+++ b/scripts/toolchains/freebsd.cmake
@@ -0,0 +1,4 @@
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")

+    set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")

+endif()

+set(CMAKE_SYSTEM_NAME FreeBSD CACHE STRING "")

diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake
index d09d374c8..ea4f15d60 100644
--- a/scripts/toolchains/linux.cmake
+++ b/scripts/toolchains/linux.cmake
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.5)

-

 if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")

     set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")

 endif()

diff --git a/scripts/toolchains/osx.cmake b/scripts/toolchains/osx.cmake
index 1a164f178..dd21f5264 100644
--- a/scripts/toolchains/osx.cmake
+++ b/scripts/toolchains/osx.cmake
@@ -1 +1,4 @@
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")

+    set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")

+endif()

 set(CMAKE_SYSTEM_NAME Darwin CACHE STRING "")

diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake
index 7bfc2282b..266e023b1 100644
--- a/scripts/toolchains/windows.cmake
+++ b/scripts/toolchains/windows.cmake
@@ -9,8 +9,17 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
         message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"")

     endif()

 

-    set(CMAKE_CXX_FLAGS " /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP ${VCPKG_CXX_FLAGS}" CACHE STRING "")

-    set(CMAKE_C_FLAGS " /DWIN32 /D_WINDOWS /W3 /utf-8 /MP ${VCPKG_C_FLAGS}" CACHE STRING "")

+    set(CHARSET_FLAG "/utf-8")

+    if(VCPKG_PLATFORM_TOOLSET MATCHES "v120")

+        # VS 2013 does not support /utf-8

+        set(CHARSET_FLAG)

+    endif()

+

+    set(CMAKE_CXX_FLAGS " /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc /MP ${VCPKG_CXX_FLAGS}" CACHE STRING "")

+    set(CMAKE_C_FLAGS " /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /MP ${VCPKG_C_FLAGS}" CACHE STRING "")

+    set(CMAKE_RC_FLAGS "-c65001 /DWIN32" CACHE STRING "")

+

+    unset(CHARSET_FLAG)

 

     set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "")

     set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "")

diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 02fd0b996..1f17102d2 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -1,43 +1,97 @@
 <?xml version="1.0"?>
-<tools version="1">
-    <tool name="cmake">
-        <requiredVersion>3.10.2</requiredVersion>
+<tools version="2">
+    <tool name="cmake" os="windows">
+        <version>3.10.2</version>
         <exeRelativePath>cmake-3.10.2-win32-x86\bin\cmake.exe</exeRelativePath>
         <url>https://cmake.org/files/v3.10/cmake-3.10.2-win32-x86.zip</url>
-        <sha256>f5f7e41a21d0e9b655aca58498b08e17ecd27796bf82837e2c84435359169dd6</sha256>
-        <archiveRelativePath>cmake-3.10.2-win32-x86.zip</archiveRelativePath>
-    </tool>
-    <tool name="git">
-        <requiredVersion>2.16.2</requiredVersion>
-        <exeRelativePath>MinGit-2.16.2-32-bit\cmd\git.exe</exeRelativePath>
-        <url>https://github.com/git-for-windows/git/releases/download/v2.16.2.windows.1/MinGit-2.16.2-32-bit.zip</url>
-        <sha256>322c727e482aa97522c64a5ac68bdda3780111e8670bcfb532beac8e11ece5da</sha256>
-        <archiveRelativePath>MinGit-2.16.2-32-bit.zip</archiveRelativePath>
-    </tool>
-    <tool name="vswhere">
-        <requiredVersion>2.3.2</requiredVersion>
-        <exeRelativePath>vswhere-2.3.2\vswhere.exe</exeRelativePath>
-        <url>https://github.com/Microsoft/vswhere/releases/download/2.3.2/vswhere.exe</url>
-        <sha256>103f2784c4b2c8e70c7c1c03687abbf22bce052aae30639406e4e13ffa29ee04</sha256>
-    </tool>
-    <tool name="nuget">
-        <requiredVersion>4.4.0</requiredVersion>
-        <exeRelativePath>nuget-4.4.0\nuget.exe</exeRelativePath>
-        <url>https://dist.nuget.org/win-x86-commandline/v4.4.0/nuget.exe</url>
-        <sha256>2cf9b118937eef825464e548f0c44f7f64090047746de295d75ac3dcffa3e1f6</sha256>
-    </tool>
-    <tool name="installerbase">
-        <requiredVersion>3.1.81</requiredVersion>
+        <sha512>9c16861a2ac09c7011b84f38459ecfec2829a9f825b254acbbde46d98f12f8ca0d4db3a6764758cb671507ee7c0327576d87658b81d7ddf1e8280b37569eb16d</sha512>
+        <archiveName>cmake-3.10.2-win32-x86.zip</archiveName>
+    </tool>
+    <tool name="cmake" os="osx">
+        <version>3.10.2</version>
+        <exeRelativePath>cmake-3.10.2-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
+        <url>https://cmake.org/files/v3.10/cmake-3.10.2-Darwin-x86_64.tar.gz</url>
+        <sha512>cb7d76e11c892eb786da5804282c4141564390c3552e08c506c7abb93015eb5f619c55255459872b219399ce8114ac321fe92df7f82a7e42bbc874eec240571e</sha512>
+        <archiveName>cmake-3.10.2-Darwin-x86_64.tar.gz</archiveName>
+    </tool>
+    <tool name="cmake" os="linux">
+        <version>3.10.2</version>
+        <exeRelativePath>cmake-3.10.2-Linux-x86_64/bin/cmake</exeRelativePath>
+        <url>https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz</url>
+        <sha512>54389b5cb3f3cb9d182d35e0b1eaf7b301695899930da0d26e9df1dc25056213a077646d23ea609a93daa81d30687757d9cf0dc263339fa3d73dbeb1284bc1a9</sha512>
+        <archiveName>cmake-3.10.2-Linux-x86_64.tar.gz</archiveName>
+    </tool>
+    <tool name="git" os="windows">
+        <version>2.17.0</version>
+        <exeRelativePath>cmd\git.exe</exeRelativePath>
+        <url>https://github.com/git-for-windows/git/releases/download/v2.17.0.windows.1/MinGit-2.17.0-32-bit.zip</url>
+        <sha512>a34575ab1b4f553e62535e38492904b512df4d6a837cf4abf205dbcdd05edf1eef450cc5b15a4f63f901424d5f3cd1f78b6b22437d0d4f8cd9ce4e42e82617b9</sha512>
+        <archiveName>MinGit-2.17.0-32-bit.zip</archiveName>
+    </tool>
+    <tool name="git" os="linux">
+        <version>2.7.4</version>
+        <exeRelativePath></exeRelativePath>
+        <url></url>
+        <sha512></sha512>
+    </tool>
+    <tool name="git" os="osx">
+        <version>2.7.4</version>
+        <exeRelativePath></exeRelativePath>
+        <url></url>
+        <sha512></sha512>
+    </tool>
+    <tool name="vswhere" os="windows">
+        <version>2.4.1</version>
+        <exeRelativePath>vswhere.exe</exeRelativePath>
+        <url>https://github.com/Microsoft/vswhere/releases/download/2.4.1/vswhere.exe</url>
+        <sha512>f477842d0cebefcd6bf9c6d536ab8ea20ec5b0aa967ee963ab6a101aeff9df8742ca600d35f39e2e7158d76d8231f1ed2bef6104dce84d2bf8d6b07d17d706a1</sha512>
+    </tool>
+    <tool name="nuget" os="windows">
+        <version>4.6.2</version>
+        <exeRelativePath>nuget.exe</exeRelativePath>
+        <url>https://dist.nuget.org/win-x86-commandline/v4.6.2/nuget.exe</url>
+        <sha512>60daea7bec2de23089f7ad73985dd788ac154171d6326c2c456726849b8f97dfc38cbdd9b9bf8d96aced009ccaaed317905b65c108e149cfbbbcdfb95f8f0519</sha512>
+    </tool>
+    <tool name="installerbase" os="windows">
+        <version>3.1.81</version>
         <exeRelativePath>QtInstallerFramework-win-x86\bin\installerbase.exe</exeRelativePath>
         <url>https://github.com/podsvirov/installer-framework/releases/download/cr203958-9/QtInstallerFramework-win-x86.zip</url>
-        <sha256>f2ce23cf5cf9fc7ce409bdca49328e09a070c0026d3c8a04e4dfde7b05b83fe8</sha256>
-        <archiveRelativePath>QtInstallerFramework-win-x86.zip</archiveRelativePath>
-    </tool>
-    <tool name="7zip">
-        <requiredVersion>18.01.0</requiredVersion>
-        <exeRelativePath>7za920\7za.exe</exeRelativePath>
-        <url>http://www.7-zip.org/a/7za920.zip</url>
-        <sha256>2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac</sha256>
-        <archiveRelativePath>7za920.zip</archiveRelativePath>
+        <sha512>1f3e593270d7c2a4e271fdb49c637a2de462351310ef66bba298d30f6ca23365ec6aecf2e57799a00c873267cd3f92060ecac03eb291d42903d0e0869cd17c73</sha512>
+        <archiveName>QtInstallerFramework-win-x86.zip</archiveName>
+    </tool>
+    <tool name="7zip" os="windows">
+        <version>18.01.0</version>
+        <exeRelativePath>7za.exe</exeRelativePath>
+        <url>https://www.7-zip.org/a/7z1801-extra.7z</url>
+        <sha512>9133fc551d76515e37fdd4dd8c1e28d464aea493548246b44565a42bba46715764f41f9cfa14d470d298c3a6e9829d200f8be5168cb67cf8f23d8042fca833bc</sha512>
+        <archiveName>7z1801-extra.7z</archiveName>
+    </tool>
+    <tool name="7zip920" os="windows">
+        <version>9.20.0</version>
+        <exeRelativePath>7za.exe</exeRelativePath>
+        <url>https://www.7-zip.org/a/7za920.zip</url>
+        <sha512>84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3</sha512>
+        <archiveName>7za920.zip</archiveName>
+    </tool>
+    <tool name="aria2" os="windows">
+        <version>18.01.0</version>
+        <exeRelativePath>aria2-1.33.1-win-32bit-build1\aria2c.exe</exeRelativePath>
+        <url>https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip</url>
+        <sha512>2456176ba3d506a07cf0cc4f61f080e1ff8cb4106426d66f354c5bb67a9a8720b5ddb26904275e61b1f623c932355f7dcde4cd17556cc895f11293c23c3a9bf3</sha512>
+        <archiveName>aria2-1.33.1-win-32bit-build1.zip</archiveName>
+    </tool>
+    <tool name="ninja" os="linux">
+        <version>1.8.2</version>
+        <exeRelativePath>ninja</exeRelativePath>
+        <url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip</url>
+        <sha512>38fcb68e745c1f15b4b50f20069ffe686b1ef5baf93b74958e132ea5d30d155cf6970d6dc1b095aafd421ebd8bcc63acf4f64e305c496266b5182f99b815cca5</sha512>
+        <archiveName>ninja-linux.zip</archiveName>
+    </tool>
+    <tool name="ninja" os="osx">
+        <version>1.8.2</version>
+        <exeRelativePath>ninja</exeRelativePath>
+        <url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip</url>
+        <sha512>acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3</sha512>
+        <archiveName>ninja-mac.zip</archiveName>
     </tool>
 </tools>