From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 24 Aug 2016 13:56:43 +0000 (+0200)
Subject: [tuner/linker] Update code to fix warnings after cecil update.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=40abe3056b03b78e90028b3f3d41fac3f3e5aca9

[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 0260c892e99..0ae94deef20 100644
--- 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 e463ff9cde8..73c89cc7991 100644
--- 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 23aca21a849..cb0646c6871 100644
--- 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 417206ce079..7d7908f2ec3 100644
--- 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 8d6389b615b..69958598dda 100644
--- 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;
 					}
 				}