Imported Upstream version 4.8.0.371

Former-commit-id: 1cedda3b6a8e480191a7a40a8dc33eb078fba58b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-28 21:01:12 +00:00
parent 62edeef69b
commit 069517201b
48 changed files with 181 additions and 50 deletions

View File

@@ -1322,6 +1322,8 @@ public class Tests : TestsBase, ITest2
o.invoke_2 ();
o.assembly_load ();
AppDomain.Unload (domain);
domains_3 ();
@@ -1353,6 +1355,11 @@ public class Tests : TestsBase, ITest2
public static void invoke_in_domain_2 () {
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public static void assembly_load_in_domain () {
Assembly.Load ("System.Transactions");
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public static void dynamic_methods () {
var m = new DynamicMethod ("dyn_method", typeof (void), new Type [] { typeof (int) }, typeof (object).Module);
@@ -1633,6 +1640,10 @@ public class CrossDomain : MarshalByRefObject
public int invoke_3 () {
return 42;
}
public void assembly_load () {
Tests.assembly_load_in_domain ();
}
}
public class Foo

View File

@@ -1 +1 @@
8f929048d1b17809b27dc30940c81b379f1ec129
10f28bcfc8faf083f7bacd0efadc598a4bbba506