Fix HostApiInvokerApp setting DllImportResolver for hostfxr (#108954)

The test wasn't saving the modified runtime config, so the app didn't actually set the DllImportResolver. The app was also using the incorrect path in its implementation. Whether or not it is needed for the test to run properly is dependent on the platform (and how it handles trying to load an already loaded native binary). I found this when trying to run the host tests on linux-musl-x64.
dotnet · Oct 17, 2024 · 43813ac · 43813ac
1 parent d8aadb1
commit 43813ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/installer/tests/Assets/Projects/HostApiInvokerApp/Program.cs b/src/installer/tests/Assets/Projects/HostApiInvokerApp/Program.cs
@@ -61,10 +61,11 @@ public static void MainCore(string[] args)
 
             if (hostfxrPath is not null)
             {
+                Console.WriteLine($"Registering DLLImportResolver for {nameof(HostFXR.hostfxr)} -> {hostfxrPath}");
                 NativeLibrary.SetDllImportResolver(typeof(Program).Assembly, (libraryName, assembly, searchPath) =>
                 {
                     return libraryName == nameof(HostFXR.hostfxr)
-                        ? NativeLibrary.Load(libraryName, assembly, searchPath)
+                        ? NativeLibrary.Load(hostfxrPath, assembly, searchPath)
                         : default;
                 });
             }

diff --git a/src/installer/tests/HostActivation.Tests/NativeHostApis.cs b/src/installer/tests/HostActivation.Tests/NativeHostApis.cs
@@ -782,7 +782,8 @@ public SharedTestState()
                 // paths to hostfxr so that it can handle resolving the library.
                 RuntimeConfig.FromFile(HostApiInvokerApp.RuntimeConfigJson)
                     .WithProperty("HOSTFXR_PATH", TestContext.BuiltDotNet.GreatestVersionHostFxrFilePath)
-                    .WithProperty("HOSTFXR_PATH_TEST_BEHAVIOR", TestBehaviorEnabledDotNet.GreatestVersionHostFxrFilePath);
+                    .WithProperty("HOSTFXR_PATH_TEST_BEHAVIOR", TestBehaviorEnabledDotNet.GreatestVersionHostFxrFilePath)
+                    .Save();
 
                 SdkAndFrameworkFixture = new SdkAndFrameworkFixture();
             }