Use TryParseAssemblyName wherever possible

This commit is contained in:
ghorsington committed 2020-08-14 12:14:54 +03:00
1 parent 68378b32b6
commit 911375ace5
4 files changed
+12 -14

No files matched your search

+1
View File
@@ -91,6 +91,7 @@ namespace BepInEx.Preloader
private static Assembly ResolveCurrentDirectory(object sender, ResolveEventArgs args)
{
// Can't use Utils here because it's not yet resolved
var name = new AssemblyName(args.Name);
try
@@ -196,15 +196,7 @@ namespace BepInEx.Preloader.Patching
private static string GetAssemblyName(string fullName)
{
// We need to manually parse full name to avoid issues with encoding on mono
try
{
return new AssemblyName(fullName).Name;
}
catch (Exception)
{
return fullName;
}
return Utility.TryParseAssemblyName(fullName, out var assName) ? assName.Name : fullName;
}
/// <summary>
+4 -5
View File
@@ -68,11 +68,10 @@ namespace BepInEx.Bootstrap
Resolver.ResolveFailure += (sender, reference) =>
{
var name = new AssemblyName(reference.FullName);
if (Utility.TryResolveDllAssembly(name, Paths.BepInExAssemblyDirectory, ReaderParameters, out var assembly) ||
Utility.TryResolveDllAssembly(name, Paths.PluginPath, ReaderParameters, out assembly) ||
Utility.TryResolveDllAssembly(name, Paths.ManagedPath, ReaderParameters, out assembly))
if (Utility.TryParseAssemblyName(reference.FullName, out var name) &&
(Utility.TryResolveDllAssembly(name, Paths.BepInExAssemblyDirectory, ReaderParameters, out var assembly) ||
Utility.TryResolveDllAssembly(name, Paths.PluginPath, ReaderParameters, out assembly) ||
Utility.TryResolveDllAssembly(name, Paths.ManagedPath, ReaderParameters, out assembly)))
return assembly;
return AssemblyResolve?.Invoke(sender, reference);
+6
View File
@@ -280,6 +280,11 @@ namespace BepInEx
/// <param name="fullName">Fully qualified assembly name</param>
/// <param name="assemblyName">Resulting <see cref="AssemblyName"/> instance</param>
/// <returns><c>true</c>, if parsing was successful, otherwise <c>false</c></returns>
/// <remarks>
/// On some versions of mono, using <see cref="Assembly.GetName()"/> fails because it runs on unmanaged side
/// which has problems with encoding.
/// Using <see cref="AssemblyName"/> solves this by doing parsing on managed side instead.
/// </remarks>
public static bool TryParseAssemblyName(string fullName, out AssemblyName assemblyName)
{
try
@@ -289,6 +294,7 @@ namespace BepInEx
}
catch (Exception e)
{
File.AppendAllText("tryparseerr.log", $"Failed to parse {fullName}: {e}");
assemblyName = null;
return false;
}