ff

Author: dellis1972

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

@@ -14,6 +14,5 @@ public AndroidLinkContext (Pipeline pipeline, AssemblyResolver resolver, ReaderP
 
 		public bool PreserveJniMarshalMethods { get; set; }
 
-		public IList<AssemblyDefinition> Assemblies => new List<AssemblyDefinition> ();
 	}
 }

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

@@ -10,20 +10,33 @@
 
 namespace MonoDroid.Tuner
 {
+	public class AndroidLinkConfiguration {
+		public IList<AssemblyDefinition> Assemblies => new List<AssemblyDefinition> ();
+
+		static IDictionary<LinkContext, AndroidLinkConfiguration> configurations = new Dictionary<LinkContext, AndroidLinkConfiguration> ();
+
+		public static AndroidLinkConfiguration GetInstance (LinkContext context)
+		{
+			if (!configurations.TryGetValue (context, out AndroidLinkConfiguration config)) {
+				configurations.Add (context, new AndroidLinkConfiguration ());
+			}
+			return config;
+		}
+	}
 	public class GetAssembliesStep : BaseStep
 	{
-		AndroidLinkContext linkContext = null;
+		AndroidLinkConfiguration config = null;
 
 		protected override void Process ()
 		{
-			linkContext = Context as AndroidLinkContext;
+			config = AndroidLinkConfiguration.GetInstance (Context);
 		}
 
 		protected override void ProcessAssembly (AssemblyDefinition assembly)
 		{
-			if (linkContext == null)
+			if (config == null)
 				return;
-			linkContext.Assemblies.Add (assembly);
+			config.Assemblies.Add (assembly);
 		}
 	}
 
@@ -37,10 +50,10 @@ public class RemoveResourceDesignerStep : BaseStep
 		protected override void Process ()
 		{
 			// resolve the MainAssembly Resource designer TypeDefinition
-			var _context = Context as AndroidLinkContext;
-			if (_context == null)
+			AndroidLinkConfiguration config = AndroidLinkConfiguration.GetInstance (Context);
+			if (config == null)
 				return;
-			foreach(var asm in _context.Assemblies) {
+			foreach(var asm in config.Assemblies) {
 				 if (FindResourceDesigner (asm, true, out mainDesigner)) {
 					 mainAssembly = asm;
 				 	break;