From 35f5a0de5327efdea1e9aea7979a2c828daacc0d Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 5 Apr 2018 21:39:47 -0700
Subject: [vcpkg-cmake-toolchain] Remove some hardcoded find_package helpers
 and guard all remaining ones

---
 scripts/buildsystems/vcpkg.cmake | 37 +++++--------------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

(limited to 'scripts')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 0c32b22fb..a9f8190f7 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -187,7 +187,7 @@ macro(find_package name)
         unset(Boost_USE_STATIC_RUNTIME)
         set(Boost_COMPILER "-vc140")
         _find_package(${ARGV})
-    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)
@@ -198,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)
@@ -207,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
@@ -237,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 )
@@ -249,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")
@@ -258,16 +241,6 @@ 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()
     else()
         _find_package(${ARGV})
     endif()
-- 
cgit v1.2.3


From 31377dee20dad9b95357934732996e2448f2eaf5 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 3 Apr 2018 21:05:31 -0700
Subject: Use 7z for extracting. Extract tools in downloads/tools

---
 scripts/VcpkgPowershellUtils.ps1 | 58 +++++++---------------------------------
 scripts/fetchTool.ps1            | 22 ++++++++++++---
 scripts/vcpkgTools.xml           | 20 +++++++++-----
 3 files changed, 41 insertions(+), 59 deletions(-)

(limited to 'scripts')

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index 92e0f21d0..988c6dbf0 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -1,8 +1,3 @@
-function vcpkgHasModule([Parameter(Mandatory=$true)][string]$moduleName)
-{
-    return [bool](Get-Module -ListAvailable -Name $moduleName)
-}
-
 function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName)
 {
     if ($object -eq $null)
@@ -160,54 +155,21 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
     Move-Item -Path $downloadPartPath -Destination $downloadPath
 }
 
-function vcpkgExtractFile(  [Parameter(Mandatory=$true)][string]$archivePath,
-                            [Parameter(Mandatory=$true)][string]$destinationDir,
-                            [Parameter(Mandatory=$true)][string]$outFilename)
+function vcpkgExtractFile(  [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
-
-    if (vcpkgHasCommand -commandName 'Microsoft.PowerShell.Archive\Expand-Archive')
-    {
-        Write-Verbose("Extracting with Microsoft.PowerShell.Archive\Expand-Archive")
-        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 $archivePath -OutputPath $destinationPartial
-    }
-    else
-    {
-        Write-Verbose("Extracting via shell")
-        $shell = new-object -com shell.application
-        $zip = $shell.NameSpace($(Get-Item $archivePath).fullname)
-        foreach($item in $zip.items())
-        {
-            # Piping to Out-Null is used to block until finished
-            $shell.Namespace($destinationPartial).copyhere($item) | Out-Null
-        }
-    }
-
-    $items = @(Get-ChildItem "$destinationPartial")
-    $itemCount = $items.Count
-
-    if ($itemCount -eq 1)
-    {
-        $item =  $items | Select-Object -first 1
-        Write-Host "$item"
-        Move-Item -Path "$destinationPartial\$item" -Destination $output
-        vcpkgRemoveItem $destinationPartial
-    }
-    else
+    $ec = vcpkgInvokeCommand "$sevenZipExe" "x `"$archivePath`" -o`"$destinationPartial`" -y"
+    if ($ec -ne 0)
     {
-        Move-Item -Path "$destinationPartial" -Destination $output
+        Write-Host "Could not extract $archivePath"
+        throw
     }
+    Rename-Item -Path "$destinationPartial" -NewName $destinationDir
 }
 
 function vcpkgInvokeCommand()
diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index 26eedac3b..315983841 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -25,7 +25,8 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
         throw "Unkown tool $tool"
     }
 
-    $exePath = "$downloadsDir\$($toolData.exeRelativePath)"
+    $toolPath="$downloadsDir\tools\$tool-$($toolData.requiredVersion)-windows"
+    $exePath = "$toolPath\$($toolData.exeRelativePath)"
 
     if (Test-Path $exePath)
     {
@@ -39,7 +40,7 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
     }
     else
     {
-        $downloadPath = "$downloadsDir\$($toolData.exeRelativePath)"
+        $downloadPath = "$toolPath\$($toolData.exeRelativePath)"
     }
 
     [String]$url = $toolData.url
@@ -56,9 +57,22 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
 
     if ($isArchive)
     {
-        $outFilename = (Get-ChildItem $downloadPath).BaseName
         Write-Host "Extracting $tool..."
-        vcpkgExtractFile -ArchivePath $downloadPath -DestinationDir $downloadsDir -outFilename $outFilename
+        if ($tool -eq "7zip")
+        {
+            $sevenZipR = fetchToolInternal "7zr"
+            $ec = vcpkgInvokeCommand "$sevenZipR" "x `"$downloadPath`" -o`"$toolPath`" -y"
+            if ($ec -ne 0)
+            {
+                Write-Host "Could not extract $downloadPath"
+                throw
+            }
+        }
+        else
+        {
+            $sevenZipExe = fetchToolInternal "7zip"
+            vcpkgExtractFile -sevenZipExe "$sevenZipExe" -ArchivePath $downloadPath -DestinationDir $toolPath
+        }
         Write-Host "Extracting $tool... done."
     }
 
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 477584c5a..6ef1e4d35 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -23,20 +23,20 @@
     </tool>
     <tool name="git">
         <requiredVersion>2.16.2</requiredVersion>
-        <exeRelativePath>MinGit-2.16.2-32-bit\cmd\git.exe</exeRelativePath>
+        <exeRelativePath>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>
+        <exeRelativePath>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>
+        <exeRelativePath>nuget.exe</exeRelativePath>
         <url>https://dist.nuget.org/win-x86-commandline/v4.4.0/nuget.exe</url>
         <sha256>2cf9b118937eef825464e548f0c44f7f64090047746de295d75ac3dcffa3e1f6</sha256>
     </tool>
@@ -49,10 +49,16 @@
     </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>
+        <exeRelativePath>7za.exe</exeRelativePath>
+        <url>https://www.7-zip.org/a/7z1801-extra.7z</url>
+        <sha256>9371df22bcd0e1aff9eaa52aa3292350eecd011f11494e709314ae3f3eb279e2</sha256>
+        <archiveRelativePath>7z1801-extra.7z</archiveRelativePath>
+    </tool>
+    <tool name="7zr">
+        <requiredVersion>18.01.0</requiredVersion>
+        <exeRelativePath>7zr.exe</exeRelativePath>
+        <url>https://www.7-zip.org/a/7zr.exe</url>
+        <sha256>2c7a8709260e0295a2a3cfd5a8ad0459f37490ed1794ea68bf85a6fab362553b</sha256>
     </tool>
     <tool name="ninja" os="linux">
         <requiredVersion>1.8.2</requiredVersion>
