Skip to content

Commit

Permalink
Detect arm64 hostfxr.dll (#24512)
Browse files Browse the repository at this point in the history
  • Loading branch information
benvillalobos authored Mar 24, 2022
1 parent 829cec3 commit fec52a4
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/Resolvers/Microsoft.DotNet.NativeWrapper/Interop.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ private static void PreloadWindowsLibrary(string dllFileName)
{
string basePath = Path.GetDirectoryName(typeof(Interop).Assembly.Location);
string architecture = IntPtr.Size == 8 ? "x64" : "x86";
architecture = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "arm64" : architecture;
string dllPath = Path.Combine(basePath, architecture, $"{dllFileName}.dll");

// return value is intentionally ignored as we let the subsequent P/Invokes fail naturally.
Expand Down

0 comments on commit fec52a4

Please sign in to comment.