Patch Tuesday for November 2024 (#42165)

2024-11-27 19:09:00 +08:00 · 2024-11-19 14:42:29 -08:00 · 2024-11-19 14:42:29 -08:00 · 0857a4b08c
commit 0857a4b08c
parent 0d9926a21d
49 changed files with 463 additions and 364 deletions
--- a/ports/chartdir/vcpkg.json
+++ b/ports/chartdir/vcpkg.json
@ -1,9 +1,9 @@
 {
  "name": "chartdir",
  "version": "7.0.0",
-  "port-version": 7,
+  "port-version": 8,
  "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.",
  "homepage": "https://www.advsofteng.com/",
  "license": null,
-  "supports": "!(arm & windows) & !uwp"
+  "supports": "(windows & !uwp & (x86 | x64)) | osx | linux"
 }
--- a/ports/freeopcua/boost-1.70.patch
+++ b/ports/freeopcua/boost-1.70.patch
@ -1,29 +0,0 @@
-diff --git a/src/server/opc_tcp_async.cpp b/src/server/opc_tcp_async.cpp
-index 9c34d72..9e68d9b 100644
--- a/src/server/opc_tcp_async.cpp
-+++ b/src/server/opc_tcp_async.cpp
-@@ -106,7 +106,11 @@ public:
-      */
-     typedef std::promise<void> Promise;
-     Promise promise;
-+#if BOOST_VERSION >= 107000
-+    boost::asio::post(Socket.get_executor(), bind(&Promise::set_value, &promise));
-+#else
-     Socket.get_io_service().post(bind(&Promise::set_value, &promise));
-+#endif
-     promise.get_future().wait();
-   }
- 
-@@ -372,7 +376,11 @@ void OpcTcpServer::Shutdown()
-    */
-   typedef std::promise<void> Promise;
-   Promise promise;
-  acceptor.get_io_service().post(bind(&Promise::set_value, &promise));
-+#if BOOST_VERSION >= 107000
-+    boost::asio::post(acceptor.get_executor(), bind(&Promise::set_value, &promise));
-+#else
-+    acceptor.get_io_service().post(bind(&Promise::set_value, &promise));
-+#endif
-   promise.get_future().wait();
- }
- 
--- a/ports/freeopcua/boost-compatibility.patch
+++ b/ports/freeopcua/boost-compatibility.patch
@ -1,3 +1,29 @@
+diff --git a/include/opc/ua/services/services.h b/include/opc/ua/services/services.h
+index f138831..4732a59 100644
+--- a/include/opc/ua/services/services.h
+++ b/include/opc/ua/services/services.h
+@@ -26,20 +26,7 @@
+ #include <vector>
+ 
+ #include <boost/version.hpp>
+-
+-
+-namespace boost
+-{
+-namespace asio
+-{
+-#if BOOST_VERSION < 106600
+-  class io_service;
+-#else
+-  class io_context;
+-  typedef io_context io_service;
+-#endif
+-}
+-}
+#include <boost/asio/io_service.hpp>
+ 
+ namespace OpcUa
+ {
 diff --git a/src/core/subscription.cpp b/src/core/subscription.cpp
 index b690d3a..fdac2f3 100644
 --- a/src/core/subscription.cpp
@ -31,8 +57,30 @@ index 795a6b2..532ac3c 100644
 #include <iostream>
 #include <thread>
 
+diff --git a/src/server/internal_subscription.cpp b/src/server/internal_subscription.cpp
+index edf4715..32f6a2b 100644
+--- a/src/server/internal_subscription.cpp
+++ b/src/server/internal_subscription.cpp
+@@ -14,7 +14,7 @@ InternalSubscription::InternalSubscription(SubscriptionServiceInternal & service
+   , CurrentSession(SessionAuthenticationToken)
+   , Callback(callback)
+   , io(service.GetIOService())
+-  , Timer(io, boost::posix_time::milliseconds(data.RevisedPublishingInterval))
+  , Timer(io, boost::posix_time::milliseconds((int)data.RevisedPublishingInterval))
+   , LifeTimeCount(data.RevisedLifetimeCount)
+   , Logger(logger)
+ {
+@@ -105,7 +105,7 @@ void InternalSubscription::PublishResults(const boost::system::error_code & erro
+     }
+ 
+   TimerStopped = false;
+-  Timer.expires_at(Timer.expires_at() + boost::posix_time::milliseconds(Data.RevisedPublishingInterval));
+  Timer.expires_at(Timer.expires_at() + boost::posix_time::milliseconds((int)Data.RevisedPublishingInterval));
+   std::shared_ptr<InternalSubscription> self = shared_from_this();
+   Timer.async_wait([self](const boost::system::error_code & error) { self->PublishResults(error); });
+ }
 diff --git a/src/server/internal_subscription.h b/src/server/internal_subscription.h
-index d42aa65..dd193a9 100644
+index d42aa65..440c7ee 100644
 --- a/src/server/internal_subscription.h
 +++ b/src/server/internal_subscription.h
@@ -1,6 +1,7 @@
@ -51,14 +99,8 @@ index d42aa65..dd193a9 100644
 #include <boost/thread/shared_mutex.hpp>
 #include <chrono>
 #include <iostream>
-@@ -115,5 +115,3 @@ private:
- 
- }
- }
-
-
 diff --git a/src/server/opc_tcp_async.cpp b/src/server/opc_tcp_async.cpp
-index dc700c2..f3a66b8 100644
+index dc700c2..c761a9e 100644
 --- a/src/server/opc_tcp_async.cpp
 +++ b/src/server/opc_tcp_async.cpp
@@ -17,6 +17,7 @@
@ -77,8 +119,32 @@ index dc700c2..f3a66b8 100644
 #include <future>
 #include <iostream>
 #include <set>
+@@ -106,7 +106,11 @@ public:
+      */
+     typedef std::promise<void> Promise;
+     Promise promise;
+#if BOOST_VERSION >= 107000
+    boost::asio::post(Socket.get_executor(), bind(&Promise::set_value, &promise));
+#else
+     Socket.get_io_service().post(bind(&Promise::set_value, &promise));
+#endif
+     promise.get_future().wait();
+   }
+ 
+@@ -372,7 +376,11 @@ void OpcTcpServer::Shutdown()
+    */
+   typedef std::promise<void> Promise;
+   Promise promise;
+#if BOOST_VERSION >= 107000
+  boost::asio::post(acceptor.get_executor(), bind(&Promise::set_value, &promise));
+#else
+   acceptor.get_io_service().post(bind(&Promise::set_value, &promise));
+#endif
+   promise.get_future().wait();
+ }
+ 
 diff --git a/src/server/subscription_service_internal.h b/src/server/subscription_service_internal.h
-index 6b16e1d..f7e5dfe 100644
+index 6b16e1d..53cfd22 100644
 --- a/src/server/subscription_service_internal.h
 +++ b/src/server/subscription_service_internal.h
@@ -9,6 +9,7 @@
@ -97,13 +163,8 @@ index 6b16e1d..f7e5dfe 100644
 #include <boost/thread/shared_mutex.hpp>
 #include <ctime>
 #include <limits>
-@@ -76,4 +76,3 @@ private:
- }
- 
- }
-
 diff --git a/src/server/tcp_server.cpp b/src/server/tcp_server.cpp
-index b4f2000..2430820 100644
+index b4f2000..b7f4df1 100644
 --- a/src/server/tcp_server.cpp
 +++ b/src/server/tcp_server.cpp
@@ -8,9 +8,6 @@
@ -116,14 +177,10 @@ index b4f2000..2430820 100644
 
 #include "tcp_server.h"
 
-@@ -34,8 +31,18 @@
- #include <string.h>
- #include <sys/types.h>
+@@ -36,6 +33,15 @@
+ 
 
-
 #ifdef _WIN32
-+#include <WinSock2.h>
-+#include <windows.h>
 +#if !defined SHUT_RD && defined SD_RECEIVE
 +#define SHUT_RD SD_RECEIVE
 +#endif
--- a/ports/freeopcua/cmakelists_fixes.patch
+++ b/ports/freeopcua/cmakelists_fixes.patch
@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index de03564..df3fcf6 100644
+index de03564..fe9f536 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -1,11 +1,8 @@
@ -45,7 +45,7 @@ index de03564..df3fcf6 100644
 # Helper function to generate a pkg-config file for a single library
 # Takes the filename of the .pc file as a parameter and replaces all
 # placeholders in the .pc.in file with the actual values
-@@ -60,23 +35,9 @@ function(generate_pkgconfig BASENAME)
+@@ -60,23 +35,10 @@ function(generate_pkgconfig BASENAME)
     endif()
 endfunction(generate_pkgconfig)
 if(MSVC)
@ -68,11 +68,12 @@ index de03564..df3fcf6 100644
 -    #set(CMAKE_SHARED_LINKER_FLAGS "--no-undefined" )
 +    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 +    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_compile_options(/bigobj)
 +    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 endif()
 
 if(WIN32)
-@@ -105,7 +66,7 @@ else(WIN32)
+@@ -105,7 +67,7 @@ else(WIN32)
 
 endif(WIN32)
 
@ -81,7 +82,7 @@ index de03564..df3fcf6 100644
 include_directories( ${Boost_INCLUDE_DIRS} )
 link_directories( ${Boost_LIBRARY_DIRS} )
 message(STATUS "Boost INCLUDE DIR IS: " ${Boost_INCLUDE_DIRS})
-@@ -185,14 +146,12 @@ add_library(opcuaprotocol
+@@ -185,14 +147,12 @@ add_library(opcuaprotocol
     src/protocol/subscriptions.cpp
 )
 
@ -98,7 +99,7 @@ index de03564..df3fcf6 100644
 
 generate_pkgconfig("libopcuaprotocol.pc")
 
-@@ -227,10 +186,6 @@ if (BUILD_TESTING)
+@@ -227,10 +187,6 @@ if (BUILD_TESTING)
         gtest_main
     )
 
@ -109,7 +110,7 @@ index de03564..df3fcf6 100644
     add_test(NAME opcuaprotocol COMMAND test_opcuaprotocol)
 endif()
 
-@@ -266,15 +221,12 @@ SET(opcuacore_SOURCES
+@@ -266,15 +222,12 @@ SET(opcuacore_SOURCES
 
 add_library(opcuacore ${opcuacore_SOURCES})
 
@ -128,7 +129,7 @@ index de03564..df3fcf6 100644
 
 generate_pkgconfig("libopcuacore.pc")
 
-@@ -306,7 +258,7 @@ if (BUILD_TESTING)
+@@ -306,7 +259,7 @@ if (BUILD_TESTING)
     )
 
     if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
@ -137,7 +138,7 @@ index de03564..df3fcf6 100644
     endif ()
 
     add_test(NAME opcuacore COMMAND test_opcuacore)
-@@ -327,9 +279,6 @@ if (BUILD_CLIENT)
+@@ -327,9 +280,6 @@ if (BUILD_CLIENT)
     src/client/client.cpp
     )
 
