Convert nethost to C#129828

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

Merged
elinor-fung merged 12 commits into from
Jul 2, 2026
Merged

Convert nethost to C #129828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2340343
Add C pal_get_loaded_library
elinor-fung Jun 18, 2026
ec86642
Convert fxr_resolver_try_get_existing_fxr to C
elinor-fung Jun 18, 2026
61fde33
Convert nethost to C
elinor-fung Jun 18, 2026
190e36a
Remove the C++ fxr_resolver wrappers
elinor-fung Jun 18, 2026
9189c4b
Link nethost against a C-only hostmisc
elinor-fung Jun 18, 2026
a525dd7
Address PR review feedback
elinor-fung Jun 25, 2026
3ce2f43
Drop single-field find_max_version_context_t wrapper
elinor-fung Jun 25, 2026
9179007
Potential fix for pull request finding
elinor-fung Jun 25, 2026
c6e1062
Apply suggestions from code review
elinor-fung Jun 30, 2026
129203b
Scope hostfxr_resolver raw path pointers to their lifetime
elinor-fung Jun 30, 2026
0a52486
Potential fix for pull request finding
elinor-fung Jul 1, 2026
c6f2953
Apply suggestions from code review
elinor-fung Jul 1, 2026
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
2 changes: 1 addition & 1 deletion src/installer/managed/Microsoft.NET.HostModel/AppHost/HostWriter.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/native/corehost/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down
34 changes: 28 additions & 6 deletions src/native/corehost/apphost/standalone/hostfxr_resolver.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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))
Expand All@@ -114,7 +116,27 @@ 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))
bool resolved;
{
pal_char_t* dotnet_root = nullptr;
pal_char_t* fxr_path = nullptr;
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;
}
Expand Down
1 change: 0 additions & 1 deletion src/native/corehost/apphost/static/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion src/native/corehost/comhost/comhost.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down
43 changes: 23 additions & 20 deletions src/native/corehost/fxr_resolver.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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"
Expand All@@ -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);

Expand All@@ -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;
}

Expand All@@ -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)
Expand DownExpand Up@@ -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;
}
66 changes: 0 additions & 66 deletions src/native/corehost/fxr_resolver.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Convert nethost to C#129828

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

 Merged

elinor-fung
merged 12 commits into

from

Jul 2, 2026
 Merged


Convert nethost to C
#129828
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2340343

Add C pal_get_loaded_library


elinor-fung Jun 18, 2026
ec86642

Convert fxr_resolver_try_get_existing_fxr to C


elinor-fung Jun 18, 2026
61fde33

Convert nethost to C


elinor-fung Jun 18, 2026
190e36a

Remove the C++ fxr_resolver wrappers


elinor-fung Jun 18, 2026
9189c4b

Link nethost against a C-only hostmisc


elinor-fung Jun 18, 2026
a525dd7

Address PR review feedback


elinor-fung Jun 25, 2026
3ce2f43

Drop single-field find_max_version_context_t wrapper


elinor-fung Jun 25, 2026
9179007

Potential fix for pull request finding


elinor-fung Jun 25, 2026
c6e1062

Apply suggestions from code review


elinor-fung Jun 30, 2026
129203b

Scope hostfxr_resolver raw path pointers to their lifetime


elinor-fung Jun 30, 2026
0a52486

Potential fix for pull request finding


elinor-fung Jul 1, 2026
c6f2953

Apply suggestions from code review


elinor-fung Jul 1, 2026

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


2 changes: 1 addition & 1 deletion
src/installer/managed/Microsoft.NET.HostModel/AppHost/HostWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

34 changes: 28 additions & 6 deletions
src/native/corehost/apphost/standalone/hostfxr_resolver.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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))
Expand All@@ -114,7 +116,27 @@ 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))
 bool resolved;
 {
 pal_char_t* dotnet_root = nullptr;
 pal_char_t* fxr_path = nullptr;
 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;
 }
Expand Down

1 change: 0 additions & 1 deletion
src/native/corehost/apphost/static/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
)
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/comhost/comhost.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

43 changes: 23 additions & 20 deletions
src/native/corehost/fxr_resolver.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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"
Expand All@@ -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);

Expand All@@ -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;
}

Expand All@@ -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)
Expand DownExpand Up@@ -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;
}

66 changes: 0 additions & 66 deletions
src/native/corehost/fxr_resolver.cpp

View file


Open in desktop


This file was deleted.

Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert nethost to C#129828

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

 Merged

elinor-fung
merged 12 commits into

