From a1a86ef4c83902a2d168aeb1515258d8a30864e1 Mon Sep 17 00:00:00 2001 From: Jason Ginchereau Date: Wed, 14 Aug 2024 14:39:57 -1000 Subject: [PATCH] Formatting --- src/NodeApi.DotNetHost/ManagedHost.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/NodeApi.DotNetHost/ManagedHost.cs b/src/NodeApi.DotNetHost/ManagedHost.cs index 1b258ded..b7192646 100644 --- a/src/NodeApi.DotNetHost/ManagedHost.cs +++ b/src/NodeApi.DotNetHost/ManagedHost.cs @@ -290,7 +290,7 @@ public static napi_value InitializeModule(napi_env env, napi_value exports) { // The dependency assembly was not resolved by an event-handler. // Look for it in the same directory as any already-loaded assemblies. - foreach (var loadedAssemblyFile in + foreach (string? loadedAssemblyFile in _loadedModules.Keys.Concat(_loadedAssembliesByPath.Keys)) { string assemblyDirectory = @@ -458,8 +458,7 @@ public JSValue LoadAssembly(JSCallbackArgs args) { string assemblyNameOrFilePath = (string)args[0]; - Assembly? assembly; - if (!_loadedAssembliesByPath.TryGetValue(assemblyNameOrFilePath, out assembly) && + if (!_loadedAssembliesByPath.TryGetValue(assemblyNameOrFilePath, out Assembly? assembly) && !_loadedAssembliesByName.TryGetValue(assemblyNameOrFilePath, out assembly)) { assembly = LoadAssembly(assemblyNameOrFilePath, allowNativeLibrary: true);