From c7f115302f77e2618ba3770dd91b48b69218fa62 Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Thu, 16 Nov 2023 21:42:05 +0100 Subject: [PATCH 1/8] [nethost] Bump to 8.0.0 --- ports/nethost/portfile.cmake | 16 +++++++--------- ports/nethost/vcpkg.json | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ports/nethost/portfile.cmake b/ports/nethost/portfile.cmake index ae88f9a3418be2..5a573f1b36361a 100644 --- a/ports/nethost/portfile.cmake +++ b/ports/nethost/portfile.cmake @@ -1,19 +1,20 @@ -set(COMMIT_HASH v7.0.0) +set(PRODUCT_VERSION "8.0.0") +set(COMMIT_HASH "v${PRODUCT_VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dotnet/runtime REF ${COMMIT_HASH} - SHA512 59210df1d9541018a21a7e89e0f552ad35c849f49be31cf47e2a85086363cdabd2bf8ce652d2024479977ae059d658c3bd18de3bdaeb8cb3ddd71f2413f266bc + SHA512 a7de43bb294a62b661dd0b8f832c0ee64a6bd4a13deb4f65f51a8a8407cc5094d25cc703223d916451209284e013775a47da226098569e94694f3762a79e1de2 HEAD_REF master PATCHES 0001-nethost-cmakelists.patch ) -set(PRODUCT_VERSION "7.0.0") - if(NOT VCPKG_TARGET_IS_WINDOWS) - execute_process(COMMAND sh -c "mkdir -p ${SOURCE_PATH}/artifacts/obj && ${SOURCE_PATH}/eng/native/version/copy_version_files.sh") + execute_process(COMMAND "sh" "-c" "mkdir -p ${SOURCE_PATH}/artifacts/obj && ${SOURCE_PATH}/eng/native/version/copy_version_files.sh") +else() + execute_process(COMMAND "cmd.exe" "/c" "mkdir artifacts\\obj && eng\\native\\version\\copy_version_files.cmd" WORKING_DIRECTORY "${SOURCE_PATH}") endif() if(VCPKG_TARGET_IS_WINDOWS) @@ -50,11 +51,8 @@ vcpkg_cmake_configure( NO_CHARSET_FLAG OPTIONS "-DSKIP_VERSIONING=1" - "-DCLI_CMAKE_HOST_POLICY_VER:STRING=${PRODUCT_VERSION}" - "-DCLI_CMAKE_HOST_FXR_VER:STRING=${PRODUCT_VERSION}" - "-DCLI_CMAKE_HOST_VER:STRING=${PRODUCT_VERSION}" - "-DCLI_CMAKE_COMMON_HOST_VER:STRING=${PRODUCT_VERSION}" "-DCLI_CMAKE_PKG_RID:STRING=${BASE_RID}" + "-DCLI_CMAKE_FALLBACK_OS:STRING=${RID_PLAT}" "-DCLI_CMAKE_COMMIT_HASH:STRING=${COMMIT_HASH}" "-DCLR_CMAKE_TARGET_ARCH_${ARCH_NAME}=1" "-DCLR_CMAKE_TARGET_ARCH=${RID_ARCH}" diff --git a/ports/nethost/vcpkg.json b/ports/nethost/vcpkg.json index 72d779ff607bb2..2ab3bbff43aac0 100644 --- a/ports/nethost/vcpkg.json +++ b/ports/nethost/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nethost", - "version": "7.0.0", + "version": "8.0.0", "description": "Provides a set of APIs that can be used to host .NET Core (dotnet)", "homepage": "https://github.com/dotnet/runtime/tree/main/src/native/corehost/nethost", "license": "MIT", From 724fa2e25e780ccf184f6279feeb0dc728a04502 Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Thu, 16 Nov 2023 21:45:05 +0100 Subject: [PATCH 2/8] vcpkg x-add-version --all --- versions/baseline.json | 2 +- versions/n-/nethost.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 536a975686f4ae..d63a119e9df45b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5877,7 +5877,7 @@ "port-version": 5 }, "nethost": { - "baseline": "7.0.0", + "baseline": "8.0.0", "port-version": 0 }, "nettle": { diff --git a/versions/n-/nethost.json b/versions/n-/nethost.json index de75f4bd818915..5eb47395389a78 100644 --- a/versions/n-/nethost.json +++ b/versions/n-/nethost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "337fdee5c39b12a4889c8c1b9175e30d8e9bcccc", + "version": "8.0.0", + "port-version": 0 + }, { "git-tree": "d0dbe0f8de11978aea0148c9474377cdc8e88aaf", "version": "7.0.0", From 788fb33f1ab1925578f4555695168425ded382bd Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Fri, 17 Nov 2023 09:45:51 +0100 Subject: [PATCH 3/8] Apply suggestions in PR --- ports/nethost/portfile.cmake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ports/nethost/portfile.cmake b/ports/nethost/portfile.cmake index 5a573f1b36361a..25c857d966ceab 100644 --- a/ports/nethost/portfile.cmake +++ b/ports/nethost/portfile.cmake @@ -1,10 +1,7 @@ -set(PRODUCT_VERSION "8.0.0") -set(COMMIT_HASH "v${PRODUCT_VERSION}") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dotnet/runtime - REF ${COMMIT_HASH} + REF "v${VERSION}" SHA512 a7de43bb294a62b661dd0b8f832c0ee64a6bd4a13deb4f65f51a8a8407cc5094d25cc703223d916451209284e013775a47da226098569e94694f3762a79e1de2 HEAD_REF master PATCHES @@ -53,7 +50,7 @@ vcpkg_cmake_configure( "-DSKIP_VERSIONING=1" "-DCLI_CMAKE_PKG_RID:STRING=${BASE_RID}" "-DCLI_CMAKE_FALLBACK_OS:STRING=${RID_PLAT}" - "-DCLI_CMAKE_COMMIT_HASH:STRING=${COMMIT_HASH}" + "-DCLI_CMAKE_COMMIT_HASH:STRING=v${VERSION}" "-DCLR_CMAKE_TARGET_ARCH_${ARCH_NAME}=1" "-DCLR_CMAKE_TARGET_ARCH=${RID_ARCH}" "-DCLR_CMAKE_HOST_ARCH=${RID_ARCH}" From b660ac0fbe2405d4ad08d91611f42530c807bccc Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Fri, 17 Nov 2023 09:46:49 +0100 Subject: [PATCH 4/8] vcpkg x-add-version --all --- versions/n-/nethost.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/n-/nethost.json b/versions/n-/nethost.json index 5eb47395389a78..c88ed55cab8b31 100644 --- a/versions/n-/nethost.json +++ b/versions/n-/nethost.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "337fdee5c39b12a4889c8c1b9175e30d8e9bcccc", + "git-tree": "a3c72b5a3069d2d75f0d90c8e9b3f445defbf75b", "version": "8.0.0", "port-version": 0 }, From 3744d661c29cf207f7971fe2dd0f65e0f5051c02 Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Fri, 17 Nov 2023 09:48:14 +0100 Subject: [PATCH 5/8] Fix license install --- ports/nethost/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/nethost/portfile.cmake b/ports/nethost/portfile.cmake index 25c857d966ceab..2772a9599d018c 100644 --- a/ports/nethost/portfile.cmake +++ b/ports/nethost/portfile.cmake @@ -72,5 +72,5 @@ else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nethost.h" "#ifdef NETHOST_USE_AS_STATIC" "#if 0") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") From 2c5e5034e518b64329b00f02afcd8e2cedffcfa8 Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Fri, 17 Nov 2023 09:49:13 +0100 Subject: [PATCH 6/8] vcpkg x-add-version --all --- versions/n-/nethost.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/n-/nethost.json b/versions/n-/nethost.json index c88ed55cab8b31..726fa21f253e11 100644 --- a/versions/n-/nethost.json +++ b/versions/n-/nethost.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a3c72b5a3069d2d75f0d90c8e9b3f445defbf75b", + "git-tree": "6a9d5a8407d1683f27bd857a976f205ac942d5f3", "version": "8.0.0", "port-version": 0 }, From f83399c2c341a81e81b17f7992f0bf2210ffb3ac Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Sat, 18 Nov 2023 19:30:35 +0100 Subject: [PATCH 7/8] Apply suggestions in PR --- ports/nethost/portfile.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nethost/portfile.cmake b/ports/nethost/portfile.cmake index 2772a9599d018c..f1421eca2ac66e 100644 --- a/ports/nethost/portfile.cmake +++ b/ports/nethost/portfile.cmake @@ -8,11 +8,16 @@ vcpkg_from_github( 0001-nethost-cmakelists.patch ) -if(NOT VCPKG_TARGET_IS_WINDOWS) - execute_process(COMMAND "sh" "-c" "mkdir -p ${SOURCE_PATH}/artifacts/obj && ${SOURCE_PATH}/eng/native/version/copy_version_files.sh") -else() - execute_process(COMMAND "cmd.exe" "/c" "mkdir artifacts\\obj && eng\\native\\version\\copy_version_files.cmd" WORKING_DIRECTORY "${SOURCE_PATH}") +file(MAKE_DIRECTORY "${SOURCE_PATH}/artifacts/obj") +set(copy_version_files sh -c "${SOURCE_PATH}/eng/native/version/copy_version_files.sh") +if(VCPKG_HOST_IS_WINDOWS) + set(copy_version_files cmd /C "eng\\native\\version\\copy_version_files.cmd") endif() +vcpkg_execute_required_process( + COMMAND ${copy_version_files} + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "copy_version_files-${TARGET_TRIPLET}" +) if(VCPKG_TARGET_IS_WINDOWS) set(RID_PLAT "win") From 2b8555b8d3cb66bcd170467c23bc283760bfe7f8 Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Sat, 18 Nov 2023 19:31:59 +0100 Subject: [PATCH 8/8] vcpkg x-add-version --all --- versions/n-/nethost.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/n-/nethost.json b/versions/n-/nethost.json index 726fa21f253e11..2dd791bafa3184 100644 --- a/versions/n-/nethost.json +++ b/versions/n-/nethost.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6a9d5a8407d1683f27bd857a976f205ac942d5f3", + "git-tree": "4e306025f6213b286479afaf20f15ab10c5a9d51", "version": "8.0.0", "port-version": 0 },