from

Jul 2, 2026
 Merged


Convert nethost to C
#129828
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2340343

Add C pal_get_loaded_library


elinor-fung Jun 18, 2026
ec86642

Convert fxr_resolver_try_get_existing_fxr to C


elinor-fung Jun 18, 2026
61fde33

Convert nethost to C


elinor-fung Jun 18, 2026
190e36a

Remove the C++ fxr_resolver wrappers


elinor-fung Jun 18, 2026
9189c4b

Link nethost against a C-only hostmisc


elinor-fung Jun 18, 2026
a525dd7

Address PR review feedback


elinor-fung Jun 25, 2026
3ce2f43

Drop single-field find_max_version_context_t wrapper


elinor-fung Jun 25, 2026
9179007

Potential fix for pull request finding


elinor-fung Jun 25, 2026
c6e1062

Apply suggestions from code review


elinor-fung Jun 30, 2026
129203b

Scope hostfxr_resolver raw path pointers to their lifetime


elinor-fung Jun 30, 2026
0a52486

Potential fix for pull request finding


elinor-fung Jul 1, 2026
c6f2953

Apply suggestions from code review


elinor-fung Jul 1, 2026

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


2 changes: 1 addition & 1 deletion
src/installer/managed/Microsoft.NET.HostModel/AppHost/HostWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

34 changes: 28 additions & 6 deletions
src/native/corehost/apphost/standalone/hostfxr_resolver.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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))
Expand All@@ -114,7 +116,27 @@ 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))
 bool resolved;
 {
 pal_char_t* dotnet_root = nullptr;
 pal_char_t* fxr_path = nullptr;
 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;
 }
Expand Down

1 change: 0 additions & 1 deletion
src/native/corehost/apphost/static/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
)
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/comhost/comhost.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

43 changes: 23 additions & 20 deletions
src/native/corehost/fxr_resolver.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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"
Expand All@@ -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);

Expand All@@ -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;
}

Expand All@@ -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)
Expand DownExpand Up@@ -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;
}

66 changes: 0 additions & 66 deletions
src/native/corehost/fxr_resolver.cpp

View file


Open in desktop


This file was deleted.

Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert nethost to C#129828

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

 Merged

elinor-fung
merged 12 commits into

from

Jul 2, 2026
 Merged


Convert nethost to C
#129828
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2340343

Add C pal_get_loaded_library


elinor-fung Jun 18, 2026
ec86642

Convert fxr_resolver_try_get_existing_fxr to C


elinor-fung Jun 18, 2026
61fde33

Convert nethost to C


elinor-fung Jun 18, 2026
190e36a

Remove the C++ fxr_resolver wrappers


elinor-fung Jun 18, 2026
9189c4b

Link nethost against a C-only hostmisc


elinor-fung Jun 18, 2026
a525dd7

Address PR review feedback


elinor-fung Jun 25, 2026
3ce2f43

Drop single-field find_max_version_context_t wrapper


elinor-fung Jun 25, 2026
9179007

Potential fix for pull request finding


elinor-fung Jun 25, 2026
c6e1062

Apply suggestions from code review


elinor-fung Jun 30, 2026
129203b

Scope hostfxr_resolver raw path pointers to their lifetime


elinor-fung Jun 30, 2026
0a52486

Potential fix for pull request finding


elinor-fung Jul 1, 2026
c6f2953

Apply suggestions from code review


elinor-fung Jul 1, 2026

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


2 changes: 1 addition & 1 deletion
src/installer/managed/Microsoft.NET.HostModel/AppHost/HostWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

34 changes: 28 additions & 6 deletions
src/native/corehost/apphost/standalone/hostfxr_resolver.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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))
Expand All@@ -114,7 +116,27 @@ 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))
 bool resolved;
 {
 pal_char_t* dotnet_root = nullptr;
 pal_char_t* fxr_path = nullptr;
 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;
 }
Expand Down

1 change: 0 additions & 1 deletion
src/native/corehost/apphost/static/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
)
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/comhost/comhost.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

43 changes: 23 additions & 20 deletions
src/native/corehost/fxr_resolver.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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"
Expand All@@ -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);

Expand All@@ -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;
}

Expand All@@ -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)
Expand DownExpand Up@@ -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;
}

66 changes: 0 additions & 66 deletions
src/native/corehost/fxr_resolver.cpp

View file


Open in desktop


This file was deleted.

Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Convert nethost to C#129828

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

 Merged

elinor-fung
merged 12 commits into

from

