Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Export unmangled name for get_hostfxr_path on nethost (Windows x86) #6672

Merged
elinor-fung merged 2 commits into from
Jun 5, 2019
Merged

Export unmangled name for get_hostfxr_path on nethost (Windows x86) #6672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9570d9
Export unmangled name for get_hostfxr_path on nethost
elinor-fung Jun 4, 2019
a1532c0
Use .def file for exports
elinor-fung Jun 5, 2019
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
5 changes: 5 additions & 0 deletions src/corehost/cli/nethost/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ set(SOURCES
../fxr/fx_ver.cpp
)

if(WIN32)
list(APPEND SOURCES
Exports.def)
endif()

include(../lib.cmake)

add_definitions(-DFEATURE_LIBHOST=1)
Expand Down
2 changes: 2 additions & 0 deletions src/corehost/cli/nethost/Exports.def
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
EXPORTS
get_hostfxr_path
49 changes: 43 additions & 6 deletions src/corehost/cli/test/nativehost/nativehost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "comhost_test.h"
#include <hostfxr.h>
#include "host_context_test.h"
#include <utils.h>

namespace
{
Expand All @@ -35,14 +36,18 @@ int main(const int argc, const pal::char_t *argv[])
const pal::char_t *command = argv[1];
if (pal::strcmp(command, _X("get_hostfxr_path")) == 0)
{
// args: ... [<assembly_path>] [<hostfxr_to_load>]
const pal::char_t *assembly_path = nullptr;
// args: ... [<explicit_load>] [<assembly_path>] [<hostfxr_to_load>]
bool explicit_load = false;
if (argc >= 3)
assembly_path = argv[2];
explicit_load = pal::strcmp(pal::to_lower(pal::string_t{argv[2]}).c_str(), _X("true")) == 0;

const pal::char_t *assembly_path = nullptr;
if (argc >= 4)
assembly_path = argv[3];

if (argc >= 5)
{
pal::string_t to_load = argv[3];
pal::string_t to_load = argv[4];
pal::dll_t fxr;
if (!pal::load_library(&to_load, &fxr))
{
Expand All @@ -51,13 +56,45 @@ int main(const int argc, const pal::char_t *argv[])
}
}

decltype(&get_hostfxr_path) get_hostfxr_path_fn;
if (explicit_load)
{
pal::string_t nethost_path;
if (!pal::get_own_executable_path(&nethost_path) || !pal::realpath(&nethost_path))
{
std::cout << "Failed to get path to current executable" << std::endl;
return EXIT_FAILURE;
}

nethost_path = get_directory(nethost_path);
nethost_path.append(MAKE_LIBNAME("nethost"));

pal::dll_t nethost;
if (!pal::load_library(&nethost_path, &nethost))
{
std::cout << "Failed to load library: " << tostr(nethost_path).data() << std::endl;
return EXIT_FAILURE;
}

get_hostfxr_path_fn = (decltype(get_hostfxr_path_fn))pal::get_symbol(nethost, "get_hostfxr_path");
if (get_hostfxr_path_fn == nullptr)
{
std::cout << "Failed to get get_hostfxr_path export from nethost" << std::endl;
return EXIT_FAILURE;
}
}
else
{
get_hostfxr_path_fn = get_hostfxr_path;
}

pal::string_t fxr_path;
size_t len = fxr_path.size();
int res = get_hostfxr_path(nullptr, &len, assembly_path);
int res = get_hostfxr_path_fn(nullptr, &len, assembly_path);
if (static_cast<StatusCode>(res) == StatusCode::HostApiBufferTooSmall)
{
fxr_path.resize(len);
res = get_hostfxr_path(&fxr_path[0], &len, assembly_path);
res = get_hostfxr_path_fn(&fxr_path[0], &len, assembly_path);
}

if (static_cast<StatusCode>(res) == StatusCode::Success)
Expand Down
54 changes: 34 additions & 20 deletions src/test/HostActivationTests/NativeHosting/Nethost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,18 @@ public Nethost(SharedTestState sharedTestState)
}

[Theory]
[InlineData(false, true)]
[InlineData(false, false)]
[InlineData(true, true)]
[InlineData(true, false)]
public void GetHostFxrPath_DotNetRootEnvironment(bool useAssemblyPath, bool isValid)
[InlineData(true, false, true)]
[InlineData(true, false, false)]
[InlineData(true, true, true)]
[InlineData(true, true, false)]
[InlineData(false, false, true)]
[InlineData(false, false, false)]
[InlineData(false, true, true)]
[InlineData(false, true, false)]
public void GetHostFxrPath_DotNetRootEnvironment(bool explicitLoad, bool useAssemblyPath, bool isValid)
{
string dotNetRoot = isValid ? Path.Combine(sharedState.ValidInstallRoot, "dotnet") : sharedState.InvalidInstallRoot;
CommandResult result = Command.Create(sharedState.NativeHostPath, $"{GetHostFxrPath} {(useAssemblyPath ? sharedState.TestAssemblyPath : string.Empty)}")
CommandResult result = Command.Create(sharedState.NativeHostPath, $"{GetHostFxrPath} {explicitLoad} {(useAssemblyPath ? sharedState.TestAssemblyPath : string.Empty)}")
.CaptureStdErr()
.CaptureStdOut()
.EnvironmentVariable("COREHOST_TRACE", "1")
Expand All @@ -55,15 +59,23 @@ public void GetHostFxrPath_DotNetRootEnvironment(bool useAssemblyPath, bool isVa
}

[Theory]
[InlineData(false, true, false)]
[InlineData(false, true, true)]
[InlineData(false, false, false)]
[InlineData(false, false, true)]
[InlineData(true, true, false)]
[InlineData(true, true, true)]
[InlineData(true, false, false)]
[InlineData(true, false, true)]
public void GetHostFxrPath_GlobalInstallation(bool useAssemblyPath, bool useRegisteredLocation, bool isValid)
[InlineData(true, false, true, false)]
[InlineData(true, false, true, true)]
[InlineData(true, false, false, false)]
[InlineData(true, false, false, true)]
[InlineData(true, true, true, false)]
[InlineData(true, true, true, true)]
[InlineData(true, true, false, false)]
[InlineData(true, true, false, true)]
[InlineData(false, false, true, false)]
[InlineData(false, false, true, true)]
[InlineData(false, false, false, false)]
[InlineData(false, false, false, true)]
[InlineData(false, true, true, false)]
[InlineData(false, true, true, true)]
[InlineData(false, true, false, false)]
[InlineData(false, true, false, true)]
public void GetHostFxrPath_GlobalInstallation(bool explicitLoad, bool useAssemblyPath, bool useRegisteredLocation, bool isValid)
{
// Overide the registry key for self-registered global installs.
// If using the registered location, set the install location value to the valid/invalid root.
Expand All @@ -78,7 +90,7 @@ public void GetHostFxrPath_GlobalInstallation(bool useAssemblyPath, bool useRegi
registeredInstallLocationOverride.SetInstallLocation(installLocation, sharedState.RepoDirectories.BuildArchitecture);
}

result = Command.Create(sharedState.NativeHostPath, $"{GetHostFxrPath} {(useAssemblyPath ? sharedState.TestAssemblyPath : string.Empty)}")
result = Command.Create(sharedState.NativeHostPath, $"{GetHostFxrPath} {explicitLoad} {(useAssemblyPath ? sharedState.TestAssemblyPath : string.Empty)}")
.CaptureStdErr()
.CaptureStdOut()
.EnvironmentVariable("COREHOST_TRACE", "1")
Expand All @@ -105,8 +117,10 @@ public void GetHostFxrPath_GlobalInstallation(bool useAssemblyPath, bool useRegi
}
}

[Fact]
public void GetHostFxrPath_WithAssemblyPath_AppLocalFxr()
[Theory]
[InlineData(true)]
[InlineData(false)]
public void GetHostFxrPath_WithAssemblyPath_AppLocalFxr(bool explicitLoad)
{
string appLocalFxrDir = Path.Combine(sharedState.BaseDirectory, "appLocalFxr");
Directory.CreateDirectory(appLocalFxrDir);
Expand All @@ -115,7 +129,7 @@ public void GetHostFxrPath_WithAssemblyPath_AppLocalFxr()
File.WriteAllText(assemblyPath, string.Empty);
File.WriteAllText(hostFxrPath, string.Empty);

Command.Create(sharedState.NativeHostPath, $"{GetHostFxrPath} {assemblyPath}")
Command.Create(sharedState.NativeHostPath, $"{GetHostFxrPath} {explicitLoad} {assemblyPath}")
.CaptureStdErr()
.CaptureStdOut()
.EnvironmentVariable("COREHOST_TRACE", "1")
Expand All @@ -127,7 +141,7 @@ public void GetHostFxrPath_WithAssemblyPath_AppLocalFxr()
[Fact]
public void GetHostFxrPath_HostFxrAlreadyLoaded()
{
Command.Create(sharedState.NativeHostPath, $"{GetHostFxrPath} {sharedState.TestAssemblyPath} {sharedState.ProductHostFxrPath}")
Command.Create(sharedState.NativeHostPath, $"{GetHostFxrPath} false {sharedState.TestAssemblyPath} {sharedState.ProductHostFxrPath}")
.CaptureStdErr()
.CaptureStdOut()
.EnvironmentVariable("COREHOST_TRACE", "1")
Expand Down