vcpkg: Bump nethost to 7.0.2

tsunamods-codes · Jan 15, 2023 · c09eb60 · c09eb60
1 parent 3233de5
commit c09eb60
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/7thWrapperLoader/.vcpkg/ports/nethost/0001-nethost-cmakelists.patch b/7thWrapperLoader/.vcpkg/ports/nethost/0001-nethost-cmakelists.patch
@@ -1,5 +1,5 @@
 diff --git a/src/native/corehost/nethost/CMakeLists.txt b/src/native/corehost/nethost/CMakeLists.txt
-index 5ae3f76e8fe..0aabb9179a4 100644
+index 5ae3f76e8fe..9c0209ba9bc 100644
 --- a/src/native/corehost/nethost/CMakeLists.txt
 +++ b/src/native/corehost/nethost/CMakeLists.txt
 @@ -1,11 +1,14 @@
@@ -41,7 +41,7 @@ index 5ae3f76e8fe..0aabb9179a4 100644
  # Copy static lib PDB to the project output directory
  if (WIN32)
      set_target_properties(libnethost PROPERTIES
-@@ -32,11 +46,15 @@ if (WIN32)
+@@ -32,12 +46,17 @@ if (WIN32)
          COMPILE_PDB_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}"
      )
  endif(WIN32)
@@ -59,11 +59,15 @@ index 5ae3f76e8fe..0aabb9179a4 100644
 +    RUNTIME DESTINATION bin
 +)
 
++if(NOT BUILD_SHARED_LIBS)
  if (MSVC)
      # We ship libnethost.lib as a static library for external consumption, so
-@@ -48,9 +66,8 @@ if (MSVC)
+     # LTCG must be disabled to ensure that non-MSVC toolchains can work with it.
+@@ -47,10 +66,10 @@ if (MSVC)
+     string(REPLACE "/LTCG" "" CMAKE_STATIC_LINKER_FLAGS_RELEASE ${CMAKE_STATIC_LINKER_FLAGS_RELEASE})
      string(REPLACE "/LTCG" "" CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO ${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO})
  endif()
++endif()
 
 -# Only Windows creates a symbols file for static libs.
 -if (WIN32)

diff --git a/7thWrapperLoader/.vcpkg/ports/nethost/portfile.cmake b/7thWrapperLoader/.vcpkg/ports/nethost/portfile.cmake
@@ -1,16 +1,20 @@
-set(COMMIT_HASH v7.0.0)
+set(COMMIT_HASH v7.0.2)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dotnet/runtime
     REF ${COMMIT_HASH}
-    SHA512 59210df1d9541018a21a7e89e0f552ad35c849f49be31cf47e2a85086363cdabd2bf8ce652d2024479977ae059d658c3bd18de3bdaeb8cb3ddd71f2413f266bc
+    SHA512 cd63fca1ca41c824602acabd8130da56f890abf954a6aa4b0be211c4b365c4363eb9af0668c37350543cac3982d06ccef725ae07494ff484517191f88e0ee76e
     HEAD_REF master
     PATCHES
         0001-nethost-cmakelists.patch
 )
 
-set(PRODUCT_VERSION "7.0.0")
+set(PRODUCT_VERSION "7.0.2")
+
+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")
+endif()
 
 if(VCPKG_TARGET_IS_WINDOWS)
   set(RID_PLAT "win")

diff --git a/7thWrapperLoader/.vcpkg/ports/nethost/vcpkg.json b/7thWrapperLoader/.vcpkg/ports/nethost/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "nethost",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Provides a set of APIs that can be used to host .NET Core (dotnet)",
-  "homepage": "https://github.com/dotnet/runtime/tree/master/src/installer/corehost/cli/nethost",
-  "supports": "!uwp",
+  "homepage": "https://github.com/dotnet/runtime/tree/main/src/native/corehost/nethost",
+  "license": "MIT",
+  "supports": "(windows & !uwp), (linux, osx)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/7thWrapperLoader/.vcpkg/versions/baseline.json b/7thWrapperLoader/.vcpkg/versions/baseline.json
@@ -1,7 +1,7 @@
 {
   "default": {
     "nethost": {
-      "baseline": "7.0.0",
+      "baseline": "7.0.2",
       "port-version": 0
     },
     "stackwalker": {

diff --git a/7thWrapperLoader/.vcpkg/versions/n-/nethost.json b/7thWrapperLoader/.vcpkg/versions/n-/nethost.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "version": "7.0.0",
+      "version": "7.0.2",
       "path": "$/ports/nethost"
     }
   ]

diff --git a/7thWrapperLoader/vcpkg.json b/7thWrapperLoader/vcpkg.json
@@ -17,7 +17,7 @@
     },
     {
       "name": "nethost",
-      "version": "7.0.0",
+      "version": "7.0.2",
       "port-version": 0
     },
     {