-- 
cgit v1.2.3


From 54c68da907e4881d29e8017e085e6786e1c34ace Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 3 Apr 2018 22:15:17 -0700
Subject: Use aria2 to do downloads (other than aria2 itself, 7za and 7zr)

---
 scripts/VcpkgPowershellUtils.ps1 | 26 ++++++++++++++++++++++++++
 scripts/fetchTool.ps1            | 13 ++++++++++++-
 scripts/vcpkgTools.xml           |  7 +++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index 988c6dbf0..7082ca747 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -155,6 +155,32 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
     Move-Item -Path $downloadPartPath -Destination $downloadPath
 }
 
+function vcpkgDownloadFileWithAria2(    [Parameter(Mandatory=$true)][string]$aria2exe,
+                                        [Parameter(Mandatory=$true)][string]$url,
+                                        [Parameter(Mandatory=$true)][string]$downloadPath)
+{
+    if (Test-Path $downloadPath)
+    {
+        return
+    }
+
+    vcpkgCreateParentDirectoryIfNotExists $downloadPath
+    $downloadPartPath = "$downloadPath.part"
+    vcpkgRemoveItem $downloadPartPath
+
+    $parentDir = split-path -parent $downloadPath
+    $filename = split-path -leaf $downloadPath
+
+    $ec = vcpkgInvokeCommand "$aria2exe" "--dir `"$parentDir`" --out `"$filename.part`" $url"
+    if ($ec -ne 0)
+    {
+        Write-Host "Could not download $url"
+        throw
+    }
+
+    Move-Item -Path $downloadPartPath -Destination $downloadPath
+}
+
 function vcpkgExtractFile(  [Parameter(Mandatory=$true)][string]$sevenZipExe,
                             [Parameter(Mandatory=$true)][string]$archivePath,
                             [Parameter(Mandatory=$true)][string]$destinationDir)
diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index 315983841..05335c724 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -47,7 +47,18 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
     if (!(Test-Path $downloadPath))
     {
         Write-Host "Downloading $tool..."
-        vcpkgDownloadFile $url $downloadPath
+
+        # aria2 needs 7zip & 7zr to extract. So, we need to download those trough powershell
+        if ($tool -eq "aria2" -or $tool -eq "7zip" -or $tool -eq "7zr")
+        {
+            vcpkgDownloadFile $url $downloadPath
+        }
+        else
+        {
+            $aria2exe = fetchToolInternal "aria2"
+            vcpkgDownloadFileWithAria2 $aria2exe $url $downloadPath
+        }
+
         Write-Host "Downloading $tool... done."
     }
 
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 6ef1e4d35..fe1cc12a9 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -60,6 +60,13 @@
         <url>https://www.7-zip.org/a/7zr.exe</url>
         <sha256>2c7a8709260e0295a2a3cfd5a8ad0459f37490ed1794ea68bf85a6fab362553b</sha256>
     </tool>
+    <tool name="aria2">
+        <requiredVersion>18.01.0</requiredVersion>
+        <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>
+        <sha256>04bf07c0449c703db17fbcd586365aebba00201ca513ca4808b543f1f9208f1f</sha256>
+        <archiveRelativePath>aria2-1.33.1-win-32bit-build1.zip</archiveRelativePath>
+    </tool>
     <tool name="ninja" os="linux">
         <requiredVersion>1.8.2</requiredVersion>
         <exeRelativePath>ninja</exeRelativePath>
-- 
cgit v1.2.3


From e3099b458b5c11742c1b88c27847801090870f2d Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 4 Apr 2018 19:26:14 -0700
Subject: Use 7zip920 instead of 7zr

---
 scripts/VcpkgPowershellUtils.ps1 | 19 +++++++++++++++++++
 scripts/fetchTool.ps1            | 14 +++++++++-----
 scripts/vcpkgTools.xml           | 11 ++++++-----
 3 files changed, 34 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index 7082ca747..d7967889e 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -198,6 +198,25 @@ function vcpkgExtractFile(  [Parameter(Mandatory=$true)][string]$sevenZipExe,
     Rename-Item -Path "$destinationPartial" -NewName $destinationDir
 }
 
