ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ext. tool dependencies not loading in Release config 

and improve logging
This commit is contained in:
James Groom 2024-05-23 02:45:23 +10:00 committed by GitHub
parent 8eb3b62724
commit 5e8cc23f75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
View File

@ -135,12 +135,7 @@ namespace BizHawk.Client.EmuHawk
try try
{ {
if (!OSTailoredCode.IsUnixHost) MotWHack.RemoveMOTW(fileName); if (!OSTailoredCode.IsUnixHost) MotWHack.RemoveMOTW(fileName);
#if DEBUG
var externalToolFile = Assembly.LoadFrom(fileName); var externalToolFile = Assembly.LoadFrom(fileName);
#else
var asmBytes = File.ReadAllBytes(fileName);
var externalToolFile = Assembly.Load(asmBytes);
#endif
if (!externalToolFile.GetReferencedAssemblies().Any(static name => name.Name.StartsWithOrdinal("BizHawk."))) if (!externalToolFile.GetReferencedAssemblies().Any(static name => name.Name.StartsWithOrdinal("BizHawk.")))
{ {
return Fail("it doesn't reference a BizHawk assembly"); return Fail("it doesn't reference a BizHawk assembly");
@ -154,9 +149,15 @@ namespace BizHawk.Client.EmuHawk
if (applicabilityAttrs.Count > 1) throw new ExternalToolApplicabilityAttributeBase.DuplicateException(); if (applicabilityAttrs.Count > 1) throw new ExternalToolApplicabilityAttributeBase.DuplicateException();
var toolAttribute = allAttrs.OfType<ExternalToolAttribute>().First(); var toolAttribute = allAttrs.OfType<ExternalToolAttribute>().First();
item.Text = toolAttribute.Name;
if (toolAttribute.LoadAssemblyFiles != null) if (toolAttribute.LoadAssemblyFiles != null)
{ {
foreach (var depFilename in toolAttribute.LoadAssemblyFiles) Assembly.LoadFrom($"{_config.PathEntries[PathEntryCollection.GLOBAL, "External Tools"].Path}/{depFilename}"); foreach (var depFilename in toolAttribute.LoadAssemblyFiles)
{
var depFilePath = $"{_config.PathEntries[PathEntryCollection.GLOBAL, "External Tools"].Path}/{depFilename}";
Console.WriteLine($"preloading assembly {depFilePath} requested by ext. tool {toolAttribute.Name}");
Assembly.LoadFrom(depFilePath);
}
} }
item.Image = null; // no errors, remove error icon item.Image = null; // no errors, remove error icon
@ -166,13 +167,12 @@ namespace BizHawk.Client.EmuHawk
var rawIcon = externalToolFile.GetManifestResourceStream(embeddedIconAttr.ResourcePath); var rawIcon = externalToolFile.GetManifestResourceStream(embeddedIconAttr.ResourcePath);
if (rawIcon != null) item.Image = new Bitmap(rawIcon); if (rawIcon != null) item.Image = new Bitmap(rawIcon);
} }
item.Text = toolAttribute.Name;
MenuItemInfo menuItemInfo = new( MenuItemInfo menuItemInfo = new(
this, this,
#if DEBUG #if DEBUG
asmChecksum: string.Empty, asmChecksum: string.Empty,
#else #else
asmChecksum: SHA1Checksum.ComputePrefixedHex(asmBytes), asmChecksum: SHA1Checksum.ComputePrefixedHex(File.ReadAllBytes(fileName)),
#endif #endif
asmFilename: fileName, asmFilename: fileName,
entryPointTypeName: entryPoint.FullName); entryPointTypeName: entryPoint.FullName);