From 1f53e1744c8c8bbc310ac7636888c3d9e4098e91 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Tue, 3 Dec 2024 01:32:58 +0100
Subject: [PATCH] [EasyHook] Fix single config builds (#42440)

---
 ports/easyhook/portfile.cmake | 24 ++++++------------------
 ports/easyhook/vcpkg.json     |  2 +-
 versions/baseline.json        |  2 +-
 versions/e-/easyhook.json     |  5 +++++
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/ports/easyhook/portfile.cmake b/ports/easyhook/portfile.cmake
index 8580c5c6db..54e26299fb 100644
--- a/ports/easyhook/portfile.cmake
+++ b/ports/easyhook/portfile.cmake
@@ -76,28 +76,16 @@ vcpkg_msbuild_install(
 
 # Remove the mismatch rebuild library
 if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/AUX_ULIB_x64.LIB")
-    endif()
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/AUX_ULIB_x64.LIB")
-    endif()
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/AUX_ULIB_x64.LIB")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/AUX_ULIB_x64.LIB")
 elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/AUX_ULIB_x86.LIB")
-    endif()
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/AUX_ULIB_x86.LIB")
-    endif()
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/AUX_ULIB_x86.LIB")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/AUX_ULIB_x86.LIB")
 endif()
 
 # These libraries are useless, so remove.
-if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/EasyHook.dll" "${CURRENT_PACKAGES_DIR}/bin/EasyHook.pdb")
-endif()
-if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.pdb")
-endif()
+file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/EasyHook.dll" "${CURRENT_PACKAGES_DIR}/bin/EasyHook.pdb")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.pdb")
 
 # Install includes
 file(INSTALL "${SOURCE_PATH}/Public/easyhook.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/easyhook")
diff --git a/ports/easyhook/vcpkg.json b/ports/easyhook/vcpkg.json
index 258da74ef5..e83eb2dcce 100644
--- a/ports/easyhook/vcpkg.json
+++ b/ports/easyhook/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "easyhook",
   "version": "2.7.7097.0",
-  "port-version": 8,
+  "port-version": 9,
   "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.",
   "homepage": "https://github.com/EasyHook/EasyHook",
   "supports": "windows & !static & !uwp & (x86 | x64)",
diff --git a/versions/baseline.json b/versions/baseline.json
index d29b27c79c..7b9d87f7a3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2502,7 +2502,7 @@
     },
     "easyhook": {
       "baseline": "2.7.7097.0",
-      "port-version": 8
+      "port-version": 9
     },
     "easyloggingpp": {
       "baseline": "9.97.1",
diff --git a/versions/e-/easyhook.json b/versions/e-/easyhook.json
index 3a51c0dc03..14bd3a85bb 100644
--- a/versions/e-/easyhook.json
+++ b/versions/e-/easyhook.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1c6fdf085b69eba1d35606b055b8d52f13142770",
+      "version": "2.7.7097.0",
+      "port-version": 9
+    },
     {
       "git-tree": "bcdbd62438d6d473f4b325a6f9b0ede4512d9dbf",
       "version": "2.7.7097.0",