[mono/mono] db2f775e: Bump ikvm-reflect
| Newsgroups | gmane.comp.gnome.mono.patches |
|---|---|
| Message-ID | <00000142527a0ddb-023f8541-e5d1-42b1-8476-072f5848a814-000000@email.amazonses.com> |
Branch: refs/heads/mono-3.2.5-branch
Home: https://github.com/mono/mono
Compare: https://github.com/mono/mono/compare/553bb795e859...db2f775ec465
Commit: db2f775ec4651f9f62b9da15807da1583f28b19f
Author: Marek Safar <[email protected]> (marek-safar)
Committer: Rodrigo Kumpera <[email protected]> (kumpera)
Date: 2013-11-13 17:18:20 GMT
URL: https://github.com/mono/mono/commit/db2f775ec4651f9f62b9da15807da1583f28b19f
Bump ikvm-reflect
Conflicts:
external/ikvm
Changed paths:
M external/ikvm
M mcs/mcs/ikvm.cs
Modified: external/ikvm
===================================================================
@@ -1 +1 @@
-Subproject commit b31b74af3bebffdec38f8cffc1ff95b1148d52a6
+Subproject commit c02349ea22f33a8658170b89796bd70ba81563b2
Modified: mcs/mcs/ikvm.cs
===================================================================
@@ -241,7 +241,7 @@ public StaticLoader (StaticImporter importer, CompilerContext compiler)
: base (compiler)
{
this.importer = importer;
- domain = new Universe (UniverseOptions.MetadataOnly | UniverseOptions.ResolveMissingMembers);
+ domain = new Universe (UniverseOptions.MetadataOnly | UniverseOptions.ResolveMissingMembers | UniverseOptions.DisableFusion);
domain.AssemblyResolve += AssemblyReferenceResolver;
loaded_names = new List<Tuple<AssemblyName, string, Assembly>> ();
@@ -307,7 +307,7 @@ Assembly AssemblyReferenceResolver (object sender, IKVM.Reflection.ResolveEventA
foreach (var assembly in domain.GetAssemblies ()) {
AssemblyComparisonResult result;
- if (!Fusion.CompareAssemblyIdentityPure (refname, false, assembly.FullName, false, out result)) {
+ if (!domain.CompareAssemblyIdentity (refname, false, assembly.FullName, false, out result)) {
if ((result == AssemblyComparisonResult.NonEquivalentVersion || result == AssemblyComparisonResult.NonEquivalentPartialVersion) &&
(version_mismatch == null || version_mismatch.GetName ().Version < assembly.GetName ().Version) &&
!is_fx_assembly) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches