[Microsoft.CSharp] Tweaks 76f97e30731d6c98f21771b516b78399185c1c51 to not call new...

This is a workaround for runtime assembly loading bug always preferring local assembly

diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/DynamicContext.cs b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/DynamicContext.cs
index d03145e0df346c783650a15ff080a963e4ddcbda..9c466c5ed9c9875b31f69f0f0ec9654075f3ac37 100644 (file)
--- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/DynamicContext.cs
+++ b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.RuntimeBinder/DynamicContext.cs
@@ -93,8 +93,7 @@ namespace Microsoft.CSharp.RuntimeBinder
                                module.SetDeclaringAssembly (temp);
 
                                var importer = new Compiler.ReflectionImporter (module, cc.BuiltinTypes) {
-                                       IgnorePrivateMembers = false,
-                                       IgnoreCompilerGeneratedField = false
+                                       IgnorePrivateMembers = false
                                };
 
                                // Import all currently loaded assemblies

diff --git a/mcs/mcs/reflection.cs b/mcs/mcs/reflection.cs
index c7bcb479dbc3b17931b12cf3a08d66220617d8ce..24f25951d583c3ca258fe6b73196ea20036a8f9d 100644 (file)
--- a/mcs/mcs/reflection.cs
+++ b/mcs/mcs/reflection.cs
@@ -48,6 +48,8 @@ namespace Mono.CSharp
                public ReflectionImporter (ModuleContainer module, BuiltinTypes builtin)
                        : base (module)
                {
+                       IgnoreCompilerGeneratedField = false;
+
                        Initialize (builtin);
                }