Skip to content

Add runtime property HOSTFXR_PATH #55369

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
mateoatr merged 5 commits into from
Jul 13, 2021
Merged

Add runtime property HOSTFXR_PATH #55369

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0385fd
Add property HOSTFXR_PATH
Jul 8, 2021
0aa3963
Comment
Jul 8, 2021
fe17786
PR feedback
Jul 9, 2021
68c01c3
Use get_own_module_path since we are on hostfxr
Jul 10, 2021
5757193
Dispose FileStream
Jul 12, 2021
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
Prev Previous commit
Dispose FileStream
  • Loading branch information
Mateo Torres Ruiz committed Jul 12, 2021
commit 5757193f6c67b05423e9cdbb7992c797c5840867
2 changes: 1 addition & 1 deletion src/installer/tests/HostActivation.Tests/DotNetBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public DotNetBuilder AddMockSDK(
string path = Path.Combine(_path, "sdk", version);
Directory.CreateDirectory(path);

File.Create(Path.Combine(path, "dotnet.dll"));
using var _ = File.Create(Path.Combine(path, "dotnet.dll"));

RuntimeConfig dotnetRuntimeConfig = new RuntimeConfig(Path.Combine(path, "dotnet.runtimeconfig.json"));
dotnetRuntimeConfig.WithFramework(new RuntimeConfig.Framework("Microsoft.NETCore.App", MNAVersion));
Expand Down
6 changes: 3 additions & 3 deletions src/native/corehost/fxr/fx_muxer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ int fx_muxer_t::execute(
argv,
new_argoff,
mode,
false,
false /*is_sdk_command*/,
result_buffer,
buffer_size,
required_buffer_size);
Expand Down Expand Up @@ -740,7 +740,7 @@ int fx_muxer_t::initialize_for_app(
host_info.app_path,
opts,
mode,
false,
false /*is_sdk_command*/,
hostpolicy_dir,
init);
if (rc != StatusCode::Success)
Expand Down Expand Up @@ -1114,7 +1114,7 @@ int fx_muxer_t::handle_cli(
new_argv.data(),
new_argoff,
host_mode_t::muxer,
true,
true /*is_sdk_command*/,
nullptr /*result_buffer*/,
0 /*buffer_size*/,
nullptr/*required_buffer_size*/);
Expand Down