Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@@ -136,6 +136,7 @@ namespace IKVM.Reflection
DisableWindowsRuntimeProjection = 64,
DecodeVersionInfoAttributeBlobs = 128,
DeterministicOutput = 256,
DisableDefaultAssembliesLookup = 512,
}
public sealed class Universe : IDisposable
@@ -676,7 +677,7 @@ namespace IKVM.Reflection
private Assembly GetLoadedAssembly(string refname)
{
Assembly asm;
if (!assembliesByName.TryGetValue(refname, out asm))
if (!assembliesByName.TryGetValue(refname, out asm) && (options & UniverseOptions.DisableDefaultAssembliesLookup) == 0)
{
string simpleName = GetSimpleAssemblyName(refname);
for (int i = 0; i < assemblies.Count; i++)