diff options
| author | jfrijters <jfrijters> | 2010-10-06 08:27:38 +0400 |
|---|---|---|
| committer | jfrijters <jfrijters> | 2010-10-06 08:27:38 +0400 |
| commit | d44f1a2be8954c38a5b00b10f20e390afc7e2386 (patch) | |
| tree | e84ae3a20b3d2b1de24ac29eda8352d1251c4eb1 /ikvmc | |
| parent | a8c6571b49a58cf0361db2ef5d78dd2e0dad1bfb (diff) | |
Moved core assembly detection to the right place, to avoid problems when a non-main assembly of the core assembly set is explicitly referenced.
Diffstat (limited to 'ikvmc')
| -rw-r--r-- | ikvmc/CompilerClassLoader.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ikvmc/CompilerClassLoader.cs b/ikvmc/CompilerClassLoader.cs index 049f9d54..a65b6bab 100644 --- a/ikvmc/CompilerClassLoader.cs +++ b/ikvmc/CompilerClassLoader.cs @@ -2496,7 +2496,7 @@ namespace IKVM.Internal return key != null && key.Length != 0; } - private static bool IsCoreAssembly(Assembly asm) + internal static bool IsCoreAssembly(Assembly asm) { return asm.IsDefined(StaticCompiler.GetRuntimeType("IKVM.Attributes.RemappedClassAttribute"), false); } @@ -2622,10 +2622,6 @@ namespace IKVM.Internal { try { - if(IsCoreAssembly(reference)) - { - JVM.CoreAssembly = reference; - } references.Add(reference); allReferencesAreStrongNamed &= IsSigned(reference); Tracer.Info(Tracer.Compiler, "Loaded reference assembly: {0}", reference.FullName); |