Skip to content

fix: Improve detection logic for NativeShims in 32 and 64 bit cases #284

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: Improve detection logic for NativeShims in 32 and 64 bit cases #284

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b601436
fix: Improve architecture detection logic in native library path reso…
DennisDyallo Jul 31, 2025
f6966ff
refactor: Improved readability for pattern matching
DennisDyallo Jul 31, 2025
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
17 changes: 9 additions & 8 deletions Yubico.Core/src/Yubico/PlatformInterop/Libraries.Net47.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ internal static partial class Libraries
/// The implementation details are handled in Libraries.Net47.cs.
/// </remarks>
public static void EnsureInitialized() => Net47Implementation.Initialize();

/// <summary>
/// Encapsulates the .NET Framework 4.7 specific implementation details for native library management.
/// This nested class handles the dynamic loading of architecture-specific (x86/x64) native libraries.
Expand All @@ -73,15 +73,16 @@ private static class Net47Implementation
private static string NativeShimsPath =>
Path.Combine(
AppDomain.CurrentDomain.BaseDirectory,
RuntimeInformation.OSArchitecture switch
(RuntimeInformation.OSArchitecture, Environment.Is64BitProcess) switch
{
Architecture.X86 => "x86",
Architecture.X64 => "x64",
Architecture.Arm64 => "arm64",
var unsupportedArch => throw new ArgumentOutOfRangeException($"Architecture {unsupportedArch } is not supported!")
{ OSArchitecture: Architecture.X86 } or { OSArchitecture: Architecture.X64, Is64BitProcess: false } => "x86",
{ OSArchitecture: Architecture.X64, Is64BitProcess: true } => "x64",
{ OSArchitecture: Architecture.Arm64 } => "arm64",
var unsupportedArch => throw new ArgumentOutOfRangeException(
$"Architecture {unsupportedArch} is not supported!")
},
NativeShims);

/// <summary>
/// Initializes the native library for the current architecture.
/// </summary>
Expand All @@ -99,7 +100,7 @@ internal static void Initialize()
{
throw new DllNotFoundException(
$"Failed to load native library from {NativeShimsPath}. " +
$"Ensure the correct {(Environment.Is64BitProcess ? "x64" : "x86")} version is present.",
$"Ensure the correct {(Environment.Is64BitProcess ? "x64" : "x86")} version is present.",
ex);
}
}
Expand Down
Loading