@ -147,7 +148,7 @@ index de03564..df3fcf6 100644
     target_link_libraries(opcuaclient
         opcuacore
         ${ADDITIONAL_LINK_LIBRARIES}
-@@ -338,8 +287,9 @@ if (BUILD_CLIENT)
+@@ -338,8 +288,9 @@ if (BUILD_CLIENT)
 
     target_include_directories(opcuaclient PUBLIC $<INSTALL_INTERFACE:include>)
     install(TARGETS opcuaclient EXPORT FreeOpcUa
@ -158,7 +159,7 @@ index de03564..df3fcf6 100644
 
     generate_pkgconfig("libopcuaclient.pc")
 
-@@ -371,9 +321,6 @@ if (BUILD_CLIENT)
+@@ -371,9 +322,6 @@ if (BUILD_CLIENT)
         opcuacore
     )
 
@ -168,7 +169,7 @@ index de03564..df3fcf6 100644
 endif(BUILD_CLIENT)
 
 
-@@ -423,14 +370,12 @@ if(BUILD_SERVER)
+@@ -423,14 +371,12 @@ if(BUILD_SERVER)
         src/server/subscription_service_internal.cpp
         )
 
@ -186,7 +187,7 @@ index de03564..df3fcf6 100644
 
     generate_pkgconfig("libopcuaserver.pc")
 
-@@ -481,7 +426,7 @@ if(BUILD_SERVER)
+@@ -481,7 +427,7 @@ if(BUILD_SERVER)
 
         target_include_directories(test_opcuaserver PUBLIC .)
         if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
@ -195,7 +196,7 @@ index de03564..df3fcf6 100644
         endif ()
 
         add_test(NAME opcuaserverapp COMMAND test_opcuaserver)
-@@ -510,9 +455,6 @@ if(BUILD_SERVER)
+@@ -510,9 +456,6 @@ if(BUILD_SERVER)
         opcuaserver
         ${Boost_PROGRAM_OPTIONS_LIBRARY}
         )
@ -205,7 +206,7 @@ index de03564..df3fcf6 100644
 
 endif(BUILD_SERVER)
 
-@@ -533,9 +475,6 @@ if (BUILD_CLIENT)
+@@ -533,9 +476,6 @@ if (BUILD_CLIENT)
         ${SSL_SUPPORT_LINK_LIBRARIES}
     )
 
@ -215,7 +216,7 @@ index de03564..df3fcf6 100644
 
 endif (BUILD_CLIENT)
 
-@@ -555,9 +494,6 @@ if(BUILD_SERVER)
+@@ -555,9 +495,6 @@ if(BUILD_SERVER)
     opcuaserver
     )
 
@ -225,7 +226,7 @@ index de03564..df3fcf6 100644
     if(MSVC)
         set_target_properties(example_server PROPERTIES LINK_FLAGS /STACK:3000000)
     endif(MSVC)
-@@ -572,8 +508,8 @@ if (BUILD_PYTHON)
+@@ -572,8 +509,8 @@ if (BUILD_PYTHON)
     add_subdirectory(python)
 endif (BUILD_PYTHON)
 
