PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

remove compat for netframework

Browse Source
This commit is contained in:
zznty
2022-06-05 15:43:15 +07:00
parent d2d96df8be
commit a1e9434444
7 changed files with 8 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Torch/Utils/TorchLauncher.cs
View File

@@ -17,13 +17,8 @@ namespace Torch.Utils
try
{
var name = AssemblyName.GetAssemblyName(file);
var key = name.Name ?? name.FullName.Split(',')[0];
#if NETFRAMEWORK
if (!Assemblies.ContainsKey(key))
Assemblies.Add(key, file);
#else
var key = name.Name ?? name.FullName[..','];
Assemblies.TryAdd(key, file);
#endif
}
catch (BadImageFormatException)
{
@@ -37,7 +32,7 @@ namespace Torch.Utils
private static Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEventArgs args)
{
var name = args.Name;
return Assemblies.TryGetValue(name.IndexOf(',') > 0 ? name.Substring(0, name.IndexOf(',')) : name, out var path) ? Assembly.LoadFrom(path) : null;
return Assemblies.TryGetValue(name.IndexOf(',') > 0 ? name[..','] : name, out var path) ? Assembly.LoadFrom(path) : null;
}
}
}