Remove use of dumpbin from post-build checks.

CMakeLists.txt

@@ -215,6 +215,7 @@ target_include_directories(vcpkglib PUBLIC include)
 target_compile_definitions(vcpkglib PUBLIC
     VCPKG_VERSION=${VCPKG_VERSION}
     VCPKG_BASE_VERSION=${VCPKG_BASE_VERSION}
+    _FILE_OFFSET_BITS=64
 )
 
 if(NOT DEFINED VCPKG_STANDALONE_BUNDLE_SHA OR VCPKG_STANDALONE_BUNDLE_SHA STREQUAL "")

azure-pipelines/e2e_assets/test-dll-port-template/build.cmd

@@ -0,0 +1,4 @@
+mkdir "%~dp0debug"
+mkdir "%~dp0release"
+cl /MDd "%~dp0test.c" "%~dp0test.def" /Fo"%~dp0debug\test.obj" /Fe"%~dp0debug\test_dll.dll" /link /DLL
+cl /MD "%~dp0test.c" "%~dp0test.def" /Fo"%~dp0release\test.obj" /Fe"%~dp0release\test_dll.dll" /link /DLL

azure-pipelines/e2e_assets/test-dll-port-template/portfile.cmake

@@ -0,0 +1,14 @@
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/debug/test_dll.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/debug/test_dll.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/release/test_dll.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/release/test_dll.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/test.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")

azure-pipelines/e2e_assets/test-dll-port-template/test.c

@@ -0,0 +1,17 @@
+#include <windows.h>
+#include <stdio.h>
+
+BOOLEAN WINAPI DllMain(HINSTANCE hDllHandle, DWORD nReason, LPVOID Reserved)
+{
+    (void)Reserved;
+    if (nReason == DLL_PROCESS_ATTACH) {
+        DisableThreadLibraryCalls( hDllHandle );
+    }
+
+    return TRUE;
+}
+
+int __cdecl export_me() {
+    puts("You called the exported function!");
+    return 42;
+}

azure-pipelines/e2e_assets/test-dll-port-template/test.def

@@ -0,0 +1,4 @@
+LIBRARY test_dll
+
+EXPORTS
+export_me

azure-pipelines/e2e_assets/test-dll-port-template/test.h

@@ -0,0 +1 @@
+    // empty test header

azure-pipelines/e2e_assets/test-dll-port-template/vcpkg.json

@@ -0,0 +1,4 @@
+{
+  "name": "test-dll",
+  "version": "1.0.0"
+}

azure-pipelines/e2e_assets/test-lib-port-template-dynamic-crt/build.cmd

@@ -0,0 +1,8 @@
+mkdir "%~dp0debug"
+mkdir "%~dp0release"
+mkdir "%~dp0both"
+cl /c /MDd "%~dp0test.c" /Fo"%~dp0debug\test.obj"
+lib "%~dp0debug\test.obj" /OUT:"%~dp0debug\test_lib.lib"
+cl /c /DNDEBUG /MD "%~dp0test.c" /Fo"%~dp0release\test.obj"
+lib "%~dp0release\test.obj" /OUT:"%~dp0release\test_lib.lib"
+lib "%~dp0debug\test.obj" "%~dp0release\test.obj" /OUT:"%~dp0both\both_lib.lib"

azure-pipelines/e2e_assets/test-lib-port-template-dynamic-crt/portfile.cmake

@@ -0,0 +1,12 @@
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/debug/test_lib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/both/both_lib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/release/test_lib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/both/both_lib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/test.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")

azure-pipelines/e2e_assets/test-lib-port-template-dynamic-crt/test.c