--- a/ports/freeopcua/improve_compatibility_with_recent_boost.patch
+++ b/ports/freeopcua/improve_compatibility_with_recent_boost.patch
@ -1,54 +0,0 @@
-diff --git a/include/opc/ua/services/services.h b/include/opc/ua/services/services.h
-index f138831..4732a59 100644
--- a/include/opc/ua/services/services.h
-+++ b/include/opc/ua/services/services.h
-@@ -26,20 +26,7 @@
- #include <vector>
- 
- #include <boost/version.hpp>
-
-
-namespace boost
-{
-namespace asio
-{
-#if BOOST_VERSION < 106600
-  class io_service;
-#else
-  class io_context;
-  typedef io_context io_service;
-#endif
-}
-}
-+#include <boost/asio/io_service.hpp>
- 
- namespace OpcUa
- {
-diff --git a/src/server/internal_subscription.cpp b/src/server/internal_subscription.cpp
-index edf4715..69ef74a 100644
--- a/src/server/internal_subscription.cpp
-+++ b/src/server/internal_subscription.cpp
-@@ -14,7 +14,7 @@ InternalSubscription::InternalSubscription(SubscriptionServiceInternal & service
-   , CurrentSession(SessionAuthenticationToken)
-   , Callback(callback)
-   , io(service.GetIOService())
-  , Timer(io, boost::posix_time::milliseconds(data.RevisedPublishingInterval))
-+  , Timer(io, boost::posix_time::milliseconds((int)data.RevisedPublishingInterval))
-   , LifeTimeCount(data.RevisedLifetimeCount)
-   , Logger(logger)
- {
-@@ -105,7 +105,7 @@ void InternalSubscription::PublishResults(const boost::system::error_code & erro
-     }
- 
-   TimerStopped = false;
-  Timer.expires_at(Timer.expires_at() + boost::posix_time::milliseconds(Data.RevisedPublishingInterval));
-+  Timer.expires_at(Timer.expires_at() + boost::posix_time::milliseconds((int)Data.RevisedPublishingInterval));
-   std::shared_ptr<InternalSubscription> self = shared_from_this();
-   Timer.async_wait([self](const boost::system::error_code & error) { self->PublishResults(error); });
- }
-@@ -615,5 +615,3 @@ std::vector<Variant> InternalSubscription::GetEventFields(const EventFilter & fi
- 
- }
- }
-
-
--- a/ports/freeopcua/portfile.cmake
+++ b/ports/freeopcua/portfile.cmake
@ -6,13 +6,11 @@ vcpkg_from_github(
    HEAD_REF master
    PATCHES
        cmakelists_fixes.patch
-        improve_compatibility_with_recent_boost.patch
        use_another_implementation_of_has_begin_end.patch
-        uri_facade_win.patch
        serverObj.patch
-        include_asio_first.patch
-        boost-1.70.patch
        fix-std-headers.patch
+        uri_facade_win.patch
+        boost-compatibility.patch
 )

 vcpkg_cmake_configure(
@ -28,8 +26,5 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-#Handle copyright
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freeopcua" RENAME copyright)
-
 vcpkg_fixup_pkgconfig()
--- a/ports/freeopcua/uri_facade_win.patch
+++ b/ports/freeopcua/uri_facade_win.patch
@ -1,5 +1,5 @@
 diff --git a/src/core/common/uri_facade_win.cpp b/src/core/common/uri_facade_win.cpp
-index 1a807fb..c579e2d 100644
+index 1a807fb..2839ddf 100644
 --- a/src/core/common/uri_facade_win.cpp
 +++ b/src/core/common/uri_facade_win.cpp
@@ -19,7 +19,7 @@
@ -20,9 +20,3 @@ index 1a807fb..c579e2d 100644
     {
       THROW_ERROR1(CannotParseUri, uriString);
     }
-@@ -50,5 +50,3 @@ void Uri::Initialize(const char * uriString, std::size_t size)
- }
- 
- } // namespace Common
-
-
--- a/ports/freeopcua/vcpkg.json
+++ b/ports/freeopcua/vcpkg.json
@ -1,8 +1,9 @@
 {
  "name": "freeopcua",
  "version": "20190125",
-  "port-version": 7,
+  "port-version": 8,
  "description": "OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.",
+  "supports": "!android",
  "dependencies": [
    "boost-asio",
    "boost-date-time",
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@ -9,6 +9,7 @@ vcpkg_from_github(
        fix-gdal-target-interfaces.patch
        libkml.patch
        target-is-valid.patch
+        remove-machine-flag.patch
 )
 # `vcpkg clean` stumbles over one subdir
 file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")
--- a/ports/gdal/remove-machine-flag.patch
+++ b/ports/gdal/remove-machine-flag.patch
@ -0,0 +1,12 @@
+diff --git a/gdal.cmake b/gdal.cmake
+index 029eedd..412fc88 100644
+--- a/gdal.cmake
+++ b/gdal.cmake
+@@ -409,7 +409,6 @@ if (MSVC)
+   target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE gcore/Version.rc)
+   source_group("Resource Files" FILES gcore/Version.rc)
+   if (CMAKE_CL_64)
+-    set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
+   endif ()
+ endif ()
+ 
--- a/ports/gdal/vcpkg.json
+++ b/ports/gdal/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "gdal",
  "version-semver": "3.10.0",
+  "port-version": 1,
  "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
  "homepage": "https://gdal.org",
  "license": null,
--- a/ports/igraph/constant-nan.patch
+++ b/ports/igraph/constant-nan.patch
@ -0,0 +1,12 @@
+diff --git a/vendor/plfit/hzeta.c b/vendor/plfit/hzeta.c
+index d8f9a6d..4ef8d5d 100644
+--- a/vendor/plfit/hzeta.c
+++ b/vendor/plfit/hzeta.c
+@@ -43,6 +43,7 @@
+ /* Author:  Jerome G. Benoit < jgmbenoit _at_ rezozer _dot_ net > */
+ 
+ #ifdef _MSC_VER
+#define _UCRT_NOISY_NAN
+ #define _USE_MATH_DEFINES
+ #endif
+ 
--- a/ports/igraph/portfile.cmake
+++ b/ports/igraph/portfile.cmake
@ -14,6 +14,7 @@ vcpkg_extract_source_archive(
    ARCHIVE ${ARCHIVE}
    PATCHES
      "glpk-uwp.patch" # patch GLPK for UWP compatibility
+      "constant-nan.patch" # Workaround https://developercommunity.visualstudio.com/t/NAN-is-no-longer-compile-time-constant-i/10688907
 )

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
--- a/ports/igraph/vcpkg.json
+++ b/ports/igraph/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "igraph",
  "version": "0.10.15",
+  "port-version": 1,
  "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.",
  "homepage": "https://igraph.org/",
  "license": "GPL-2.0-or-later",
--- a/ports/libgit2/fix-arm64-windows.patch
+++ b/ports/libgit2/fix-arm64-windows.patch
@ -0,0 +1,17 @@
+diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt
+index f2a9943..3ce01b7 100644
+--- a/src/libgit2/CMakeLists.txt
+++ b/src/libgit2/CMakeLists.txt
+@@ -65,12 +65,6 @@ set_target_properties(libgit2package PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJE
+ set_target_properties(libgit2package PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+ set_target_properties(libgit2package PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+ 
+-# Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240)
+-# Win64+MSVC+static libs = linker error
+-if(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS)
+-	set_target_properties(libgit2package PROPERTIES STATIC_LIBRARY_FLAGS "/MACHINE:x64")
+-endif()
+-
+ ide_split_sources(libgit2package)
+ 
+ if(SONAME)
--- a/ports/libgit2/portfile.cmake
+++ b/ports/libgit2/portfile.cmake
@ -10,6 +10,7 @@ vcpkg_from_github(
        dependencies.diff
        mingw-winhttp.diff
        unofficial-config-export.diff
+        fix-arm64-windows.patch
 )
 file(REMOVE_RECURSE
    "${SOURCE_PATH}/cmake/FindPCRE.cmake"
--- a/ports/libgit2/vcpkg.json
+++ b/ports/libgit2/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "libgit2",
  "version-semver": "1.8.0",
+  "port-version": 1,
  "description": "A C library implementing the Git core methods with a solid API",
  "homepage": "https://github.com/libgit2/libgit2",
  "license": null,
--- a/ports/librttopo/constant-nan.patch
+++ b/ports/librttopo/constant-nan.patch
@ -0,0 +1,14 @@
+diff --git a/src/rtout_wkb.c b/src/rtout_wkb.c
+index 7cfeda6..4f2ff38 100644
+--- a/src/rtout_wkb.c
+++ b/src/rtout_wkb.c
+@@ -22,8 +22,7 @@
+  *
+  **********************************************************************/
+ 
+-
+-
+#define _UCRT_NOISY_NAN
+ #include "rttopo_config.h"
+ #include <math.h>
+ 
--- a/ports/librttopo/portfile.cmake
+++ b/ports/librttopo/portfile.cmake
@ -15,6 +15,7 @@ vcpkg_extract_source_archive(
        fix-makefiles.patch
        geos-config.patch
        fix-pc-file.patch
+        constant-nan.patch # https://developercommunity.visualstudio.com/t/NAN-is-no-longer-compile-time-constant-i/10688907
 )

 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
--- a/ports/librttopo/vcpkg.json
+++ b/ports/librttopo/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "librttopo",
  "version": "1.1.0",
-  "port-version": 8,
+  "port-version": 9,
  "description": "The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided data stores.",
  "homepage": "https://git.osgeo.org/gitea/rttopo/librttopo",
  "license": "GPL-2.0-or-later",
--- a/scripts/azure-pipelines/android/Dockerfile
+++ b/scripts/azure-pipelines/android/Dockerfile
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.4
 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
-FROM ubuntu:focal-20240918
+FROM ubuntu:noble-20241011

 ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
 ADD https://dl.google.com/android/repository/android-ndk-r27c-linux.zip /android-ndk-r27c-linux.zip
--- a/scripts/azure-pipelines/android/azure-pipelines.yml
+++ b/scripts/azure-pipelines/android/azure-pipelines.yml
@ -16,7 +16,7 @@ jobs:
 - job: ${{ parameters.jobName }}
  condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
  pool:
-    name: 'PrAnd-1ES-Pool'
+    name: PrAnd-WUS
  workspace:
    clean: resources
  timeoutInMinutes: 1440 # 1 day
@ -39,12 +39,6 @@ jobs:
      sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} -m=777
      exit 0
    displayName: 'Create working directories'
-  - bash: |
-      CONTAINERS=$(docker ps -a -q)
-      if [ -n "$CONTAINERS" ]; then
-        docker rm -f $CONTAINERS
-      fi
-    displayName: 'Stop and remove all docker containers'
  - task: AzureCLI@2
    displayName: '*** Test Modified Ports'
    inputs:
@ -52,15 +46,15 @@ jobs:
      scriptType: bash
      scriptLocation: 'inlineScript'  # Be very very careful that the exit code from the last pwsh is reported correctly
      inlineScript: |
-        az acr login --name vcpkgandroidwus3
+        az acr login --name vcpkgandroidwus
        docker pull ${{ parameters.dockerImage }}
        docker run --rm \
          --mount type=bind,source=$(Build.Repository.LocalPath),target=/vcpkg \
          ${{ parameters.dockerImage }} \
          ./bootstrap-vcpkg.sh
        end=`date -u -d "2 days" '+%Y-%m-%dT%H:%MZ'`
-        assetSas=`az storage container generate-sas --name cache --account-name vcpkgassetcachewus3 --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv`
-        binarySas=`az storage container generate-sas --name cache --account-name vcpkgbinarycachewus3 --as-user --auth-mode login --https-only --permissions rclw --expiry $end -o tsv`
+        assetSas=`az storage container generate-sas --name cache --account-name vcpkgassetcachewus --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv`
+        binarySas=`az storage container generate-sas --name cache --account-name vcpkgbinarycachewus --as-user --auth-mode login --https-only --permissions rclw --expiry $end -o tsv`
        echo Minting SAS tokens valid through $end
        USER=$(id --user)
        docker run --init -i \
@ -70,38 +64,31 @@ jobs:
        --mount type=bind,source=$(Build.Repository.LocalPath),target=/vcpkg \
        --mount type=bind,source=$(WORKING_ROOT)/failure-logs,target=/vcpkg/failure-logs \
        --mount type=bind,source=/mnt/vcpkg-ci,target=/mnt/vcpkg-ci \
-        --env X_VCPKG_ASSET_SOURCES="x-azurl,https://vcpkgassetcachewus3.blob.core.windows.net/cache,$assetSas,readwrite" \
+        --env X_VCPKG_ASSET_SOURCES="x-azurl,https://vcpkgassetcachewus.blob.core.windows.net/cache,$assetSas,readwrite" \
        --env ANDROID_NDK_HOME="${{ variables.ANDROID_NDK_HOME }}" \
        ${{ parameters.dockerImage }} \
        pwsh \
         -File /vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 \
         -Triplet ${{ replace(parameters.jobName, '_', '-') }} \
         -BuildReason $(Build.Reason) \
-         -BinarySourceStub "x-azblob,https://vcpkgbinarycachewus3.blob.core.windows.net/cache,$binarySas" \
+         -BinarySourceStub "x-azblob,https://vcpkgbinarycachewus.blob.core.windows.net/cache,$binarySas" \
         -WorkingRoot ${{ variables.WORKING_ROOT }}
-  - bash: |
-      CONTAINERS=$(docker ps -a -q)
-      if [ -n "$CONTAINERS" ]; then
-        docker rm -f $CONTAINERS
-      fi
-    displayName: 'Stop and remove all docker containers'
-    condition: always()
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
    displayName: "Publish Artifact: failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
    inputs:
-      PathtoPublish: '$(WORKING_ROOT)/failure-logs'
-      ArtifactName: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
+      targetPath: '$(WORKING_ROOT)/failure-logs'
+      artifact: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
    condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
  - bash: |
      python3 scripts/file_script.py /mnt/vcpkg-ci/installed/vcpkg/info/
    displayName: 'Build a file list for all packages'
    condition: always()
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
    displayName: "Publish Artifact: file lists for ${{ replace(parameters.jobName, '_', '-') }}"
    condition: always()
    inputs:
-      PathtoPublish: scripts/list_files
-      ArtifactName: "file lists for ${{ replace(parameters.jobName, '_', '-') }}"
+      targetPath: scripts/list_files
+      artifact: "file lists for ${{ replace(parameters.jobName, '_', '-') }}"
  - task: PublishTestResults@2
    displayName: 'Publish Test Results'
    condition: ne(variables['XML_RESULTS_FILE'], '')
--- a/scripts/azure-pipelines/android/create-docker-image.ps1
+++ b/scripts/azure-pipelines/android/create-docker-image.ps1
@ -2,7 +2,7 @@

 $Date = (Get-Date -Format 'yyyy-MM-dd')
 $ResourceGroupName = "PrAnd-1ES"
-$ContainerRegistryName = "vcpkgandroidwus3"
+$ContainerRegistryName = "vcpkgandroidwus"
 $ErrorActionPreference = 'Stop'

 $registry = Get-AzContainerRegistry -ResourceGroupName $ResourceGroupName -Name $ContainerRegistryName
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 #
 variables:
-  linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-10-21'
+  linux-docker-image: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2024-10-21'

 parameters:
  - name: vcpkgToolSha
@ -51,6 +51,12 @@ jobs:
    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
    tripletPattern: ${{ parameters.tripletPattern }}

+- template: windows/azure-pipelines.yml
+  parameters:
+    jobName: arm64_windows_static_md
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
 - template: windows/azure-pipelines.yml
  parameters:
    jobName: arm64_uwp
--- a/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/scripts/azure-pipelines/linux/azure-pipelines.yml
@ -19,7 +19,7 @@ jobs:
 - job: x64_linux
  condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
  pool:
-    name: PrLin-1ES-Pool
+    name: PrLin-WUS
  workspace:
    clean: resources
  timeoutInMinutes: 1440 # 1 day
@ -53,28 +53,28 @@ jobs:
          $current = Get-Date -AsUtc
          $endDate = $current.AddDays(2)
          $end = Get-Date -Date $endDate -UFormat '+%Y-%m-%dT%H:%MZ'
-          $assetSas = az storage container generate-sas --name cache --account-name vcpkgassetcachewus3 --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv | Out-String
+          $assetSas = az storage container generate-sas --name cache --account-name vcpkgassetcachewus --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv | Out-String
          $assetSas = $assetSas.Trim()
-          $binarySas = az storage container generate-sas --name cache --account-name vcpkgbinarycachewus3 --as-user --auth-mode login --https-only --permissions rclw --expiry $end -o tsv | Out-String
+          $binarySas = az storage container generate-sas --name cache --account-name vcpkgbinarycachewus --as-user --auth-mode login --https-only --permissions rclw --expiry $end -o tsv | Out-String
          $binarySas = $binarySas.Trim()
-          $env:X_VCPKG_ASSET_SOURCES = "x-azurl,https://vcpkgassetcachewus3.blob.core.windows.net/cache,$assetSas,readwrite"
-          & scripts/azure-pipelines/test-modified-ports.ps1 -Triplet ${{ replace(parameters.jobName, '_', '-') }} -BuildReason $(Build.Reason) -BinarySourceStub "x-azblob,https://vcpkgbinarycachewus3.blob.core.windows.net/cache,$binarySas" -WorkingRoot $env:WORKING_ROOT -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)
-  - task: PublishBuildArtifacts@1
+          $env:X_VCPKG_ASSET_SOURCES = "x-azurl,https://vcpkgassetcachewus.blob.core.windows.net/cache,$assetSas,readwrite"
+          & scripts/azure-pipelines/test-modified-ports.ps1 -Triplet ${{ replace(parameters.jobName, '_', '-') }} -BuildReason $(Build.Reason) -BinarySourceStub "x-azblob,https://vcpkgbinarycachewus.blob.core.windows.net/cache,$binarySas" -WorkingRoot $env:WORKING_ROOT -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)
+  - task: PublishPipelineArtifact@1
    displayName: "Publish Artifact: failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
    inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs'
-      ArtifactName: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
+      targetPath: '$(Build.ArtifactStagingDirectory)/failure-logs'
+      artifact: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
    condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
  - bash: |
      python3 scripts/file_script.py /mnt/vcpkg-ci/installed/vcpkg/info/
    displayName: 'Build a file list for all packages'
    condition: always()
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
    displayName: "Publish Artifact: file lists for ${{ replace(parameters.jobName, '_', '-') }}"
    condition: always()
    inputs:
-      PathtoPublish: scripts/list_files
-      ArtifactName: "file lists for ${{ replace(parameters.jobName, '_', '-') }}"
+      targetPath: scripts/list_files
+      artifact: "file lists for ${{ replace(parameters.jobName, '_', '-') }}"
  - task: PublishTestResults@2
    displayName: 'Publish Test Results'
    condition: ne(variables['XML_RESULTS_FILE'], '')
--- a/scripts/azure-pipelines/linux/managed-image.json
+++ b/scripts/azure-pipelines/linux/managed-image.json
@ -14,6 +14,18 @@
        },
        {
            "name": "linux-azcli"
+        },
+        {
+            "name": "linux-bash-command",
+            "parameters": {
+                "command": "apt-get update -y"
+            }
+        },
+        {
+            "name": "linux-bash-command",
+            "parameters": {
+                "command": "apt-get upgrade -y"
+            }
        }
    ]
 }
--- a/scripts/azure-pipelines/osx/azure-pipelines.yml
+++ b/scripts/azure-pipelines/osx/azure-pipelines.yml
@ -52,27 +52,27 @@ jobs:
          $current = Get-Date -AsUtc
          $endDate = $current.AddDays(2)
          $end = Get-Date -Date $endDate -UFormat '+%Y-%m-%dT%H:%MZ'
-          $assetSas = az storage container generate-sas --name cache --account-name vcpkgassetcachewus3 --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv | Out-String
+          $assetSas = az storage container generate-sas --name cache --account-name vcpkgassetcachewus --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv | Out-String
          $assetSas = $assetSas.Trim()
