diff --git a/scripts/fetchTool.ps1 b/scripts/fetchTool.ps1
index e46c7808daa..79ac82cb0b3 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 fbd6aabd604..839e476b0fc 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -5,28 +5,28 @@
cmake-3.10.2-win32-x86\bin\cmake.exe
https://cmake.org/files/v3.10/cmake-3.10.2-win32-x86.zip
f5f7e41a21d0e9b655aca58498b08e17ecd27796bf82837e2c84435359169dd6
- cmake-3.10.2-win32-x86.zip
+ cmake-3.10.2-win32-x86.zip
3.10.2
cmake-3.10.2-Darwin-x86_64/CMake.app/Contents/bin/cmake
https://cmake.org/files/v3.10/cmake-3.10.2-Darwin-x86_64.tar.gz
e748eb7698f8e2783c2eea9ab81eebf66da0238bbf8e8fa722a67a38f2110718
- cmake-3.10.2-Darwin-x86_64.tar.gz
+ cmake-3.10.2-Darwin-x86_64.tar.gz
3.10.2
cmake-3.10.2-Linux-x86_64/bin/cmake
https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz
7a82b46c35f4e68a0807e8dc04e779dee3f36cd42c6387fd13b5c29fe62a69ea
- cmake-3.10.2-Linux-x86_64.tar.gz
+ cmake-3.10.2-Linux-x86_64.tar.gz
2.16.2
cmd\git.exe
https://github.com/git-for-windows/git/releases/download/v2.16.2.windows.1/MinGit-2.16.2-32-bit.zip
322c727e482aa97522c64a5ac68bdda3780111e8670bcfb532beac8e11ece5da
- MinGit-2.16.2-32-bit.zip
+ MinGit-2.16.2-32-bit.zip
2.3.2
@@ -45,41 +45,41 @@
QtInstallerFramework-win-x86\bin\installerbase.exe
https://github.com/podsvirov/installer-framework/releases/download/cr203958-9/QtInstallerFramework-win-x86.zip
f2ce23cf5cf9fc7ce409bdca49328e09a070c0026d3c8a04e4dfde7b05b83fe8
- QtInstallerFramework-win-x86.zip
+ QtInstallerFramework-win-x86.zip
18.01.0
7za.exe
https://www.7-zip.org/a/7z1801-extra.7z
9371df22bcd0e1aff9eaa52aa3292350eecd011f11494e709314ae3f3eb279e2
- 7z1801-extra.7z
+ 7z1801-extra.7z
9.20.0
7za.exe
https://www.7-zip.org/a/7za920.zip
2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac
- 7za920.zip
+ 7za920.zip
18.01.0
aria2-1.33.1-win-32bit-build1\aria2c.exe
https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip
04bf07c0449c703db17fbcd586365aebba00201ca513ca4808b543f1f9208f1f
- aria2-1.33.1-win-32bit-build1.zip
+ aria2-1.33.1-win-32bit-build1.zip
1.8.2
ninja
https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07
- ninja-linux.zip
+ ninja-linux.zip
1.8.2
ninja
https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip
0347d55c66061652b26f48769d566761630ffde3143793b29064a57f356542cc
- ninja-mac.zip
+ ninja-mac.zip
diff --git a/toolsrc/src/vcpkg/commands.fetch.cpp b/toolsrc/src/vcpkg/commands.fetch.cpp
index cfb1b6c2a55..10153293c6f 100644
--- a/toolsrc/src/vcpkg/commands.fetch.cpp
+++ b/toolsrc/src/vcpkg/commands.fetch.cpp
@@ -75,7 +75,7 @@ namespace vcpkg::Commands::Fetch
static const std::regex EXE_RELATIVE_PATH_REGEX{
Strings::format(R"###(([\s\S]*?))###")};
static const std::regex ARCHIVE_RELATIVE_PATH_REGEX{
- Strings::format(R"###(([\s\S]*?))###")};
+ Strings::format(R"###(([\s\S]*?))###")};
static const std::regex URL_REGEX{Strings::format(R"###(([\s\S]*?))###")};
const std::regex tool_regex{