+function vcpkgExtractZipFileWithShell(  [Parameter(Mandatory=$true)][string]$archivePath,
+                                        [Parameter(Mandatory=$true)][string]$destinationDir)
+{
+    vcpkgRemoveItem $destinationDir
+    $destinationPartial = "$destinationDir.partial"
+    vcpkgRemoveItem $destinationPartial
+    vcpkgCreateDirectoryIfNotExists $destinationPartial
+
+    $shell = new-object -com shell.application
+    $zip = $shell.NameSpace($(Get-Item $archivePath).fullname)
+    foreach($item in $zip.items())
+    {
+        # Piping to Out-Null is used to block until finished
+        $shell.Namespace($destinationPartial).copyhere($item) | Out-Null
+    }
+
+    Rename-Item -Path "$destinationPartial" -NewName $destinationDir
+}
+
 function vcpkgInvokeCommand()
 {
     param ( [Parameter(Mandatory=$true)][string]$executable,
diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index 05335c724..e46c7808d 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -48,8 +48,8 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
     {
         Write-Host "Downloading $tool..."
 
-        # aria2 needs 7zip & 7zr to extract. So, we need to download those trough powershell
-        if ($tool -eq "aria2" -or $tool -eq "7zip" -or $tool -eq "7zr")
+        # aria2 needs 7zip & 7zip920 to extract. So, we need to download those trough powershell
+        if ($tool -eq "aria2" -or $tool -eq "7zip" -or $tool -eq "7zip920")
         {
             vcpkgDownloadFile $url $downloadPath
         }
@@ -69,10 +69,14 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
     if ($isArchive)
     {
         Write-Host "Extracting $tool..."
-        if ($tool -eq "7zip")
+        if ($tool -eq "7zip920")
         {
-            $sevenZipR = fetchToolInternal "7zr"
-            $ec = vcpkgInvokeCommand "$sevenZipR" "x `"$downloadPath`" -o`"$toolPath`" -y"
+            vcpkgExtractZipFileWithShell -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"
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index fe1cc12a9..810818998 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -54,11 +54,12 @@
         <sha256>9371df22bcd0e1aff9eaa52aa3292350eecd011f11494e709314ae3f3eb279e2</sha256>
         <archiveRelativePath>7z1801-extra.7z</archiveRelativePath>
     </tool>
-    <tool name="7zr">
-        <requiredVersion>18.01.0</requiredVersion>
-        <exeRelativePath>7zr.exe</exeRelativePath>
-        <url>https://www.7-zip.org/a/7zr.exe</url>
-        <sha256>2c7a8709260e0295a2a3cfd5a8ad0459f37490ed1794ea68bf85a6fab362553b</sha256>
+    <tool name="7zip920">
+        <requiredVersion>9.20.0</requiredVersion>
+        <exeRelativePath>7za.exe</exeRelativePath>
+        <url>https://www.7-zip.org/a/7za920.zip</url>
+        <sha256>2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac</sha256>
+        <archiveRelativePath>7za920.zip</archiveRelativePath>
     </tool>
     <tool name="aria2">
         <requiredVersion>18.01.0</requiredVersion>
-- 
cgit v1.2.3


From 23c2b82535d24a8ef343ce2ca36e5a63d111dcd8 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 4 Apr 2018 19:28:10 -0700
Subject: [vcpkgTools.xml] Add os="windows" to relevant entries

---
 scripts/vcpkgTools.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 810818998..fbd6aabd6 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <tools version="1">
-    <tool name="cmake">
+    <tool name="cmake" os="windows">
         <requiredVersion>3.10.2</requiredVersion>
         <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>
@@ -21,47 +21,47 @@
         <sha256>7a82b46c35f4e68a0807e8dc04e779dee3f36cd42c6387fd13b5c29fe62a69ea</sha256>
         <archiveRelativePath>cmake-3.10.2-Linux-x86_64.tar.gz</archiveRelativePath>
     </tool>
-    <tool name="git">
+    <tool name="git" os="windows">
         <requiredVersion>2.16.2</requiredVersion>
         <exeRelativePath>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">
+    <tool name="vswhere" os="windows">
         <requiredVersion>2.3.2</requiredVersion>
         <exeRelativePath>vswhere.exe</exeRelativePath>
         <url>https://github.com/Microsoft/vswhere/releases/download/2.3.2/vswhere.exe</url>
         <sha256>103f2784c4b2c8e70c7c1c03687abbf22bce052aae30639406e4e13ffa29ee04</sha256>
     </tool>
-    <tool name="nuget">
+    <tool name="nuget" os="windows">
         <requiredVersion>4.4.0</requiredVersion>
         <exeRelativePath>nuget.exe</exeRelativePath>
         <url>https://dist.nuget.org/win-x86-commandline/v4.4.0/nuget.exe</url>
         <sha256>2cf9b118937eef825464e548f0c44f7f64090047746de295d75ac3dcffa3e1f6</sha256>
     </tool>
-    <tool name="installerbase">
+    <tool name="installerbase" os="windows">
         <requiredVersion>3.1.81</requiredVersion>
         <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">
+    <tool name="7zip" os="windows">
         <requiredVersion>18.01.0</requiredVersion>
         <exeRelativePath>7za.exe</exeRelativePath>
         <url>https://www.7-zip.org/a/7z1801-extra.7z</url>
         <sha256>9371df22bcd0e1aff9eaa52aa3292350eecd011f11494e709314ae3f3eb279e2</sha256>
         <archiveRelativePath>7z1801-extra.7z</archiveRelativePath>
     </tool>
-    <tool name="7zip920">
+    <tool name="7zip920" os="windows">
         <requiredVersion>9.20.0</requiredVersion>
         <exeRelativePath>7za.exe</exeRelativePath>
         <url>https://www.7-zip.org/a/7za920.zip</url>
         <sha256>2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac</sha256>
         <archiveRelativePath>7za920.zip</archiveRelativePath>
     </tool>
-    <tool name="aria2">
+    <tool name="aria2" os="windows">
         <requiredVersion>18.01.0</requiredVersion>
         <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>
-- 
cgit v1.2.3


From 863a8f3329356d260c02c0d6f855e81fd1e2cea9 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 4 Apr 2018 19:37:31 -0700
Subject: [vcpkgTools.xml] Rename archiveRelativePath to archiveName

---
 scripts/fetchTool.ps1  |  4 ++--
 scripts/vcpkgTools.xml | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index e46c7808d..79ac82cb0 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -33,10 +33,10 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
         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
     {
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index fbd6aabd6..839e476b0 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -5,28 +5,28 @@
         <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>
+        <archiveName>cmake-3.10.2-win32-x86.zip</archiveName>
     </tool>
     <tool name="cmake" os="osx">
         <requiredVersion>3.10.2</requiredVersion>
         <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>
         <sha256>e748eb7698f8e2783c2eea9ab81eebf66da0238bbf8e8fa722a67a38f2110718</sha256>
-        <archiveRelativePath>cmake-3.10.2-Darwin-x86_64.tar.gz</archiveRelativePath>
+        <archiveName>cmake-3.10.2-Darwin-x86_64.tar.gz</archiveName>
     </tool>
     <tool name="cmake" os="linux">
         <requiredVersion>3.10.2</requiredVersion>
         <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>
         <sha256>7a82b46c35f4e68a0807e8dc04e779dee3f36cd42c6387fd13b5c29fe62a69ea</sha256>
-        <archiveRelativePath>cmake-3.10.2-Linux-x86_64.tar.gz</archiveRelativePath>
+        <archiveName>cmake-3.10.2-Linux-x86_64.tar.gz</archiveName>
     </tool>
     <tool name="git" os="windows">
         <requiredVersion>2.16.2</requiredVersion>
         <exeRelativePath>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>
+        <archiveName>MinGit-2.16.2-32-bit.zip</archiveName>
     </tool>
     <tool name="vswhere" os="windows">
         <requiredVersion>2.3.2</requiredVersion>
@@ -45,41 +45,41 @@
         <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>
+        <archiveName>QtInstallerFramework-win-x86.zip</archiveName>
     </tool>
     <tool name="7zip" os="windows">
         <requiredVersion>18.01.0</requiredVersion>
         <exeRelativePath>7za.exe</exeRelativePath>
         <url>https://www.7-zip.org/a/7z1801-extra.7z</url>
         <sha256>9371df22bcd0e1aff9eaa52aa3292350eecd011f11494e709314ae3f3eb279e2</sha256>
-        <archiveRelativePath>7z1801-extra.7z</archiveRelativePath>
+        <archiveName>7z1801-extra.7z</archiveName>
     </tool>
     <tool name="7zip920" os="windows">
         <requiredVersion>9.20.0</requiredVersion>
         <exeRelativePath>7za.exe</exeRelativePath>
         <url>https://www.7-zip.org/a/7za920.zip</url>
         <sha256>2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac</sha256>
-        <archiveRelativePath>7za920.zip</archiveRelativePath>
+        <archiveName>7za920.zip</archiveName>
     </tool>
     <tool name="aria2" os="windows">
         <requiredVersion>18.01.0</requiredVersion>
         <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>
         <sha256>04bf07c0449c703db17fbcd586365aebba00201ca513ca4808b543f1f9208f1f</sha256>
-        <archiveRelativePath>aria2-1.33.1-win-32bit-build1.zip</archiveRelativePath>
+        <archiveName>aria2-1.33.1-win-32bit-build1.zip</archiveName>
     </tool>
     <tool name="ninja" os="linux">
         <requiredVersion>1.8.2</requiredVersion>
         <exeRelativePath>ninja</exeRelativePath>
         <url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip</url>
         <sha256>d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07</sha256>
-        <archiveRelativePath>ninja-linux.zip</archiveRelativePath>
+        <archiveName>ninja-linux.zip</archiveName>
     </tool>
     <tool name="ninja" os="osx">
         <requiredVersion>1.8.2</requiredVersion>
         <exeRelativePath>ninja</exeRelativePath>
         <url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip</url>
         <sha256>0347d55c66061652b26f48769d566761630ffde3143793b29064a57f356542cc</sha256>
-        <archiveRelativePath>ninja-mac.zip</archiveRelativePath>
+        <archiveName>ninja-mac.zip</archiveName>
     </tool>
 </tools>
-- 
cgit v1.2.3


From 2fa16cda18856ae7f6685c48c0aeefd15225af11 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 4 Apr 2018 20:07:45 -0700
Subject: [vcpkgTools.xml] Change sha256 to sha512

---
 scripts/VcpkgPowershellUtils.ps1 |  8 ++++----
 scripts/fetchTool.ps1            |  4 ++--
 scripts/vcpkgTools.xml           | 24 ++++++++++++------------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'scripts')

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index d7967889e..676ee5c03 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -79,22 +79,22 @@ 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
+        $hash = (Microsoft.PowerShell.Utility\Get-FileHash -Path $filePath -Algorithm SHA512).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 $_})
diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index 79ac82cb0..d5c8fe77e 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -62,8 +62,8 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
         Write-Host "Downloading $tool... done."
     }
 
-    $expectedDownloadedFileHash = $toolData.sha256
-    $downloadedFileHash = vcpkgGetSHA256 $downloadPath
+    $expectedDownloadedFileHash = $toolData.sha512
+    $downloadedFileHash = vcpkgGetSHA512 $downloadPath
     vcpkgCheckEqualFileHash -filePath $downloadPath -expectedHash $expectedDownloadedFileHash -actualHash $downloadedFileHash
 
     if ($isArchive)
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 839e476b0..c3114c2e5 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -4,82 +4,82 @@
         <requiredVersion>3.10.2</requiredVersion>
         <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>
+        <sha512>9c16861a2ac09c7011b84f38459ecfec2829a9f825b254acbbde46d98f12f8ca0d4db3a6764758cb671507ee7c0327576d87658b81d7ddf1e8280b37569eb16d</sha512>
         <archiveName>cmake-3.10.2-win32-x86.zip</archiveName>
     </tool>
     <tool name="cmake" os="osx">
         <requiredVersion>3.10.2</requiredVersion>
         <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>
-        <sha256>e748eb7698f8e2783c2eea9ab81eebf66da0238bbf8e8fa722a67a38f2110718</sha256>
+        <sha512>cb7d76e11c892eb786da5804282c4141564390c3552e08c506c7abb93015eb5f619c55255459872b219399ce8114ac321fe92df7f82a7e42bbc874eec240571e</sha512>
         <archiveName>cmake-3.10.2-Darwin-x86_64.tar.gz</archiveName>
     </tool>
     <tool name="cmake" os="linux">
         <requiredVersion>3.10.2</requiredVersion>
         <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>
-        <sha256>7a82b46c35f4e68a0807e8dc04e779dee3f36cd42c6387fd13b5c29fe62a69ea</sha256>
+        <sha512>54389b5cb3f3cb9d182d35e0b1eaf7b301695899930da0d26e9df1dc25056213a077646d23ea609a93daa81d30687757d9cf0dc263339fa3d73dbeb1284bc1a9</sha512>
         <archiveName>cmake-3.10.2-Linux-x86_64.tar.gz</archiveName>
     </tool>
     <tool name="git" os="windows">
         <requiredVersion>2.16.2</requiredVersion>
         <exeRelativePath>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>
+        <sha512>004e1dc1904f2e2d5c3534d0a56f58bf030b1146f5b263d6d191e60f72cd35455977c588604708125a1e93268ee8f7a5ab32ed6115adc028257b12d5926f350a</sha512>
         <archiveName>MinGit-2.16.2-32-bit.zip</archiveName>
     </tool>
     <tool name="vswhere" os="windows">
         <requiredVersion>2.3.2</requiredVersion>
         <exeRelativePath>vswhere.exe</exeRelativePath>
         <url>https://github.com/Microsoft/vswhere/releases/download/2.3.2/vswhere.exe</url>
-        <sha256>103f2784c4b2c8e70c7c1c03687abbf22bce052aae30639406e4e13ffa29ee04</sha256>
+        <sha512>42f8a8ffd0b156b2e30b2ec7bf7d19582b3ce38a2046ff62bd7fd82f12a8d66ed601e74865957864cef0a376e33a7d07cad746f03c57d1b95a7929a1f8f119ed</sha512>
     </tool>
     <tool name="nuget" os="windows">
         <requiredVersion>4.4.0</requiredVersion>
         <exeRelativePath>nuget.exe</exeRelativePath>
         <url>https://dist.nuget.org/win-x86-commandline/v4.4.0/nuget.exe</url>
-        <sha256>2cf9b118937eef825464e548f0c44f7f64090047746de295d75ac3dcffa3e1f6</sha256>
+        <sha512>fb0903665d2a64ce1da3f40961eb19e46c152a631b2441750aa8b30b20acd2a5e78d7f1058e79e83e37959b3ce9a090a60f081895fdba9998715e3a64437c3e5</sha512>
     </tool>
     <tool name="installerbase" os="windows">
         <requiredVersion>3.1.81</requiredVersion>
         <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>
+        <sha512>1f3e593270d7c2a4e271fdb49c637a2de462351310ef66bba298d30f6ca23365ec6aecf2e57799a00c873267cd3f92060ecac03eb291d42903d0e0869cd17c73</sha512>
         <archiveName>QtInstallerFramework-win-x86.zip</archiveName>
     </tool>
     <tool name="7zip" os="windows">
         <requiredVersion>18.01.0</requiredVersion>
         <exeRelativePath>7za.exe</exeRelativePath>
         <url>https://www.7-zip.org/a/7z1801-extra.7z</url>
-        <sha256>9371df22bcd0e1aff9eaa52aa3292350eecd011f11494e709314ae3f3eb279e2</sha256>
+        <sha512>9133fc551d76515e37fdd4dd8c1e28d464aea493548246b44565a42bba46715764f41f9cfa14d470d298c3a6e9829d200f8be5168cb67cf8f23d8042fca833bc</sha512>
         <archiveName>7z1801-extra.7z</archiveName>
     </tool>
     <tool name="7zip920" os="windows">
         <requiredVersion>9.20.0</requiredVersion>
         <exeRelativePath>7za.exe</exeRelativePath>
         <url>https://www.7-zip.org/a/7za920.zip</url>
-        <sha256>2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac</sha256>
+        <sha512>84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3</sha512>
         <archiveName>7za920.zip</archiveName>
     </tool>
     <tool name="aria2" os="windows">
         <requiredVersion>18.01.0</requiredVersion>
         <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>
-        <sha256>04bf07c0449c703db17fbcd586365aebba00201ca513ca4808b543f1f9208f1f</sha256>
+        <sha512>2456176ba3d506a07cf0cc4f61f080e1ff8cb4106426d66f354c5bb67a9a8720b5ddb26904275e61b1f623c932355f7dcde4cd17556cc895f11293c23c3a9bf3</sha512>
         <archiveName>aria2-1.33.1-win-32bit-build1.zip</archiveName>
     </tool>
     <tool name="ninja" os="linux">
         <requiredVersion>1.8.2</requiredVersion>
         <exeRelativePath>ninja</exeRelativePath>
         <url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip</url>
-        <sha256>d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07</sha256>
+        <sha512>38fcb68e745c1f15b4b50f20069ffe686b1ef5baf93b74958e132ea5d30d155cf6970d6dc1b095aafd421ebd8bcc63acf4f64e305c496266b5182f99b815cca5</sha512>
         <archiveName>ninja-linux.zip</archiveName>
     </tool>
     <tool name="ninja" os="osx">
         <requiredVersion>1.8.2</requiredVersion>
         <exeRelativePath>ninja</exeRelativePath>
         <url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip</url>
-        <sha256>0347d55c66061652b26f48769d566761630ffde3143793b29064a57f356542cc</sha256>
+        <sha512>acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3</sha512>
         <archiveName>ninja-mac.zip</archiveName>
     </tool>
 </tools>
-- 
cgit v1.2.3


From 408cd5ccb8d8260efd9a8f2ff956414587d42e28 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 4 Apr 2018 20:33:45 -0700
Subject: [vcpkgTools.xml] requiredVersion -> version

---
 scripts/fetchTool.ps1  |  2 +-
 scripts/vcpkgTools.xml | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'scripts')

diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index d5c8fe77e..55d04ec98 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -25,7 +25,7 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
         throw "Unkown tool $tool"
     }
 
