Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nethost] Bump to 8.0.0 #35158

Merged
merged 8 commits into from
Nov 22, 2023
Merged

[nethost] Bump to 8.0.0 #35158

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7f1153
[nethost] Bump to 8.0.0
julianxhokaxhiu Nov 16, 2023
724fa2e
vcpkg x-add-version --all
julianxhokaxhiu Nov 16, 2023
788fb33
Apply suggestions in PR
julianxhokaxhiu Nov 17, 2023
b660ac0
vcpkg x-add-version --all
julianxhokaxhiu Nov 17, 2023
3744d66
Fix license install
julianxhokaxhiu Nov 17, 2023
2c5e503
vcpkg x-add-version --all
julianxhokaxhiu Nov 17, 2023
f83399c
Apply suggestions in PR
julianxhokaxhiu Nov 18, 2023
2b8555b
vcpkg x-add-version --all
julianxhokaxhiu Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions ports/nethost/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
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")
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)
Expand Down Expand Up @@ -50,12 +48,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}"
Expand All @@ -77,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}")
2 changes: 1 addition & 1 deletion ports/nethost/vcpkg.json
View file
Open in desktop
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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5877,7 +5877,7 @@
"port-version": 5
},
"nethost": {
"baseline": "7.0.0",
"baseline": "8.0.0",
"port-version": 0
},
"nettle": {
Expand Down
5 changes: 5 additions & 0 deletions versions/n-/nethost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6a9d5a8407d1683f27bd857a976f205ac942d5f3",
"version": "8.0.0",
"port-version": 0
},
{
"git-tree": "d0dbe0f8de11978aea0148c9474377cdc8e88aaf",
"version": "7.0.0",
Expand Down