Skip to content

Commit c844c90

Browse files
committed
fix dependency resolving issues
1 parent d0529c2 commit c844c90

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

Source/DependencyResolver.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,22 @@ private static bool TryResolveAssemblyFor(string assemblyName, ResolveEventArgs
7676
private static bool ShouldResolveNamedFor(string assemblyName, ResolveEventArgs args)
7777
{
7878
var requiredAssemblyName = IsolateName(args.Name);
79-
var requestingAssemblyName = IsolateName(GetMainRequiringAssembly(args)?.FullName ?? "");
79+
var requestingAssemblyName = IsolateName(args.RequestingAssembly?.FullName ?? "");
80+
var mainRequestingAssemblyName = IsolateName(GetMainRequiringAssembly(args)?.FullName ?? "");
8081

8182
bool requiredAssemblyValid = requiredAssemblyName.Contains(assemblyName);
8283
bool requestingAssemblyValid = requestingAssemblyName.Contains(assemblyName);
84+
bool mainRequestingAssemblyValid = mainRequestingAssemblyName.Contains(assemblyName);
8385

84-
return (requiredAssemblyValid || requestingAssemblyValid);
86+
return requiredAssemblyValid || requestingAssemblyValid || mainRequestingAssemblyValid;
8587
}
8688

8789
private static bool TryResolveModdedDependency(ResolveEventArgs args, out Assembly assembly)
8890
{
8991
assembly = default!;
9092

93+
if (Hat.Instance == null) return false;
94+
9195
var requestingMainAssembly = GetMainRequiringAssembly(args);
9296
if (requestingMainAssembly == null) return false;
9397

0 commit comments

Comments
 (0)