-    $toolPath="$downloadsDir\tools\$tool-$($toolData.requiredVersion)-windows"
+    $toolPath="$downloadsDir\tools\$tool-$($toolData.version)-windows"
     $exePath = "$toolPath\$($toolData.exeRelativePath)"
 
     if (Test-Path $exePath)
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index c3114c2e5..07284333c 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -1,82 +1,82 @@
 <?xml version="1.0"?>
 <tools version="1">
     <tool name="cmake" os="windows">
-        <requiredVersion>3.10.2</requiredVersion>
+        <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>
         <sha512>9c16861a2ac09c7011b84f38459ecfec2829a9f825b254acbbde46d98f12f8ca0d4db3a6764758cb671507ee7c0327576d87658b81d7ddf1e8280b37569eb16d</sha512>
         <archiveName>cmake-3.10.2-win32-x86.zip</archiveName>
     </tool>
     <tool name="cmake" os="osx">
-        <requiredVersion>3.10.2</requiredVersion>
+        <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">
-        <requiredVersion>3.10.2</requiredVersion>
+        <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">
-        <requiredVersion>2.16.2</requiredVersion>
+        <version>2.16.2</version>
         <exeRelativePath>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>
         <sha512>004e1dc1904f2e2d5c3534d0a56f58bf030b1146f5b263d6d191e60f72cd35455977c588604708125a1e93268ee8f7a5ab32ed6115adc028257b12d5926f350a</sha512>
         <archiveName>MinGit-2.16.2-32-bit.zip</archiveName>
     </tool>
     <tool name="vswhere" os="windows">