@@ -0,0 +1,10 @@
+#include <stdio.h>
+
+#ifdef NDEBUG
+int __cdecl use_ndebug() {
+#else
+int __cdecl use_no_ndebug() {
+#endif
+    puts("You called the static lib function!");
+    return 42;
+}

azure-pipelines/e2e_assets/test-lib-port-template-dynamic-crt/test.h

@@ -0,0 +1 @@
+    // empty test header

azure-pipelines/e2e_assets/test-lib-port-template-dynamic-crt/vcpkg.json

@@ -0,0 +1,4 @@
+{
+  "name": "test-lib",
+  "version": "1.0.0"
+}

azure-pipelines/e2e_ports/llvm-lto-lib/portfile.cmake

@@ -0,0 +1,12 @@
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/llvm-lto-charset.lib"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/llvm-lto-charset.lib"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
+file(TOUCH "${CURRENT_PACKAGES_DIR}/include/llvm-lto-lib.h")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")

azure-pipelines/e2e_ports/llvm-lto-lib/vcpkg.json

@@ -0,0 +1,5 @@
+{
+  "name": "llvm-lto-lib",
+  "version": "1",
+  "supports": "windows"
+}

azure-pipelines/e2e_ports/vcpkg-internal-dll-with-no-exports/CMakeLists.txt

@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.24)
+project(vcpkg-internal-dll-with-no-exports LANGUAGES C)
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test.c" [[ #include <windows.h>
+BOOLEAN WINAPI DllMain(HINSTANCE hDllHandle, DWORD nReason, LPVOID Reserved)
+{
+    (void)Reserved;
+    if (nReason == DLL_PROCESS_ATTACH) {
+        DisableThreadLibraryCalls( hDllHandle );
+    }
+
+    return TRUE;
+}
+]])
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test.h" [[
+    // empty test header
+]])
+
+add_library(no_exports "${CMAKE_CURRENT_BINARY_DIR}/test.c")
+include(GNUInstallDirs)
+install(TARGETS no_exports)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/test.c" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

azure-pipelines/e2e_ports/vcpkg-internal-dll-with-no-exports/portfile.cmake

@@ -0,0 +1,12 @@
+SET(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}/src")
+vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src")
+vcpkg_cmake_install()
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/lib"
+    "${CURRENT_PACKAGES_DIR}/lib")
+file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")

azure-pipelines/e2e_ports/vcpkg-internal-dll-with-no-exports/vcpkg.json

