[tuner/linker] Update code to fix warnings after cecil update.

diff --git a/mcs/tools/linker/Mono.Linker.Steps/OutputStep.cs b/mcs/tools/linker/Mono.Linker.Steps/OutputStep.cs
index 0260c892e99b74494f18250b4979bf3c20fbff4c..0ae94deef202d9affd272d7269621be5ba6df058 100644 (file)
--- a/mcs/tools/linker/Mono.Linker.Steps/OutputStep.cs
+++ b/mcs/tools/linker/Mono.Linker.Steps/OutputStep.cs
@@ -129,7 +129,7 @@ namespace Mono.Linker.Steps {
 
                static FileInfo GetOriginalAssemblyFileInfo (AssemblyDefinition assembly)
                {
-                       return new FileInfo (assembly.MainModule.FullyQualifiedName);
+                       return new FileInfo (assembly.MainModule.FileName);
                }
 
                static void CopyAssembly (FileInfo fi, string directory, bool symbols)

diff --git a/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs b/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs
index e463ff9cde8d982212c5ead62160b37ef461cb7b..73c89cc7991f9c770da19dce0a6fa69deb7474e4 100644 (file)
--- a/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs
+++ b/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs
@@ -152,7 +152,7 @@ namespace Mono.Linker.Steps {
                                // at this stage reference might include things that can't be resolved
                                // and if it is (resolved) it needs to be kept only if marked (#16213)
                                if ((td != null) && Annotations.IsMarked (td)) {
-                                       scope = assembly.MainModule.Import (td).Scope;
+                                       scope = assembly.MainModule.ImportReference (td).Scope;
                                        if (tr.Scope != scope)
                                                changes = true;
                                        hash.Add (tr, scope);
@@ -163,7 +163,7 @@ namespace Mono.Linker.Steps {
                                        var td = et.Resolve ();
                                        IMetadataScope scope = et.Scope;
                                        if ((td != null) && Annotations.IsMarked (td)) {
-                                               scope = assembly.MainModule.Import (td).Scope;
+                                               scope = assembly.MainModule.ImportReference (td).Scope;
                                                hash.Add (td, scope);
                                        }
                                }

diff --git a/mcs/tools/linker/Mono.Linker/AssemblyResolver.cs b/mcs/tools/linker/Mono.Linker/AssemblyResolver.cs
index 23aca21a84908c5153725cbcb77ec3fe02bb14f3..cb0646c6871d50e77ef8dd30560e2b91101ce52c 100644 (file)
--- a/mcs/tools/linker/Mono.Linker/AssemblyResolver.cs
+++ b/mcs/tools/linker/Mono.Linker/AssemblyResolver.cs
@@ -65,7 +65,7 @@ namespace Mono.Linker {
                public void CacheAssembly (AssemblyDefinition assembly)
                {
                        _assemblies [assembly.Name.Name] = assembly;
-                       base.AddSearchDirectory (Path.GetDirectoryName (assembly.MainModule.FullyQualifiedName));
+                       base.AddSearchDirectory (Path.GetDirectoryName (assembly.MainModule.FileName));
                }
        }
 }

diff --git a/mcs/tools/linker/Mono.Linker/LinkContext.cs b/mcs/tools/linker/Mono.Linker/LinkContext.cs
index 417206ce0798843fb35d1584fbb132cd8e74e21b..7d7908f2ec37e944bad42ab297b54b2f997dbb79 100644 (file)
--- a/mcs/tools/linker/Mono.Linker/LinkContext.cs
+++ b/mcs/tools/linker/Mono.Linker/LinkContext.cs
@@ -178,7 +178,7 @@ namespace Mono.Linker {
                                if (_symbolReaderProvider != null) {
                                        var symbolReader = _symbolReaderProvider.GetSymbolReader (
                                                assembly.MainModule,
-                                               assembly.MainModule.FullyQualifiedName);
+                                               assembly.MainModule.FileName);
 
                                        _annotations.AddSymbolReader (assembly, symbolReader);
                                        assembly.MainModule.ReadSymbols (symbolReader);

diff --git a/mcs/tools/tuner/Mono.Tuner/CecilRocks.cs b/mcs/tools/tuner/Mono.Tuner/CecilRocks.cs
index 8d6389b615b47aaeb7179ea646daccc14b15978e..69958598dda2c3386fb92a7adaadf4bc26f31da7 100644 (file)
--- a/mcs/tools/tuner/Mono.Tuner/CecilRocks.cs
+++ b/mcs/tools/tuner/Mono.Tuner/CecilRocks.cs
@@ -477,12 +477,12 @@ namespace Mono.Tuner {
                        while (type != null) {
                                // does the type implements it itself
                                if (type.HasInterfaces) {
-                                       foreach (TypeReference iface in type.Interfaces) {
-                                               string fullname = (generic) ? iface.GetElementType ().FullName : iface.FullName;
+                                       foreach (var iface in type.Interfaces) {
+                                               string fullname = (generic) ? iface.InterfaceType.GetElementType ().FullName : iface.InterfaceType.FullName;
                                                if (fullname == interfaceName)
                                                        return true;
                                                //if not, then maybe one of its parent interfaces does
-                                               if (Implements (iface.Resolve (), interfaceName, generic))
+                                               if (Implements (iface.InterfaceType.Resolve (), interfaceName, generic))
                                                        return true;
                                        }
                                }