-          $binarySas = az storage container generate-sas --name cache --account-name vcpkgbinarycachewus3 --as-user --auth-mode login --https-only --permissions rclw --expiry $end -o tsv | Out-String
+          $binarySas = az storage container generate-sas --name cache --account-name vcpkgbinarycachewus --as-user --auth-mode login --https-only --permissions rclw --expiry $end -o tsv | Out-String
          $binarySas = $binarySas.Trim()
-          $env:X_VCPKG_ASSET_SOURCES = "x-azurl,https://vcpkgassetcachewus3.blob.core.windows.net/cache,$assetSas,readwrite"
-          & scripts/azure-pipelines/test-modified-ports.ps1 -Triplet ${{ replace(parameters.jobName, '_', '-') }} -BuildReason $(Build.Reason) -BinarySourceStub "x-azblob,https://vcpkgbinarycachewus3.blob.core.windows.net/cache,$binarySas" -WorkingRoot $env:WORKING_ROOT -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)
-  - task: PublishBuildArtifacts@1
+          $env:X_VCPKG_ASSET_SOURCES = "x-azurl,https://vcpkgassetcachewus.blob.core.windows.net/cache,$assetSas,readwrite"
+          & scripts/azure-pipelines/test-modified-ports.ps1 -Triplet ${{ replace(parameters.jobName, '_', '-') }} -BuildReason $(Build.Reason) -BinarySourceStub "x-azblob,https://vcpkgbinarycachewus.blob.core.windows.net/cache,$binarySas" -WorkingRoot $env:WORKING_ROOT -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)
+  - task: PublishPipelineArtifact@1
    displayName: 'Publish Artifact: failure logs for x64-osx'
    inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs'
-      ArtifactName: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
+      targetPath: '$(Build.ArtifactStagingDirectory)/failure-logs'
+      artifact: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
    condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
  - bash: python3 scripts/file_script.py /Users/vcpkg/Data/installed/vcpkg/info/
    displayName: 'Build a file list for all packages'
    condition: always()
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
    displayName: "Publish Artifact: file lists for ${{ replace(parameters.jobName, '_', '-') }}"
    condition: always()
    inputs:
-      PathtoPublish: scripts/list_files
-      ArtifactName: "file lists for ${{ replace(parameters.jobName, '_', '-') }}"
+      targetPath: scripts/list_files
+      artifact: "file lists for ${{ replace(parameters.jobName, '_', '-') }}"
  - task: PublishTestResults@2
    displayName: 'Publish Test Results'
    condition: ne(variables['XML_RESULTS_FILE'], '')
--- a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml
@ -6,7 +6,7 @@ jobs:
 - job: x64_windows
  pool:
    name: vcpkg-testing-msvc
-    demands: ImageVersionOverride -equals 2024.10.14
+    demands: ImageVersionOverride -equals 2024.11.18
  workspace:
    clean: resources
  timeoutInMinutes: 2880 # 2 days
@ -71,13 +71,13 @@ jobs:
          $current = Get-Date -AsUtc
          $endDate = $current.AddDays(2)
          $end = Get-Date -Date $endDate -UFormat '+%Y-%m-%dT%H:%MZ'
-          $assetSas = az storage container generate-sas --name cache --account-name vcpkgassetcachewus3 --as-user --auth-mode login --https-only --permissions r --expiry $end -o tsv | Out-String
+          $assetSas = az storage container generate-sas --name cache --account-name vcpkgassetcachewus --as-user --auth-mode login --https-only --permissions r --expiry $end -o tsv | Out-String
          $assetSas = $assetSas.Trim()
-          $env:X_VCPKG_ASSET_SOURCES = "x-azurl,https://vcpkgassetcachewus3.blob.core.windows.net/cache,$assetSas,read"
+          $env:X_VCPKG_ASSET_SOURCES = "x-azurl,https://vcpkgassetcachewus.blob.core.windows.net/cache,$assetSas,read"
          & scripts/azure-pipelines/test-modified-ports.ps1 -Triplet x64-windows -BuildReason $(Build.Reason) -WorkingRoot $env:WORKING_ROOT -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -PassingIsPassing
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
    displayName: "Publish Artifact: failure logs for x64-windows"
    inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)\failure-logs'
-      ArtifactName: "failure logs for x64-windows"
+      targetPath: '$(Build.ArtifactStagingDirectory)\failure-logs'
+      artifact: "failure logs for x64-windows"
    condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@ -19,8 +19,8 @@ jobs:
 - job: ${{ parameters.jobName }}
  condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
  pool:
-    name: PrWin-1ES
-    demands: ImageVersionOverride -equals 2024.10.14
+    name: PrWin-WUS
+    demands: ImageVersionOverride -equals 2024.11.18
  workspace:
    clean: resources
  timeoutInMinutes: 2880 # 2 days
@ -50,12 +50,12 @@ jobs:
      filePath: scripts/azure-pipelines/Create-PRDiff.ps1
      arguments: "-DiffFile '$(DiffFile)'"
      pwsh: true
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
    displayName: 'Publish Format and Documentation Diff'
    condition: and(eq('${{ replace(parameters.jobName, '_', '-') }}', '${{ variables.ExtraChecksTriplet }}'), failed())
    inputs:
-      PathtoPublish: '$(DiffFile)'
-      ArtifactName: 'format.diff'
+      targetPath: '$(DiffFile)'
+      artifact: 'format.diff'
  - task: AzureCLI@2
    displayName: '*** Test Modified Ports'
    inputs:
@ -66,23 +66,23 @@ jobs:
          $current = Get-Date -AsUtc
          $endDate = $current.AddDays(2)
          $end = Get-Date -Date $endDate -UFormat '+%Y-%m-%dT%H:%MZ'
-          $assetSas = az storage container generate-sas --name cache --account-name vcpkgassetcachewus3 --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv | Out-String
+          $assetSas = az storage container generate-sas --name cache --account-name vcpkgassetcachewus --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv | Out-String
          $assetSas = $assetSas.Trim()
-          $binarySas = az storage container generate-sas --name cache --account-name vcpkgbinarycachewus3 --as-user --auth-mode login --https-only --permissions rclw --expiry $end -o tsv | Out-String
+          $binarySas = az storage container generate-sas --name cache --account-name vcpkgbinarycachewus --as-user --auth-mode login --https-only --permissions rclw --expiry $end -o tsv | Out-String
          $binarySas = $binarySas.Trim()
-          $env:X_VCPKG_ASSET_SOURCES = "x-azurl,https://vcpkgassetcachewus3.blob.core.windows.net/cache,$assetSas,readwrite"
-          & scripts/azure-pipelines/test-modified-ports.ps1 -Triplet ${{ replace(parameters.jobName, '_', '-') }} -BuildReason $(Build.Reason) -BinarySourceStub "x-azblob,https://vcpkgbinarycachewus3.blob.core.windows.net/cache,$binarySas" -WorkingRoot $env:WORKING_ROOT -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)
+          $env:X_VCPKG_ASSET_SOURCES = "x-azurl,https://vcpkgassetcachewus.blob.core.windows.net/cache,$assetSas,readwrite"
+          & scripts/azure-pipelines/test-modified-ports.ps1 -Triplet ${{ replace(parameters.jobName, '_', '-') }} -BuildReason $(Build.Reason) -BinarySourceStub "x-azblob,https://vcpkgbinarycachewus.blob.core.windows.net/cache,$binarySas" -WorkingRoot $env:WORKING_ROOT -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)
  - task: PowerShell@2
    displayName: 'Validate version files'
    condition: eq('${{ replace(parameters.jobName, '_', '-') }}', '${{ variables.ExtraChecksTriplet }}')
    inputs:
      filePath: 'scripts/azure-pipelines/windows/validate-version-files.ps1'
      pwsh: true
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
    displayName: "Publish Artifact: failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
    inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)\failure-logs'
-      ArtifactName: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
+      targetPath: '$(Build.ArtifactStagingDirectory)\failure-logs'
+      artifact: "failure logs for ${{ replace(parameters.jobName, '_', '-') }}"
    condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
  - task: PowerShell@2
    displayName: 'Build a file list for all packages'
@ -93,12 +93,12 @@ jobs:
        ./vcpkg.exe fetch python3
        & $(.\vcpkg fetch python3) .\scripts\file_script.py D:\installed\vcpkg\info\
      pwsh: true
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
    displayName: "Publish Artifact: file lists for ${{ replace(parameters.jobName, '_', '-') }}"
    condition: always()
    inputs:
-      PathtoPublish: scripts/list_files
-      ArtifactName: "file lists for ${{ replace(parameters.jobName, '_', '-') }}"
+      targetPath: scripts/list_files
+      artifact: "file lists for ${{ replace(parameters.jobName, '_', '-') }}"
  - task: PublishTestResults@2
    displayName: 'Publish Test Results'
    condition: ne(variables['XML_RESULTS_FILE'], '')
--- a/scripts/azure-pipelines/windows/create-image.ps1
+++ b/scripts/azure-pipelines/windows/create-image.ps1
@ -24,7 +24,7 @@ $WindowsServerSku = '2022-datacenter-azure-edition'
 $ErrorActionPreference = 'Stop'

 $ProgressActivity = 'Creating Windows Image'
-$TotalProgress = 18
+$TotalProgress = 17
 $CurrentProgress = 1

 # Assigning this to another variable helps when running the commands in this script manually for
@ -198,9 +198,6 @@ Invoke-ScriptWithPrefix -ScriptName 'deploy-tlssettings.ps1' -SkipSas
 Write-Host 'Waiting 1 minute for VM to reboot...'
 Start-Sleep -Seconds 60

-####################################################################################################
-Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-sdks.ps1'
-
 ####################################################################################################
 Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1'

@ -254,7 +251,7 @@ Set-AzVM `
  -Generalized

 $westus3Location = @{Name = 'West US 3';}
-$southEastAsiaLocation = @{Name = 'Southeast Asia';}
+$westusLocation = @{Name = 'West US';}

 New-AzGalleryImageVersion `
  -ResourceGroupName 'vcpkg-image-minting' `
@ -266,7 +263,7 @@ New-AzGalleryImageVersion `
  -ReplicaCount 1 `
  -StorageAccountType 'Premium_LRS' `
  -PublishingProfileExcludeFromLatest `
-  -TargetRegion @($westus3Location, $southEastAsiaLocation)
+  -TargetRegion @($westus3Location, $westusLocation)

 ####################################################################################################
 Write-Progress `
--- a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1
+++ b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1
@ -9,10 +9,12 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {

 [string]$AzCliUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
-  $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.65.0-x64.msi'
+  Write-Host 'Downloading from the Internet'
+  $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.66.0-x64.msi'
 } else {
+  Write-Host 'Downloading from vcpkgimageminting using SAS token'
  $SasToken = $SasToken.Replace('"', '')
-  $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.65.0-x64.msi?$SasToken"
+  $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.66.0-x64.msi?$SasToken"
 }

 DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart')
--- a/scripts/azure-pipelines/windows/deploy-cuda.ps1
+++ b/scripts/azure-pipelines/windows/deploy-cuda.ps1
@ -9,8 +9,10 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {

 [string]$CudaUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
+  Write-Host 'Downloading from the Internet'
  $CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/12.5.0/local_installers/cuda_12.5.0_555.85_windows.exe'
 } else {
+  Write-Host 'Downloading from vcpkgimageminting using SAS token'
  $SasToken = $SasToken.Replace('"', '')
  $CudaUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cuda_12.5.0_555.85_windows.exe?$SasToken"
 }
