diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4963f063d1e7ac..53f1edb1d3d9d4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -172,10 +172,17 @@ boost-log:arm-uwp=fail boost-log:x64-uwp=fail boost-stacktrace:arm-uwp=fail boost-stacktrace:x64-uwp=fail +boost-stacktrace:arm64-windows=fail boost-test:arm-uwp=fail boost-test:x64-uwp=fail boost-wave:arm-uwp=fail boost-wave:x64-uwp=fail +boost-exception:arm64-windows=fail +boost-regex:arm64-windows=fail +boost-signals:arm64-windows=fail +boost-system:arm64-windows=fail +boost-container:arm64-windows=fail +boost-atomic:arm64-windows=fail botan:arm64-windows=fail botan:arm-uwp=fail botan:x64-uwp=fail @@ -557,6 +564,8 @@ gmmlib:x64-uwp=fail gmmlib:x64-windows=fail gmmlib:x64-windows-static=fail gmmlib:x86-windows=fail +gmp:x64-windows=fail +gmp:x86-windows=fail googleapis:arm64-windows=fail googleapis:arm-uwp=fail googleapis:x64-uwp=fail @@ -580,6 +589,7 @@ gsl:x64-uwp=fail gsoap:x64-linux=fail gsoap:x64-osx=fail gsoap:x64-uwp=fail +gsoap:x86-windows=fail gtk:x64-linux=fail gtk:x86-windows=ignore guetzli:x64-osx=fail @@ -750,6 +760,7 @@ libfabric:x64-linux=fail libfabric:x64-osx=fail libfabric:x64-uwp=fail libfabric:x64-windows=ignore +libfabric:x64-windows-static=fail libfreenect2:arm64-windows=fail libgd:x64-linux=ignore libgit2:arm-uwp=fail @@ -823,6 +834,7 @@ libmicrohttpd:arm-uwp=fail libmicrohttpd:x64-linux=fail libmicrohttpd:x64-osx=fail libmicrohttpd:x64-uwp=fail +libmikmod:x86-windows=fail libmodbus:arm-uwp=fail libmodbus:x64-uwp=fail libmodman:arm-uwp=fail @@ -1143,6 +1155,7 @@ mozjpeg:x86-windows = skip mpir:arm64-windows=fail mpir:arm-uwp=fail mpir:x64-uwp=fail +mpg123:x64-windows-static=fail # Building package gmp[core]:x64-linux... done # Installing package gmp[core]:x64-linux... # The following files are already installed in /mnt/1/s/installed/x64-linux and are in conflict with gmp:x64-linux @@ -1398,6 +1411,7 @@ parmetis:x64-osx=fail pcre2:arm-uwp=fail pdal:x64-linux=fail pdal:x64-osx=fail +pdal:x86-windows=fail pdal-c:x64-windows-static=fail pdcurses:arm-uwp=fail pdcurses:x64-linux=fail @@ -1549,6 +1563,7 @@ quickfix:x64-windows-static=ignore quickfix:x86-windows=ignore quickfix:x64-uwp=fail quickfix:arm-uwp=fail +quickfix:arm64-windows=fail quill:arm64-windows=fail quill:arm-uwp=fail quill:x64-uwp=fail @@ -1669,6 +1684,7 @@ sdl2-net:x64-uwp=fail # https://github.com/microsoft/vcpkg/issues/10918 seal:arm-uwp=fail seal:x64-uwp=fail +seal:arm64-windows=fail secp256k1:x64-linux=fail secp256k1:x64-osx=fail selene:x64-linux=ignore @@ -2015,6 +2031,7 @@ zkpp:x64-windows-static=fail zkpp:arm64-windows=fail zkpp:x64-uwp=fail zkpp:arm-uwp=fail +zxing-cpp:x64-windows-static=fail c4core:arm-uwp=fail c4core:arm64-windows=fail c4core:x64-osx=fail diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 0c50f6da5987b3..6d380e864f5a3a 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -60,10 +60,10 @@ f477842d0cebefcd6bf9c6d536ab8ea20ec5b0aa967ee963ab6a101aeff9df8742ca600d35f39e2e7158d76d8231f1ed2bef6104dce84d2bf8d6b07d17d706a1 - 4.8.1 + 5.6.0 nuget.exe - https://dist.nuget.org/win-x86-commandline/v4.8.1/nuget.exe - 42cb744338af8decc033a75bce5b4c4df28e102bafc45f9a8ba86d7bc010f5b43ebacae80d7b28c4f85ac900eefc2a349620ae65f27f6ca1c21c53b63b92924b + https://dist.nuget.org/win-x86-commandline/v5.6.0/nuget.exe + 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619 3.1.81 @@ -73,11 +73,11 @@ QtInstallerFramework-win-x86.zip - 18.1.0 - 7-Zip.CommandLine.18.1.0\tools\7za.exe - https://www.nuget.org/api/v2/package/7-Zip.CommandLine/18.1.0 - 8c75314102e68d2b2347d592f8e3eb05812e1ebb525decbac472231633753f1d4ca31c8e6881a36144a8da26b2571305b3ae3f4e2b85fc4a290aeda63d1a13b8 - 7-zip.commandline.18.1.0.nupkg + 19.0.0 + 7-Zip.StandaloneConsole.19.0.0\tools\7za.exe + https://www.nuget.org/api/v2/package/7-Zip.StandaloneConsole/19.0.0 + 7e05111289a7a666336f5a2ac88954e5ebd368d3c67d1eb5a0eee39cce2f789f1bb31c721236b97a5a89bbcb39a4d457cae801ce6689a7fd7cb1a6a6b1022116 + 7-zip.standaloneconsole.19.0.0.nupkg 18.01.0 @@ -115,10 +115,10 @@ ninja-freebsd-1.8.2.zip - 6.2.1 + 7.0.1 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v6.2.1/PowerShell-6.2.1-win-x86.zip - ab1effc926b000a6adc12198a1886514ec203621a53b0cd7ec1cd9a8225dccda7e857feaabcfba4004bea73129b986abaad777c4573f44e0af70411226ce08b0 - PowerShell-6.2.1-win-x86.zip + https://github.com/PowerShell/PowerShell/releases/download/v7.0.1/PowerShell-7.0.1-win-x86.zip + b6e3fb7f6bcf438263481b12c2d49e4b5f4113844ec4a1b0d3d34a381c43e4983fe314087b5bc5ac15b474d7fcb20f3fbcda3bf4e195a55120f3f903a41f90f1 + PowerShell-7.0.1-win-x86.zip diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index c46fe428834195..72ff4f2130a0a6 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -150,10 +150,10 @@ namespace vcpkg::Downloads // // This is the NEW hash for 7zip if (actual_hash == "a9dfaaafd15d98a2ac83682867ec5766720acf6e99d40d1a00d480692752603bf3f3742623f0ea85647a92374df" - "405f331afd6021c5cf36af43ee8db198129c0") - // This is the OLD hash for 7zip - actual_hash = "8c75314102e68d2b2347d592f8e3eb05812e1ebb525decbac472231633753f1d4ca31c8e6881a36144a8da26b257" - "1305b3ae3f4e2b85fc4a290aeda63d1a13b8"; + "405f331afd6021c5cf36af43ee8db198129c0"; + // This is the OLD hash for 7zip + actual_hash == "7e05111289a7a666336f5a2ac88954e5ebd368d3c67d1eb5a0eee39cce2f789f1bb31c721236b97a5a89bbcb39a" + "4d457cae801ce6689a7fd7cb1a6a6b1022116") // Checks::check_exit(VCPKG_LINE_INFO,