Rename Location to prevent compilation with it

This commit is contained in:
aldelaro5 committed 2024-09-02 07:16:13 -04:00
1 parent d44b93ba93
commit e0a81dfdbd
2 files changed
+5 -5

No files matched your search

+4 -4
View File
@@ -91,7 +91,7 @@ public abstract class BaseChainloader<TPlugin>
Incompatibilities = incompatibilities, Incompatibilities = incompatibilities,
TypeName = type.FullName, TypeName = type.FullName,
TargettedBepInExVersion = bepinVersion, TargettedBepInExVersion = bepinVersion,
Location = assemblyLocation, _location = assemblyLocation,
LoadContext = loadContext LoadContext = loadContext
}; };
} }
@@ -390,10 +390,10 @@ public abstract class BaseChainloader<TPlugin>
Logger.Log(LogLevel.Info, $"Loading [{pluginInfo}]"); Logger.Log(LogLevel.Info, $"Loading [{pluginInfo}]");
Assembly ass = null; Assembly ass = null;
if (provider && !loadedAssemblies.TryGetValue(pluginInfo.Location, out ass)) if (provider && !loadedAssemblies.TryGetValue(pluginInfo._location, out ass))
{ {
ass = Assembly.LoadFrom(pluginInfo.Location); ass = Assembly.LoadFrom(pluginInfo._location);
loadedAssemblies[pluginInfo.Location] = ass; loadedAssemblies[pluginInfo._location] = ass;
} }
else if (!provider && !loadedAssemblies.TryGetValue(pluginInfo.LoadContext.AssemblyIdentifier, out ass)) else if (!provider && !loadedAssemblies.TryGetValue(pluginInfo.LoadContext.AssemblyIdentifier, out ass))
{ {
+1 -1
View File
@@ -53,7 +53,7 @@ public class PluginInfo : ICacheable
internal Version TargettedBepInExVersion { get; set; } internal Version TargettedBepInExVersion { get; set; }
internal string Location { get; set; } internal string _location { get; set; }
/// <inheritdoc /> /// <inheritdoc />
public override string ToString() => $"{Metadata?.Name} {Metadata?.Version}"; public override string ToString() => $"{Metadata?.Name} {Metadata?.Version}";