Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -100,7 +100,7 @@ namespace Mono.Cecil.Tests {
public void Register (AssemblyDefinition assembly)
{
this.RegisterAssembly (assembly);
this.AddSearchDirectory (Path.GetDirectoryName (assembly.MainModule.FullyQualifiedName));
this.AddSearchDirectory (Path.GetDirectoryName (assembly.MainModule.FileName));
}
}
@@ -113,12 +113,13 @@ namespace Mono.Cecil.Tests {
resolver.Register (mma.Assembly);
var current_module = GetCurrentModule (parameters);
var reference = new TypeReference ("Module.A", "Foo", current_module, AssemblyNameReference.Parse (mma.Assembly.FullName), false);
using (var current_module = GetCurrentModule (parameters)) {
var reference = new TypeReference ("Module.A", "Foo", current_module, AssemblyNameReference.Parse (mma.Assembly.FullName), false);
var definition = reference.Resolve ();
Assert.IsNotNull (definition);
Assert.AreEqual ("Module.A.Foo", definition.FullName);
var definition = reference.Resolve ();
Assert.IsNotNull (definition);
Assert.AreEqual ("Module.A.Foo", definition.FullName);
}
}
[Test]
@@ -226,7 +227,7 @@ namespace Mono.Cecil.Tests {
}
}
static TRet GetReference<TDel, TRet> (TDel code)
TRet GetReference<TDel, TRet> (TDel code)
{
var @delegate = code as Delegate;
if (@delegate == null)
@@ -264,7 +265,7 @@ namespace Mono.Cecil.Tests {
throw new InvalidOperationException ();
}
static MethodDefinition GetMethodFromDelegate (Delegate @delegate)
MethodDefinition GetMethodFromDelegate (Delegate @delegate)
{
var method = @delegate.Method;
var type = (TypeDefinition) TypeParser.ParseType (GetCurrentModule (), method.DeclaringType.FullName);