-        <requiredVersion>2.3.2</requiredVersion>
+        <version>2.3.2</version>
         <exeRelativePath>vswhere.exe</exeRelativePath>
         <url>https://github.com/Microsoft/vswhere/releases/download/2.3.2/vswhere.exe</url>
         <sha512>42f8a8ffd0b156b2e30b2ec7bf7d19582b3ce38a2046ff62bd7fd82f12a8d66ed601e74865957864cef0a376e33a7d07cad746f03c57d1b95a7929a1f8f119ed</sha512>
     </tool>
     <tool name="nuget" os="windows">
-        <requiredVersion>4.4.0</requiredVersion>
+        <version>4.4.0</version>
         <exeRelativePath>nuget.exe</exeRelativePath>
         <url>https://dist.nuget.org/win-x86-commandline/v4.4.0/nuget.exe</url>
         <sha512>fb0903665d2a64ce1da3f40961eb19e46c152a631b2441750aa8b30b20acd2a5e78d7f1058e79e83e37959b3ce9a090a60f081895fdba9998715e3a64437c3e5</sha512>
     </tool>
     <tool name="installerbase" os="windows">
-        <requiredVersion>3.1.81</requiredVersion>
+        <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>
         <sha512>1f3e593270d7c2a4e271fdb49c637a2de462351310ef66bba298d30f6ca23365ec6aecf2e57799a00c873267cd3f92060ecac03eb291d42903d0e0869cd17c73</sha512>
         <archiveName>QtInstallerFramework-win-x86.zip</archiveName>
     </tool>
     <tool name="7zip" os="windows">
-        <requiredVersion>18.01.0</requiredVersion>
+        <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">
-        <requiredVersion>9.20.0</requiredVersion>
+        <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">
-        <requiredVersion>18.01.0</requiredVersion>
+        <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">
-        <requiredVersion>1.8.2</requiredVersion>
+        <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">
-        <requiredVersion>1.8.2</requiredVersion>
+        <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>
-- 
cgit v1.2.3


From ab9dd6e6eb85331631ba41f16b04c21e292c93d1 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 4 Apr 2018 20:56:55 -0700
Subject: [find_acquire] Extract variable

