Fix the build

Author: radekdoulik

src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj

@@ -28,6 +28,7 @@
     <Compile Remove="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\LinkerOptions.cs" />
 
     <!--Steps that are upstreamed, these are OK to remove-->
+    <Compile Remove="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\AddKeepAlivesStep.cs" />
     <Compile Remove="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\ApplyPreserveAttribute.cs" />
     <Compile Remove="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\OutputStepWithTimestamps.cs" />
     <Compile Remove="..\Xamarin.Android.Build.Tasks\Linker\MonoDroid.Tuner\PreserveCode.cs" />

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Extensions.cs

@@ -46,13 +46,30 @@ public static object GetSettableValue (this CustomAttributeArgument arg)
 			return td != null ? td.FullName + "," + td.Module.Assembly.FullName : arg.Value;
 		}
 
+#if !NETCOREAPP
 		public static AssemblyDefinition GetAssembly (this LinkContext context, string assemblyName)
 		{
 			AssemblyDefinition ad;
 			context.TryGetLinkedAssembly (assemblyName, out ad);
 			return ad;
 		}
 
+		public static TypeDefinition GetType (this LinkContext context, string assemblyName, string typeName)
+		{
+			AssemblyDefinition ad = context.GetAssembly (assemblyName);
+			return ad == null ? null : GetType (ad, typeName);
+		}
+
+		public static MethodDefinition GetMethod (this LinkContext context, string ns, string typeName, string name, string [] parameters)
+		{
+			var type = context.GetType (ns, typeName);
+			if (type == null)
+				return null;
+
+			return GetMethod (type, name, parameters);
+		}
+#endif
+
 		public static MethodDefinition GetMethod (TypeDefinition td, string name)
 		{
 			MethodDefinition method = null;
@@ -66,15 +83,6 @@ public static MethodDefinition GetMethod (TypeDefinition td, string name)
 			return method;
 		}
 
-		public static MethodDefinition GetMethod (this LinkContext context, string ns, string typeName, string name, string [] parameters)
-		{
-			var type = context.GetType (ns, typeName);
-			if (type == null)
-				return null;
-
-			return GetMethod (type, name, parameters);
-		}
-
 		public static MethodDefinition GetMethod (TypeDefinition type, string name, string [] parameters)
 		{
 			MethodDefinition method = null;
@@ -103,12 +111,6 @@ public static MethodDefinition GetMethod (TypeDefinition type, string name, stri
 			return method;
 		}
 
-		public static TypeDefinition GetType (this LinkContext context, string assemblyName, string typeName)
-		{
-			AssemblyDefinition ad = context.GetAssembly (assemblyName);
-			return ad == null ? null : GetType (ad, typeName);
-		}
-
 		public static TypeDefinition GetType (AssemblyDefinition assembly, string typeName)
 		{
 			return assembly.MainModule.GetType (typeName);