Jul 2, 2026
 Merged


Convert nethost to C
#129828
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2340343

Add C pal_get_loaded_library


elinor-fung Jun 18, 2026
ec86642

Convert fxr_resolver_try_get_existing_fxr to C


elinor-fung Jun 18, 2026
61fde33

Convert nethost to C


elinor-fung Jun 18, 2026
190e36a

Remove the C++ fxr_resolver wrappers


elinor-fung Jun 18, 2026
9189c4b

Link nethost against a C-only hostmisc


elinor-fung Jun 18, 2026
a525dd7

Address PR review feedback


elinor-fung Jun 25, 2026
3ce2f43

Drop single-field find_max_version_context_t wrapper


elinor-fung Jun 25, 2026
9179007

Potential fix for pull request finding


elinor-fung Jun 25, 2026
c6e1062

Apply suggestions from code review


elinor-fung Jun 30, 2026
129203b

Scope hostfxr_resolver raw path pointers to their lifetime


elinor-fung Jun 30, 2026
0a52486

Potential fix for pull request finding


elinor-fung Jul 1, 2026
c6f2953

Apply suggestions from code review


elinor-fung Jul 1, 2026

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


2 changes: 1 addition & 1 deletion
src/installer/managed/Microsoft.NET.HostModel/AppHost/HostWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

34 changes: 28 additions & 6 deletions
src/native/corehost/apphost/standalone/hostfxr_resolver.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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))
Expand All@@ -114,7 +116,27 @@ 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))
 bool resolved;
 {
 pal_char_t* dotnet_root = nullptr;
 pal_char_t* fxr_path = nullptr;
 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;
 }
Expand Down

1 change: 0 additions & 1 deletion
src/native/corehost/apphost/static/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
)
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/comhost/comhost.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

43 changes: 23 additions & 20 deletions
src/native/corehost/fxr_resolver.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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"
Expand All@@ -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);

Expand All@@ -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;
}

Expand All@@ -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)
Expand DownExpand Up@@ -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;
}

66 changes: 0 additions & 66 deletions
src/native/corehost/fxr_resolver.cpp

View file


Open in desktop


This file was deleted.

Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert nethost to C#129828

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

 Merged

elinor-fung
merged 12 commits into

from

Jul 2, 2026
 Merged


Convert nethost to C
#129828
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2340343

Add C pal_get_loaded_library


elinor-fung Jun 18, 2026
ec86642

Convert fxr_resolver_try_get_existing_fxr to C


elinor-fung Jun 18, 2026
61fde33

Convert nethost to C


elinor-fung Jun 18, 2026
190e36a

Remove the C++ fxr_resolver wrappers


elinor-fung Jun 18, 2026
9189c4b

Link nethost against a C-only hostmisc


elinor-fung Jun 18, 2026
a525dd7

Address PR review feedback


elinor-fung Jun 25, 2026
3ce2f43

Drop single-field find_max_version_context_t wrapper


elinor-fung Jun 25, 2026
9179007

Potential fix for pull request finding


elinor-fung Jun 25, 2026
c6e1062

Apply suggestions from code review


elinor-fung Jun 30, 2026
129203b

Scope hostfxr_resolver raw path pointers to their lifetime


elinor-fung Jun 30, 2026
0a52486

Potential fix for pull request finding


elinor-fung Jul 1, 2026
c6f2953

Apply suggestions from code review


elinor-fung Jul 1, 2026

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


2 changes: 1 addition & 1 deletion
src/installer/managed/Microsoft.NET.HostModel/AppHost/HostWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

34 changes: 28 additions & 6 deletions
src/native/corehost/apphost/standalone/hostfxr_resolver.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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))
Expand All@@ -114,7 +116,27 @@ 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))
 bool resolved;
 {
 pal_char_t* dotnet_root = nullptr;
 pal_char_t* fxr_path = nullptr;
 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;
 }
Expand Down

1 change: 0 additions & 1 deletion
src/native/corehost/apphost/static/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
)
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/comhost/comhost.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

43 changes: 23 additions & 20 deletions
src/native/corehost/fxr_resolver.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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"
Expand All@@ -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);

Expand All@@ -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;
}

Expand All@@ -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)
Expand DownExpand Up@@ -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;
}

66 changes: 0 additions & 66 deletions
src/native/corehost/fxr_resolver.cpp

View file


Open in desktop


This file was deleted.

Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert nethost to C#129828

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

 Merged

elinor-fung
merged 12 commits into

from

Jul 2, 2026
 Merged