---
 scripts/cmake/vcpkg_find_acquire_program.cmake | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index ef0e1584f..3f0142377 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -218,19 +218,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)
       if(DEFINED _vfa_RENAME)
-        file(INSTALL ${ARCHIVE_PATH} DESTINATION ${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR} RENAME ${_vfa_RENAME})
+        file(INSTALL ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} RENAME ${_vfa_RENAME})
       else()
-        file(COPY ${ARCHIVE_PATH} DESTINATION ${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR})
+        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}
@@ -238,7 +239,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()
-- 
cgit v1.2.3


From e6ed2f89027bd35744f0522c49643449ee12ee33 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 4 Apr 2018 20:58:50 -0700
Subject: [find_acquire] Fix ninja path

---
 scripts/cmake/vcpkg_find_acquire_program.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 3f0142377..30ecb0573 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -116,7 +116,7 @@ function(vcpkg_find_acquire_program VAR)
     if(CMAKE_HOST_WIN32)
       set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}")
     else()
-      set(PATHS "${DOWNLOADS}/tools/${SUBDIR}")
+      set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-linux")
     endif()
     set(BREW_PACKAGE_NAME "ninja")
     set(APT_PACKAGE_NAME "ninja-build")
-- 
cgit v1.2.3


From 5b78dfaf68d33c2444437f92d253d7fa912152ec Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 4 Apr 2018 22:13:12 -0700
Subject: [fetchTool] Extract aria2 with shell

---
 scripts/fetchTool.ps1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index 55d04ec98..c076d304a 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -48,8 +48,8 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
     {
         Write-Host "Downloading $tool..."
 
-        # aria2 needs 7zip & 7zip920 to extract. So, we need to download those trough powershell
-        if ($tool -eq "aria2" -or $tool -eq "7zip" -or $tool -eq "7zip920")
+        # Download aria2 with .NET. aria2 will be used to download everything else.
+        if ($tool -eq "aria2")
         {
             vcpkgDownloadFile $url $downloadPath
         }
@@ -69,7 +69,9 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
     if ($isArchive)
     {
         Write-Host "Extracting $tool..."
-        if ($tool -eq "7zip920")
+        # 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")
         {
             vcpkgExtractZipFileWithShell -ArchivePath $downloadPath -DestinationDir $toolPath
         }
-- 
cgit v1.2.3


From 3a9be92f7e9cb867eaef4091ace282e4c8e82b92 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 5 Apr 2018 03:16:22 -0700
Subject: [fetchTool.ps1] Move downloaded file in place after hash check

---
 scripts/VcpkgPowershellUtils.ps1 | 19 +++++++++++++++----
 scripts/fetchTool.ps1            |  8 ++------
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index 676ee5c03..63069f44d 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -103,22 +103,25 @@ function vcpkgGetSHA512([Parameter(Mandatory=$true)][string]$filePath)
     return $hash.ToLower()
 }
 
-function vcpkgCheckEqualFileHash(   [Parameter(Mandatory=$true)][string]$filePath,
+function vcpkgCheckEqualFileHash(   [Parameter(Mandatory=$true)][string]$url,
+                                    [Parameter(Mandatory=$true)][string]$filePath,
                                     [Parameter(Mandatory=$true)][string]$expectedHash,
                                     [Parameter(Mandatory=$true)][string]$actualHash)
 {
     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)
     {
@@ -152,12 +155,17 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
     }
 
     $wc.DownloadFile($url, $downloadPartPath)
+
+    $actualHash = vcpkgGetSHA512 $downloadPartPath
+    vcpkgCheckEqualFileHash -url $url -filePath $downloadPath -expectedHash $sha512 -actualHash $actualHash
+
     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]$downloadPath,
+                                        [Parameter(Mandatory=$true)][string]$sha512)
 {
     if (Test-Path $downloadPath)
     {
@@ -178,6 +186,9 @@ function vcpkgDownloadFileWithAria2(    [Parameter(Mandatory=$true)][string]$ari
         throw
     }
 
+    $actualHash = vcpkgGetSHA512 $downloadPartPath
+    vcpkgCheckEqualFileHash -url $url -filePath $downloadPath -expectedHash $sha512 -actualHash $actualHash
+
     Move-Item -Path $downloadPartPath -Destination $downloadPath
 }
 
diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index c076d304a..c1e8d87fc 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -51,21 +51,17 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
         # Download aria2 with .NET. aria2 will be used to download everything else.
         if ($tool -eq "aria2")
         {
-            vcpkgDownloadFile $url $downloadPath
+            vcpkgDownloadFile $url $downloadPath $toolData.sha512
         }
         else
         {
             $aria2exe = fetchToolInternal "aria2"
-            vcpkgDownloadFileWithAria2 $aria2exe $url $downloadPath
+            vcpkgDownloadFileWithAria2 $aria2exe $url $downloadPath $toolData.sha512
         }
 
         Write-Host "Downloading $tool... done."
     }
 
-    $expectedDownloadedFileHash = $toolData.sha512
-    $downloadedFileHash = vcpkgGetSHA512 $downloadPath
-    vcpkgCheckEqualFileHash -filePath $downloadPath -expectedHash $expectedDownloadedFileHash -actualHash $downloadedFileHash
-
     if ($isArchive)
     {
         Write-Host "Extracting $tool..."
-- 
cgit v1.2.3


From 3f6f9f3f4d48ef0115f3095f7d8d2c6d3b0c63e1 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 5 Apr 2018 17:12:59 -0700
Subject: [metrics] Use new string-hash functions instead of ps1 script

---
 scripts/SHA256Hash.ps1 | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 scripts/SHA256Hash.ps1

(limited to 'scripts')

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)))
-- 
cgit v1.2.3


From 7d5c33cf1b9483c94894e5f1831c8411b36f37cf Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 6 Apr 2018 14:36:48 -0700
Subject: [vcpkgTools.xml] Bump version to "2"

---
 scripts/vcpkgTools.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 07284333c..ba81ed926 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tools version="1">
+<tools version="2">
     <tool name="cmake" os="windows">
         <version>3.10.2</version>
         <exeRelativePath>cmake-3.10.2-win32-x86\bin\cmake.exe</exeRelativePath>
-- 
cgit v1.2.3


From d5a1e1054120c993560e5de1c6ad8ac16131d356 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 6 Apr 2018 15:22:50 -0700
Subject: [ps1] Verify hash for already present files. Dont check for path
 twice

