Merge pull request #94 from GmodNET/HostfxrFullPath

Hostfxr full path

Author: SupinePandora43

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ env:
 jobs:
  linux-build:
 
-   runs-on: ubuntu-18.04
+   runs-on: ubuntu-20.04
 
    steps:
     - name: Checkout
@@ -51,7 +51,17 @@ jobs:
     - name: Run Garry's Mod
       run: ./srcds_run_x64 -game garrysmod -systemtest +sv_hibernate_think 1 || true
       working-directory: ./gmod/
-      timeout-minutes: 5
+      timeout-minutes: 1
+      continue-on-error: true
+      env:
+        COREHOST_TRACE: 1
+        COREHOST_TRACE_VERBOSITY: 4
+        COREHOST_TRACEFILE: corehost_trace.txt
+
+    - name: Print Corehost trace
+      working-directory: ./gmod/
+      run: cat corehost_trace.txt
+      continue-on-error: true
 
     - name: Print test log
       run: cat gmod/tests-log.txt

gm_dotnet_native/dotnethelper-src/dotnethelper.cpp

@@ -9,6 +9,7 @@
 #include "LuaAPIExposure.h"
 #include <string>
 #include <fstream>
+#include <filesystem>
 #ifdef WIN32
 #include <Windows.h>
 #else
@@ -45,7 +46,7 @@ std::string hosfxr_path = "garrysmod/lua/bin/dotnet/host/fxr/" + std::string(NET
 #ifdef WIN32
 void* hostfxr_library_handle = LoadLibraryA((hosfxr_path + "/hostfxr.dll").c_str());
 #elif __APPLE__
-void* hostfxr_library_handle = dlopen((hosfxr_path + "/libhostfxr.dylib").c_str(), RTLD_LAZY);
+void* hostfxr_library_handle = dlopen((hosfxr_path + "/libhostfxr.dylib").c_str(), RTLD_LAZY | RTLD_LOCAL);
 #elif __gnu_linux__
 void* hostfxr_library_handle = dlopen((hosfxr_path + "/libhostfxr.so").c_str(), RTLD_LAZY);
 #endif
@@ -184,11 +185,10 @@ extern "C" DYNANAMIC_EXPORT cleanup_function_fn InitNetRuntime(GarrysMod::Lua::I
         game_exe_path[game_exe_path_len] = '\0';
 #endif
         dotnet_runtime_params.host_path = game_exe_path;
-#ifdef WIN32
-        dotnet_runtime_params.dotnet_root = L"garrysmod/lua/bin/dotnet";
-#else
-        dotnet_runtime_params.dotnet_root = "garrysmod/lua/bin/dotnet";
-#endif
+
+        std::filesystem::path dotnet_root_path = std::filesystem::current_path() / "garrysmod" / "lua" / "bin" / "dotnet";
+        dotnet_runtime_params.dotnet_root = dotnet_root_path.native().c_str();
+
         int init_success_code = hostfxr_initialize_for_dotnet_command_line(2, dotnet_args, &dotnet_runtime_params, &runtime_environment_handle);
         if(init_success_code != 0)
         {