epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace custom mono defines with toolchain-provided defines.

Browse Source
This commit is contained in:
Paul Chote
2022-04-24 18:45:33 +01:00
committed by Matthias Mailänder
parent 3e5666ca53
commit a152bf7324
9 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/ObjectCreator.cs
View File

@@ -60,7 +60,11 @@ namespace OpenRA
if (!ResolvedAssemblies.TryGetValue(hash, out var assembly))
{
#if MONO
#if NET5_0_OR_GREATER
var loader = new AssemblyLoader(resolvedPath);
assembly = loader.LoadDefaultAssembly();
ResolvedAssemblies.Add(hash, assembly);
#else
assembly = Assembly.LoadFile(resolvedPath);
ResolvedAssemblies.Add(hash, assembly);
@@ -75,10 +79,6 @@ namespace OpenRA
LoadAssembly(assemblyList, depedencyPath);
}
}
#else
var loader = new AssemblyLoader(resolvedPath);
assembly = loader.LoadDefaultAssembly();
ResolvedAssemblies.Add(hash, assembly);
#endif
}