Skip to content

Commit

Permalink
[nethost] Bump to 8.0.0 (microsoft#35158)
Browse files Browse the repository at this point in the history
* [nethost] Bump to 8.0.0

* vcpkg x-add-version --all

* Apply suggestions in PR

* vcpkg x-add-version --all

* Fix license install

* vcpkg x-add-version --all

* Apply suggestions in PR

* vcpkg x-add-version --all
julianxhokaxhiu authored Nov 22, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent d54715d commit dfbe9e7
Showing 4 changed files with 21 additions and 16 deletions.
28 changes: 14 additions & 14 deletions ports/nethost/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
set(COMMIT_HASH v7.0.0)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO dotnet/runtime
REF ${COMMIT_HASH}
SHA512 59210df1d9541018a21a7e89e0f552ad35c849f49be31cf47e2a85086363cdabd2bf8ce652d2024479977ae059d658c3bd18de3bdaeb8cb3ddd71f2413f266bc
REF "v${VERSION}"
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")
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")
@@ -50,12 +53,9 @@ 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_COMMIT_HASH:STRING=${COMMIT_HASH}"
"-DCLI_CMAKE_FALLBACK_OS:STRING=${RID_PLAT}"
"-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}"
@@ -77,5 +77,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}")
2 changes: 1 addition & 1 deletion ports/nethost/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
@@ -5897,7 +5897,7 @@
"port-version": 5
},
"nethost": {
"baseline": "7.0.0",
"baseline": "8.0.0",
"port-version": 0
},
"nettle": {
5 changes: 5 additions & 0 deletions versions/n-/nethost.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4e306025f6213b286479afaf20f15ab10c5a9d51",
"version": "8.0.0",
"port-version": 0
},
{
"git-tree": "d0dbe0f8de11978aea0148c9474377cdc8e88aaf",
"version": "7.0.0",

0 comments on commit dfbe9e7

Please sign in to comment.