--- a/scripts/azure-pipelines/windows/deploy-cudnn.ps1
+++ b/scripts/azure-pipelines/windows/deploy-cudnn.ps1
@ -9,8 +9,10 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {

 [string]$CudnnUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
+  Write-Host 'Downloading from the Internet'
  $CudnnUrl = 'https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/windows-x86_64/cudnn-windows-x86_64-9.2.0.82_cuda12-archive.zip'
 } else {
+  Write-Host 'Downloading from vcpkgimageminting using SAS token'
  $SasToken = $SasToken.Replace('"', '')
  $CudnnUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-9.2.0.82_cuda12-archive.zip?$SasToken"
 }
--- a/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1
+++ b/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1
@ -10,8 +10,10 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {

 [string]$oneAPIBaseUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
+  Write-Host 'Downloading from the Internet'
  $oneAPIBaseUrl = 'https://registrationcenter-download.intel.com/akdlm/IRC_NAS/c95a3b26-fc45-496c-833b-df08b10297b9/w_HPCKit_p_2024.1.0.561_offline.exe'
 } else {
+  Write-Host 'Downloading from vcpkgimageminting using SAS token'
  $SasToken = $SasToken.Replace('"', '')
  $oneAPIBaseUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/w_HPCKit_p_2024.1.0.561_offline.exe?$SasToken"
 }
@ -30,7 +32,7 @@ try {
    $tempPath = Get-TempFilePath
    New-Item -ItemType Directory -Path $tempPath -Force
    $LocalPath = Join-Path $tempPath $LocalName
-    Invoke-WebRequest -Uri $oneAPIBaseUrl -Outfile $LocalPath
+    curl.exe -L -o $LocalPath $oneAPIBaseUrl
    $doRemove = $true
  }

--- a/scripts/azure-pipelines/windows/deploy-mpi.ps1
+++ b/scripts/azure-pipelines/windows/deploy-mpi.ps1
@ -9,8 +9,10 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {

 [string]$MpiUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
+  Write-Host 'Downloading from the Internet'
  $MpiUrl = 'https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisetup.exe'
 } else {
+  Write-Host 'Downloading from vcpkgimageminting using SAS token'
  $SasToken = $SasToken.Replace('"', '')
  $MpiUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/msmpisetup.exe?$SasToken"
 }
--- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1
+++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1
@ -9,10 +9,12 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {

 [string]$PwshUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
-  $PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.5/PowerShell-7.4.5-win-x64.msi'
+  Write-Host 'Downloading from the Internet'
+  $PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.6/PowerShell-7.4.6-win-x64.msi'
 } else {
+  Write-Host 'Downloading from vcpkgimageminting using SAS token'
  $SasToken = $SasToken.Replace('"', '')
-  $PwshUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/PowerShell-7.4.5-win-x64.msi?$SasToken"
+  $PwshUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/PowerShell-7.4.6-win-x64.msi?$SasToken"
 }

 DownloadAndInstall -Url $PwshUrl -Name 'PowerShell Core' -Args @('/quiet', '/norestart')
--- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
+++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
@ -8,8 +8,8 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
 }

 # See https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history
