Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/ikvm-fork.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjfrijters <jfrijters>2011-03-11 13:42:45 +0300
committerjfrijters <jfrijters>2011-03-11 13:42:45 +0300
commitcfa0dec0a58cf0ad91de8f0c98f2e3ad64743d4c (patch)
tree371900b3fa8ea852fe96ab208e38ca1f783133a1 /reflect
parent39c7869184fc7c5a81bcfc8ccaa4668564d96326 (diff)
If mscorlib is missing and the context assembly isn't, we should assume that an unqualified missing type is from mscorlib.
Diffstat (limited to 'reflect')
-rw-r--r--reflect/TypeNameParser.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/reflect/TypeNameParser.cs b/reflect/TypeNameParser.cs
index 2b4c5589..9e5e6289 100644
--- a/reflect/TypeNameParser.cs
+++ b/reflect/TypeNameParser.cs
@@ -479,7 +479,14 @@ namespace IKVM.Reflection
}
if (type == null && resolve)
{
- type = context.ResolveType(name);
+ if (universe.Mscorlib.__IsMissing && !context.__IsMissing)
+ {
+ type = universe.Mscorlib.ResolveType(name);
+ }
+ else
+ {
+ type = context.ResolveType(name);
+ }
}
}
return Expand(type, context, throwOnError, originalName, resolve);