Merge tag '2025-11-19' into binary_caching_preserve_zips_from_cloud_storage

Author: rressi-at-globus

.clang-format

@@ -1,6 +1,4 @@
 BasedOnStyle: WebKit
-Language: Cpp
-Standard: Cpp11
 
 UseTab: Never
 IndentWidth: 4
@@ -75,3 +73,8 @@ IncludeCategories:
     Priority: 6
   - Regex: '^<[a-z0-9_]*>$' # C++ standard library
     Priority: 7
+
+---
+
+Language: Cpp
+Standard: c++17

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -12,3 +12,30 @@ pipelines:
           lastModifiedDate: 2024-08-28
         armory:
           lastModifiedDate: 2024-08-28
+      binary:
+        credscan:
+          lastModifiedDate: 2025-01-29
+        binskim:
+          lastModifiedDate: 2025-01-29
+        spotbugs:
+          lastModifiedDate: 2025-01-29
+  15684:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2025-01-14
+        eslint:
+          lastModifiedDate: 2025-01-14
+        psscriptanalyzer:
+          lastModifiedDate: 2025-01-14
+        armory:
+          lastModifiedDate: 2025-01-14
+        accessibilityinsights:
+          lastModifiedDate: 2025-06-04
+      binary:
+        credscan:
+          lastModifiedDate: 2025-01-28
+        binskim:
+          lastModifiedDate: 2025-01-28
+        spotbugs:
+          lastModifiedDate: 2025-01-28

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
-FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
+FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04
 
-ADD https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
-ADD https://deb.nodesource.com/setup_20.x /nodesource_setup.sh
+ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
+ADD https://deb.nodesource.com/setup_24.x /nodesource_setup.sh
 
 ENV APT_PACKAGES="git curl zip unzip tar build-essential cmake ninja-build powershell nodejs mono-complete"
 

.github/workflows/build.yaml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: "18.x"
+          node-version: "24.x"
           cache: 'npm'
           cache-dependency-path: vcpkg-artifacts/package-lock.json
       - name: Enable Problem Matchers
@@ -56,12 +56,8 @@ jobs:
       - name: '[CI Only] Perform CodeQL Analysis'
         if: inputs.codeql && matrix.preset != 'linux-arm64-ci'
         uses: github/codeql-action/analyze@v3
-      - name: Run vcpkg unit tests
+      - name: Run vcpkg and vcpkg-artifacts unit tests
         run: ctest --preset ${{ matrix.preset }} --output-on-failure 2>&1
-      - name: Run vcpkg-artifacts unit tests
-        run: |
-          cd out/build/${{ matrix.preset }}/vcpkg-artifacts
-          node node_modules/mocha/bin/mocha --config mocha-config.yaml
       - name: Get microsoft/vcpkg pinned sha into VCPKG_SHA
         id: vcpkg_sha
         shell: pwsh

.github/workflows/pr.yaml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: "18.x"
+          node-version: "24.x"
           cache: 'npm'
           cache-dependency-path: vcpkg-artifacts/package-lock.json
       - uses: lukka/[email protected]

.vscode/launch.json

@@ -4,6 +4,21 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "vcpkg linux debug",
+      "type": "cppdbg",
+      "request": "launch",
+      "environment": [
+        {
+          "name": "VCPKG_ROOT",
+          "value": "/vcpkg"
+        }
+      ],
+      "program": "${workspaceRoot}/out/build/linux-debug/vcpkg",
+      "cwd": "${workspaceRoot}/out/build/linux-debug",
+      "args": [
+      ]
+    },
     {
       "name": "vcpkg-ce cli",
       "request": "launch",
@@ -20,7 +35,7 @@
     },
     {
       "name": "MochaTest",
-      "type": "pwa-node",
+      "type": "node",
       "request": "attach",
       "port": 9229,
       "continueOnAttach": true,

CMakeLists.txt

@@ -98,11 +98,11 @@ if(MSVC)
     # either MSVC, or clang-cl
     string(APPEND CMAKE_C_FLAGS " -FC -permissive- -utf-8 /guard:cf")
     string(APPEND CMAKE_CXX_FLAGS " /EHsc -FC -permissive- -utf-8 /guard:cf")
-    string(APPEND CMAKE_C_FLAGS_RELEASE " /Zi")
-    string(APPEND CMAKE_CXX_FLAGS_RELEASE " /Zi")
+    string(APPEND CMAKE_C_FLAGS_RELEASE " /Zi /GL")
+    string(APPEND CMAKE_CXX_FLAGS_RELEASE " /Zi /GL")
 
-    string(APPEND CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO " /DEBUG /INCREMENTAL:NO /debugtype:cv,fixup /guard:cf")
-    string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " /DEBUG /INCREMENTAL:NO /debugtype:cv,fixup /guard:cf")
+    string(APPEND CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO " /DEBUG /INCREMENTAL:NO /debugtype:cv,fixup /guard:cf /OPT:REF /OPT:ICF /LTCG")
+    string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " /DEBUG /INCREMENTAL:NO /debugtype:cv,fixup /guard:cf /OPT:REF /OPT:ICF /LTCG")
     if (MSVC_CXX_ARCHITECTURE_ID STREQUAL "x64")
         string(APPEND CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO " /CETCOMPAT")
         string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " /CETCOMPAT")
