ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-22 20:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove assembly version checks from resolver

Browse source 
Not sure how this version check slipped in. It's not present in upstream
cecil code or the disassembled code from our current copy of
mono.cecil.dll.

Fixes #710
This commit is contained in:
Fraser Waters 2018-01-14 19:07:01 +00:00 committed by Jarl Gullberg
parent 1e2af5e648
commit f505808c8b
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Generator.Rewrite/OpenTKAssemblyResolver.cs
View file

@ -93,11 +93,7 @@ namespace OpenTK.Rewrite
continue; continue;
try try
{ {
var assembly = GetAssembly(file, parameters); return GetAssembly(file, parameters);
if (assembly.Name.Version == name.Version || IsZero(name.Version))
{
return assembly;
}
} }
catch (System.BadImageFormatException) catch (System.BadImageFormatException)
{ {
@ -248,11 +244,7 @@ namespace OpenTK.Rewrite
var file = GetAssemblyFile(reference, string.Empty, gac_path); var file = GetAssemblyFile(reference, string.Empty, gac_path);
if (File.Exists(file)) if (File.Exists(file))
{ {
var assembly = GetAssembly(file, parameters); return GetAssembly(file, parameters);
if (assembly.Name.Version == reference.Version || IsZero(reference.Version))
{
return assembly;
}
} }
} }
@ -272,11 +264,7 @@ namespace OpenTK.Rewrite
var file = GetAssemblyFile(reference, prefixes[i], gac); var file = GetAssemblyFile(reference, prefixes[i], gac);
if (Directory.Exists(gac) && File.Exists(file)) if (Directory.Exists(gac) && File.Exists(file))
{ {
var assembly = GetAssembly(file, parameters); return GetAssembly(file, parameters);
if (assembly.Name.Version == reference.Version || IsZero(reference.Version))
{
return assembly;
}
} }
} }
} }