@@ -0,0 +1,10 @@
+{
+  "name": "vcpkg-internal-dll-with-no-exports",
+  "version": "1.0.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}

azure-pipelines/end-to-end-tests-dir/post-build-checks.ps1

@@ -0,0 +1,81 @@
+. $PSScriptRoot/../end-to-end-tests-prelude.ps1
+
+if (-not $IsWindows) {
+    Write-Host 'Skipping e2e post build checks on non-Windows'
+    return
+}
+
+# DLLs with no exports
+Refresh-TestRoot
+[string]$buildOutput = Run-VcpkgAndCaptureOutput @commonArgs install --overlay-ports="$PSScriptRoot/../e2e_ports" vcpkg-internal-dll-with-no-exports --no-binarycaching
+if (-not $buildOutput.Contains("$packagesRoot\vcpkg-internal-dll-with-no-exports_x86-windows\debug\bin\no_exports.dll") `
+    -or -not $buildOutput.Contains("$packagesRoot\vcpkg-internal-dll-with-no-exports_x86-windows\bin\no_exports.dll") `
+    -or -not $buildOutput.Contains('set(VCPKG_POLICY_DLLS_WITHOUT_EXPORTS enabled)')) {
+    throw 'Did not detect DLLs with no exports.'
+}
+
+# DLLs with wrong architecture
+Refresh-TestRoot
+mkdir "$TestingRoot/wrong-architecture"
+Copy-Item -Recurse "$PSScriptRoot/../e2e_assets/test-dll-port-template" "$TestingRoot/wrong-architecture/test-dll"
+Run-Vcpkg env "$TestingRoot/wrong-architecture/test-dll/build.cmd" --Triplet x64-windows
+Throw-IfFailed
+
+$buildOutput = Run-VcpkgAndCaptureOutput @commonArgs install --overlay-ports="$TestingRoot/wrong-architecture" test-dll --no-binarycaching
+$expected = "warning: The following files were built for an incorrect architecture:`n" + `
+"warning:     $packagesRoot\test-dll_x86-windows\debug\lib\test_dll.lib`n" + `
+" Expected: x86, but was x64`n" + `
+"warning:     $packagesRoot\test-dll_x86-windows\lib\test_dll.lib`n" + `
+" Expected: x86, but was x64`n" + `
+"warning: The following files were built for an incorrect architecture:`n" + `
+"warning:     $packagesRoot\test-dll_x86-windows\debug\bin\test_dll.dll`n" + `
+" Expected: x86, but was x64`n" + `
+"warning:     $packagesRoot\test-dll_x86-windows\bin\test_dll.dll`n" + `
+" Expected: x86, but was x64`n"
+
+if (-not $buildOutput.Replace("`r`n", "`n").Contains($expected)) {
+    throw 'Did not detect DLL with wrong architecture.'
+}
+
+# DLLs with no AppContainer bit
+Refresh-TestRoot
+mkdir "$TestingRoot/wrong-appcontainer"
+Copy-Item -Recurse "$PSScriptRoot/../e2e_assets/test-dll-port-template" "$TestingRoot/wrong-appcontainer/test-dll"
+Run-Vcpkg env "$TestingRoot/wrong-appcontainer/test-dll/build.cmd" --Triplet x64-windows
+Throw-IfFailed
+
+$buildOutput = Run-VcpkgAndCaptureOutput --triplet x64-uwp "--x-buildtrees-root=$buildtreesRoot" "--x-install-root=$installRoot" "--x-packages-root=$packagesRoot" install --overlay-ports="$TestingRoot/wrong-appcontainer" test-dll --no-binarycaching
+$expected = "warning: The App Container bit must be set for Windows Store apps. The following DLLs do not have the App Container bit set:`n" + `
+"`n" + `
+"    $packagesRoot\test-dll_x64-uwp\debug\bin\test_dll.dll`n" + `
+"    $packagesRoot\test-dll_x64-uwp\bin\test_dll.dll`n"
+
+if (-not $buildOutput.Replace("`r`n", "`n").Contains($expected)) {
+    throw 'Did not detect DLL with wrong appcontainer.'
+}
+
+# Wrong CRT linkage
+Refresh-TestRoot
+mkdir "$TestingRoot/wrong-crt"
+Copy-Item -Recurse "$PSScriptRoot/../e2e_assets/test-lib-port-template-dynamic-crt" "$TestingRoot/wrong-crt/test-lib"
+Run-Vcpkg env "$TestingRoot/wrong-crt/test-lib/build.cmd" --Triplet x86-windows-static
+Throw-IfFailed
+
+$buildOutput = Run-VcpkgAndCaptureOutput --triplet x86-windows-static "--x-buildtrees-root=$buildtreesRoot" "--x-install-root=$installRoot" "--x-packages-root=$packagesRoot" install --overlay-ports="$TestingRoot/wrong-crt" test-lib --no-binarycaching
+$expected = "warning: The following binaries should use the Static Debug (/MTd) CRT.`n" +
+"    $packagesRoot\test-lib_x86-windows-static\debug\lib\both_lib.lib links with:`n" +
+"        Dynamic Debug (/MDd)`n" +
+"        Dynamic Release (/MD)`n" +
+"    $packagesRoot\test-lib_x86-windows-static\debug\lib\test_lib.lib links with: Dynamic Debug (/MDd)`n" +
+"To inspect the lib files, use:`n" +
+"    dumpbin.exe /directives mylibfile.lib`n" +
+"warning: The following binaries should use the Static Release (/MT) CRT.`n" +
+"    $packagesRoot\test-lib_x86-windows-static\lib\both_lib.lib links with:`n" +
+"        Dynamic Debug (/MDd)`n" +
+"        Dynamic Release (/MD)`n" +
+"    $packagesRoot\test-lib_x86-windows-static\lib\test_lib.lib links with: Dynamic Release (/MD)`n" +
+"To inspect the lib files, use:`n" +
+"    dumpbin.exe /directives mylibfile.lib`n"
+if (-not $buildOutput.Replace("`r`n", "`n").Contains($expected)) {
+    throw 'Did not detect lib with wrong CRT linkage.'
+}

azure-pipelines/end-to-end-tests-dir/regression-ports.ps1

@@ -0,0 +1,6 @@
+. $PSScriptRoot/../end-to-end-tests-prelude.ps1
+
+if ($IsWindows) {
+    Run-Vcpkg install --overlay-ports="$PSScriptRoot/../e2e_ports/llvm-lto-lib" llvm-lto-lib:x64-windows-static
+    Throw-IfFailed
+}