Convert nethost to C
#129828
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2340343

Add C pal_get_loaded_library


elinor-fung Jun 18, 2026
ec86642

Convert fxr_resolver_try_get_existing_fxr to C


elinor-fung Jun 18, 2026
61fde33

Convert nethost to C


elinor-fung Jun 18, 2026
190e36a

Remove the C++ fxr_resolver wrappers


elinor-fung Jun 18, 2026
9189c4b

Link nethost against a C-only hostmisc


elinor-fung Jun 18, 2026
a525dd7

Address PR review feedback


elinor-fung Jun 25, 2026
3ce2f43

Drop single-field find_max_version_context_t wrapper


elinor-fung Jun 25, 2026
9179007

Potential fix for pull request finding


elinor-fung Jun 25, 2026
c6e1062

Apply suggestions from code review


elinor-fung Jun 30, 2026
129203b

Scope hostfxr_resolver raw path pointers to their lifetime


elinor-fung Jun 30, 2026
0a52486

Potential fix for pull request finding


elinor-fung Jul 1, 2026
c6f2953

Apply suggestions from code review


elinor-fung Jul 1, 2026

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


2 changes: 1 addition & 1 deletion
src/installer/managed/Microsoft.NET.HostModel/AppHost/HostWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

34 changes: 28 additions & 6 deletions
src/native/corehost/apphost/standalone/hostfxr_resolver.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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))
Expand All@@ -114,7 +116,27 @@ 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))
 bool resolved;
 {
 pal_char_t* dotnet_root = nullptr;
 pal_char_t* fxr_path = nullptr;
 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;
 }
Expand Down

1 change: 0 additions & 1 deletion
src/native/corehost/apphost/static/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
)
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/comhost/comhost.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

43 changes: 23 additions & 20 deletions
src/native/corehost/fxr_resolver.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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"
Expand All@@ -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);

Expand All@@ -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;
}

Expand All@@ -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)
Expand DownExpand Up@@ -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;
}

66 changes: 0 additions & 66 deletions
src/native/corehost/fxr_resolver.cpp

View file


Open in desktop


This file was deleted.

Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Convert nethost to C#129828

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

 Merged

elinor-fung
merged 12 commits into

from

Jul 2, 2026
 Merged


Convert nethost to C
#129828
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
2340343

Add C pal_get_loaded_library


elinor-fung Jun 18, 2026
ec86642

Convert fxr_resolver_try_get_existing_fxr to C


elinor-fung Jun 18, 2026
61fde33

Convert nethost to C


elinor-fung Jun 18, 2026
190e36a

Remove the C++ fxr_resolver wrappers


elinor-fung Jun 18, 2026
9189c4b

Link nethost against a C-only hostmisc


elinor-fung Jun 18, 2026
a525dd7

Address PR review feedback


elinor-fung Jun 25, 2026
3ce2f43

Drop single-field find_max_version_context_t wrapper


elinor-fung Jun 25, 2026
9179007

Potential fix for pull request finding


elinor-fung Jun 25, 2026
c6e1062

Apply suggestions from code review


elinor-fung Jun 30, 2026
129203b

Scope hostfxr_resolver raw path pointers to their lifetime


elinor-fung Jun 30, 2026
0a52486

Potential fix for pull request finding


elinor-fung Jul 1, 2026
c6f2953

Apply suggestions from code review


elinor-fung Jul 1, 2026

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


2 changes: 1 addition & 1 deletion
src/installer/managed/Microsoft.NET.HostModel/AppHost/HostWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand Down

34 changes: 28 additions & 6 deletions
src/native/corehost/apphost/standalone/hostfxr_resolver.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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
Expand DownExpand Up@@ -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))
Expand All@@ -114,7 +116,27 @@ 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))
 bool resolved;
 {
 pal_char_t* dotnet_root = nullptr;
 pal_char_t* fxr_path = nullptr;
 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;
 }
Expand Down

1 change: 0 additions & 1 deletion
src/native/corehost/apphost/static/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
)
Expand Down

2 changes: 1 addition & 1 deletion
src/native/corehost/comhost/comhost.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

43 changes: 23 additions & 20 deletions
src/native/corehost/fxr_resolver.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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"
Expand All@@ -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);

Expand All@@ -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;
}

Expand All@@ -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)
Expand DownExpand Up@@ -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;
}

66 changes: 0 additions & 66 deletions
src/native/corehost/fxr_resolver.cpp

View file


Open in desktop


This file was deleted.

Loading
Loading