-# 17.11.5
-$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/69e24482-3b48-44d3-af65-51f866a08313/2e8384dde0c87bc49830e325c7565c25278340c83f6da46b8c14101dd75d8f15/vs_Enterprise.exe'
+# 17.11.6
+$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/1affe83d-fcd4-41b0-bb9b-d62f64a857c4/1f0413df169150ed2475e7fbb5aa9e4105533a5b3f717c2dcc589203ac84f899/vs_Enterprise.exe'
 $Workloads = @(
  'Microsoft.VisualStudio.Workload.NativeDesktop',
  'Microsoft.VisualStudio.Workload.Universal',
@ -21,8 +21,9 @@ $Workloads = @(
  'Microsoft.VisualStudio.Component.VC.ATLMFC',
  'Microsoft.VisualStudio.Component.VC.ATL.ARM64',
  'Microsoft.VisualStudio.Component.VC.MFC.ARM64',
-  'Microsoft.VisualStudio.Component.Windows11SDK.22621',
-  'Microsoft.VisualStudio.Component.Windows10SDK.20348',
+  'Microsoft.VisualStudio.Component.Windows11SDK.26100',
+  'Microsoft.VisualStudio.Component.Windows10SDK.20348', # As of 2024-11-15, CMake explicitly needs a Windows 10 SDK for Store
+  # These .NET parts are needed for easyhook, openni2
  'Microsoft.Net.Component.4.8.SDK',
  'Microsoft.Net.Component.4.7.2.TargetingPack',
  'Microsoft.Component.NetFX.Native',
--- a/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1
+++ b/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1
@ -1,18 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: MIT
-
-param([string]$SasToken)
-
-if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
-  . "$PSScriptRoot/utility-prefix.ps1"
-}
-
-[string]$WdkUrl
-if ([string]::IsNullOrEmpty($SasToken)) {
-  $WdkUrl = 'https://go.microsoft.com/fwlink/?linkid=2128854'
-} else {
-  $SasToken = $SasToken.Replace('"', '')
-  $WdkUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/wdksetup.exe?$SasToken"
-}
-
-DownloadAndInstall -Name 'Windows 10 WDK, version 2004' -Url $WdkUrl -Args @('/features', '+', '/q') -LocalName 'wdksetup.exe'
--- a/scripts/azure-pipelines/windows/provision-entire-image.ps1
+++ b/scripts/azure-pipelines/windows/provision-entire-image.ps1
@ -5,7 +5,6 @@
 # and assumes it is being run as an admin user.

 . "$PSScriptRoot\deploy-tlssettings.ps1" -RebootIfRequired 0
-. "$PSScriptRoot\deploy-windows-sdks.ps1"
 . "$PSScriptRoot\deploy-visual-studio.ps1"
 . "$PSScriptRoot\deploy-mpi.ps1"
 . "$PSScriptRoot\deploy-cuda.ps1"
--- a/scripts/azure-pipelines/windows/utility-prefix.ps1
+++ b/scripts/azure-pipelines/windows/utility-prefix.ps1
@ -64,7 +64,7 @@ Function DownloadAndInstall {
      $tempPath = Get-TempFilePath
      New-Item -ItemType Directory -Path $tempPath -Force | Out-Null
      $LocalPath = Join-Path $tempPath $LocalName
-      Invoke-WebRequest -Uri $Url -OutFile $LocalPath
+      curl.exe -L -o $LocalPath $Url
      $doRemove = $true
    }

@ -129,7 +129,7 @@ Function DownloadAndUnzip {
      New-Item -ItemType Directory -Path $tempPath -Force | Out-Null
      $zipPath = Join-Path $tempPath $LocalName
      Write-Host "Downloading $Name ( $Url -> $zipPath )..."
-      Invoke-WebRequest -Uri $Url -OutFile $zipPath
+      curl.exe -L -o $zipPath $Url
      $doRemove = $true
    }

--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@ -26,6 +26,7 @@
 ##    arm64-osx
 ##    arm64-uwp
 ##    arm64-windows
+##    arm64-windows-static-md
 ##    x64-android
 ##    x64-linux
 ##    x64-osx
@ -96,6 +97,8 @@ blas-test:x64-uwp=pass # openblas
 lapack-test:x64-uwp=pass # clapack
 blas-test:arm64-windows=pass # openblas
 lapack-test:arm64-windows=pass # clapack
+blas-test:arm64-windows-static-md=pass # openblas
+lapack-test:arm64-windows-static-md=pass # clapack
 blas-test:arm64-uwp=pass # openblas
 lapack-test:arm64-uwp=pass # clapack
 blas-test:x64-osx=pass # accelerate framework
@ -118,6 +121,7 @@ lapack-reference:arm64-android=fail
 lapack-reference:arm64-osx=skip
 lapack-reference:arm64-uwp=skip
 lapack-reference:arm64-windows=skip
+lapack-reference:arm64-windows-static-md=skip
 lapack-reference:x64-osx=skip
 lapack-reference:x64-uwp=skip
 openblas:arm64-osx=skip
@ -140,6 +144,7 @@ bond:x64-osx=fail
 boringssl:arm-neon-android=skip
 boringssl:arm64-android=skip
 boringssl:arm64-windows=skip
+boringssl:arm64-windows-static-md=skip
 boringssl:arm64-uwp=skip
 boringssl:x64-android=skip
 boringssl:x64-linux=skip
@ -166,6 +171,7 @@ c-dbg-macro:x64-windows-static=skip
 c-dbg-macro:x64-windows-static-md=skip
 c-dbg-macro:x64-uwp=skip
 c-dbg-macro:arm64-windows=skip
+c-dbg-macro:arm64-windows-static-md=skip
 c-dbg-macro:arm64-uwp=skip
 c-dbg-macro:x64-osx=skip
 c-dbg-macro:arm64-osx=skip
@ -184,33 +190,22 @@ casclib:arm64-uwp=fail
 casclib:x64-uwp=fail
 catch-classic:arm-neon-android=skip
 catch-classic:arm64-android=skip
-catch-classic:arm64-windows      = skip
-catch-classic:arm64-uwp            = skip
+catch-classic:arm64-windows=skip
+catch-classic:arm64-windows-static-md=skip
+catch-classic:arm64-uwp=skip
 catch-classic:x64-android=skip
-catch-classic:x64-linux          = skip
-catch-classic:x64-osx            = skip
-catch-classic:arm64-osx          = skip
-catch-classic:x64-uwp            = skip
-catch-classic:x64-windows        = skip
-catch-classic:x64-windows-static = skip
+catch-classic:x64-linux=skip
+catch-classic:x64-osx=skip
+catch-classic:arm64-osx=skip
+catch-classic:x64-uwp=skip
+catch-classic:x64-windows=skip
+catch-classic:x64-windows-static=skip
 catch-classic:x64-windows-static-md=skip
-catch-classic:x86-windows        = skip
+catch-classic:x86-windows=skip
 cctag:x64-windows-static-md=fail
 cello:arm64-uwp=fail
 cello:x64-uwp=fail
 chakracore:x64-linux=skip
-# chartdir does not offer stable download URLs
-chartdir:arm-neon-android=fail
-chartdir:arm64-android=fail
-chartdir:arm64-windows=skip
-chartdir:arm64-uwp=skip
-chartdir:x64-android=fail
-chartdir:x64-uwp=skip
-chartdir:x64-windows-static=skip
-chartdir:x86-windows=skip
-chartdir:x64-windows=skip
-chartdir:x64-windows-static-md=skip
-chartdir:x64-osx=skip
 # chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI
 #  broken on Windows because it does not yet support VS2022
 chromium-base:x64-windows=skip
@ -241,6 +236,7 @@ cpp-ipc:x64-android=fail
 cppmicroservices:arm-neon-android=fail
 cppmicroservices:arm64-android=fail
 cppmicroservices:arm64-windows=fail
+cppmicroservices:arm64-windows-static-md=fail
 cppmicroservices:arm64-uwp=fail
 cppmicroservices:x64-android=fail
 cppmicroservices:x64-uwp=fail
@ -275,6 +271,7 @@ dbg-macro:x64-android=skip
 # Since pipeline cannot automatically install dbghelp dependency, skip this detection
 dbghelp:arm64-uwp=skip
 dbghelp:arm64-windows=skip
+dbghelp:arm64-windows-static-md=skip
 dbghelp:x64-uwp=skip
 dbghelp:x64-windows-static=skip
 dbghelp:x64-windows-static-md=skip
@ -284,6 +281,7 @@ dbghelp:x86-windows=skip
 dcmtk:arm-neon-android=fail
 dcmtk:arm64-android=fail
 dcmtk:arm64-windows=fail
+dcmtk:arm64-windows-static-md=fail
 dcmtk:x64-android=fail
 # legacy directxsdk which conflicts with dxsdk-d3dx
 directxsdk:x86-windows=skip
@ -334,6 +332,7 @@ fltk:x64-android=fail
 # fluidlite has no dependencies and thus is less likely to be broken by another package.
 fluidlite:arm64-uwp=skip
 fluidlite:arm64-windows=skip
+fluidlite:arm64-windows-windows-static-md=skip
 fluidlite:x64-linux=skip
 fluidlite:x64-osx=skip
 fluidlite:arm64-osx=skip
@ -357,11 +356,6 @@ freeglut:x64-android=fail
 # Needs XQuartz
 freeglut:x64-osx=fail
 freeglut:arm64-osx=fail
-# Needs /bigobj
-freeopcua:arm-neon-android=fail
-freeopcua:arm64-android=fail
-freeopcua:arm64-windows=fail
-freeopcua:x64-android=fail
 fruit:arm-neon-android=fail
 fruit:arm64-android=fail
 fruit:x64-android=fail
@ -398,15 +392,16 @@ gherkin-c:arm-neon-android=fail
 gherkin-c:arm64-android=fail
 gherkin-c:x64-android=fail
 # Conflicts with libevent
-gherkin-c:arm64-windows         = skip
-gherkin-c:arm64-uwp               = skip
-gherkin-c:x64-linux             = skip
-gherkin-c:x64-osx               = skip
-gherkin-c:x64-uwp               = skip
-gherkin-c:x64-windows           = skip
-gherkin-c:x64-windows-static    = skip
-gherkin-c:x64-windows-static-md = skip
-gherkin-c:x86-windows           = skip
+gherkin-c:arm64-windows=skip
+gherkin-c:arm64-windows-static-md=skip
+gherkin-c:arm64-uwp=skip
+gherkin-c:x64-linux=skip
+gherkin-c:x64-osx=skip
+gherkin-c:x64-uwp=skip
+gherkin-c:x64-windows=skip
+gherkin-c:x64-windows-static=skip
+gherkin-c:x64-windows-static-md=skip
+gherkin-c:x86-windows=skip
 gl3w:arm-neon-android=fail
 gl3w:arm64-android=fail
 gl3w:x64-android=fail
@ -415,6 +410,7 @@ glfw3:arm64-uwp=fail
 glfw3:arm64-android=fail
 glfw3:x64-android=fail
 glfw3:x64-uwp=fail
+glibmm:arm64-windows-static-md=fail
 glibmm:x64-windows-static-md=fail
 glibmm:x64-windows-static=fail
 graphicsmagick:arm64-uwp=fail
@ -455,6 +451,7 @@ iceoryx:arm-neon-android=fail
 ignition-msgs1:arm-neon-android=fail
 ignition-msgs1:arm64-android=fail
 ignition-msgs1:arm64-windows=fail
+ignition-msgs1:arm64-windows-static-md=fail
 ignition-msgs1:arm64-uwp=fail
 ignition-msgs1:x64-android=fail
 ignition-msgs1:x64-uwp=fail
@ -466,18 +463,19 @@ ignition-tools:arm-neon-android=fail
 ignition-tools:arm64-android=fail
 ignition-tools:x64-android=fail
 ijg-libjpeg:arm-neon-android=skip
-ijg-libjpeg:arm64-uwp            = skip
+ijg-libjpeg:arm64-uwp=skip
 ijg-libjpeg:arm64-android=skip
-ijg-libjpeg:arm64-osx          = skip
-ijg-libjpeg:arm64-windows      = skip
+ijg-libjpeg:arm64-osx= skip
+ijg-libjpeg:arm64-windows=skip
+ijg-libjpeg:arm64-windows-static-md=skip
 ijg-libjpeg:x64-android=skip
-ijg-libjpeg:x64-linux          = skip
-ijg-libjpeg:x64-osx            = skip
-ijg-libjpeg:x64-uwp            = skip
-ijg-libjpeg:x64-windows        = skip
-ijg-libjpeg:x64-windows-static = skip
+ijg-libjpeg:x64-linux= skip
+ijg-libjpeg:x64-osx=skip
+ijg-libjpeg:x64-uwp=skip
+ijg-libjpeg:x64-windows=skip
+ijg-libjpeg:x64-windows-static=skip
 ijg-libjpeg:x64-windows-static-md=fail
-ijg-libjpeg:x86-windows        = skip
+ijg-libjpeg:x86-windows=skip
 intelrdfpmathlib:arm-neon-android=fail
 intelrdfpmathlib:arm64-android=fail
 intelrdfpmathlib:x64-android=fail
@ -490,12 +488,14 @@ isal:x64-android=fail
 itk:arm-neon-android=fail
 itk:arm64-android=fail
 itk:arm64-windows=fail
+itk:arm64-windows-static-md=fail
 itk:x64-android=fail
 jaeger-client-cpp:arm-neon-android=fail
 jaeger-client-cpp:x64-android=fail
 jemalloc:arm-neon-android=fail
 jemalloc:arm64-android=fail
 jemalloc:arm64-windows=fail
+jemalloc:arm64-windows-static-md=fail
 jemalloc:arm64-uwp=fail
 jemalloc:x64-android=fail
 jemalloc:x64-uwp=fail
@ -506,11 +506,12 @@ kfr:x64-android=fail
 kfr:x64-uwp=fail
 # needs android-24
 kubazip:arm-neon-android=fail
-lcm:x64-windows-static=fail
-lcm:x64-windows-static-md=fail
 lcm:arm-neon-android=fail
 lcm:arm64-android=fail
+lcm:arm64-windows-static-md=fail
 lcm:x64-android=fail
+lcm:x64-windows-static-md=fail
+lcm:x64-windows-static=fail
 leptonica:x64-uwp=fail
 leptonica:arm64-uwp=fail
 libaiff:x64-linux=fail
@ -550,6 +551,7 @@ libgpg-error:x64-android=fail
 # Missing system libraries on linux to run/prepare autoconf
 libgpod:x64-linux=fail
 libfreenect2:arm64-windows=fail
+libfreenect2:arm64-windows-static-md=fail
 libgpod:arm-neon-android=fail
 libgpod:arm64-android=fail
 libgpod:x64-android=fail
@ -575,12 +577,13 @@ liblo:arm64-android=fail
 liblo:x64-android=fail
 liblo:x64-uwp=fail
 # libmariadb conflicts with libmysql
-libmariadb:arm64-windows      = skip
-libmariadb:x64-linux          = skip
-libmariadb:x64-osx            = skip
-libmariadb:arm64-osx          = skip
-libmariadb:x64-windows        = skip
-libmariadb:x64-windows-static = skip
+libmariadb:arm64-windows=skip
+libmariadb:arm64-windows-static-md=skip
+libmariadb:x64-linux=skip
+libmariadb:x64-osx=skip
+libmariadb:arm64-osx=skip
+libmariadb:x64-windows=skip
+libmariadb:x64-windows-static=skip
 libmariadb:x64-windows-static-md=skip
 libmaxminddb:arm64-android=fail
 libmaxminddb:arm-neon-android=fail
@ -599,15 +602,16 @@ libopensp:arm-neon-android=fail
 libopensp:arm64-android=fail
 libopensp:x64-android=fail
 libp7client:x64-android=fail
-libpng-apng:arm64-windows      = skip
-libpng-apng:arm64-uwp            = skip
-libpng-apng:x64-linux          = skip
-libpng-apng:x64-osx            = skip
-libpng-apng:x64-uwp            = skip
-libpng-apng:x64-windows        = skip
-libpng-apng:x64-windows-static = skip
+libpng-apng:arm64-windows=skip
+libpng-apng:arm64-windows-static-md=skip
+libpng-apng:arm64-uwp=skip
+libpng-apng:x64-linux=skip
+libpng-apng:x64-osx=skip
+libpng-apng:x64-uwp=skip
+libpng-apng:x64-windows=skip
+libpng-apng:x64-windows-static=skip
 libpng-apng:x64-windows-static-md=skip
-libpng-apng:x86-windows        = skip
+libpng-apng:x86-windows=skip
 # The developer of libqcow does not offer stable release archives
 libqcow:arm-neon-android=skip
 libqcow:arm64-uwp=skip
@ -621,6 +625,7 @@ libqcow:x64-windows=skip
 libqcow:x64-linux=skip
 libqcow:x86-windows=skip
 libqcow:arm64-windows=skip
+libqcow:arm64-windows-static-md=skip
 # 32-bit needs android-24
 libraw:arm-neon-android=fail
 # Conflicts with openssl
@ -629,6 +634,7 @@ libressl:arm64-android=skip
 libressl:arm64-osx=skip
 libressl:arm64-uwp=skip
 libressl:arm64-windows=skip
+libressl:arm64-windows-static-md=skip
 libressl:x64-android=skip
 libressl:x64-linux=skip
 libressl:x64-osx=skip
@ -638,12 +644,14 @@ libressl:x64-windows-static=skip
 libressl:x64-windows=skip
 libressl:x86-windows=skip
 libsoundio:arm64-windows=fail
+libsoundio:arm64-windows-static-md=fail
 libtar:arm-neon-android=fail
 libtar:arm64-android=fail
 libtcod:arm-neon-android=fail
 libtcod:arm64-android=fail
 libtcod:x64-android=fail
 libtomcrypt:arm64-windows=fail
+libtomcrypt:arm64-windows-static-md=fail
 libtomcrypt:arm64-uwp=fail
 libusb-win32:arm64-uwp=fail
 libusb-win32:x64-uwp=fail
@ -652,23 +660,24 @@ libvhdi:arm-neon-android=fail
 libvhdi:arm64-android=fail
 libvhdi:x64-android=fail
 #Skip detection to avoid upstream remove older releases
-libvmdk:arm-neon-android        =skip   # upstream issue https://github.com/microsoft/vcpkg/pull/13765#issuecomment-699710253
-libvmdk:arm64-android           =skip
-libvmdk:arm64-osx               =skip
-libvmdk:arm64-windows           =skip
-libvmdk:x64-android             =skip
-libvmdk:x64-linux               =skip
-libvmdk:x64-osx                 =skip
-libvmdk:x64-windows-static-md   =skip
-libvmdk:x64-windows-static      =skip
-libvmdk:x64-windows             =skip
-libvmdk:x86-windows             =skip
+libvmdk:arm-neon-android=skip   # upstream issue https://github.com/microsoft/vcpkg/pull/13765#issuecomment-699710253
+libvmdk:arm64-android=skip
+libvmdk:arm64-osx=skip
+libvmdk:arm64-windows=skip
+libvmdk:arm64-windows-static-md=skip
+libvmdk:x64-android=skip
+libvmdk:x64-linux=skip
+libvmdk:x64-osx=skip
+libvmdk:x64-windows-static-md=skip
+libvmdk:x64-windows-static=skip
+libvmdk:x64-windows=skip
+libvmdk:x86-windows=skip
 libwandio:arm-neon-android=fail
 libwandio:arm64-android=fail
 libwandio:x64-android=fail
 libxaw:x64-windows-static=skip
-# clang-cl ICEd
 libxt:arm64-windows=fail
+libxt:arm64-windows-static-md=fail
 libzen:arm-neon-android=fail
 linenoise-ng:arm64-uwp=fail
 linenoise-ng:x64-uwp=fail
@ -696,14 +705,15 @@ magma:x64-linux=fail
 mchehab-zbar:arm-neon-android=fail
 mchehab-zbar:arm64-android=fail
 mchehab-zbar:x64-android=fail
-mecab:arm64-windows      = skip
-mecab:arm64-uwp            = skip
-mecab:x64-linux          = skip
-mecab:x64-uwp            = skip
-mecab:x64-windows        = skip
-mecab:x64-windows-static = skip
+mecab:arm64-windows=skip
+mecab:arm64-windows-static-md=skip
+mecab:arm64-uwp=skip
+mecab:x64-linux=skip
+mecab:x64-uwp=skip
+mecab:x64-windows=skip
+mecab:x64-windows-static=skip
 mecab:x64-windows-static-md=skip
-mecab:x86-windows        = skip
+mecab:x86-windows=skip
 memorymodule:arm-neon-android=fail
 memorymodule:arm64-android=fail
 memorymodule:x64-android=fail
@ -731,9 +741,11 @@ ms-gltf:arm-neon-android=fail
 ms-gltf:arm64-android=fail
 ms-gltf:x64-android=fail
 monkeys-audio:arm64-windows=fail
+monkeys-audio:arm64-windows-static-md=fail
 monkeys-audio:x64-windows-static=fail
 moos-core:x64-windows-static=fail
 moos-essential:arm64-windows=fail
+moos-essential:arm64-windows-static-md=fail
 moos-essential:x64-windows-static-md=fail
 moos-essential:x64-windows=fail
 moos-essential:x86-windows=fail
@ -741,16 +753,17 @@ moos-essential:x86-windows=fail
 mozjpeg:arm-neon-android=fail
 mozjpeg:arm64-android=fail
 mozjpeg:x64-android=fail
-mozjpeg:arm64-windows      = skip
-mozjpeg:arm64-uwp            = skip
-mozjpeg:x64-linux          = skip
-mozjpeg:x64-osx            = skip
-mozjpeg:arm64-osx          = skip
-mozjpeg:x64-uwp            = skip
-mozjpeg:x64-windows        = skip
-mozjpeg:x64-windows-static = skip
+mozjpeg:arm64-windows=skip
+mozjpeg:arm64-windows-static-md=skip
+mozjpeg:arm64-uwp=skip
+mozjpeg:x64-linux=skip
+mozjpeg:x64-osx=skip
+mozjpeg:arm64-osx=skip
+mozjpeg:x64-uwp=skip
+mozjpeg:x64-windows=skip
+mozjpeg:x64-windows-static=skip
 mozjpeg:x64-windows-static-md=skip
-mozjpeg:x86-windows        = skip
+mozjpeg:x86-windows=skip
 # mpir conflicts with gmp
 # see https://github.com/microsoft/vcpkg/issues/11756
 mpir:x86-windows=skip
@ -758,9 +771,11 @@ mpir:x64-windows=skip
 mpir:x64-windows-static=skip
 mpir:x64-windows-static-md=skip
 mpir:arm64-windows=skip
+mpir:arm64-windows-static-md=skip
 mpir:x64-osx=skip
 mpir:x64-linux=skip
 msmpi:arm64-windows=fail
+msmpi:arm64-windows-static-md=fail
 munit:x64-android=fail
 mysql-connector-cpp:arm-neon-android=fail
 mysql-connector-cpp:arm64-android=fail
@ -775,6 +790,7 @@ nanodbc:x64-linux=skip
 netcdf-c:arm-neon-android=fail
 netcdf-c:arm64-android=fail
 netcdf-c:x64-android=fail
+netcdf-cxx4:arm64-windows-static-md=fail
 netcdf-cxx4:x64-windows-static-md=fail
 ngspice:x64-android=fail
 ngspice:x64-windows-static=fail
@ -789,6 +805,7 @@ octave:x64-windows-static=fail
 octave:x64-windows-static-md=fail
 octave:x64-osx=fail
 ode:arm64-windows=fail
+ode:arm64-windows-static-md=fail
 offscale-libetcd-cpp:arm64-uwp=fail
 offscale-libetcd-cpp:x64-uwp=fail
 ogdf:arm64-android=fail
@ -816,17 +833,22 @@ openfbx:arm-neon-android=fail
 openimageio:arm-neon-android=fail
 openimageio:arm64-android=fail
 openimageio:x64-android=fail
+openimageio:arm64-windows-static-md=fail
 openldap:arm-neon-android=fail
 openldap:arm64-android=fail
 openldap:x64-android=fail
 openmama:x64-windows-static-md=fail
+openmama:arm64-windows-static-md=fail
 openmesh:arm64-windows=fail
+openmesh:arm64-windows-static-md=fail
 openmesh:arm64-uwp=fail
 openmesh:x64-uwp=fail
 openmpi:arm-neon-android=fail
 openmpi:arm64-android=fail
 openmpi:x64-android=fail
 openmvg:x64-linux=fail
+openmvg:arm64-windows-static-md=fail
+openmvs:arm64-windows-static-md=fail
 openscap:arm-neon-android=fail
 openscap:arm64-android=fail
 openscap:x64-android=fail
@ -835,6 +857,7 @@ openscap:arm64-osx=fail
 openscap:x64-windows-static=fail
 opensubdiv:x64-android=fail
 openturns:arm64-windows=fail
+openturns:arm64-windows-static-md=fail
 openvr:x64-windows-static=fail
 # Conflicts with optional-lite, by the same author
 optional-bare:arm-neon-android=skip
@ -842,6 +865,7 @@ optional-bare:arm64-android=skip
 optional-bare:arm64-osx=skip
 optional-bare:arm64-uwp=skip
 optional-bare:arm64-windows=skip
+optional-bare:arm64-windows-static-md=skip
 optional-bare:x64-android=skip
 optional-bare:x64-linux=skip
 optional-bare:x64-osx=skip
@ -872,6 +896,7 @@ plib:arm-neon-android=fail
 plib:arm64-android=fail
 plib:x64-android=fail
 plplot:arm64-windows=fail
+plplot:arm64-windows-static-md=fail
 pmdk:x64-android=fail
 pmdk:x64-osx=fail
 pmdk:x64-windows-static=fail
@ -886,9 +911,6 @@ python2:x64-android=fail
 python3:arm-neon-android=fail
 python3:arm64-android=fail
 python3:x64-android=fail
-# Not yet ready for these platforms.
-qbittorrent:x64-osx=fail
-qbittorrent:x64-linux=fail
 qpid-proton:arm-neon-android=fail
 qpid-proton:arm64-uwp=fail
 qpid-proton:arm64-android=fail
@ -898,6 +920,7 @@ qpid-proton:x64-windows-static=fail
 qt5-base:arm-neon-android=fail
 qt5-base:arm64-android=fail
 qt5-base:arm64-windows=fail
+qt5-base:arm64-windows-static-md=fail
 qt5-base:x64-android=fail
 # Skip deprecated Qt module
 # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly)
@ -922,18 +945,20 @@ rabit:arm64-android=fail
 rabit:x64-android=fail
 range-v3-vs2015:arm-neon-android=skip
 range-v3-vs2015:arm64-android=skip
-range-v3-vs2015:arm64-windows      = skip
-range-v3-vs2015:arm64-uwp            = skip
+range-v3-vs2015:arm64-windows=skip
+range-v3-vs2015:arm64-windows-static-md=skip
+range-v3-vs2015:arm64-uwp=skip
 range-v3-vs2015:x64-android=skip
-range-v3-vs2015:x64-linux          = skip
-range-v3-vs2015:x64-osx            = skip
-range-v3-vs2015:arm64-osx          = skip
-range-v3-vs2015:x64-uwp            = skip
-range-v3-vs2015:x64-windows        = skip
-range-v3-vs2015:x64-windows-static = skip
+range-v3-vs2015:x64-linux=skip
+range-v3-vs2015:x64-osx=skip
+range-v3-vs2015:arm64-osx=skip
+range-v3-vs2015:x64-uwp=skip
+range-v3-vs2015:x64-windows=skip
+range-v3-vs2015:x64-windows-static=skip
 range-v3-vs2015:x64-windows-static-md=skip
-range-v3-vs2015:x86-windows        = skip
+range-v3-vs2015:x86-windows=skip
 rapidstring:arm64-windows=fail
+rapidstring:arm64-windows-static-md=fail
 rapidstring:arm64-uwp=fail
 rapidstring:x64-linux=fail
 rapidstring:x64-uwp=fail
@ -952,6 +977,7 @@ rbdl-orb:x64-windows-static-md=skip
 rbdl-orb:x64-uwp=skip
 rbdl-orb:arm64-uwp=skip
 rbdl-orb:arm64-windows=skip
+rbdl-orb:arm64-windows-static-md=skip
 rbdl-orb:x64-linux=skip
 rbdl-orb:x64-osx=skip
 rbdl:arm-neon-android=fail
@ -965,6 +991,7 @@ restbed:arm64-uwp=fail
 restbed:arm64-android=fail
 restbed:x64-uwp=fail
 rpclib:arm64-windows=fail
+rpclib:arm64-windows-static-md=fail
 rpclib:arm64-uwp=fail
 rpclib:x64-uwp=fail
 rtmidi:arm-neon-android=fail
@ -977,6 +1004,7 @@ scintilla:x64-android=fail
 sciter:arm-neon-android=fail
 sciter:arm64-android=fail
 sciter:arm64-windows=skip
+sciter:arm64-windows-static-md=skip
 sciter:arm64-uwp=skip
 sciter:x64-android=fail
 sciter:x64-linux=skip
@ -999,22 +1027,24 @@ sfml:arm-neon-android=fail
 sfml:arm64-android=fail
 sfml:x64-android=fail
 shader-slang:x64-windows-static=fail
-shogun:arm64-windows      = skip
-shogun:arm64-uwp            = skip
-shogun:x64-osx            = skip
-shogun:arm64-osx            = skip
-shogun:x64-uwp            = skip
-shogun:x64-windows        = skip
-shogun:x64-windows-static = skip
+shogun:arm64-windows=skip
+shogun:arm64-windows-static-md=skip
+shogun:arm64-uwp=skip
+shogun:x64-osx=skip
+shogun:arm64-osx=skip
+shogun:x64-uwp=skip
+shogun:x64-windows= skip
+shogun:x64-windows-static=skip
 shogun:x64-windows-static-md=skip
-shogun:x86-windows        = skip
-shogun:arm64-android      = skip
+shogun:x86-windows=skip
+shogun:arm64-android=skip
 # "Obsolete" and conflicts with microsoft-signalr
 signalrclient:arm-neon-android=skip
 signalrclient:arm64-android=skip
 signalrclient:arm64-osx=skip
 signalrclient:arm64-uwp=skip
 signalrclient:arm64-windows=skip
+signalrclient:arm64-windows-static-md=skip
 signalrclient:x64-android=skip
 signalrclient:x64-linux=skip
 signalrclient:x64-osx=skip
@ -1024,6 +1054,7 @@ signalrclient:x64-windows-static-md=skip
 signalrclient:x64-windows-static=skip
 signalrclient:x86-windows=skip
 simbody:arm64-windows=fail
+simbody:arm64-windows-static-md=fail
 simd:arm-neon-android=fail
 simd:arm64-android=fail
 simd:x64-android=fail
@ -1048,6 +1079,7 @@ soil:x64-android=fail
 solid3:arm64-android=fail
 spaceland:arm64-android=fail
 spaceland:arm64-windows=fail
+spaceland:arm64-windows-static-md=fail
 spaceland:arm64-uwp=fail
 spaceland:x64-android=fail
 spaceland:x64-uwp=fail
@ -1073,6 +1105,7 @@ stxxl:x64-windows=skip
 stxxl:x64-windows-static=skip
 stxxl:x64-windows-static-md=skip
 systemc:arm64-windows=fail
+systemc:arm64-windows-static-md=fail
 systemc:arm64-uwp=fail
 systemc:x64-uwp=fail
 teemo:x64-android=fail
@ -1101,6 +1134,7 @@ tinycthread:x64-android=fail
 torch-th:arm-neon-android=fail
 torch-th:arm64-android=fail
 torch-th:arm64-windows=fail
+torch-th:arm64-windows-static-md=fail
 torch-th:arm64-uwp=fail
 torch-th:x64-android=fail
 torch-th:x64-uwp=fail
@ -1175,6 +1209,7 @@ yajl:x64-android=fail
 zeroc-ice:arm-neon-android=fail
 zeroc-ice:arm64-android=fail
 zeroc-ice:x64-android=fail
+zyre:arm64-windows-static-md=fail
 zyre:x64-windows-static-md=fail

 # Ports which needs to pass in CI
@ -1182,10 +1217,12 @@ cmake:x64-windows=pass
 cmake:x64-windows-static=pass
 cmake:x64-windows-static-md=pass
 cmake:arm64-windows=pass
+cmake:arm64-windows-static-md=pass
 cmake:x64-linux=pass
 cmake:x64-osx=pass
 cmake-user:arm64-uwp=pass
 cmake-user:arm64-windows=pass
+cmake-user:arm64-windows-static-md=pass
 cmake-user:x64-linux=pass
 cmake-user:x64-osx=pass
 cmake-user:x64-windows-static-md=pass
@ -1201,6 +1238,7 @@ gtk:x86-windows=pass
 qt:x64-windows=pass
 qt:x64-windows-static=pass
 # qt:x64-windows-static-md=pass # hunspell is fail so this cannot pass.
+# qt:arm64-windows-static-md=pass # hunspell is fail so this cannot pass.
 qt:arm64-windows=pass
 qt:x64-linux=pass
 # qt:x64-osx=pass # gstreamer issues preventing qtmultimedia
@ -1213,6 +1251,7 @@ vcpkg-ci-boost:arm-neon-android=pass
 vcpkg-ci-boost:arm64-android=pass
 vcpkg-ci-boost:arm64-uwp=pass
 vcpkg-ci-boost:arm64-windows=pass
+vcpkg-ci-boost:arm64-windows-static-md=pass
 vcpkg-ci-boost:x64-android=pass
 vcpkg-ci-boost:x64-linux=pass
 vcpkg-ci-boost:x64-osx=pass
@ -1228,6 +1267,7 @@ vcpkg-ci-curl:x64-linux=pass
 vcpkg-ci-curl:arm64-osx=pass
 vcpkg-ci-curl:x64-osx=pass
 vcpkg-ci-curl:arm64-windows=pass
+vcpkg-ci-curl:arm64-windows-static-md=pass
 vcpkg-ci-curl:x64-windows-static-md=pass
 vcpkg-ci-curl:x64-windows-static=pass
 vcpkg-ci-curl:x64-windows=pass
@ -1237,6 +1277,7 @@ vcpkg-ci-ffmpeg:arm64-android=pass
 vcpkg-ci-ffmpeg:arm64-osx=pass
 vcpkg-ci-ffmpeg:arm64-uwp=pass
 vcpkg-ci-ffmpeg:arm64-windows=pass
+vcpkg-ci-ffmpeg:arm64-windows-static-md=pass
 vcpkg-ci-ffmpeg:x64-android=pass
 vcpkg-ci-ffmpeg:x64-linux=pass
 vcpkg-ci-ffmpeg:x64-osx=pass
@ -1287,6 +1328,7 @@ vcpkg-ci-opencv:arm64-android=pass
 vcpkg-ci-opencv:arm64-osx=pass
 vcpkg-ci-opencv:arm64-uwp=pass
 vcpkg-ci-opencv:arm64-windows=pass
+vcpkg-ci-opencv:arm64-windows-static-md=pass
 vcpkg-ci-opencv:x64-android=pass
 vcpkg-ci-opencv:x64-linux=pass
 vcpkg-ci-opencv:x64-osx=pass
@ -1312,6 +1354,7 @@ vcpkg-ci-skia:arm-neon-android=pass
 vcpkg-ci-skia:arm64-android=pass
 vcpkg-ci-skia:arm64-uwp=pass
 vcpkg-ci-skia:arm64-windows=pass
+vcpkg-ci-skia:arm64-windows-static-md=pass
 vcpkg-ci-skia:x64-android=pass
 vcpkg-ci-skia:x64-linux=pass
 vcpkg-ci-skia:x64-osx=pass
@ -1330,6 +1373,7 @@ vcpkg-ci-sqlpp11:arm64-android=pass
 vcpkg-ci-sqlpp11:arm64-osx=pass
 vcpkg-ci-sqlpp11:arm64-uwp=pass
 vcpkg-ci-sqlpp11:arm64-windows=pass
+vcpkg-ci-sqlpp11:arm64-windows-static-md=pass
 vcpkg-ci-sqlpp11:x64-android=pass
 vcpkg-ci-sqlpp11:x64-linux=pass
 vcpkg-ci-sqlpp11:x64-osx=pass
@ -1342,6 +1386,7 @@ vcpkg-ci-vxl:arm-neon-android=pass
 vcpkg-ci-vxl:arm64-android=pass
 vcpkg-ci-vxl:arm64-osx=pass
 vcpkg-ci-vxl:arm64-windows=pass
+vcpkg-ci-vxl:arm64-windows-static-md=pass
 vcpkg-ci-vxl:x64-android=pass
 vcpkg-ci-vxl:x64-linux=pass
 vcpkg-ci-vxl:x64-osx=pass
@ -1350,6 +1395,7 @@ vcpkg-ci-vxl:x64-windows-static=pass
 vcpkg-ci-vxl:x64-windows-static-md=pass
 vcpkg-ci-vxl:x86-windows=pass
 vcpkg-ci-wxwidgets:arm64-windows=pass
+vcpkg-ci-wxwidgets:arm64-windows-static-md=pass
 vcpkg-ci-wxwidgets:x64-linux=pass
 vcpkg-ci-wxwidgets:x64-osx=pass
 vcpkg-ci-wxwidgets:x64-windows-static-md=pass
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@ -186,11 +186,11 @@
        <archiveName>ninja-mac-1.11.1.zip</archiveName>
    </tool>
    <tool name="powershell-core" os="windows">
-        <version>7.2.23</version>
+        <version>7.2.24</version>
        <exeRelativePath>pwsh.exe</exeRelativePath>
-        <url>https://github.com/PowerShell/PowerShell/releases/download/v7.2.23/PowerShell-7.2.23-win-x64.zip</url>
-        <sha512>b374a878df02980d54e17ad7cfc9021e331748c3770f586be61356c257494d1b33899c1167d09a35c210bc084474aefdff972f672d16afb43be0562b3589285a</sha512>
-        <archiveName>PowerShell-7.2.23-win-x64.zip</archiveName>
+        <url>https://github.com/PowerShell/PowerShell/releases/download/v7.2.24/PowerShell-7.2.24-win-x64.zip</url>
+        <sha512>a08b72958f5a552240d3f68c581d8c8cb580468a71f5e55ca54a1dd0c0fcd81da9df11036653e2300fc4a5778a77c0147832ca06f7837f03417e9795e577a76f</sha512>
+        <archiveName>PowerShell-7.2.24-win-x64.zip</archiveName>
    </tool>
    <tool name="node" os="windows">
        <version>16.15.1</version>
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -1626,7 +1626,7 @@
    },
    "chartdir": {
      "baseline": "7.0.0",
-      "port-version": 7
+      "port-version": 8
    },
    "check": {
      "baseline": "0.15.2",
@ -2922,7 +2922,7 @@
    },
    "freeopcua": {
      "baseline": "20190125",
-      "port-version": 7
+      "port-version": 8
    },
    "freerdp": {
      "baseline": "3.8.0",
@ -3042,7 +3042,7 @@
    },
    "gdal": {
      "baseline": "3.10.0",
-      "port-version": 0
+      "port-version": 1
    },
    "gdcm": {
      "baseline": "3.0.24",
@ -3674,7 +3674,7 @@
    },
    "igraph": {
      "baseline": "0.10.15",
-      "port-version": 0
+      "port-version": 1
    },
    "iir1": {
      "baseline": "1.9.5",
@ -4598,7 +4598,7 @@
    },
    "libgit2": {
      "baseline": "1.8.0",
-      "port-version": 0
+      "port-version": 1
    },
    "libgme": {
      "baseline": "0.6.3",
@ -5066,7 +5066,7 @@
    },
    "librttopo": {
      "baseline": "1.1.0",
-      "port-version": 8
+      "port-version": 9
    },
    "libsamplerate": {
      "baseline": "0.2.2",
--- a/versions/c-/chartdir.json
+++ b/versions/c-/chartdir.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "81e3babb505d9198b120c40dc5f00d11e460faa0",
+      "version": "7.0.0",
+      "port-version": 8
+    },
    {
      "git-tree": "4de62166c67f2104f1e7180f04f1d5954d8e464a",
      "version": "7.0.0",
--- a/versions/f-/freeopcua.json
+++ b/versions/f-/freeopcua.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "e73f15f28d4be622e42317c8a43d7735d65d593f",
+      "version": "20190125",
+      "port-version": 8
+    },
    {
      "git-tree": "adfdfa8138aa47929d7e6f1e03809d00c6bf8aa2",
      "version": "20190125",
--- a/versions/g-/gdal.json
+++ b/versions/g-/gdal.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "19d3353df9cfc0a3a7e51b4450438e5d2d9ed1e6",
+      "version-semver": "3.10.0",
+      "port-version": 1
+    },
    {
      "git-tree": "722436c5a55405d9c7f31c3044c3a66901638ed5",
      "version-semver": "3.10.0",
--- a/versions/i-/igraph.json
+++ b/versions/i-/igraph.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "0c766a667b2c2df17eddf1013712e87602e7dd73",
+      "version": "0.10.15",
+      "port-version": 1
+    },
    {
      "git-tree": "d8d7f26d7f84453184d67529391c51effd999e85",
      "version": "0.10.15",
--- a/versions/l-/libgit2.json
+++ b/versions/l-/libgit2.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2584fc140e3c1406fe30f6ad62973df7cc8c573c",
+      "version-semver": "1.8.0",
+      "port-version": 1
+    },
    {
      "git-tree": "83d6bb1f73f67956eebce5f63e024790b12c0f39",
      "version-semver": "1.8.0",
--- a/versions/l-/librttopo.json
+++ b/versions/l-/librttopo.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "d5f4a016a014a3037978f92f851a08952de641d5",
+      "version": "1.1.0",
+      "port-version": 9
+    },
    {
      "git-tree": "adc1d3db75fdf633bfcf3ffd908a45005a576163",
      "version": "1.1.0",