---
 scripts/VcpkgPowershellUtils.ps1 | 23 ++++-------------------
 scripts/fetchTool.ps1            |  4 ++++
 2 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'scripts')

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index 63069f44d..f6882409b 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -105,9 +105,9 @@ function vcpkgGetSHA512([Parameter(Mandatory=$true)][string]$filePath)
 
 function vcpkgCheckEqualFileHash(   [Parameter(Mandatory=$true)][string]$url,
                                     [Parameter(Mandatory=$true)][string]$filePath,
-                                    [Parameter(Mandatory=$true)][string]$expectedHash,
-                                    [Parameter(Mandatory=$true)][string]$actualHash)
+                                    [Parameter(Mandatory=$true)][string]$expectedHash)
 {
+    $actualHash = vcpkgGetSHA512 $filePath
     if ($expectedHash -ne $actualHash)
     {
         Write-Host ("`nFile does not have expected hash:`n" +
@@ -123,11 +123,6 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
                             [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"))
@@ -155,10 +150,7 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
     }
 
     $wc.DownloadFile($url, $downloadPartPath)
-
-    $actualHash = vcpkgGetSHA512 $downloadPartPath
-    vcpkgCheckEqualFileHash -url $url -filePath $downloadPath -expectedHash $sha512 -actualHash $actualHash
-
+    vcpkgCheckEqualFileHash -url $url -filePath $downloadPartPath -expectedHash $sha512
     Move-Item -Path $downloadPartPath -Destination $downloadPath
 }
 
@@ -167,11 +159,6 @@ function vcpkgDownloadFileWithAria2(    [Parameter(Mandatory=$true)][string]$ari
                                         [Parameter(Mandatory=$true)][string]$downloadPath,
                                         [Parameter(Mandatory=$true)][string]$sha512)
 {
-    if (Test-Path $downloadPath)
-    {
-        return
-    }
-
     vcpkgCreateParentDirectoryIfNotExists $downloadPath
     $downloadPartPath = "$downloadPath.part"
     vcpkgRemoveItem $downloadPartPath
@@ -186,9 +173,7 @@ function vcpkgDownloadFileWithAria2(    [Parameter(Mandatory=$true)][string]$ari
         throw
     }
 
-    $actualHash = vcpkgGetSHA512 $downloadPartPath
-    vcpkgCheckEqualFileHash -url $url -filePath $downloadPath -expectedHash $sha512 -actualHash $actualHash
-
+    vcpkgCheckEqualFileHash -url $url -filePath $downloadPartPath -expectedHash $sha512
     Move-Item -Path $downloadPartPath -Destination $downloadPath
 }
 
diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index c1e8d87fc..8de642674 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -61,6 +61,10 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
 
         Write-Host "Downloading $tool... done."
     }
+    else
+    {
+        vcpkgCheckEqualFileHash -url $url -filePath $downloadPath -expectedHash $toolData.sha512
+    }
 
     if ($isArchive)
     {
-- 
cgit v1.2.3


From f63994db6c02266525b33c014f1447cb72a19e82 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 6 Apr 2018 20:34:06 -0700
Subject: Update nuget.exe to 4.6.2

---
 scripts/vcpkgTools.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index ba81ed926..a11ee344f 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -35,10 +35,10 @@
         <sha512>42f8a8ffd0b156b2e30b2ec7bf7d19582b3ce38a2046ff62bd7fd82f12a8d66ed601e74865957864cef0a376e33a7d07cad746f03c57d1b95a7929a1f8f119ed</sha512>
     </tool>
     <tool name="nuget" os="windows">
-        <version>4.4.0</version>
+        <version>4.6.2</version>
         <exeRelativePath>nuget.exe</exeRelativePath>
-        <url>https://dist.nuget.org/win-x86-commandline/v4.4.0/nuget.exe</url>
-        <sha512>fb0903665d2a64ce1da3f40961eb19e46c152a631b2441750aa8b30b20acd2a5e78d7f1058e79e83e37959b3ce9a090a60f081895fdba9998715e3a64437c3e5</sha512>
+        <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>
-- 
cgit v1.2.3


From 340320487342740ff2313f44efd35eeba9423ac2 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 6 Apr 2018 20:36:07 -0700
Subject: Update vswhere.exe to 2.4.1

---
 scripts/vcpkgTools.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index a11ee344f..daaf29214 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -29,10 +29,10 @@
         <archiveName>MinGit-2.16.2-32-bit.zip</archiveName>
     </tool>
     <tool name="vswhere" os="windows">
-        <version>2.3.2</version>
+        <version>2.4.1</version>
         <exeRelativePath>vswhere.exe</exeRelativePath>
-        <url>https://github.com/Microsoft/vswhere/releases/download/2.3.2/vswhere.exe</url>
-        <sha512>42f8a8ffd0b156b2e30b2ec7bf7d19582b3ce38a2046ff62bd7fd82f12a8d66ed601e74865957864cef0a376e33a7d07cad746f03c57d1b95a7929a1f8f119ed</sha512>
+        <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>
-- 
cgit v1.2.3


From 1e1899c3a27f3816c39145049e2c33832071b8c6 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Sun, 8 Apr 2018 15:12:19 -0700
Subject: [ps1] Handle "downloading" local files

Fixes #3230
---
 scripts/VcpkgPowershellUtils.ps1 | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'scripts')

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index f6882409b..3ab301c55 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -166,6 +166,12 @@ function vcpkgDownloadFileWithAria2(    [Parameter(Mandatory=$true)][string]$ari
     $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)
     {
-- 
cgit v1.2.3


From 908e714980fe2f2ab32cba4dd44f6a61b5991733 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Mon, 9 Apr 2018 22:14:47 -0700
Subject: Fix typo

---
 scripts/fetchTool.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index 8de642674..be18656c7 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -22,7 +22,7 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
 
     if ($toolData -eq $null)
     {
-        throw "Unkown tool $tool"
+        throw "Unknown tool $tool"
     }
 
     $toolPath="$downloadsDir\tools\$tool-$($toolData.version)-windows"
-- 
cgit v1.2.3


From bb054e645d6a91adc6d533929ff3b4d9fd1d8788 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 2 Apr 2018 20:40:25 -0700
Subject: [vcpkg] Don't pass /utf-8 to VS 2013

---
 scripts/cmake/vcpkg_configure_cmake.cmake |  1 +
 scripts/toolchains/windows.cmake          | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 3a3a88515..3e0922428 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -165,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"
diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake
index 7bfc2282b..753723bd9 100644
--- a/scripts/toolchains/windows.cmake
+++ b/scripts/toolchains/windows.cmake
@@ -9,8 +9,16 @@ 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 "")
+
+    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 "")
-- 
cgit v1.2.3


From 58be8482764c4bae5a62418786b30432a69649aa Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 10 Apr 2018 10:52:19 -0700
Subject: [vcpkg] Always use -c65001 for the resource compiler on windows.
 Fixes #3221.

