Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@@ -26,7 +26,8 @@ namespace Mono.Cecil.Tests {
Assert.IsNotNull (definition);
Assert.AreEqual ("System.String System.String::Empty", definition.FullName);
Assert.AreEqual ("mscorlib", definition.Module.Assembly.Name.Name);
Assert.AreEqual (Platform.OnCoreClr ? "System.Private.CoreLib" : "mscorlib",
definition.Module.Assembly.Name.Name);
}
delegate string GetSubstring (string str, int start, int length);
@@ -42,7 +43,8 @@ namespace Mono.Cecil.Tests {
Assert.IsNotNull (definition);
Assert.AreEqual ("System.String System.String::Substring(System.Int32,System.Int32)", definition.FullName);
Assert.AreEqual ("mscorlib", definition.Module.Assembly.Name.Name);
Assert.AreEqual (Platform.OnCoreClr ? "System.Private.CoreLib" : "mscorlib",
definition.Module.Assembly.Name.Name);
}
[Test]
@@ -56,7 +58,8 @@ namespace Mono.Cecil.Tests {
Assert.AreEqual ("get_Length", definition.Name);
Assert.AreEqual ("System.String", definition.DeclaringType.FullName);
Assert.AreEqual ("mscorlib", definition.Module.Assembly.Name.Name);
Assert.AreEqual (Platform.OnCoreClr ? "System.Private.CoreLib" : "mscorlib",
definition.Module.Assembly.Name.Name);
}
[Test]
@@ -72,7 +75,8 @@ namespace Mono.Cecil.Tests {
Assert.IsNotNull (definition);
Assert.AreEqual ("System.Void System.Collections.Generic.List`1::Add(T)", definition.FullName);
Assert.AreEqual ("mscorlib", definition.Module.Assembly.Name.Name);
Assert.AreEqual (Platform.OnCoreClr ? "System.Private.CoreLib" : "mscorlib",
definition.Module.Assembly.Name.Name);
}
[Test]
@@ -92,7 +96,8 @@ namespace Mono.Cecil.Tests {
Assert.IsNotNull (definition);
Assert.AreEqual ("System.Boolean System.Collections.Generic.Dictionary`2::TryGetValue(TKey,TValue&)", definition.FullName);
Assert.AreEqual ("mscorlib", definition.Module.Assembly.Name.Name);
Assert.AreEqual (Platform.OnCoreClr ? "System.Private.CoreLib" : "mscorlib",
definition.Module.Assembly.Name.Name);
}
class CustomResolver : DefaultAssemblyResolver {
@@ -140,7 +145,7 @@ namespace Mono.Cecil.Tests {
var definition = reference.Resolve ();
Assert.IsNotNull (definition);
Assert.AreEqual ("System.Diagnostics.DebuggableAttribute", definition.FullName);
Assert.AreEqual ("mscorlib", definition.Module.Assembly.Name.Name);
Assert.AreEqual (Platform.OnCoreClr ? "System.Private.CoreLib" : "mscorlib", definition.Module.Assembly.Name.Name);
}
[Test]
@@ -162,7 +167,7 @@ namespace Mono.Cecil.Tests {
var definition = reference.Resolve ();
Assert.IsNotNull (definition);
Assert.AreEqual ("System.Diagnostics.DebuggableAttribute/DebuggingModes", definition.FullName);
Assert.AreEqual ("mscorlib", definition.Module.Assembly.Name.Name);
Assert.AreEqual (Platform.OnCoreClr ? "System.Private.CoreLib" : "mscorlib", definition.Module.Assembly.Name.Name);
}
[Test]
@@ -175,6 +180,19 @@ namespace Mono.Cecil.Tests {
Assert.IsNull (get_a_b.Resolve ());
}
[Test]
public void GenericRectangularArrayGetMethodInMemberReferences ()
{
using (var module = GetResourceModule ("FSharp.Core.dll")) {
foreach (var member in module.GetMemberReferences ()) {
if (!member.DeclaringType.IsArray)
continue;
Assert.IsNull (member.Resolve ());
}
}
}
[Test]
public void ResolveFunctionPointer ()
{
@@ -223,7 +241,9 @@ namespace Mono.Cecil.Tests {
Assert.IsTrue (reference.IsRetargetable);
var assembly = resolver.Resolve (reference);
Assert.IsNotNull (assembly);
Assert.AreEqual (typeof (object).Assembly.GetName ().Version, assembly.Name.Version);
if (!Platform.OnCoreClr)
Assert.AreEqual (typeof (object).Assembly.GetName ().Version, assembly.Name.Version);
}
}