Convert nethost to C

src/installer/managed/Microsoft.NET.HostModel/AppHost/HostWriter.cs

@@ -38,7 +38,7 @@ public static partial class HostWriter
 
         public class DotNetSearchOptions
         {
-            // Keep in sync with fxr_resolver::search_location in fxr_resolver.h
+            // Keep in sync with fxr_search_location in fxr_resolver.h
             [Flags]
             public enum SearchLocation : byte
             {

src/native/corehost/CMakeLists.txt

@@ -83,7 +83,7 @@ endif()
 
 if(NOT CLR_CMAKE_TARGET_BROWSER)
     add_library(fxr_resolver INTERFACE)
-    target_sources(fxr_resolver INTERFACE fxr_resolver.cpp fxr_resolver.c)
+    target_sources(fxr_resolver INTERFACE fxr_resolver.c)
     target_include_directories(fxr_resolver INTERFACE fxr)
 
     add_compile_definitions(RAPIDJSON_HAS_CXX17)

src/native/corehost/apphost/standalone/hostfxr_resolver.cpp

@@ -6,6 +6,8 @@
 #include "pal.h"
 #include "fxr_resolver.h"
 #include "trace.h"
+#include "utils.h"
+#include "error_codes.h"
 #include "hostfxr_resolver.h"
 
 namespace
@@ -14,22 +16,22 @@ namespace
     #define EMBED_DOTNET_SEARCH_HI_PART_UTF8 "19ff3e9c3602ae8e841925bb461a0adb"
     #define EMBED_DOTNET_SEARCH_LO_PART_UTF8 "064a1f1903667a5e0d87e8f608f425ac"
 
-    // <fxr_resolver::search_location_default> \0 <app_relative_dotnet_placeholder>
+    // <fxr_search_location_default> \0 <app_relative_dotnet_placeholder>
     #define EMBED_DOTNET_SEARCH_FULL_UTF8    ("\0\0" EMBED_DOTNET_SEARCH_HI_PART_UTF8 EMBED_DOTNET_SEARCH_LO_PART_UTF8)
 
     // Get the .NET search options that should be used
     // Returns false if options are invalid - for example, app-relative search was specified, but the path is invalid or not embedded
-    bool try_get_dotnet_search_options(fxr_resolver::search_location& out_search_location, pal::string_t& out_app_relative_dotnet)
+    bool try_get_dotnet_search_options(fxr_search_location& out_search_location, pal::string_t& out_app_relative_dotnet)
     {
         constexpr int EMBED_SIZE = 512;
         static_assert(sizeof(EMBED_DOTNET_SEARCH_FULL_UTF8) / sizeof(EMBED_DOTNET_SEARCH_FULL_UTF8[0]) < EMBED_SIZE, "Placeholder value for .NET search options longer than expected");
 
         // Contains the EMBED_DOTNET_SEARCH_FULL_UTF8 value at compile time or app-relative .NET path written by the SDK (dotnet publish).
         static char embed[EMBED_SIZE] = EMBED_DOTNET_SEARCH_FULL_UTF8;
 
-        out_search_location = (fxr_resolver::search_location)embed[0];
+        out_search_location = (fxr_search_location)embed[0];
         assert(embed[1] == 0); // NUL separates the search location and embedded .NET root value
-        if ((out_search_location & fxr_resolver::search_location_app_relative) == 0)
+        if ((out_search_location & fxr_search_location_app_relative) == 0)
             return true;
 
         // Get the embedded app-relative .NET path
@@ -98,7 +100,7 @@ hostfxr_main_fn hostfxr_resolver_t::resolve_main_v1()
 
 hostfxr_resolver_t::hostfxr_resolver_t(const pal::string_t& app_root)
 {
-    fxr_resolver::search_location search_location = fxr_resolver::search_location_default;
+    fxr_search_location search_location = fxr_search_location_default;
     pal::string_t app_relative_dotnet;
     pal::string_t app_relative_dotnet_path;
     if (!try_get_dotnet_search_options(search_location, app_relative_dotnet))
@@ -114,7 +116,24 @@ hostfxr_resolver_t::hostfxr_resolver_t(const pal::string_t& app_root)
         append_path(&app_relative_dotnet_path, app_relative_dotnet.c_str());
     }
 
-    if (!fxr_resolver::try_get_path(app_root, search_location, &app_relative_dotnet_path, &m_dotnet_root, &m_fxr_path))
+    pal_char_t* dotnet_root = nullptr;
+    pal_char_t* fxr_path = nullptr;
+    bool resolved = fxr_resolver_try_get_path(
+        app_root.c_str(),
+        search_location,
+        app_relative_dotnet_path.empty() ? nullptr : app_relative_dotnet_path.c_str(),
+        &dotnet_root,
+        &fxr_path);
+    if (resolved)
+    {
+        m_dotnet_root.assign(dotnet_root);
+        m_fxr_path.assign(fxr_path);
+    }
+
+    free(dotnet_root);
+    free(fxr_path);
+
+    if (!resolved)
     {
         m_status_code = StatusCode::CoreHostLibMissingFailure;
     }

src/native/corehost/apphost/static/CMakeLists.txt

@@ -30,7 +30,6 @@ set(SOURCES
     ./hostfxr_resolver.cpp
     ./hostpolicy_resolver.cpp
     ../../hostpolicy/static/coreclr_resolver.cpp
-    ../../fxr_resolver.cpp
     ../../fxr_resolver.c
     ../../corehost.cpp
 )

src/native/corehost/comhost/comhost.cpp

@@ -4,7 +4,7 @@
 #include "comhost.h"
 #include "redirected_error_writer.h"
 #include "hostfxr.h"
-#include "fxr_resolver.h"
+#include "load_fxr_and_get_delegate.h"
 #include "pal.h"
 #include "trace.h"
 #include "error_codes.h"

src/native/corehost/fxr_resolver.c

@@ -1,10 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-// C implementation of the fxr_resolver_* APIs (the C++ fxr_resolver:: namespace
-// in fxr_resolver.cpp now delegates here). try_get_existing_fxr stays in C++
-// because pal::get_loaded_library is templated/typed for C++ callers.
-
 #include "fxr_resolver.h"
 
 #include "fx_ver.h"
@@ -21,14 +17,9 @@
      | fxr_search_location_environment_variable \
      | fxr_search_location_global)
 
-typedef struct
-{
-    c_fx_ver_t max_ver;
-} find_max_version_context_t;
-
 static bool find_max_version_callback(const pal_char_t* entry_name, void* ctx_in)
 {
-    find_max_version_context_t* ctx = (find_max_version_context_t*)ctx_in;
+    c_fx_ver_t* max_ver = (c_fx_ver_t*)ctx_in;
 
     trace_info(_X("Considering fxr version=[%s]..."), entry_name);
 
@@ -40,14 +31,14 @@ static bool find_max_version_callback(const pal_char_t* entry_name, void* ctx_in
         return true;
     }
 
-    if (!c_fx_ver_is_empty(&ctx->max_ver) && c_fx_ver_compare(&ver, &ctx->max_ver) <= 0)
+    if (!c_fx_ver_is_empty(max_ver) && c_fx_ver_compare(&ver, max_ver) <= 0)
     {
         c_fx_ver_cleanup(&ver);
         return true;
     }
 
-    c_fx_ver_cleanup(&ctx->max_ver);
-    ctx->max_ver = ver; // transfer ownership of pre/build
+    c_fx_ver_cleanup(max_ver);
+    *max_ver = ver; // transfer ownership of pre/build
     return true;
 }
 
@@ -58,23 +49,23 @@ static bool get_latest_fxr(const pal_char_t* fxr_root, pal_char_t** out_fxr_path
 {
     trace_info(_X("Reading fx resolver directory=[%s]"), fxr_root);
 
-    find_max_version_context_t ctx;
-    c_fx_ver_init(&ctx.max_ver);
+    c_fx_ver_t max_ver;
+    c_fx_ver_init(&max_ver);
 
-    pal_readdir_onlydirectories(fxr_root, find_max_version_callback, &ctx);
+    pal_readdir_onlydirectories(fxr_root, find_max_version_callback, &max_ver);
 
-    if (c_fx_ver_is_empty(&ctx.max_ver))
+    if (c_fx_ver_is_empty(&max_ver))
     {
         trace_error(_X("Error: [%s] does not contain any version-numbered child folders"), fxr_root);
-        c_fx_ver_cleanup(&ctx.max_ver);
+        c_fx_ver_cleanup(&max_ver);
         return false;
     }
 
     // SemVer does not define a size limit on version string, but calls out a reasonable max of 255 characters:
     // https://semver.org/#does-semver-have-a-size-limit-on-the-version-string
     pal_char_t max_ver_str[256];
-    c_fx_ver_as_str(&ctx.max_ver, max_ver_str, ARRAY_SIZE(max_ver_str));
-    c_fx_ver_cleanup(&ctx.max_ver);
+    c_fx_ver_as_str(&max_ver, max_ver_str, ARRAY_SIZE(max_ver_str));
+    c_fx_ver_cleanup(&max_ver);
 
     pal_char_t* fxr_dir = utils_append_path_alloc(fxr_root, max_ver_str);
     if (fxr_dir == NULL)
@@ -443,3 +434,15 @@ bool fxr_resolver_try_get_path_from_dotnet_root(
     free(fxr_dir);
     return ok;
 }
+
+bool fxr_resolver_try_get_existing_fxr(pal_dll_t* out_fxr, pal_char_t** out_fxr_path)
+{
+    *out_fxr = NULL;
+    *out_fxr_path = NULL;
+
+    if (!pal_get_loaded_library(LIBFXR_NAME, "hostfxr_main", out_fxr, out_fxr_path))
+        return false;
+
+    trace_verbose(_X("Found previously loaded library %s [%s]."), LIBFXR_NAME, *out_fxr_path);
+    return true;
+}