---
 scripts/toolchains/windows.cmake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scripts')

diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake
index 753723bd9..266e023b1 100644
--- a/scripts/toolchains/windows.cmake
+++ b/scripts/toolchains/windows.cmake
@@ -17,6 +17,7 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
 
     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)
 
-- 
cgit v1.2.3


From 401e7a0e7ca47cefb7e332f50333f8719d26a90c Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 10 Apr 2018 15:38:58 -0700
Subject: [vcpkg_build_cmake] Add workaround for WSL filesystem issues

---
 scripts/cmake/vcpkg_build_cmake.cmake | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake
index 630662588..41415d9a8 100644
--- a/scripts/cmake/vcpkg_build_cmake.cmake
+++ b/scripts/cmake/vcpkg_build_cmake.cmake
@@ -105,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"
@@ -123,6 +124,33 @@ 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")
+                        message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of (potential) wsl subsystem issue.")
+                        execute_process(
+                            COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS}
+                            OUTPUT_FILE "${LOGPREFIX}-out-1.log"
+                            ERROR_FILE "${LOGPREFIX}-err-1.log"
+                            RESULT_VARIABLE error_code
+                            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE})
+
+                        if(error_code)
+                            file(READ "${LOGPREFIX}-out-1.log" out_contents)
+                            file(READ "${LOGPREFIX}-err-1.log" err_contents)
+
+                            if(out_contents)
+                                list(APPEND LOGS "${LOGPREFIX}-out-1.log")
+                            endif()
+                            if(err_contents)
+                                list(APPEND LOGS "${LOGPREFIX}-err-1.log")
+                            endif()
+                        endif()
+                    endif()
                 endif()
 
                 if(error_code)
-- 
cgit v1.2.3


From dc207a2c891fe6deb2710ccde0abf48078f64fcd Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 12 Apr 2018 18:15:38 -0700
Subject: Restore powershell extracting because shell may not be available (see
 #3252)

---
 scripts/VcpkgPowershellUtils.ps1 | 40 ++++++++++++++++++++++++++++++----------
 scripts/fetchTool.ps1            |  4 ++--
 2 files changed, 32 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index 3ab301c55..fdd89e7b9 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -1,3 +1,8 @@
+function vcpkgHasModule([Parameter(Mandatory=$true)][string]$moduleName)
+{
+    return [bool](Get-Module -ListAvailable -Name $moduleName)
+}
+
 function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName)
 {
     if ($object -eq $null)
@@ -183,9 +188,9 @@ function vcpkgDownloadFileWithAria2(    [Parameter(Mandatory=$true)][string]$ari
     Move-Item -Path $downloadPartPath -Destination $downloadPath
 }
 
-function vcpkgExtractFile(  [Parameter(Mandatory=$true)][string]$sevenZipExe,
-                            [Parameter(Mandatory=$true)][string]$archivePath,
-                            [Parameter(Mandatory=$true)][string]$destinationDir)
+function vcpkgExtractFileWith7z([Parameter(Mandatory=$true)][string]$sevenZipExe,
+                                [Parameter(Mandatory=$true)][string]$archivePath,
+                                [Parameter(Mandatory=$true)][string]$destinationDir)
 {
     vcpkgRemoveItem $destinationDir
     $destinationPartial = "$destinationDir.partial"
@@ -200,20 +205,35 @@ function vcpkgExtractFile(  [Parameter(Mandatory=$true)][string]$sevenZipExe,
     Rename-Item -Path "$destinationPartial" -NewName $destinationDir
 }
 
-function vcpkgExtractZipFileWithShell(  [Parameter(Mandatory=$true)][string]$archivePath,
-                                        [Parameter(Mandatory=$true)][string]$destinationDir)
+function vcpkgExtractZipFile(  [Parameter(Mandatory=$true)][string]$archivePath,
+                               [Parameter(Mandatory=$true)][string]$destinationDir)
 {
     vcpkgRemoveItem $destinationDir
     $destinationPartial = "$destinationDir.partial"
     vcpkgRemoveItem $destinationPartial
     vcpkgCreateDirectoryIfNotExists $destinationPartial
 
-    $shell = new-object -com shell.application
-    $zip = $shell.NameSpace($(Get-Item $archivePath).fullname)
-    foreach($item in $zip.items())
+
+    if (vcpkgHasCommand -commandName 'Microsoft.PowerShell.Archive\Expand-Archive')
+    {
+        Write-Verbose("Extracting with Microsoft.PowerShell.Archive\Expand-Archive")
+        Microsoft.PowerShell.Archive\Expand-Archive -path $archivePath -destinationpath $destinationPartial
+    }
+    elseif (vcpkgHasCommand -commandName 'Pscx\Expand-Archive')
     {
-        # Piping to Out-Null is used to block until finished
-        $shell.Namespace($destinationPartial).copyhere($item) | Out-Null
+        Write-Verbose("Extracting with Pscx\Expand-Archive")
+        Pscx\Expand-Archive -path $archivePath -OutputPath $destinationPartial
+    }
+    else
+    {
+        Write-Verbose("Extracting via shell")
+        $shell = new-object -com shell.application
+        $zip = $shell.NameSpace($(Get-Item $archivePath).fullname)
+        foreach($item in $zip.items())
+        {
+            # Piping to Out-Null is used to block until finished
+            $shell.Namespace($destinationPartial).copyhere($item) | Out-Null
+        }
     }
 
     Rename-Item -Path "$destinationPartial" -NewName $destinationDir
diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index be18656c7..dd3f0f9f4 100644
--- a/scripts/fetchTool.ps1
+++ b/scripts/fetchTool.ps1
@@ -73,7 +73,7 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
         # Extract aria2 with shell because we need it to download 7zip
         if ($tool -eq "7zip920" -or $tool -eq "aria2")
         {
-            vcpkgExtractZipFileWithShell -ArchivePath $downloadPath -DestinationDir $toolPath
+            vcpkgExtractZipFile -ArchivePath $downloadPath -DestinationDir $toolPath
         }
         elseif ($tool -eq "7zip")
         {
@@ -88,7 +88,7 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
         else
         {
             $sevenZipExe = fetchToolInternal "7zip"
-            vcpkgExtractFile -sevenZipExe "$sevenZipExe" -ArchivePath $downloadPath -DestinationDir $toolPath
+            vcpkgExtractFileWith7z -sevenZipExe "$sevenZipExe" -ArchivePath $downloadPath -DestinationDir $toolPath
         }
         Write-Host "Extracting $tool... done."
     }
-- 
cgit v1.2.3