Skip to content

[release/8.0-staging] Stop trying to format HOST_RUNTIME_CONTRACT property with locale settings #97891

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
jeffschwMSFT merged 1 commit into from
Feb 9, 2024
Merged

[release/8.0-staging] Stop trying to format HOST_RUNTIME_CONTRACT property with locale settings #97891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/native/corehost/hostpolicy/deps_resolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,8 @@ bool deps_resolver_t::probe_deps_entry(const deps_entry_t& entry, const pal::str

for (const auto& config : m_probes)
{
trace::verbose(_X(" Using probe config: %s"), config.as_str().c_str());
if (trace::is_enabled())
trace::verbose(_X(" Using probe config: %s"), config.as_str().c_str());

if (config.is_servicing() && !entry.is_serviceable)
{
Expand Down
6 changes: 3 additions & 3 deletions src/native/corehost/hostpolicy/hostpolicy_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,9 @@ int hostpolicy_context_t::initialize(const hostpolicy_init_t &hostpolicy_init, c
}

host_contract.get_runtime_property = &get_runtime_property;
pal::stringstream_t ptr_stream;
ptr_stream << "0x" << std::hex << (size_t)(&host_contract);
if (!coreclr_properties.add(_STRINGIFY(HOST_PROPERTY_RUNTIME_CONTRACT), ptr_stream.str().c_str()))
pal::char_t buffer[STRING_LENGTH("0xffffffffffffffff")];
pal::snwprintf(buffer, ARRAY_SIZE(buffer), _X("0x%zx"), (size_t)(&host_contract));
if (!coreclr_properties.add(_STRINGIFY(HOST_PROPERTY_RUNTIME_CONTRACT), buffer))
{
log_duplicate_property_error(_STRINGIFY(HOST_PROPERTY_RUNTIME_CONTRACT));
return StatusCode::LibHostDuplicateProperty;
Expand Down