@@ -237,9 +237,16 @@ elseif(VCPKG_OFFICIAL_BUILD)
     message(FATAL_ERROR "VCPKG_STANDALONE_BUNDLE_SHA is required for official builds.")
 endif()
 
+if(VCPKG_ARTIFACTS_SHA)
+    target_compile_definitions(vcpkglib PUBLIC
+        "VCPKG_ARTIFACTS_SHA=${VCPKG_ARTIFACTS_SHA}"
+    )
+elseif(VCPKG_OFFICIAL_BUILD)
+    message(FATAL_ERROR "VCPKG_ARTIFACTS_SHA is required for official builds.")
+endif()
+
 file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg-artifacts" VCPKG_ARTIFACTS_SOURCE_DIR)
 if (VCPKG_ARTIFACTS_DEVELOPMENT)
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/vcpkg-artifacts" VCPKG_ARTIFACTS_BINARY_DIR)
     # The directory constructed by this portion of the build script needs to be kept in sync with
     # that created by azure-pipelines/signing.yml
 
@@ -258,7 +265,7 @@ if (VCPKG_ARTIFACTS_DEVELOPMENT)
     add_custom_command(
         OUTPUT
             "${VCPKG_ARTIFACTS_SOURCE_DIR}/node_modules"
-        COMMAND "${NPM}" ARGS "ci"
+        COMMAND "${NPM}" ARGS "ci" "--include=dev"
         WORKING_DIRECTORY
             "${VCPKG_ARTIFACTS_SOURCE_DIR}"
         COMMENT
@@ -301,9 +308,8 @@ if (VCPKG_ARTIFACTS_DEVELOPMENT)
     set(VCPKG_ARTIFACTS_SOURCES ${VCPKG_ARTIFACTS_ROOT_SOURCES} ${VCPKG_ARTIFACTS_NESTED_SOURCES})
     list(TRANSFORM VCPKG_ARTIFACTS_SOURCES PREPEND "${VCPKG_ARTIFACTS_SOURCE_DIR}/")
 
-    set(VCPKG_ARTIFACTS_BINARIES ${VCPKG_ARTIFACTS_ROOT_SOURCES} ${VCPKG_ARTIFACTS_NESTED_SOURCES}) 
-    list(TRANSFORM VCPKG_ARTIFACTS_BINARIES PREPEND "${VCPKG_ARTIFACTS_BINARY_DIR}/")
-    list(TRANSFORM VCPKG_ARTIFACTS_BINARIES REPLACE "\\.ts" ".js")
+    set(VCPKG_ARTIFACTS_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/vcpkg-artifacts-build")
+    set(VCPKG_ARTIFACTS_BINARY "${CMAKE_CURRENT_BINARY_DIR}/vcpkg-artifacts.mjs")
     add_custom_command(
         OUTPUT "${VCPKG_ARTIFACTS_SOURCE_DIR}/locales/messages.json"
         COMMAND "${NODEJS}" ARGS "${VCPKG_ARTIFACTS_SOURCE_DIR}/node_modules/translate-strings/dist/main.js" "." "--json"
@@ -317,74 +323,30 @@ if (VCPKG_ARTIFACTS_DEVELOPMENT)
 
     add_custom_command(
         OUTPUT
-            ${VCPKG_ARTIFACTS_BINARIES}
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/package.json"
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/package-lock.json"
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/.npmrc"
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/mocha-config.yaml"
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/locales/messages.json"
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/artifacts-development.txt"
-        COMMAND
-            "${CMAKE_COMMAND}" ARGS -E rm -rf "${VCPKG_ARTIFACTS_BINARY_DIR}"
-        COMMAND
-            "${CMAKE_COMMAND}" ARGS -E make_directory "${VCPKG_ARTIFACTS_BINARY_DIR}"
-        COMMAND
-            "${CMAKE_COMMAND}" ARGS -E make_directory "${VCPKG_ARTIFACTS_BINARY_DIR}/locales"
-        COMMAND
-            "${CMAKE_COMMAND}" ARGS -E copy_directory
-                "${VCPKG_ARTIFACTS_SOURCE_DIR}/node_modules"
-                "${VCPKG_ARTIFACTS_BINARY_DIR}/node_modules"
-        COMMAND
-            "${CMAKE_COMMAND}" ARGS -E copy_directory
-                "${VCPKG_ARTIFACTS_SOURCE_DIR}/test-resources"
-                "${VCPKG_ARTIFACTS_BINARY_DIR}/test-resources"
-        # Files are after directories for more accurate cmake tracking of interrupted runs
-        COMMAND
-            "${CMAKE_COMMAND}" ARGS -E copy
-                "${VCPKG_ARTIFACTS_SOURCE_DIR}/package.json"
-                "${VCPKG_ARTIFACTS_SOURCE_DIR}/package-lock.json"
-                "${VCPKG_ARTIFACTS_SOURCE_DIR}/.npmrc"
-                "${VCPKG_ARTIFACTS_SOURCE_DIR}/mocha-config.yaml"
-                "${VCPKG_ARTIFACTS_BINARY_DIR}"
-        COMMAND
-            "${CMAKE_COMMAND}" ARGS -E copy
-                "${VCPKG_ARTIFACTS_SOURCE_DIR}/locales/messages.json"
-                "${VCPKG_ARTIFACTS_BINARY_DIR}/locales/messages.json"
+            ${VCPKG_ARTIFACTS_BINARY}
         COMMAND
-            "${NODEJS}" ARGS "${VCPKG_ARTIFACTS_SOURCE_DIR}/node_modules/typescript/bin/tsc"
-                -p "${VCPKG_ARTIFACTS_SOURCE_DIR}"
-                --outDir "${VCPKG_ARTIFACTS_BINARY_DIR}"
+            "${NODEJS}" ARGS "${VCPKG_ARTIFACTS_SOURCE_DIR}/node_modules/@vercel/ncc/dist/ncc/cli.js"
+                build "main.ts"
+                --out "${VCPKG_ARTIFACTS_BUILD_DIR}"
         COMMAND
-            "${CMAKE_COMMAND}" ARGS -E touch
-                "${VCPKG_ARTIFACTS_BINARY_DIR}/artifacts-development.txt"
+            "${CMAKE_COMMAND}" ARGS -E copy "${VCPKG_ARTIFACTS_BUILD_DIR}/index.js" "${VCPKG_ARTIFACTS_BINARY}"
+        WORKING_DIRECTORY
+            "${VCPKG_ARTIFACTS_SOURCE_DIR}"
         DEPENDS
+            npm-restore
             ${VCPKG_ARTIFACTS_SOURCES}
             "${VCPKG_ARTIFACTS_SOURCE_DIR}/tsconfig.json"
             "${VCPKG_ARTIFACTS_SOURCE_DIR}/package.json"
             "${VCPKG_ARTIFACTS_SOURCE_DIR}/package-lock.json"
             "${VCPKG_ARTIFACTS_SOURCE_DIR}/.npmrc"
-            "${VCPKG_ARTIFACTS_SOURCE_DIR}/mocha-config.yaml"
+            "${VCPKG_ARTIFACTS_SOURCE_DIR}/.mocharc.json"
             "${VCPKG_ARTIFACTS_SOURCE_DIR}/locales/messages.json"
         COMMENT
             "Building vcpkg-artifacts..."
         VERBATIM
         )
 
-    add_custom_target(vcpkg-artifacts-target
-        ALL
-        DEPENDS
-            ${VCPKG_ARTIFACTS_BINARIES}
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/package.json"
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/package-lock.json"
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/.npmrc"
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/mocha-config.yaml"
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/locales/messages.json"
-            "${VCPKG_ARTIFACTS_BINARY_DIR}/artifacts-development.txt"
-            npm-restore
-        )
-    set_target_properties(vcpkg-artifacts-target
-        PROPERTIES
-            ADDITIONAL_CLEAN_FILES "${VCPKG_ARTIFACTS_BINARY_DIR}")
+    add_custom_target(vcpkg-artifacts-target ALL DEPENDS "${VCPKG_ARTIFACTS_BINARY}")
 endif()
 
 set(CPP_ATOMIC_LIBRARY "")
@@ -431,6 +393,10 @@ elseif(NOT MSVC)
     target_compile_options(vcpkglib PRIVATE -include "${CMAKE_CURRENT_SOURCE_DIR}/include/pch.h")
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+    target_link_libraries(vcpkglib PRIVATE socket)
+endif()
+
 if(ANDROID AND CMAKE_SYSTEM_VERSION LESS "28")
     # pkg install libandroid-spawn
     target_link_libraries(vcpkglib PRIVATE android-spawn)
@@ -462,7 +428,7 @@ add_custom_target(vcpkg-ps1 ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/vcpkg-shell
 # === Target: vcpkg ===
 
 add_executable(vcpkg ${VCPKG_SOURCES} "${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkg.manifest")
-target_link_libraries(vcpkg PRIVATE vcpkglib)
+target_link_libraries(vcpkg PRIVATE vcpkglib ${CMAKE_DL_LIBS})
 
 if(VCPKG_ADD_SOURCELINK)
     if(VCPKG_VERSION STREQUAL "unknownhash")
@@ -514,11 +480,13 @@ if (BUILD_TESTING)
        target_compile_options(vcpkg-test PRIVATE -include "${CMAKE_CURRENT_SOURCE_DIR}/include/pch.h")
     endif()
 
-    add_test(NAME default COMMAND "${CMAKE_COMMAND}" -E env LC_ALL=C "$<TARGET_FILE:vcpkg-test>" --order rand --rng-seed time)
-
-    if (VCPKG_BUILD_BENCHMARKING)
+    add_test(NAME vcpkg-test COMMAND "${CMAKE_COMMAND}" -E env LC_ALL=C "$<TARGET_FILE:vcpkg-test>" --order rand --rng-seed time)
+    if(VCPKG_BUILD_BENCHMARKING)
         target_compile_options(vcpkg-test PRIVATE -DCATCH_CONFIG_ENABLE_BENCHMARKING)
     endif()
+    if(VCPKG_ARTIFACTS_DEVELOPMENT)
+        add_test(NAME artifacts COMMAND "${NODEJS}" "${VCPKG_ARTIFACTS_SOURCE_DIR}/node_modules/mocha/bin/mocha.js" "--import=tsx" WORKING_DIRECTORY "${VCPKG_ARTIFACTS_SOURCE_DIR}")
+    endif()
 endif()
 
 # === Target: vcpkg-fuzz ===

CMakePresets.json

@@ -135,6 +135,17 @@
                 "artifacts"
             ]
         },
+        {
+            "name": "linux-debug",
+            "inherits": [
+                "base",
+                "debug",
+                "linux"
+            ],
+            "cacheVariables": {
+                "VCPKG_WARNINGS_AS_ERRORS": true
+            }
+        },
         {
             "name": "linux-ci",
             "inherits": [
@@ -217,6 +228,10 @@
             "name": "windows-ci",
             "configurePreset": "windows-ci"
         },
+        {
+            "name": "linux-debug",
+            "configurePreset": "linux-debug"
+        },
         {
             "name": "linux-ci",
             "configurePreset": "linux-ci"
@@ -239,6 +254,10 @@
             "name": "windows-ci",
             "configurePreset": "windows-ci"
         },
+        {
+            "name": "linux-debug",
+            "configurePreset": "linux-debug"
+        },
         {
             "name": "linux-ci",
             "configurePreset": "linux-ci"

azure-pipelines/arch-independent-signing.signproj

@@ -11,12 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <FilesToSign Include="$(IntermediateOutputPath)\vcpkg-artifacts\**\*.js" Exclude="$(IntermediateOutputPath)\vcpkg-artifacts\**\node_modules\**\*.js">
+    <FilesToSign Include="$(IntermediateOutputPath)\vcpkg-artifacts.js">
       <Authenticode>Microsoft400</Authenticode>
     </FilesToSign>
-    <FilesToSign Include="$(IntermediateOutputPath)\vcpkg-artifacts\node_modules\**\*.js">
-      <Authenticode>3PartyScriptsSHA2</Authenticode>
-    </FilesToSign>
     <FilesToSign Include="$(IntermediateOutputPath)\vcpkg-init.ps1">
       <Authenticode>Microsoft400</Authenticode>
     </FilesToSign>