[mtouch] Remove most static state and put it on an instance. (#1398)

* [mtouch] Remove most static state and put it on an instance.

Remove most static state, and put it on an instance (of Application) instead.

Soon we'll build multiple apps (app extensions) in the same process, and we
need to make sure we're not inadvertedly (and incorrectly) sharing state
between apps, so remove as much static state as possible to avoid any
problems.

* [mtouch] Rename GetIsUsingClang -> IsUsingClang.

src/ObjCRuntime/ErrorHelper.cs

@@ -63,13 +63,13 @@ namespace XamCore.ObjCRuntime {
 		}
 
 #if (MTOUCH || MMP) && !MMP_TEST && !WIN32
-		public static void SetLocation (ProductException ex, Mono.Cecil.MethodDefinition method)
+		public static void SetLocation (Application app, ProductException ex, Mono.Cecil.MethodDefinition method)
 		{
 			if (!method.HasBody)
 				return;
 
 #if MTOUCH
-			Driver.App.LoadSymbols ();
+			app.LoadSymbols ();
 #endif
 
 			if (method.Body.Instructions.Count == 0)
@@ -98,23 +98,23 @@ namespace XamCore.ObjCRuntime {
 			return CreateError (code, method == null ? null : method.Resolve (), message, args);
 		}
 
-		public static ProductException CreateError (int code, Mono.Cecil.MethodDefinition location, string message, params object[] args)
+		public static ProductException CreateError (Application app, int code, Mono.Cecil.MethodDefinition location, string message, params object[] args)
 		{
 			var e = new ProductException (code, true, message, args);
 			if (location != null)
-				SetLocation (e, location);
+				SetLocation (app, e, location);
 			return e;
 		}
 
-		public static ProductException CreateError (int code, Exception innerException, Mono.Cecil.MethodDefinition location, string message, params object[] args)
+		public static ProductException CreateError (Application app, int code, Exception innerException, Mono.Cecil.MethodDefinition location, string message, params object[] args)
 		{
 			var e = new ProductException (code, true, innerException, message, args);
 			if (location != null)
-				SetLocation (e, location);
+				SetLocation (app, e, location);
 			return e;
 		}
 
-		public static ProductException CreateError (int code, Exception innerException, Mono.Cecil.TypeReference location, string message, params object[] args)
+		public static ProductException CreateError (Application app, int code, Exception innerException, Mono.Cecil.TypeReference location, string message, params object[] args)
 		{
 			var e = new ProductException (code, true, innerException, message, args);
 			if (location != null) {
@@ -124,7 +124,7 @@ namespace XamCore.ObjCRuntime {
 					foreach (var method in td.Methods) {
 						if (!method.IsConstructor)
 							continue;
-						SetLocation (e, method);
+						SetLocation (app, e, method);
 						if (e.FileName != null)
 							break;
 					}

src/ObjCRuntime/Registrar.cs

@@ -88,6 +88,10 @@ namespace XamCore.Registrar {
 	}
 
 	abstract partial class Registrar {
+#if MTOUCH || MMP
+		public Application App { get; protected set; }
+#endif
+
 		Dictionary<TAssembly, object> assemblies = new Dictionary<TAssembly, object> (); // Use Dictionary instead of HashSet to avoid pulling in System.Core.dll.
 		// locking: all accesses must lock 'types'.
 		Dictionary<TType, ObjCType> types = new Dictionary<TType, ObjCType> ();
@@ -885,9 +889,10 @@ namespace XamCore.Registrar {
 		internal const string CompatNamespace = "MonoTouch";
 		internal const string CompatAssemblyName = "monotouch";
 #if MTOUCH
-		internal static string DualAssemblyName {
+		internal string DualAssemblyName
+		{
 			get {
-				switch (Driver.App.Platform) {
+				switch (App.Platform) {
 				case Xamarin.Utils.ApplePlatform.iOS:
 					return "Xamarin.iOS";
 				case Xamarin.Utils.ApplePlatform.WatchOS:
@@ -895,7 +900,7 @@ namespace XamCore.Registrar {
 				case Xamarin.Utils.ApplePlatform.TVOS:
 					return "Xamarin.TVOS";
 				default:
-					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", Driver.App.Platform);
+					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", App.Platform);
 				}
 			}
 		}
@@ -923,7 +928,7 @@ namespace XamCore.Registrar {
 				internal const string INativeObject           =	"INativeObject";
 		}
 
-		internal static string PlatformAssembly {
+		internal string PlatformAssembly {
 			get {
 				return IsDualBuild ? DualAssemblyName : CompatAssemblyName;
 			}

src/ObjCRuntime/RuntimeOptions.cs

@@ -51,15 +51,15 @@ namespace XamCore.ObjCRuntime {
 		/*
 		 * This section is only used by the tools
 		 */
-		internal static RuntimeOptions Create (string http_message_handler, string tls_provider)
+		internal static RuntimeOptions Create (Application app, string http_message_handler, string tls_provider)
 		{
 			var options = new RuntimeOptions ();
-			options.http_message_handler = ParseHttpMessageHandler (http_message_handler);
+			options.http_message_handler = ParseHttpMessageHandler (app, http_message_handler);
 			ParseTlsProvider (tls_provider);
 			return options;
 		}
 
-		static string ParseHttpMessageHandler (string value)
+		static string ParseHttpMessageHandler (Application app, string value)
 		{
 			switch (value) {
 			// default
@@ -67,7 +67,7 @@ namespace XamCore.ObjCRuntime {
 				return HttpClientHandlerValue;
 			case CFNetworkHandlerValue:
 			case HttpClientHandlerValue:
-				if (Driver.App.Platform == Utils.ApplePlatform.WatchOS) {
+				if (app.Platform == Utils.ApplePlatform.WatchOS) {
 					ErrorHelper.Warning (2015, "Invalid HttpMessageHandler `{0}` for watchOS. The only valid value is NSUrlSessionHandler.", value);
 					return NSUrlSessionHandlerValue;
 				}
@@ -75,7 +75,7 @@ namespace XamCore.ObjCRuntime {
 			case NSUrlSessionHandlerValue:
 				return value;
 			default:
-				if (Driver.App.Platform == Utils.ApplePlatform.WatchOS) // This is value we don't know about at all, show as error instead of warning.
+				if (app.Platform == Utils.ApplePlatform.WatchOS) // This is value we don't know about at all, show as error instead of warning.
 					throw ErrorHelper.CreateError (2015, "Invalid HttpMessageHandler `{0}` for watchOS. The only valid value is NSUrlSessionHandler.", value);
 				throw ErrorHelper.CreateError (2010, "Unknown HttpMessageHandler `{0}`. Valid values are HttpClientHandler (default), CFNetworkHandler or NSUrlSessionHandler", value);
 			}
@@ -138,13 +138,13 @@ namespace XamCore.ObjCRuntime {
 		}
 
 		// Called from CoreHttpMessageHandler
-		internal static TypeDefinition GetHttpMessageHandler (RuntimeOptions options, ModuleDefinition httpModule, ModuleDefinition platformModule = null)
+		internal static TypeDefinition GetHttpMessageHandler (Application app, RuntimeOptions options, ModuleDefinition httpModule, ModuleDefinition platformModule = null)
 		{
 			string handler;
 
 			if (options != null) {
 				handler = options.http_message_handler;
-			} else if (Driver.App.Platform == Utils.ApplePlatform.WatchOS) {
+			} else if (app.Platform == Utils.ApplePlatform.WatchOS) {
 				handler = NSUrlSessionHandlerValue;
 			} else {
 				handler = HttpClientHandlerValue;
@@ -163,7 +163,7 @@ namespace XamCore.ObjCRuntime {
 				break;
 #else
 			case HttpClientHandlerValue:
-				if (Driver.App.Platform == Utils.ApplePlatform.WatchOS) {
+				if (app.Platform == Utils.ApplePlatform.WatchOS) {
 					ErrorHelper.Warning (2015, "Invalid HttpMessageHandler `{0}` for watchOS. The only valid value is NSUrlSessionHandler.", handler);
 					type = httpModule.GetType ("System.Net.Http", "NSUrlSessionHandler");
 				} else {
@@ -171,7 +171,7 @@ namespace XamCore.ObjCRuntime {
 				}
 				break;
 			case CFNetworkHandlerValue:
-				if (Driver.App.Platform == Utils.ApplePlatform.WatchOS) {
+				if (app.Platform == Utils.ApplePlatform.WatchOS) {
 					ErrorHelper.Warning (2015, "Invalid HttpMessageHandler `{0}` for watchOS. The only valid value is NSUrlSessionHandler.", handler);
 					type = httpModule.GetType ("System.Net.Http", "NSUrlSessionHandler");
 				} else {

tools/common/Application.cs

@@ -35,7 +35,7 @@ namespace Xamarin.Bundler {
 
 	public partial class Application
 	{
-		public string AppDirectory;
+		public string AppDirectory = ".";
 		public bool DeadStrip = true;
 		public bool EnableDebug;
 		internal RuntimeOptions RuntimeOptions;
@@ -60,6 +60,9 @@ namespace Xamarin.Bundler {
 		public string RootAssembly;
 		public string RegistrarOutputLibrary;
 
+		public Version DeploymentTarget;
+		public Version SdkVersion;
+
 		public bool RequiresPInvokeWrappers {
 			get {
 #if MTOUCH
@@ -419,15 +422,15 @@ namespace Xamarin.Bundler {
 
 			var resolvedAssemblies = new List<AssemblyDefinition> ();
 			var resolver = new PlatformResolver () {
-				FrameworkDirectory = Driver.PlatformFrameworkDirectory,
+				FrameworkDirectory = Driver.GetPlatformFrameworkDirectory (this),
 				RootDirectory = Path.GetDirectoryName (RootAssembly),
 			};
 
-			if (Driver.App.Platform == ApplePlatform.iOS || Driver.App.Platform == ApplePlatform.MacOSX) {
-				if (Driver.App.Is32Build) {
-					resolver.ArchDirectory = Driver.Arch32Directory;
+			if (Platform == ApplePlatform.iOS || Platform == ApplePlatform.MacOSX) {
+				if (Is32Build) {
+					resolver.ArchDirectory = Driver.GetArch32Directory (this);
 				} else {
-					resolver.ArchDirectory = Driver.Arch64Directory;
+					resolver.ArchDirectory = Driver.GetArch64Directory (this);
 				}
 			}
 
@@ -436,7 +439,7 @@ namespace Xamarin.Bundler {
 			resolvedAssemblies.Add (ps.AssemblyResolver.Resolve ("mscorlib"));
 
 			var rootName = Path.GetFileNameWithoutExtension (RootAssembly);
-			if (rootName != Driver.ProductAssembly)
+			if (rootName != Driver.GetProductAssembly (this))
 				throw new PlatformException (66, "Invalid build registrar assembly: {0}", RootAssembly);
 
 			resolvedAssemblies.Add (ps.AssemblyResolver.Resolve (rootName));

tools/common/CompilerFlags.cs

@@ -85,22 +85,22 @@ namespace Xamarin.Utils
 		{
 			// link with the exact path to libmono
 			if (Application.UseMonoFramework.Value) {
-				AddFramework (Path.Combine (Driver.ProductFrameworksDirectory, "Mono.framework"));
+				AddFramework (Path.Combine (Driver.GetProductFrameworksDirectory (Application), "Mono.framework"));
 			} else {
-				AddLinkWith (Path.Combine (Driver.MonoTouchLibDirectory, Application.LibMono));
+				AddLinkWith (Path.Combine (Driver.GetMonoTouchLibDirectory (Application), Application.LibMono));
 			}
 		}
 
 		public void LinkWithXamarin ()
 		{
-			AddLinkWith (Path.Combine (Driver.MonoTouchLibDirectory, Application.LibXamarin));
+			AddLinkWith (Path.Combine (Driver.GetMonoTouchLibDirectory (Application), Application.LibXamarin));
 			AddFramework ("Foundation");
 			AddOtherFlag ("-lz");
 		}
 
 		public void LinkWithPInvokes (Abi abi)
 		{
-			if (!Driver.App.FastDev || !Driver.App.RequiresPInvokeWrappers)
+			if (!Application.FastDev || !Application.RequiresPInvokeWrappers)
 				return;
 
 			AddOtherFlag (Path.Combine (Cache.Location, "libpinvokes." + abi.AsArchString () + ".dylib"));
@@ -139,9 +139,9 @@ namespace Xamarin.Utils
 				foreach (var fwk in Frameworks) {
 					if (!fwk.EndsWith (".framework", StringComparison.Ordinal)) {
 						var add_to = WeakFrameworks;
-						var framework = Driver.Frameworks.Find (fwk);
+						var framework = Driver.GetFrameworks (Application).Find (fwk);
 						if (framework != null) {
-							if (framework.Version > Driver.SDKVersion)
+							if (framework.Version > Application.SdkVersion)
 								continue;
 							add_to = Application.DeploymentTarget >= framework.Version ? Frameworks : WeakFrameworks;
 						}

tools/common/Driver.cs

@@ -18,27 +18,27 @@ using XamCore.ObjCRuntime;
 
 namespace Xamarin.Bundler {
 	public partial class Driver {
-		static void AddSharedOptions (Mono.Options.OptionSet options)
+		static void AddSharedOptions (Application app, Mono.Options.OptionSet options)
 		{
-			options.Add ("coop:", "If the GC should run in cooperative mode.", v => { App.EnableCoopGC = ParseBool (v, "coop"); }, hidden: true);
+			options.Add ("coop:", "If the GC should run in cooperative mode.", v => { app.EnableCoopGC = ParseBool (v, "coop"); }, hidden: true);
 			options.Add ("marshal-objectivec-exceptions:", "Specify how Objective-C exceptions should be marshalled. Valid values: default, unwindmanagedcode, throwmanagedexception, abort and disable. The default depends on the target platform (on watchOS the default is 'throwmanagedexception', while on all other platforms it's 'disable').", v => {
 				switch (v) {
 				case "default":
-					App.MarshalObjectiveCExceptions = MarshalObjectiveCExceptionMode.Default;
+					app.MarshalObjectiveCExceptions = MarshalObjectiveCExceptionMode.Default;
 					break;
 				case "unwindmanaged":
 				case "unwindmanagedcode":
-					App.MarshalObjectiveCExceptions = MarshalObjectiveCExceptionMode.UnwindManagedCode;
+					app.MarshalObjectiveCExceptions = MarshalObjectiveCExceptionMode.UnwindManagedCode;
 					break;
 				case "throwmanaged":
 				case "throwmanagedexception":
-					App.MarshalObjectiveCExceptions = MarshalObjectiveCExceptionMode.ThrowManagedException;
+					app.MarshalObjectiveCExceptions = MarshalObjectiveCExceptionMode.ThrowManagedException;
 					break;
 				case "abort":
-					App.MarshalObjectiveCExceptions = MarshalObjectiveCExceptionMode.Abort;
+					app.MarshalObjectiveCExceptions = MarshalObjectiveCExceptionMode.Abort;
 					break;
 				case "disable":
-					App.MarshalObjectiveCExceptions = MarshalObjectiveCExceptionMode.Disable;
+					app.MarshalObjectiveCExceptions = MarshalObjectiveCExceptionMode.Disable;
 					break;
 				default:
 					throw ErrorHelper.CreateError (26, "Could not parse the command line argument '{0}': {1}", "--marshal-objective-exceptions", $"Invalid value: {v}. Valid values are: default, unwindmanagedcode, throwmanagedexception, abort and disable.");
@@ -47,21 +47,21 @@ namespace Xamarin.Bundler {
 			options.Add ("marshal-managed-exceptions:", "Specify how managed exceptions should be marshalled. Valid values: default, unwindnativecode, throwobjectivecexception, abort and disable. The default depends on the target platform (on watchOS the default is 'throwobjectivecexception', while on all other platform it's 'disable').", v => {
 				switch (v) {
 				case "default":
-					App.MarshalManagedExceptions = MarshalManagedExceptionMode.Default;
+					app.MarshalManagedExceptions = MarshalManagedExceptionMode.Default;
 					break;
 				case "unwindnative":
 				case "unwindnativecode":
-					App.MarshalManagedExceptions = MarshalManagedExceptionMode.UnwindNativeCode;
+					app.MarshalManagedExceptions = MarshalManagedExceptionMode.UnwindNativeCode;
 					break;
 				case "throwobjectivec":
 				case "throwobjectivecexception":
-					App.MarshalManagedExceptions = MarshalManagedExceptionMode.ThrowObjectiveCException;
+					app.MarshalManagedExceptions = MarshalManagedExceptionMode.ThrowObjectiveCException;
 					break;
 				case "abort":
-					App.MarshalManagedExceptions = MarshalManagedExceptionMode.Abort;
+					app.MarshalManagedExceptions = MarshalManagedExceptionMode.Abort;
 					break;
 				case "disable":
-					App.MarshalManagedExceptions = MarshalManagedExceptionMode.Disable;
+					app.MarshalManagedExceptions = MarshalManagedExceptionMode.Disable;
 					break;
 				default:
 					throw ErrorHelper.CreateError (26, "Could not parse the command line argument '{0}': {1}", "--marshal-managed-exceptions", $"Invalid value: {v}. Valid values are: default, unwindnativecode, throwobjectivecexception, abort and disable.");

tools/common/Frameworks.cs

@@ -141,105 +141,104 @@ public class Frameworks : Dictionary <string, Framework>
 
 #if MTOUCH
 	static Frameworks ios_frameworks;
-	public static Frameworks iOSFrameworks {
-		get {
-			if (ios_frameworks == null) {
-				ios_frameworks = new Frameworks () {
-					{ "AddressBook",  "AddressBook", 3 },
-					{ "Security", "Security", 3 },
-					{ "AudioUnit", "AudioToolbox", 3 },
-					{ "AddressBookUI", "AddressBookUI", 3 },
-					{ "AudioToolbox", "AudioToolbox", 3 },
-					{ "AVFoundation", "AVFoundation", 3 },
-					{ "CoreAnimation", "QuartzCore", 3 },
-					{ "CoreData", "CoreData", 3 },
-					{ "CoreGraphics", "CoreGraphics", 3 },
-					{ "CoreLocation", "CoreLocation", 3 },
-					{ "ExternalAccessory", "ExternalAccessory", 3 },
-					{ "Foundation", "Foundation", 3 },
-					{ "GameKit", "GameKit", 3 },
-					{ "MapKit", "MapKit", 3 },
-					{ "MediaPlayer", "MediaPlayer", 3 },
-					{ "MessageUI", "MessageUI", 3 },
-					{ "MobileCoreServices", "MobileCoreServices", 3 },
-					{ "StoreKit", "StoreKit", 3 },
-					{ "SystemConfiguration", "SystemConfiguration", 3 },
-					{ "OpenGLES", "OpenGLES", 3 },
-					{ "UIKit", "UIKit", 3 },
+	public static Frameworks GetiOSFrameworks (Application app)
+	{
+		if (ios_frameworks == null) {
+			ios_frameworks = new Frameworks () {
+				{ "AddressBook",  "AddressBook", 3 },
+				{ "Security", "Security", 3 },
+				{ "AudioUnit", "AudioToolbox", 3 },
+				{ "AddressBookUI", "AddressBookUI", 3 },
+				{ "AudioToolbox", "AudioToolbox", 3 },
+				{ "AVFoundation", "AVFoundation", 3 },
+				{ "CoreAnimation", "QuartzCore", 3 },
+				{ "CoreData", "CoreData", 3 },
+				{ "CoreGraphics", "CoreGraphics", 3 },
+				{ "CoreLocation", "CoreLocation", 3 },
+				{ "ExternalAccessory", "ExternalAccessory", 3 },
+				{ "Foundation", "Foundation", 3 },
+				{ "GameKit", "GameKit", 3 },
+				{ "MapKit", "MapKit", 3 },
+				{ "MediaPlayer", "MediaPlayer", 3 },
+				{ "MessageUI", "MessageUI", 3 },
+				{ "MobileCoreServices", "MobileCoreServices", 3 },
+				{ "StoreKit", "StoreKit", 3 },
+				{ "SystemConfiguration", "SystemConfiguration", 3 },
+				{ "OpenGLES", "OpenGLES", 3 },
+				{ "UIKit", "UIKit", 3 },
 
-					{ "Accelerate", "Accelerate", 4 },
-					{ "EventKit", "EventKit", 4 },
-					{ "EventKitUI", "EventKitUI", 4 },
-					{ "CoreMotion", "CoreMotion", 4 },
-					{ "CoreMedia", "CoreMedia", 4 },
-					{ "CoreVideo", "CoreVideo", 4 },
-					{ "CoreTelephony", "CoreTelephony", 4 },
-					{ "iAd", "iAd", 4 },
-					{ "QuickLook", "QuickLook", 4 },
-					{ "ImageIO", "ImageIO", 4 },
-					{ "AssetsLibrary", "AssetsLibrary", 4 },
-					{ "CoreText", "CoreText", 4 },
-					{ "CoreMidi", "CoreMIDI", 4 },
+				{ "Accelerate", "Accelerate", 4 },
+				{ "EventKit", "EventKit", 4 },
+				{ "EventKitUI", "EventKitUI", 4 },
+				{ "CoreMotion", "CoreMotion", 4 },
+				{ "CoreMedia", "CoreMedia", 4 },
+				{ "CoreVideo", "CoreVideo", 4 },
+				{ "CoreTelephony", "CoreTelephony", 4 },
+				{ "iAd", "iAd", 4 },
+				{ "QuickLook", "QuickLook", 4 },
+				{ "ImageIO", "ImageIO", 4 },
+				{ "AssetsLibrary", "AssetsLibrary", 4 },
+				{ "CoreText", "CoreText", 4 },
+				{ "CoreMidi", "CoreMIDI", 4 },
 
-					{ "Accounts", "Accounts", 5 },
-					{ "GLKit", "GLKit", 5 },
-					{ "NewsstandKit", "NewsstandKit", 5 },
-					{ "CoreImage", "CoreImage", 5 },
-					{ "CoreBluetooth", "CoreBluetooth", 5 },
-					{ "Twitter", "Twitter", 5 },
+				{ "Accounts", "Accounts", 5 },
+				{ "GLKit", "GLKit", 5 },
+				{ "NewsstandKit", "NewsstandKit", 5 },
+				{ "CoreImage", "CoreImage", 5 },
+				{ "CoreBluetooth", "CoreBluetooth", 5 },
+				{ "Twitter", "Twitter", 5 },
 
-					{ "MediaToolbox", "MediaToolbox", 6 },
-					{ "PassKit", "PassKit", 6 },
-					{ "Social", "Social", 6 },
-					{ "AdSupport", "AdSupport", 6 },
+				{ "MediaToolbox", "MediaToolbox", 6 },
+				{ "PassKit", "PassKit", 6 },
+				{ "Social", "Social", 6 },
+				{ "AdSupport", "AdSupport", 6 },
 
-					{ "GameController", "GameController", 7 },
-					{ "JavaScriptCore", "JavaScriptCore", 7 },
-					{ "MediaAccessibility", "MediaAccessibility", 7 },
-					{ "MultipeerConnectivity", "MultipeerConnectivity", 7 },
-					{ "SafariServices", "SafariServices", 7 },
-					{ "SpriteKit", "SpriteKit", 7 },
+				{ "GameController", "GameController", 7 },
+				{ "JavaScriptCore", "JavaScriptCore", 7 },
+				{ "MediaAccessibility", "MediaAccessibility", 7 },
+				{ "MultipeerConnectivity", "MultipeerConnectivity", 7 },
+				{ "SafariServices", "SafariServices", 7 },
+				{ "SpriteKit", "SpriteKit", 7 },
 
-					{ "HealthKit", "HealthKit", 8 },
-					{ "HomeKit", "HomeKit", 8 },
-					{ "LocalAuthentication", "LocalAuthentication", 8 },
-					{ "NotificationCenter", "NotificationCenter", 8 },
-					{ "PushKit", "PushKit", 8 },
-					{ "Photos", "Photos", 8 },
-					{ "PhotosUI", "PhotosUI", 8 },
-					{ "SceneKit", "SceneKit", 8 },
-					{ "CloudKit", "CloudKit", 8 },
-					{ "AVKit", "AVKit", 8 },
-					{ "CoreAudioKit", "CoreAudioKit", Driver.App.IsSimulatorBuild ? 9 : 8 },
-					{ "Metal", "Metal", 8 },
-					{ "WebKit", "WebKit", 8 },
-					{ "NetworkExtension", "NetworkExtension", 8 },
-					{ "VideoToolbox", "VideoToolbox", 8 },
-					{ "WatchKit", "WatchKit", 8,2 },
-					
-					{ "ReplayKit", "ReplayKit", 9 },
-					{ "Contacts", "Contacts", 9 },
-					{ "ContactsUI", "ContactsUI", 9 },
-					{ "CoreSpotlight", "CoreSpotlight", 9 },
-					{ "WatchConnectivity", "WatchConnectivity", 9 },
-					{ "ModelIO", "ModelIO", 9 },
-					{ "MetalKit", "MetalKit", 9 },
-					{ "MetalPerformanceShaders", "MetalPerformanceShaders", 9 },
-					{ "GameplayKit", "GameplayKit", 9 },
-					{ "HealthKitUI", "HealthKitUI", 9,3 },
+				{ "HealthKit", "HealthKit", 8 },
+				{ "HomeKit", "HomeKit", 8 },
+				{ "LocalAuthentication", "LocalAuthentication", 8 },
+				{ "NotificationCenter", "NotificationCenter", 8 },
+				{ "PushKit", "PushKit", 8 },
+				{ "Photos", "Photos", 8 },
+				{ "PhotosUI", "PhotosUI", 8 },
+				{ "SceneKit", "SceneKit", 8 },
+				{ "CloudKit", "CloudKit", 8 },
+				{ "AVKit", "AVKit", 8 },
+				{ "CoreAudioKit", "CoreAudioKit", app.IsSimulatorBuild ? 9 : 8 },
+				{ "Metal", "Metal", 8 },
+				{ "WebKit", "WebKit", 8 },
+				{ "NetworkExtension", "NetworkExtension", 8 },
+				{ "VideoToolbox", "VideoToolbox", 8 },
+				{ "WatchKit", "WatchKit", 8,2 },
 
-					{ "CallKit", "CallKit", 10 },
-					{ "Messages", "Messages", 10 },
-					{ "Speech", "Speech", 10 },
-					{ "VideoSubscriberAccount", "VideoSubscriberAccount", 10 },
-					{ "UserNotifications", "UserNotifications", 10 },
-					{ "UserNotificationsUI", "UserNotificationsUI", 10 },
-					{ "Intents", "Intents", 10 },
-					{ "IntentsUI", "IntentsUI", 10 },
-				};
-			}
-			return ios_frameworks;
+				{ "ReplayKit", "ReplayKit", 9 },
+				{ "Contacts", "Contacts", 9 },
+				{ "ContactsUI", "ContactsUI", 9 },
+				{ "CoreSpotlight", "CoreSpotlight", 9 },
+				{ "WatchConnectivity", "WatchConnectivity", 9 },
+				{ "ModelIO", "ModelIO", 9 },
+				{ "MetalKit", "MetalKit", 9 },
+				{ "MetalPerformanceShaders", "MetalPerformanceShaders", 9 },
+				{ "GameplayKit", "GameplayKit", 9 },
+				{ "HealthKitUI", "HealthKitUI", 9,3 },
+
+				{ "CallKit", "CallKit", 10 },
+				{ "Messages", "Messages", 10 },
+				{ "Speech", "Speech", 10 },
+				{ "VideoSubscriberAccount", "VideoSubscriberAccount", 10 },
+				{ "UserNotifications", "UserNotifications", 10 },
+				{ "UserNotificationsUI", "UserNotificationsUI", 10 },
+				{ "Intents", "Intents", 10 },
+				{ "IntentsUI", "IntentsUI", 10 },
+			};
 		}
+		return ios_frameworks;
 	}
 
 	static Frameworks watch_frameworks;
@@ -345,7 +344,7 @@ public class Frameworks : Dictionary <string, Framework>
 	}
 #endif
 
-	public static void Gather (AssemblyDefinition product_assembly, HashSet<string> frameworks, HashSet<string> weak_frameworks)
+	public static void Gather (Application app, AssemblyDefinition product_assembly, HashSet<string> frameworks, HashSet<string> weak_frameworks)
 	{
 		var namespaces = new HashSet<string> ();
 
@@ -357,9 +356,9 @@ public class Frameworks : Dictionary <string, Framework>
 		// Iterate over all the namespaces and check which frameworks we need to link with.
 		foreach (var nspace in namespaces) {
 			Framework framework;
-			if (Driver.Frameworks.TryGetValue (nspace, out framework)) {
-				if (Driver.SDKVersion >= framework.Version) {
-					var add_to = Driver.MinOSVersion >= framework.Version ? frameworks : weak_frameworks;
+			if (Driver.GetFrameworks (app).TryGetValue (nspace, out framework)) {
+				if (app.SdkVersion >= framework.Version) {
+					var add_to = app.DeploymentTarget >= framework.Version ? frameworks : weak_frameworks;
 					add_to.Add (framework.Name);
 					continue;
 				}

tools/common/PInvokeWrapperGenerator.cs

@@ -12,6 +12,7 @@ namespace Xamarin.Bundler
 {
 	class PInvokeWrapperGenerator
 	{
+		public Application App;
 		public Dictionary<string,string> signatures = new Dictionary<string, string> ();
 		public List<Exception> exceptions = new List<Exception> ();
 		public StringBuilder signature = new StringBuilder ();
@@ -36,7 +37,7 @@ namespace Xamarin.Bundler
 
 		public void Start ()
 		{							
-			if (Driver.EnableDebug)
+			if (App.EnableDebug)
 				hdr.WriteLine ("#define DEBUG 1");
 
 			hdr.WriteLine ("#include <stdarg.h>");

tools/common/StaticRegistrar.cs

@@ -516,7 +516,6 @@ namespace XamCore.Registrar {
 	}
 
 	class StaticRegistrar : Registrar, IStaticRegistrar {
-		public Application App { get; private set; }
 		public Target Target { get; private set; }
 		public bool IsSingleAssembly { get { return !string.IsNullOrEmpty (single_assembly); } }
 
@@ -664,12 +663,12 @@ namespace XamCore.Registrar {
 
 		protected override Exception CreateException (int code, Exception innerException, MethodDefinition method, string message, params object[] args)
 		{
-			return ErrorHelper.CreateError (code, innerException, method, message, args);
+			return ErrorHelper.CreateError (App, code, innerException, method, message, args);
 		}
 
 		protected override Exception CreateException (int code, Exception innerException, TypeReference type, string message, params object [] args)
 		{
-			return ErrorHelper.CreateError (code, innerException, type, message, args);
+			return ErrorHelper.CreateError (App, code, innerException, type, message, args);
 		}
 
 		protected override bool ContainsPlatformReference (AssemblyDefinition assembly)
@@ -1209,7 +1208,7 @@ namespace XamCore.Registrar {
 
 		protected override string PlatformName {
 			get {
-				return Driver.App.PlatformName;
+				return App.PlatformName;
 			}
 		}
 
@@ -1288,7 +1287,7 @@ namespace XamCore.Registrar {
 		{
 			PlatformName currentPlatform;
 #if MTOUCH
-			switch (Driver.App.Platform) {
+			switch (App.Platform) {
 			case Xamarin.Utils.ApplePlatform.iOS:
 				currentPlatform = global::XamCore.ObjCRuntime.PlatformName.iOS;
 				break;
@@ -1299,7 +1298,7 @@ namespace XamCore.Registrar {
 				currentPlatform = global::XamCore.ObjCRuntime.PlatformName.WatchOS;
 				break;
 			default:
-				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", Driver.App.Platform);
+				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", App.Platform);
 			}
 #else
 			currentPlatform = global::XamCore.ObjCRuntime.PlatformName.MacOSX;
@@ -1443,7 +1442,7 @@ namespace XamCore.Registrar {
 
 		protected override Version GetSDKVersion ()
 		{
-			return Driver.SDKVersion;
+			return App.SdkVersion;
 		}
 
 		protected override Dictionary<MethodDefinition, List<MethodDefinition>> PrepareMethodMapping (TypeReference type)
@@ -1645,7 +1644,7 @@ namespace XamCore.Registrar {
 		uint full_token_reference_count;
 		List<string> registered_assemblies = new List<string> ();
 
-		static bool IsPlatformType (TypeReference type)
+		bool IsPlatformType (TypeReference type)
 		{
 			if (type.IsNested)
 				return false;
@@ -1655,7 +1654,7 @@ namespace XamCore.Registrar {
 				return false;
 				
 			if (IsDualBuild) {
-				return Driver.Frameworks.ContainsKey (type.Namespace);
+				return Driver.GetFrameworks (App).ContainsKey (type.Namespace);
 			} else {
 				return type.Namespace.StartsWith (CompatNamespace + ".", StringComparison.Ordinal);
 			}
@@ -1675,8 +1674,8 @@ namespace XamCore.Registrar {
 			var ns = type.Namespace;
 
 			Framework framework;
-			if (Driver.Frameworks.TryGetValue (ns, out framework)) {
-				if (framework.Version > Driver.SDKVersion) {
+			if (Driver.GetFrameworks (App).TryGetValue (ns, out framework)) {
+				if (framework.Version > App.SdkVersion) {
 					if (reported_frameworks == null)
 						reported_frameworks = new HashSet<string> ();
 					if (!reported_frameworks.Contains (framework.Name)) {
@@ -1690,7 +1689,7 @@ namespace XamCore.Registrar {
 							"This configuration is only supported with the legacy registrar (pass --registrar:legacy as an additional mtouch argument in your project's iOS Build option to select). " +
 							"Alternatively select a newer SDK in your app's iOS Build options.",
 #endif
-							framework.Name, Driver.SDKVersion, framework.Version));
+							framework.Name, App.SdkVersion, framework.Version));
 						reported_frameworks.Add (framework.Name);
 					}
 					return;
@@ -1736,7 +1735,7 @@ namespace XamCore.Registrar {
 			case "CoreAnimation":
 				header.WriteLine ("#import <QuartzCore/QuartzCore.h>");
 #if MTOUCH
-				if (Driver.SDKVersion.Major > 7)
+				if (App.SdkVersion.Major > 7)
 					header.WriteLine ("#import <QuartzCore/CAEmitterBehavior.h>");
 #endif
 				return;
@@ -1751,7 +1750,7 @@ namespace XamCore.Registrar {
 				header.WriteLine ("#import <CoreTelephony/CTCallCenter.h>");
 				header.WriteLine ("#import <CoreTelephony/CTCarrier.h>");
 				header.WriteLine ("#import <CoreTelephony/CTTelephonyNetworkInfo.h>");
-				if (Driver.SDKVersion.Major >= 7) {
+				if (App.SdkVersion.Major >= 7) {
 					header.WriteLine ("#import <CoreTelephony/CTSubscriber.h>");
 					header.WriteLine ("#import <CoreTelephony/CTSubscriberInfo.h>");
 				}
@@ -1759,7 +1758,7 @@ namespace XamCore.Registrar {
 #endif
 #if MTOUCH
 			case "Accounts":
-				var compiler = Path.GetFileName (Driver.CompilerPath);
+				var compiler = Path.GetFileName (App.CompilerPath);
 				if (compiler == "gcc" || compiler == "g++") {
 					exceptions.Add (new MonoTouchException (4121, true, "Cannot use GCC/G++ to compile the generated code from the static registrar when using the Accounts framework (the header files provided by Apple used during the compilation require Clang). Either use Clang (--compiler:clang) or the dynamic registrar (--registrar:dynamic)."));
 					return;
@@ -1786,7 +1785,7 @@ namespace XamCore.Registrar {
 				goto default;
 			case "GameKit":
 #if !MONOMAC
-				if (IsSimulator && Driver.App.Platform == Xamarin.Utils.ApplePlatform.WatchOS)
+				if (IsSimulator && App.Platform == Xamarin.Utils.ApplePlatform.WatchOS)
 					return; // No headers provided for watchOS/simulator.
 #endif
 				goto default;
@@ -1801,7 +1800,7 @@ namespace XamCore.Registrar {
 				return;
 			case "QTKit":
 #if MONOMAC
-				if (Driver.SDKVersion >= MacOSTenTwelveVersion)
+				if (App.SdkVersion >= MacOSTenTwelveVersion)
 					return; // 10.12 removed the header files for QTKit
 #endif
 				goto default;
@@ -2274,7 +2273,7 @@ namespace XamCore.Registrar {
 						continue;
 				}
 
-				if (IsQTKitType (@class) && Driver.SDKVersion >= MacOSTenTwelveVersion)
+				if (IsQTKitType (@class) && App.SdkVersion >= MacOSTenTwelveVersion)
 					continue; // QTKit header was removed in 10.12 SDK
 
 				// These are 64-bit frameworks that extend NSExtensionContext / NSUserActivity, which you can't do
@@ -2989,7 +2988,7 @@ namespace XamCore.Registrar {
 						
 						setup_call_stack.AppendLine ("if (p{0}) {{", i);
 						setup_call_stack.AppendLine ("NSArray *arr = (NSArray *) p{0};", i);
-						if (Driver.EnableDebug)
+						if (App.EnableDebug)
 							setup_call_stack.AppendLine ("xamarin_check_objc_type (p{0}, [NSArray class], _cmd, self, {0}, managed_method);", i);
 						setup_call_stack.AppendLine ("MonoClass *e_class;");
 						setup_call_stack.AppendLine ("MonoArray *marr;");
@@ -3040,7 +3039,7 @@ namespace XamCore.Registrar {
 								setup_call_stack.AppendLine ("mobj{0} = xamarin_get_managed_object_for_ptr_fast (nobj, &exception_gchandle);", i);
 								setup_call_stack.AppendLine ("if (exception_gchandle != 0) goto exception_handling;");
 							}
-							if (Driver.EnableDebug) {
+							if (App.EnableDebug) {
 								setup_call_stack.AppendLine ("xamarin_verify_parameter (mobj{0}, _cmd, self, nobj, {0}, e_class, managed_method);", i);
 							}
 							setup_call_stack.AppendLine ("}");
@@ -3064,7 +3063,7 @@ namespace XamCore.Registrar {
 								setup_call_stack.AppendLine ("paramtype{0} = xamarin_get_parameter_type (managed_method, {0});", i);
 								setup_call_stack.AppendLine ("mobj{0} = xamarin_get_nsobject_with_type_for_ptr (nsobj{0}, false, paramtype{0}, &exception_gchandle);", i);
 								setup_call_stack.AppendLine ("if (exception_gchandle != 0) goto exception_handling;");
-								if (Driver.EnableDebug) {
+								if (App.EnableDebug) {
 									setup_call_stack.AppendLine ("xamarin_verify_parameter (mobj{0}, _cmd, self, nsobj{0}, {0}, mono_class_from_mono_type (paramtype{0}), managed_method);", i);
 								}
 								setup_call_stack.AppendLine ("}");
@@ -3090,7 +3089,7 @@ namespace XamCore.Registrar {
 							setup_call_stack.AppendLine ("paramtype{0} = xamarin_get_parameter_type (managed_method, {0});", i);
 							setup_call_stack.AppendLine ("mobj{0} = xamarin_get_nsobject_with_type_for_ptr_created (nsobj{0}, false, paramtype{0}, &created{0}, &exception_gchandle);", i);
 							setup_call_stack.AppendLine ("if (exception_gchandle != 0) goto exception_handling;");
-							if (Driver.EnableDebug) {
+							if (App.EnableDebug) {
 								setup_call_stack.AppendLine ("xamarin_verify_parameter (mobj{0}, _cmd, self, nsobj{0}, {0}, mono_class_from_mono_type (paramtype{0}), managed_method);", i);
 							}
 							setup_call_stack.AppendLine ("}");
@@ -3727,7 +3726,7 @@ namespace XamCore.Registrar {
 							hdr.WriteLine ("#pragma clang diagnostic ignored \"-Wtypedef-redefinition\""); // temporary hack until we can stop including glib.h
 							hdr.WriteLine ("#pragma clang diagnostic ignored \"-Wobjc-designated-initializers\"");
 
-							if (Driver.EnableDebug)
+							if (App.EnableDebug)
 								hdr.WriteLine ("#define DEBUG 1");
 
 							hdr.WriteLine ("#include <stdarg.h>");

tools/common/Target.cs

@@ -43,7 +43,7 @@ namespace Xamarin.Bundler {
 		public HashSet<string> Frameworks = new HashSet<string> ();
 		public HashSet<string> WeakFrameworks = new HashSet<string> ();
 
-		public IStaticRegistrar StaticRegistrar { get; set; }
+		internal StaticRegistrar StaticRegistrar { get; set; }
 
 #if MONOMAC
 		public bool Is32Build { get { return !Driver.Is64Bit; } }

tools/linker/CoreHttpMessageHandler.cs

@@ -58,7 +58,7 @@ namespace Xamarin.Linker.Steps {
 			MethodDefinition method = type.Methods.First (x => x.Name == "GetHttpMessageHandler" && !x.HasParameters);
 
 			AssemblyDefinition systemNetHTTPAssembly = context.GetAssemblies ().First (x => x.Name.Name == "System.Net.Http");
-			TypeDefinition handler = RuntimeOptions.GetHttpMessageHandler (Options.RuntimeOptions, systemNetHTTPAssembly.MainModule, type.Module);
+			TypeDefinition handler = RuntimeOptions.GetHttpMessageHandler (Driver.App, Options.RuntimeOptions, systemNetHTTPAssembly.MainModule, type.Module);
 			MethodReference handler_ctor = handler.Methods.First (x => x.IsConstructor && !x.HasParameters && !x.IsStatic);
 
 			// HttpClientHandler is defined not in Xamarin.Mac.dll so we need to import
@@ -92,7 +92,7 @@ namespace Xamarin.Linker.Steps {
 			if (default_ctor == null || full_ctor == null)
 				throw new Exception ("Could not set the default HttpMessageHandler");
 
-			var handler = RuntimeOptions.GetHttpMessageHandler (Options.RuntimeOptions, type.Module);
+			var handler = RuntimeOptions.GetHttpMessageHandler (Options.Application, Options.RuntimeOptions, type.Module);
 
 			MethodDefinition handler_ctor = null;
 			foreach (var m in handler.Methods) {

tools/mmp/driver.cs

@@ -150,39 +150,36 @@ namespace Xamarin.Bundler {
 			}
 		}
 
-		public static Version SDKVersion { get; private set; }
-
-		public static Version MinOSVersion { get { return minos; } }
-
-		public static string ProductAssembly => "Xamarin.Mac";
-		public static string PlatformFrameworkDirectory	{
-			get {
-				if (IsUnifiedMobile)
-					return Path.Combine (MMPDirectory, "lib", "mono", "Xamarin.Mac");
-				else if (IsUnifiedFullXamMacFramework)
-					return Path.Combine (MMPDirectory, "lib", "mono", "4.5");
-				throw new InvalidOperationException ("PlatformFrameworkDirectory when not Mobile or Full?");
-			}
+		public static string GetProductAssembly (Application app)
+		{
+			return "Xamarin.Mac";
 		}
 
-		public static string Arch32Directory {
-			get {
-				if (IsUnifiedMobile)
-					return Path.Combine (MMPDirectory, "lib", "i386", "mobile");
-				else if (IsUnifiedFullXamMacFramework)
-					return Path.Combine (MMPDirectory, "lib", "i386", "full");
-				throw new InvalidOperationException ("Arch32Directory when not Mobile or Full?");
-			}
+		public static string GetPlatformFrameworkDirectory (Application app)
+		{
+			if (IsUnifiedMobile)
+				return Path.Combine (MMPDirectory, "lib", "mono", "Xamarin.Mac");
+			else if (IsUnifiedFullXamMacFramework)
+				return Path.Combine (MMPDirectory, "lib", "mono", "4.5");
+			throw new InvalidOperationException ("PlatformFrameworkDirectory when not Mobile or Full?");
+		}
+
+		public static string GetArch32Directory (Application app)
+		{
+			if (IsUnifiedMobile)
+				return Path.Combine (MMPDirectory, "lib", "i386", "mobile");
+			else if (IsUnifiedFullXamMacFramework)
+				return Path.Combine (MMPDirectory, "lib", "i386", "full");
+			throw new InvalidOperationException ("Arch32Directory when not Mobile or Full?");
 		}
 		
-		public static string Arch64Directory {
-			get {
-				if (IsUnifiedMobile)
-					return Path.Combine (MMPDirectory, "lib", "x86_64", "mobile");
-				else if (IsUnifiedFullXamMacFramework)
-					return Path.Combine (MMPDirectory, "lib", "x86_64", "full");
-				throw new InvalidOperationException ("Arch64Directory when not Mobile or Full?");
-			}
+		public static string GetArch64Directory (Application app)
+		{
+			if (IsUnifiedMobile)
+				return Path.Combine (MMPDirectory, "lib", "x86_64", "mobile");
+			else if (IsUnifiedFullXamMacFramework)
+				return Path.Combine (MMPDirectory, "lib", "x86_64", "full");
+			throw new InvalidOperationException ("Arch64Directory when not Mobile or Full?");
 		}
 					
 
@@ -318,7 +315,7 @@ namespace Xamarin.Bundler {
 				{ "sdk=", "Specifies the SDK version to compile against (version, for example \"10.9\")",
 					v => {
 						try {
-							SDKVersion = Version.Parse (v);
+							App.SdkVersion = Version.Parse (v);
 						} catch (Exception ex) {
 							ErrorHelper.Error (26, ex, "Could not parse the command line argument '{0}': {1}", "-sdk", ex.Message);
 						}
@@ -362,7 +359,7 @@ namespace Xamarin.Bundler {
 				{ "xamarin-system-framework", "Used with --target-framework=4.5 to select XM 4.5 Target Framework", v => { IsUnifiedFullSystemFramework = true; } },
 			};
 
-			AddSharedOptions (os);
+			AddSharedOptions (App, os);
 
 			IList<string> unprocessed;
 			try {
@@ -375,7 +372,7 @@ namespace Xamarin.Bundler {
 				throw new MonoMacException (10, true, "Could not parse the command line arguments: {0}", e.Message);
 			}
 
-			App.RuntimeOptions = RuntimeOptions.Create (http_message_provider, tls_provider);
+			App.RuntimeOptions = RuntimeOptions.Create (App, http_message_provider, tls_provider);
 
 			ErrorHelper.Verbosity = verbose;
 
@@ -591,9 +588,9 @@ namespace Xamarin.Bundler {
 		// Validates that sdk_version is set to a reasonable value before compile
 		static void ValidateSDKVersion ()
 		{
-			if (SDKVersion != null) {
+			if (App.SdkVersion != null) {
 				// We can't do mutation while parsing command line args as XcodeVersion isn't set yet
-				SDKVersion = MutateSDKVersionToPointRelease (SDKVersion);
+				App.SdkVersion = MutateSDKVersionToPointRelease (App.SdkVersion);
 				return;
 			}
 
@@ -613,11 +610,14 @@ namespace Xamarin.Bundler {
 			if (sdks.Count > 0) {
 				sdks.Sort ();
 				// select the highest.
-				SDKVersion = MutateSDKVersionToPointRelease (sdks [sdks.Count - 1]);
+				App.SdkVersion = MutateSDKVersionToPointRelease (sdks [sdks.Count - 1]);
 			}
 		}
 
-		public static Frameworks Frameworks { get { return Frameworks.MacFrameworks; } }
+		public static Frameworks GetFrameworks (Application app)
+		{
+			return Frameworks.MacFrameworks;
+		}
 
 		static void CheckForUnknownCommandLineArguments (IList<Exception> exceptions, IList<string> arguments)
 		{
@@ -1094,8 +1094,8 @@ namespace Xamarin.Bundler {
 				BuildTarget.StaticRegistrar.LinkContext = BuildTarget.LinkContext;
 				BuildTarget.StaticRegistrar.Generate (BuildTarget.Resolver.ResolverCache.Values, registrarH, registrarPath);
 
-				var platform_assembly = BuildTarget.Resolver.ResolverCache.First ((v) => v.Value.Name.Name == XamCore.Registrar.Registrar.PlatformAssembly).Value;
-				Frameworks.Gather (platform_assembly, BuildTarget.Frameworks, BuildTarget.WeakFrameworks);
+				var platform_assembly = BuildTarget.Resolver.ResolverCache.First ((v) => v.Value.Name.Name == BuildTarget.StaticRegistrar.PlatformAssembly).Value;
+				Frameworks.Gather (App, platform_assembly, BuildTarget.Frameworks, BuildTarget.WeakFrameworks);
 			}
 
 			try {
@@ -1231,7 +1231,7 @@ namespace Xamarin.Bundler {
 					args.Append (link_flags + " ");
 				if (!string.IsNullOrEmpty (DeveloperDirectory))
 				{
-					var sysRootSDKVersion = new Version (SDKVersion.Major, SDKVersion.Minor); // Sys Root SDKs do not have X.Y.Z, just X.Y 
+					var sysRootSDKVersion = new Version (App.SdkVersion.Major, App.SdkVersion.Minor); // Sys Root SDKs do not have X.Y.Z, just X.Y 
 					args.Append ("-isysroot ").Append (Quote (Path.Combine (DeveloperDirectory, "Platforms", "MacOSX.platform", "Developer", "SDKs", "MacOSX" + sysRootSDKVersion + ".sdk"))).Append (' ');
 				}
 
@@ -1334,6 +1334,7 @@ namespace Xamarin.Bundler {
 				EnsureUIThread = thread_check.HasValue ? thread_check.Value : App.EnableDebug,
 				MarshalNativeExceptionsState = !App.RequiresPInvokeWrappers ? null : new PInvokeWrapperGenerator ()
 				{
+					App = App,
 					SourcePath = Path.Combine (Cache.Location, "pinvokes.m"),
 					HeaderPath = Path.Combine (Cache.Location, "pinvokes.h"),
 					Registrar = (StaticRegistrar) BuildTarget.StaticRegistrar,

tools/mmp/mmp.csproj

@@ -54,6 +54,7 @@
     <Reference Include="Mono.Security" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Application.cs" />
     <Compile Include="driver.cs" />
     <Compile Include="resolver.cs" />
     <Compile Include="Tuning.cs" />

tools/mtouch/Application.cs

@@ -88,7 +88,6 @@ namespace Xamarin.Bundler {
 		public string ExecutableName;
 		public BuildTarget BuildTarget;
 
-		public Version DeploymentTarget;
 		public bool EnableCxx;
 		public bool EnableProfiling;
 		bool? package_mdb;
@@ -120,6 +119,23 @@ namespace Xamarin.Bundler {
 		public bool? UseMonoFramework;
 		public bool? PackageMonoFramework;
 
+		public bool NoFastSim;
+
+		// The list of assemblies that we do generate debugging info for.
+		public bool DebugAll;
+		public List<string> DebugAssemblies = new List<string> ();
+
+		public bool? DebugTrack;
+
+		public string Compiler = string.Empty;
+		public string CompilerPath;
+
+		public string AotArguments = "static,asmonly,direct-icalls,";
+		public string AotOtherArguments = string.Empty;
+		public bool? LLVMAsmWriter;
+
+		public Dictionary<string, string> EnvironmentVariables = new Dictionary<string, string> ();
+
 		//
 		// Linker config
 		//
@@ -585,7 +601,7 @@ namespace Xamarin.Bundler {
 			var platformAssemblyReference = false;
 			foreach (var reference in References) {
 				var name = Path.GetFileNameWithoutExtension (reference);
-				if (name == Driver.ProductAssembly) {
+				if (name == Driver.GetProductAssembly (this)) {
 					platformAssemblyReference = true;
 				} else {
 					switch (name) {
@@ -597,14 +613,14 @@ namespace Xamarin.Bundler {
 				}
 			}
 			if (!platformAssemblyReference) {
-				ErrorHelper.Warning (85, "No reference to '{0}' was found. It will be added automatically.", Driver.ProductAssembly + ".dll");
-				References.Add (Path.Combine (Driver.PlatformFrameworkDirectory, Driver.ProductAssembly + ".dll"));
+				ErrorHelper.Warning (85, "No reference to '{0}' was found. It will be added automatically.", Driver.GetProductAssembly (this) + ".dll");
+				References.Add (Path.Combine (Driver.GetPlatformFrameworkDirectory (this), Driver.GetProductAssembly (this) + ".dll"));
 			}
 
-			var FrameworkDirectory = Driver.PlatformFrameworkDirectory;
+			var FrameworkDirectory = Driver.GetPlatformFrameworkDirectory (this);
 			var RootDirectory = Path.GetDirectoryName (Path.GetFullPath (RootAssembly));
 
-			((MonoTouchProfile) Profile.Current).SetProductAssembly (Driver.ProductAssembly);
+			((MonoTouchProfile) Profile.Current).SetProductAssembly (Driver.GetProductAssembly (this));
 
 			string root_wo_ext = Path.GetFileNameWithoutExtension (RootAssembly);
 			if (Profile.IsSdkAssembly (root_wo_ext) || Profile.IsProductAssembly (root_wo_ext))
@@ -617,13 +633,13 @@ namespace Xamarin.Bundler {
 				target32.ArchDirectory = Path.Combine (Cache.Location, "32");
 				target32.TargetDirectory = IsSimulatorBuild ? Path.Combine (AppDirectory, ".monotouch-32") : Path.Combine (target32.ArchDirectory, "Output");
 				target32.AppTargetDirectory = Path.Combine (AppDirectory, ".monotouch-32");
-				target32.Resolver.ArchDirectory = Driver.Arch32Directory;
+				target32.Resolver.ArchDirectory = Driver.GetArch32Directory (this);
 				target32.Abis = SelectAbis (abis, Abi.Arch32Mask);
 
 				target64.ArchDirectory = Path.Combine (Cache.Location, "64");
 				target64.TargetDirectory = IsSimulatorBuild ? Path.Combine (AppDirectory, ".monotouch-64") : Path.Combine (target64.ArchDirectory, "Output");
 				target64.AppTargetDirectory = Path.Combine (AppDirectory, ".monotouch-64");
-				target64.Resolver.ArchDirectory = Driver.Arch64Directory;
+				target64.Resolver.ArchDirectory = Driver.GetArch64Directory (this);
 				target64.Abis = SelectAbis (abis, Abi.Arch64Mask);
 
 				Targets.Add (target64);
@@ -634,7 +650,7 @@ namespace Xamarin.Bundler {
 				target.TargetDirectory = AppDirectory;
 				target.AppTargetDirectory = IsSimulatorBuild ? AppDirectory : Path.Combine (AppDirectory, Is64Build ? ".monotouch-64" : ".monotouch-32");
 				target.ArchDirectory = Cache.Location;
-				target.Resolver.ArchDirectory = Path.Combine (Driver.PlatformFrameworkDirectory, "..", "..", Is32Build ? "32bits" : "64bits");
+				target.Resolver.ArchDirectory = Path.Combine (FrameworkDirectory, "..", "..", Is32Build ? "32bits" : "64bits");
 				target.Abis = abis;
 
 				Targets.Add (target);
@@ -651,7 +667,7 @@ namespace Xamarin.Bundler {
 			}
 
 			foreach (var target in Targets) {
-				target.Resolver.FrameworkDirectory = Driver.PlatformFrameworkDirectory;
+				target.Resolver.FrameworkDirectory = FrameworkDirectory;
 				target.Resolver.RootDirectory = RootDirectory;
 				target.Resolver.EnableRepl = EnableRepl;
 				target.ManifestResolver.EnableRepl = EnableRepl;
@@ -673,7 +689,7 @@ namespace Xamarin.Bundler {
 				ErrorHelper.Warning (30, "The executable name ({0}) and the app name ({1}) are different, this may prevent crash logs from getting symbolicated properly.",
 					ExecutableName, Path.GetFileName (AppDirectory));
 			
-			if (IsExtension && Platform == ApplePlatform.iOS && Driver.SDKVersion < new Version (8, 0))
+			if (IsExtension && Platform == ApplePlatform.iOS && SdkVersion < new Version (8, 0))
 				throw new MonoTouchException (45, true, "--extension is only supported when using the iOS 8.0 (or later) SDK.");
 
 			if (IsExtension && Platform != ApplePlatform.iOS && Platform != ApplePlatform.WatchOS && Platform != ApplePlatform.TVOS)
@@ -723,7 +739,7 @@ namespace Xamarin.Bundler {
 				UseMonoFramework = false;
 			
 			if (UseMonoFramework.Value)
-				Frameworks.Add (Path.Combine (Driver.ProductFrameworksDirectory, "Mono.framework"));
+				Frameworks.Add (Path.Combine (Driver.GetProductFrameworksDirectory (this), "Mono.framework"));
 
 			if (!PackageMonoFramework.HasValue) {
 				if (!IsExtension && Extensions.Count > 0 && !UseMonoFramework.Value) {
@@ -774,7 +790,7 @@ namespace Xamarin.Bundler {
 			if (EnableBitCode && IsSimulatorBuild)
 				throw ErrorHelper.CreateError (84, "Bitcode is not supported in the simulator. Do not pass --bitcode when building for the simulator.");
 
-			if (LinkMode == LinkMode.None && Driver.SDKVersion < SdkVersions.GetVersion (Platform))
+			if (LinkMode == LinkMode.None && SdkVersion < SdkVersions.GetVersion (Platform))
 				throw ErrorHelper.CreateError (91, "This version of Xamarin.iOS requires the {0} {1} SDK (shipped with Xcode {2}) when the managed linker is disabled. Either upgrade Xcode, or enable the managed linker.", PlatformName, SdkVersions.GetVersion (Platform), SdkVersions.Xcode);
 
 			Namespaces.Initialize ();
@@ -1002,7 +1018,7 @@ namespace Xamarin.Bundler {
 		void BuildFinalExecutable ()
 		{
 			if (FastDev) {
-				var libdir = Path.Combine (Driver.ProductSdkDirectory, "usr", "lib");
+				var libdir = Path.Combine (Driver.GetProductSdkDirectory (this), "usr", "lib");
 				var libmono_name = LibMono;
 				if (!UseMonoFramework.Value) {
 					var libmono_target = Path.Combine (AppDirectory, libmono_name);
@@ -1017,7 +1033,7 @@ namespace Xamarin.Bundler {
 
 				// Copy libXamarin.dylib to the app
 				var libxamarin_target = Path.Combine (AppDirectory, LibXamarin);
-				Application.UpdateFile (Path.Combine (Driver.MonoTouchLibDirectory, LibXamarin), libxamarin_target);
+				Application.UpdateFile (Path.Combine (Driver.GetMonoTouchLibDirectory (this), LibXamarin), libxamarin_target);
 
 				if (UseMonoFramework.Value) {
 					if (EnableProfiling)
@@ -1044,7 +1060,7 @@ namespace Xamarin.Bundler {
 					
 				if (PackageMonoFramework.Value) {
 					// We may have to copy the Mono framework to the bundle even if we're not linking with it.
-					all_frameworks.Add (Path.Combine (Driver.ProductSdkDirectory, "Frameworks", "Mono.framework"));
+					all_frameworks.Add (Path.Combine (Driver.GetProductSdkDirectory (this), "Frameworks", "Mono.framework"));
 				}
 				
 				foreach (var appex in Extensions) {
@@ -1138,7 +1154,7 @@ namespace Xamarin.Bundler {
 				}
 			}
 
-			Driver.CalculateCompilerPath ();
+			Driver.CalculateCompilerPath (this);
 		}
 
 		public string LibMono {
@@ -1704,7 +1720,7 @@ namespace Xamarin.Bundler {
 			var files = assemblies.Select (v => v.FullPath);
 
 			if (!Application.IsUptodate (files, new string [] { ifile })) {
-				Driver.GenerateMain (assemblies, assemblyName, abi, ifile, registration_methods);
+				Driver.GenerateMain (target.App, assemblies, assemblyName, abi, ifile, registration_methods);
 			} else {
 				Driver.Log (3, "Target '{0}' is up-to-date.", ifile);
 			}
@@ -1747,7 +1763,7 @@ namespace Xamarin.Bundler {
 		public static void Create (List<BuildTask> tasks, Abi abi, Target target, string ifile)
 		{
 			var arch = abi.AsArchString ();
-			var ext = Driver.App.FastDev ? ".dylib" : ".o";
+			var ext = target.App.FastDev ? ".dylib" : ".o";
 			var ofile = Path.Combine (Cache.Location, "lib" + Path.GetFileNameWithoutExtension (ifile) + "." + arch + ext);
 
 			if (!Application.IsUptodate (ifile, ofile)) {
@@ -1757,10 +1773,10 @@ namespace Xamarin.Bundler {
 					Abi = abi,
 					InputFile = ifile,
 					OutputFile = ofile,
-					SharedLibrary = Driver.App.FastDev,
+					SharedLibrary = target.App.FastDev,
 					Language = "objective-c++",
 				};
-				if (Driver.App.FastDev) {
+				if (target.App.FastDev) {
 					task.InstallName = "lib" + Path.GetFileNameWithoutExtension (ifile) + ext;
 					task.CompilerFlags.AddFramework ("Foundation");
 					task.CompilerFlags.LinkWithXamarin ();
@@ -1812,7 +1828,7 @@ namespace Xamarin.Bundler {
 
 		protected override void Build ()
 		{
-			if (Driver.IsUsingClang) {
+			if (Driver.IsUsingClang (App)) {
 				// This is because iOS has a forward declaration of NSPortMessage, but no actual declaration.
 				// They still use NSPortMessage in other API though, so it can't just be removed from our bindings.
 				CompilerFlags.AddOtherFlag ("-Wno-receiver-forward-class");
@@ -1890,7 +1906,7 @@ namespace Xamarin.Bundler {
 				flags.AddOtherFlag ("-mthumb");
 		}
 
-		public static void GetCompilerFlags (CompilerFlags flags, string ifile, string language = null)
+		public static void GetCompilerFlags (Application app, CompilerFlags flags, string ifile, string language = null)
 		{
 			if (string.IsNullOrEmpty (ifile) || !ifile.EndsWith (".s", StringComparison.Ordinal))
 				flags.AddOtherFlag ("-gdwarf-2");
@@ -1900,17 +1916,17 @@ namespace Xamarin.Bundler {
 					// error: invalid argument '-std=c99' not allowed with 'C++/ObjC++'
 					flags.AddOtherFlag ("-std=c99");
 				}
-				flags.AddOtherFlag ($"-I{Driver.Quote (Path.Combine (Driver.ProductSdkDirectory, "usr", "include"))}");
+				flags.AddOtherFlag ($"-I{Driver.Quote (Path.Combine (Driver.GetProductSdkDirectory (app), "usr", "include"))}");
 			}
-			flags.AddOtherFlag ($"-isysroot {Driver.Quote (Driver.FrameworkDirectory)}");
+			flags.AddOtherFlag ($"-isysroot {Driver.Quote (Driver.GetFrameworkDirectory (app))}");
 			flags.AddOtherFlag ("-Qunused-arguments"); // don't complain about unused arguments (clang reports -std=c99 and -Isomething as unused).
 		}
 		
 		public static void GetSimulatorCompilerFlags (CompilerFlags flags, string ifile, Application app, string language = null)
 		{
-			GetCompilerFlags (flags, ifile, language);
+			GetCompilerFlags (app, flags, ifile, language);
 
-			string sim_platform = Driver.PlatformDirectory;
+			string sim_platform = Driver.GetPlatformDirectory (app);
 			string plist = Path.Combine (sim_platform, "Info.plist");
 
 			var dict = Driver.FromPList (plist);
@@ -1921,8 +1937,8 @@ namespace Xamarin.Bundler {
 			if (!String.IsNullOrWhiteSpace (objc_abi))
 				flags.AddOtherFlag ($"-fobjc-abi-version={objc_abi}");
 			
-			plist = Path.Combine (Driver.FrameworkDirectory, "SDKSettings.plist");
-			string min_prefix = Driver.CompilerPath.Contains ("clang") ? Driver.TargetMinSdkName : "iphoneos";
+			plist = Path.Combine (Driver.GetFrameworkDirectory (app), "SDKSettings.plist");
+			string min_prefix = app.CompilerPath.Contains ("clang") ? Driver.GetTargetMinSdkName (app) : "iphoneos";
 			dict = Driver.FromPList (plist);
 			dp = dict.Get<PDictionary> ("DefaultProperties");
 			if (app.DeploymentTarget == new Version ()) {
@@ -1939,9 +1955,9 @@ namespace Xamarin.Bundler {
 		
 		void GetDeviceCompilerFlags (CompilerFlags flags, string ifile)
 		{
-			GetCompilerFlags (flags, ifile, Language);
+			GetCompilerFlags (App, flags, ifile, Language);
 			
-			flags.AddOtherFlag ($"-m{Driver.TargetMinSdkName}-version-min={App.DeploymentTarget.ToString ()}");
+			flags.AddOtherFlag ($"-m{Driver.GetTargetMinSdkName (App)}-version-min={App.DeploymentTarget.ToString ()}");
 
 			if (App.EnableLLVMOnlyBitCode)
 				// The AOT compiler doesn't optimize the bitcode so clang will do it
@@ -2005,7 +2021,7 @@ namespace Xamarin.Bundler {
 
 			CompilerFlags.AddOtherFlag (Driver.Quote (InputFile));
 
-			var rv = Driver.RunCommand (Driver.CompilerPath, CompilerFlags.ToString (), null, null);
+			var rv = Driver.RunCommand (App.CompilerPath, CompilerFlags.ToString (), null, null);
 			
 			return rv;
 		}

tools/mtouch/Assembly.cs

@@ -197,7 +197,7 @@ namespace Xamarin.Bundler {
 			var data = Path.Combine (asm_dir, Path.GetFileNameWithoutExtension (s)) + "." + arch + ".aotdata";
 			string llvm_ofile, llvm_aot_ofile = "";
 			var is_llvm = (abi & Abi.LLVM) == Abi.LLVM;
-			bool assemble_llvm = is_llvm && Driver.LLVMAsmWriter;
+			bool assemble_llvm = is_llvm && Driver.GetLLVMAsmWriter (App);
 
 			if (!File.Exists (s))
 				throw new MonoTouchException (3004, true, "Could not AOT the assembly '{0}' because it doesn't exist.", s);
@@ -215,7 +215,7 @@ namespace Xamarin.Bundler {
 			} else {
 				deps = new List<string> (dependencies.ToArray ());
 				deps.Add (s);
-				deps.Add (Driver.GetAotCompiler (Target.Is64Build));
+				deps.Add (Driver.GetAotCompiler (App, Target.Is64Build));
 			}
 
 			if (App.EnableLLVMOnlyBitCode) {
@@ -253,8 +253,8 @@ namespace Xamarin.Bundler {
 				Driver.Log (3, "Target {0} needs to be rebuilt.", asm);
 			}
 
-			var aotCompiler = Driver.GetAotCompiler (Target.Is64Build);
-			var aotArgs = Driver.GetAotArguments (s, abi, build_dir, asm, llvm_aot_ofile, data);
+			var aotCompiler = Driver.GetAotCompiler (App, Target.Is64Build);
+			var aotArgs = Driver.GetAotArguments (App, s, abi, build_dir, asm, llvm_aot_ofile, data);
 			Driver.Log (3, "Aot compiler: {0} {1}", aotCompiler, aotArgs);
 
 			AotDataFiles.Add (data);
@@ -268,7 +268,7 @@ namespace Xamarin.Bundler {
 			return new BuildTask [] { new AOTTask ()
 				{
 					AssemblyName = s,
-					ProcessStartInfo = Driver.CreateStartInfo (aotCompiler, aotArgs, Path.GetDirectoryName (s)),
+					ProcessStartInfo = Driver.CreateStartInfo (App, aotCompiler, aotArgs, Path.GetDirectoryName (s)),
 					NextTasks = nextTasks
 				}
 			};
@@ -290,7 +290,7 @@ namespace Xamarin.Bundler {
 				Target.LinkWith (ofile);
 			}
 
-			if (Application.IsUptodate (new string [] { infile_path, Driver.CompilerPath }, new string [] { ofile })) {
+			if (Application.IsUptodate (new string [] { infile_path, App.CompilerPath }, new string [] { ofile })) {
 				Driver.Log (3, "Target {0} is up-to-date.", ofile);
 				return null;
 			} else {
@@ -374,7 +374,7 @@ namespace Xamarin.Bundler {
 			string target = Path.Combine (Target.TargetDirectory, Path.GetFileName (FullPath));
 			string source = FullPath;
 
-			if (!Driver.SymlinkAssembly (source, target, Path.GetDirectoryName (target))) {
+			if (!Driver.SymlinkAssembly (App, source, target, Path.GetDirectoryName (target))) {
 				symlink_failed = true;
 				CopyAssembly (source, target);
 			}
@@ -384,7 +384,7 @@ namespace Xamarin.Bundler {
 					string s_target_dir = Path.Combine (Target.TargetDirectory, Path.GetFileName (Path.GetDirectoryName (a)));
 					string s_target = Path.Combine (s_target_dir, Path.GetFileName (a));
 
-					if (!Driver.SymlinkAssembly (a, s_target, s_target_dir)) {
+					if (!Driver.SymlinkAssembly (App, a, s_target, s_target_dir)) {
 						CopyAssembly (a, s_target);
 					}
 				}

tools/mtouch/Target.cs

@@ -71,6 +71,7 @@ namespace Xamarin.Bundler
 				if (pinvoke_state == null) {
 					pinvoke_state = new PInvokeWrapperGenerator ()
 					{
+						App = App,
 						SourcePath = Path.Combine (ArchDirectory, "pinvokes.m"),
 						HeaderPath = Path.Combine (ArchDirectory, "pinvokes.h"),
 						Registrar = (StaticRegistrar) StaticRegistrar,
@@ -106,7 +107,7 @@ namespace Xamarin.Bundler
 					ErrorHelper.Show (new MonoTouchException (11, false, "{0} was built against a more recent runtime ({1}) than Xamarin.iOS supports.", Path.GetFileName (reference), ad.MainModule.Runtime));
 
 				// Figure out if we're referencing Xamarin.iOS or monotouch.dll
-				if (Path.GetFileNameWithoutExtension (ad.MainModule.FileName) == Driver.ProductAssembly)
+				if (Path.GetFileNameWithoutExtension (ad.MainModule.FileName) == Driver.GetProductAssembly (App))
 					ProductAssembly = ad;
 			}
 
@@ -267,7 +268,7 @@ namespace Xamarin.Bundler
 				case "Xamarin.iOS":
 				case "Xamarin.TVOS":
 				case "Xamarin.WatchOS":
-					if (reference.Name != Driver.ProductAssembly)
+					if (reference.Name != Driver.GetProductAssembly (App))
 						exceptions.Add (ErrorHelper.CreateError (34, "Cannot reference '{0}.dll' in a {1} project - it is implicitly referenced by '{2}'.", reference.Name, Driver.TargetFramework.Identifier, assembly.FullName));
 					break;
 				}
@@ -408,6 +409,7 @@ namespace Xamarin.Bundler
 				DumpDependencies = App.LinkerDumpDependencies,
 				RuntimeOptions = App.RuntimeOptions,
 				MarshalNativeExceptionsState = MarshalNativeExceptionsState,
+				Application = App,
 			};
 
 			MonoTouch.Tuner.Linker.Process (LinkerOptions, out link_context, out assemblies);
@@ -714,7 +716,7 @@ namespace Xamarin.Bundler
 				}
 
 				registration_methods.Add (method);
-				link_with.Add (Path.Combine (Driver.ProductSdkDirectory, "usr", "lib", library));
+				link_with.Add (Path.Combine (Driver.GetProductSdkDirectory (App), "usr", "lib", library));
 			}
 
 			// The main method.
@@ -777,8 +779,8 @@ namespace Xamarin.Bundler
 
 			CompileTask.GetArchFlags (compiler_flags, Abis);
 			if (App.IsDeviceBuild) {
-				compiler_flags.AddOtherFlag ($"-m{Driver.TargetMinSdkName}-version-min={App.DeploymentTarget}");
-				compiler_flags.AddOtherFlag ($"-isysroot {Driver.Quote (Driver.FrameworkDirectory)}");
+				compiler_flags.AddOtherFlag ($"-m{Driver.GetTargetMinSdkName (App)}-version-min={App.DeploymentTarget}");
+				compiler_flags.AddOtherFlag ($"-isysroot {Driver.Quote (Driver.GetFrameworkDirectory (App))}");
 			} else {
 				CompileTask.GetSimulatorCompilerFlags (compiler_flags, null, App);
 			}
@@ -820,7 +822,7 @@ namespace Xamarin.Bundler
 			} else {
 				mainlib = "libapp.a";
 			}
-			var libdir = Path.Combine (Driver.ProductSdkDirectory, "usr", "lib");
+			var libdir = Path.Combine (Driver.GetProductSdkDirectory (App), "usr", "lib");
 			var libmain = Path.Combine (libdir, mainlib);
 			compiler_flags.AddLinkWith (libmain, true);
 
@@ -846,7 +848,7 @@ namespace Xamarin.Bundler
 			if (App.IsExtension) {
 				if (App.Platform == ApplePlatform.iOS && Driver.XcodeVersion.Major < 7) {
 					compiler_flags.AddOtherFlag ("-lpkstart");
-					compiler_flags.AddOtherFlag ($"-F {Driver.Quote (Path.Combine (Driver.FrameworkDirectory, "System/Library/PrivateFrameworks"))} -framework PlugInKit");
+					compiler_flags.AddOtherFlag ($"-F {Driver.Quote (Path.Combine (Driver.GetFrameworkDirectory (App), "System/Library/PrivateFrameworks"))} -framework PlugInKit");
 				}
 				compiler_flags.AddOtherFlag ("-fapplication-extension");
 			}
@@ -859,7 +861,7 @@ namespace Xamarin.Bundler
 				// and very hard to diagnose otherwise when hidden from the build output. Ref: bug #2430
 				var linker_errors = new List<Exception> ();
 				var output = new StringBuilder ();
-				var code = Driver.RunCommand (Driver.CompilerPath, flags, null, output);
+				var code = Driver.RunCommand (App.CompilerPath, flags, null, output);
 
 				Application.ProcessNativeLinkerOutput (this, output.ToString (), link_with, linker_errors, code != 0);
 
@@ -914,7 +916,7 @@ namespace Xamarin.Bundler
 
 		public bool CanWeSymlinkTheApplication ()
 		{
-			if (!Driver.CanWeSymlinkTheApplication ())
+			if (!Driver.CanWeSymlinkTheApplication (App))
 				return false;
 
 			foreach (var a in Assemblies)

tools/mtouch/Tuning.cs

@@ -35,6 +35,7 @@ namespace MonoTouch.Tuner {
 		internal RuntimeOptions RuntimeOptions { get; set; }
 
 		public MonoTouchLinkContext LinkContext { get; set; }
+		public Application Application { get; set; }
 
 		public static I18nAssemblies ParseI18nAssemblies (string i18n)
 		{

tools/mtouch/mtouch.cs

@@ -113,38 +113,17 @@ namespace Xamarin.Bundler
 			LaunchWatchApp,
 		}
 
-		static Application app = new Application ();
 		static Action action;
 
-		// The list of assemblies that we do generate debugging info for.
-		static bool debug_all = false;
-		static List<string> debug_assemblies = new List<string> ();
-
-		//
-		// iPhone Developer platform
-		static string framework_dir;
-		static Version sdk_version;
-		static string compiler = string.Empty;
-		static string compiler_path;
 		static bool xcode_version_check = true;
 
 		//
 		// Output generation
-		static bool fast_sim = true;
 		static bool force = false;
-		static bool? llvm_asmwriter;
 		static string cross_prefix = Environment.GetEnvironmentVariable ("MONO_CROSS_PREFIX");
 		static string extra_args = Environment.GetEnvironmentVariable ("MTOUCH_ENV_OPTIONS");
 
-		//
-		// Where we output the generated code (source or compiled, depending on mode)
-		//
-		static string output_dir = ".";
-		static string aot_args = "static,asmonly,direct-icalls,";
-		static string aot_other_args = "";
 		static int verbose = GetDefaultVerbosity ();
-		static bool? debug_track;
-		static Dictionary<string, string> environment_variables = new Dictionary<string, string> ();
 
 		static int Jobs;
 		public static int Concurrency {
@@ -187,12 +166,6 @@ namespace Xamarin.Bundler
 			Console.WriteLine (format, args);
 		}
 
-		public static bool EnableDebug {
-			get {
-				return app.EnableDebug;
-			}
-		}
-
 		public static bool IsUnified {
 			get { return true; }
 		}
@@ -206,29 +179,23 @@ namespace Xamarin.Bundler
 			set { force = value; }
 		}
 
-		static string Platform {
-			get {
-				switch (app.Platform) {
-				case ApplePlatform.iOS:
-					return app.IsDeviceBuild ? "iPhoneOS" : "iPhoneSimulator";
-				case ApplePlatform.WatchOS:
-					return app.IsDeviceBuild ? "WatchOS" : "WatchSimulator";
-				case ApplePlatform.TVOS:
-					return app.IsDeviceBuild ? "AppleTVOS" : "AppleTVSimulator";
-				default:
-					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
-				}
+		static string GetPlatform (Application app)
+		{
+			switch (app.Platform) {
+			case ApplePlatform.iOS:
+				return app.IsDeviceBuild ? "iPhoneOS" : "iPhoneSimulator";
+			case ApplePlatform.WatchOS:
+				return app.IsDeviceBuild ? "WatchOS" : "WatchSimulator";
+			case ApplePlatform.TVOS:
+				return app.IsDeviceBuild ? "AppleTVOS" : "AppleTVSimulator";
+			default:
+				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
 			}
 		}
 
-		public static Application App {
-			get { return app; }
-		}
-
-		public static string MonoTouchLibDirectory {
-			get {
-				return Path.Combine (ProductSdkDirectory, "usr", "lib");
-			}
+		public static string GetMonoTouchLibDirectory (Application app)
+		{
+			return Path.Combine (GetProductSdkDirectory (app), "usr", "lib");
 		}
 
 		public static string DriverBinDirectory {
@@ -260,108 +227,100 @@ namespace Xamarin.Bundler
 			}
 		}
 
-		public static string PlatformFrameworkDirectory {
-			get {
-				switch (app.Platform) {
-				case ApplePlatform.iOS:
-					return Path.Combine (MonoTouchDirectory, "lib", "mono", "Xamarin.iOS");
-				case ApplePlatform.WatchOS:
-					return Path.Combine (MonoTouchDirectory, "lib", "mono", "Xamarin.WatchOS");
-				case ApplePlatform.TVOS:
-					return Path.Combine (MonoTouchDirectory, "lib", "mono", "Xamarin.TVOS");
-				default:
-					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
-				}
+		public static string GetPlatformFrameworkDirectory (Application app)
+		{
+			switch (app.Platform) {
+			case ApplePlatform.iOS:
+				return Path.Combine (MonoTouchDirectory, "lib", "mono", "Xamarin.iOS");
+			case ApplePlatform.WatchOS:
+				return Path.Combine (MonoTouchDirectory, "lib", "mono", "Xamarin.WatchOS");
+			case ApplePlatform.TVOS:
+				return Path.Combine (MonoTouchDirectory, "lib", "mono", "Xamarin.TVOS");
+			default:
+				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
 			}
 		}
 
-		public static string Arch32Directory {
-			get {
-				switch (app.Platform) {
-				case ApplePlatform.iOS:
-					return Path.Combine (Driver.PlatformFrameworkDirectory, "..", "..", "32bits");
-				default:
-					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
-				}
+		public static string GetArch32Directory (Application app)
+		{
+			switch (app.Platform) {
+			case ApplePlatform.iOS:
+				return Path.Combine (GetPlatformFrameworkDirectory (app), "..", "..", "32bits");
+			default:
+				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
 			}
 		}
 
-		public static string Arch64Directory {
-			get {
-				switch (app.Platform) {
-				case ApplePlatform.iOS:
-					return Path.Combine (Driver.PlatformFrameworkDirectory, "..", "..", "64bits");
-				default:
-					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
-				}
+		public static string GetArch64Directory (Application app)
+		{
+			switch (app.Platform) {
+			case ApplePlatform.iOS:
+				return Path.Combine (GetPlatformFrameworkDirectory (app), "..", "..", "64bits");
+			default:
+				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
 			}
 		}
 
-		public static string ProductSdkDirectory {
-			get {
-				switch (app.Platform) {
-				case ApplePlatform.iOS:
-					return Path.Combine (MonoTouchDirectory, "SDKs", app.IsDeviceBuild ? "MonoTouch.iphoneos.sdk" : "MonoTouch.iphonesimulator.sdk");
-				case ApplePlatform.WatchOS:
-					return Path.Combine (MonoTouchDirectory, "SDKs", app.IsDeviceBuild ? "Xamarin.WatchOS.sdk" : "Xamarin.WatchSimulator.sdk");
-				case ApplePlatform.TVOS:
-					return Path.Combine (MonoTouchDirectory, "SDKs", app.IsDeviceBuild ? "Xamarin.AppleTVOS.sdk" : "Xamarin.AppleTVSimulator.sdk");
-				default:
-					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
-				}
+		public static string GetProductSdkDirectory (Application app)
+		{
+			switch (app.Platform) {
+			case ApplePlatform.iOS:
+				return Path.Combine (MonoTouchDirectory, "SDKs", app.IsDeviceBuild ? "MonoTouch.iphoneos.sdk" : "MonoTouch.iphonesimulator.sdk");
+			case ApplePlatform.WatchOS:
+				return Path.Combine (MonoTouchDirectory, "SDKs", app.IsDeviceBuild ? "Xamarin.WatchOS.sdk" : "Xamarin.WatchSimulator.sdk");
+			case ApplePlatform.TVOS:
+				return Path.Combine (MonoTouchDirectory, "SDKs", app.IsDeviceBuild ? "Xamarin.AppleTVOS.sdk" : "Xamarin.AppleTVSimulator.sdk");
+			default:
+				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
 			}
 		}
 
-		public static string ProductFrameworksDirectory {
-			get {
-				return Path.Combine (Driver.ProductSdkDirectory, "Frameworks");
-			}
+		public static string GetProductFrameworksDirectory (Application app)
+		{
+			return Path.Combine (GetProductSdkDirectory (app), "Frameworks");
 		}
 
 		// This is for the -mX-version-min=A.B compiler flag
-		public static string TargetMinSdkName {
-			get {
-				switch (app.Platform) {
-				case ApplePlatform.iOS:
-					return app.IsDeviceBuild ? "iphoneos" : "ios-simulator";
-				case ApplePlatform.WatchOS:
-					return app.IsDeviceBuild ? "watchos" : "watchos-simulator";
-				case ApplePlatform.TVOS:
-					return app.IsDeviceBuild ? "tvos" : "tvos-simulator";
-				default:
-					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
-				}
+		public static string GetTargetMinSdkName (Application app)
+		{
+			switch (app.Platform) {
+			case ApplePlatform.iOS:
+				return app.IsDeviceBuild ? "iphoneos" : "ios-simulator";
+			case ApplePlatform.WatchOS:
+				return app.IsDeviceBuild ? "watchos" : "watchos-simulator";
+			case ApplePlatform.TVOS:
+				return app.IsDeviceBuild ? "tvos" : "tvos-simulator";
+			default:
+				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
 			}
 		}
 
-		public static string ProductAssembly {
-			get {
-				switch (app.Platform) {
-				case ApplePlatform.iOS:
-					return "Xamarin.iOS";
-				case ApplePlatform.WatchOS:
-					return "Xamarin.WatchOS";
-				case ApplePlatform.TVOS:
-					return "Xamarin.TVOS";
-				default:
-					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
-				}
+		public static string GetProductAssembly (Application app)
+		{
+			switch (app.Platform) {
+			case ApplePlatform.iOS:
+				return "Xamarin.iOS";
+			case ApplePlatform.WatchOS:
+				return "Xamarin.WatchOS";
+			case ApplePlatform.TVOS:
+				return "Xamarin.TVOS";
+			default:
+				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
 			}
 		}
 
-		public static bool LLVMAsmWriter {
-			get {
-				if (llvm_asmwriter.HasValue)
-					return llvm_asmwriter.Value;
-				switch (app.Platform) {
-				case ApplePlatform.iOS:
-					return false;
-				case ApplePlatform.TVOS:
-				case ApplePlatform.WatchOS:
-					return true;
-				default:
-					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
-				}
+		public static bool GetLLVMAsmWriter (Application app)
+		{
+			if (app.LLVMAsmWriter.HasValue)
+				return app.LLVMAsmWriter.Value;
+			switch (app.Platform) {
+			case ApplePlatform.iOS:
+				return false;
+			case ApplePlatform.TVOS:
+			case ApplePlatform.WatchOS:
+				return true;
+			default:
+				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
 			}
 		}
 
@@ -445,30 +404,25 @@ namespace Xamarin.Bundler
 			}
 		}
 
-		public static string FrameworkDirectory {
-			get { return framework_dir; }
+		public static string GetFrameworkDirectory (Application app)
+		{
+			return GetFrameworkDir (GetPlatform (app), app.SdkVersion);
 		}
 
-		public static bool IsUsingClang {
-			get { return compiler_path.EndsWith ("clang", StringComparison.Ordinal) || compiler_path.EndsWith ("clang++", StringComparison.Ordinal); }
+		public static bool IsUsingClang (Application app)
+		{
+			return app.CompilerPath.EndsWith ("clang", StringComparison.Ordinal) || app.CompilerPath.EndsWith ("clang++", StringComparison.Ordinal);
 		}
 
-		public static string CompilerPath {
-			get { return compiler_path; }
-		}
-
-		public static Version SDKVersion { get { return sdk_version; } }
-
 		public static string PlatformsDirectory {
 			get {
 				return Path.Combine (DeveloperDirectory, "Platforms");
 			}
 		}
 
-		public static string PlatformDirectory {
-			get {
-				return Path.Combine (PlatformsDirectory, Platform + ".platform");
-			}
+		public static string GetPlatformDirectory (Application app)
+		{
+			return Path.Combine (PlatformsDirectory, GetPlatform (app) + ".platform");
 		}
 
 		public static int XcodeRun (string command, string args, StringBuilder output = null)
@@ -483,7 +437,7 @@ namespace Xamarin.Bundler
 			return ret;
 		}
 
-		public static string GetAotCompiler (bool is64bits)
+		public static string GetAotCompiler (Application app, bool is64bits)
 		{
 			switch (app.Platform) {
 			case ApplePlatform.iOS:
@@ -501,7 +455,7 @@ namespace Xamarin.Bundler
 			}
 		}
 
-		public static string GetAotArguments (string filename, Abi abi, string outputDir, string outputFile, string llvmOutputFile, string dataFile)
+		public static string GetAotArguments (Application app, string filename, Abi abi, string outputDir, string outputFile, string llvmOutputFile, string dataFile)
 		{
 			string fname = Path.GetFileName (filename);
 			StringBuilder args = new StringBuilder ();
@@ -519,12 +473,12 @@ namespace Xamarin.Bundler
 
 			if (!llvm_only)
 				args.Append ("-O=gsharedvt ");
-			args.Append (aot_other_args).Append (" ");
+			args.Append (app.AotOtherArguments).Append (" ");
 			args.Append ("--aot=mtriple=");
 			args.Append (enable_thumb ? arch.Replace ("arm", "thumb") : arch);
 			args.Append ("-ios,");
 			args.Append ("data-outfile=").Append (Quote (dataFile)).Append (",");
-			args.Append (aot_args);
+			args.Append (app.AotArguments);
 			if (llvm_only)
 				args.Append ("llvmonly,");
 			else
@@ -537,7 +491,7 @@ namespace Xamarin.Bundler
 				args.Append ("nodebug,");
 			else if (!(enable_debug || enable_mdb))
 				args.Append ("nodebug,");
-			else if (debug_all || debug_assemblies.Contains (fname) || !sdk_or_product)
+			else if (app.DebugAll || app.DebugAssemblies.Contains (fname) || !sdk_or_product)
 				args.Append ("soft-debug,");
 
 			args.Append ("dwarfdebug,");
@@ -567,7 +521,7 @@ namespace Xamarin.Bundler
 			return args.ToString ();
 		}
 
-		public static ProcessStartInfo CreateStartInfo (string file_name, string arguments, string mono_path, string mono_debug = null)
+		public static ProcessStartInfo CreateStartInfo (Application app, string file_name, string arguments, string mono_path, string mono_debug = null)
 		{
 			var info = new ProcessStartInfo (file_name, arguments);
 			info.UseShellExecute = false;
@@ -600,7 +554,7 @@ namespace Xamarin.Bundler
 		}
 
 		// note: this is executed under Parallel.ForEach
-		public static string GenerateMain (IEnumerable<Assembly> assemblies, string assembly_name, Abi abi, string main_source, IList<string> registration_methods)
+		public static string GenerateMain (Application app, IEnumerable<Assembly> assemblies, string assembly_name, Abi abi, string main_source, IList<string> registration_methods)
 		{
 			var assembly_externs = new StringBuilder ();
 			var assembly_aot_modules = new StringBuilder ();
@@ -654,7 +608,7 @@ namespace Xamarin.Bundler
 					// On iOS we can pass -u to the native linker, but that doesn't work on tvOS, where
 					// we're building with bitcode (even when bitcode is disabled, we still build with the
 					// bitcode marker, which makes the linker reject -u).
-					if (App.EnableProfiling) {
+					if (app.EnableProfiling) {
 						sw.WriteLine ("extern \"C\" { void mono_profiler_startup_log (); }");
 						sw.WriteLine ("typedef void (*xamarin_profiler_symbol_def)();");
 						sw.WriteLine ("extern xamarin_profiler_symbol_def xamarin_profiler_symbol;");
@@ -664,10 +618,10 @@ namespace Xamarin.Bundler
 					sw.WriteLine ("void xamarin_setup_impl ()");
 					sw.WriteLine ("{");
 
-					if (App.EnableProfiling)
+					if (app.EnableProfiling)
 						sw.WriteLine ("\txamarin_profiler_symbol = mono_profiler_startup_log;");
 
-					if (App.EnableLLVMOnlyBitCode)
+					if (app.EnableLLVMOnlyBitCode)
 						sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_LLVMONLY);");
 					
 					if (registration_methods != null) {
@@ -679,7 +633,7 @@ namespace Xamarin.Bundler
 					}
 
 					if (app.EnableDebug)
-						sw.WriteLine ("\txamarin_gc_pump = {0};", debug_track.Value ? "TRUE" : "FALSE");
+						sw.WriteLine ("\txamarin_gc_pump = {0};", app.DebugTrack.Value ? "TRUE" : "FALSE");
 					sw.WriteLine ("\txamarin_init_mono_debug = {0};", app.PackageMdb ? "TRUE" : "FALSE");
 					sw.WriteLine ("\txamarin_executable_name = \"{0}\";", assembly_name);
 					sw.WriteLine ("\tmono_use_llvm = {0};", enable_llvm ? "TRUE" : "FALSE");
@@ -692,7 +646,7 @@ namespace Xamarin.Bundler
 						sw.WriteLine ("\txamarin_debug_mode = TRUE;");
 					if (!string.IsNullOrEmpty (app.MonoGCParams))
 						sw.WriteLine ("\tsetenv (\"MONO_GC_PARAMS\", \"{0}\", 1);", app.MonoGCParams);
-					foreach (var kvp in environment_variables)
+					foreach (var kvp in app.EnvironmentVariables)
 						sw.WriteLine ("\tsetenv (\"{0}\", \"{1}\", 1);", kvp.Key.Replace ("\"", "\\\""), kvp.Value.Replace ("\"", "\\\""));
 					sw.WriteLine ("}");
 					sw.WriteLine ();
@@ -775,7 +729,7 @@ namespace Xamarin.Bundler
 				File.Copy (sdebug, tdebug);
 		}
 
-		public static bool SymlinkAssembly (string source, string target, string target_dir)
+		public static bool SymlinkAssembly (Application app, string source, string target, string target_dir)
 		{
 			if (app.IsSimulatorBuild && Driver.XcodeVersion >= new Version (6, 0)) {
 				// Don't symlink with Xcode 6, it has a broken simulator (at least in
@@ -827,6 +781,7 @@ namespace Xamarin.Bundler
 
 		public static void GatherFrameworks (Target target, HashSet<string> frameworks, HashSet<string> weak_frameworks)
 		{
+			var app = target.App;
 			AssemblyDefinition monotouch = null;
 
 			foreach (var assembly in target.Assemblies) {
@@ -851,12 +806,12 @@ namespace Xamarin.Bundler
 					processed.Add (nspace);
 
 					Framework framework;
-					if (Driver.Frameworks.TryGetValue (nspace, out framework)) {
+					if (Driver.GetFrameworks (app).TryGetValue (nspace, out framework)) {
 						// framework specific processing
 						switch (framework.Name) {
 						case "CoreAudioKit":
 							// CoreAudioKit seems to be functional in the iOS 9 simulator.
-							if (app.IsSimulatorBuild && SDKVersion.Major < 9)
+							if (app.IsSimulatorBuild && app.SdkVersion.Major < 9)
 								continue;
 							break;
 						case "Metal":
@@ -877,7 +832,7 @@ namespace Xamarin.Bundler
 							break;
 						}
 
-						if (sdk_version >= framework.Version) {
+						if (app.SdkVersion >= framework.Version) {
 							var add_to = app.DeploymentTarget >= framework.Version ? frameworks : weak_frameworks;
 							add_to.Add (framework.Name);
 							continue;
@@ -887,7 +842,7 @@ namespace Xamarin.Bundler
 			}
 		}
 
-		public static bool CanWeSymlinkTheApplication ()
+		public static bool CanWeSymlinkTheApplication (Application app)
 		{
 			if (app.Platform != ApplePlatform.iOS)
 				return false;
@@ -910,7 +865,7 @@ namespace Xamarin.Bundler
 				return false;
 
 			//mtouch was invoked with --nofastsim, eg symlinking was explicit disabled
-			if (!fast_sim)
+			if (app.NoFastSim)
 				return false;
 
 			//Can't symlink if we are running the linker since the assemblies content will change
@@ -922,7 +877,7 @@ namespace Xamarin.Bundler
 				return false;
 
 			// Setting environment variables is done in the generated main.m, so we can't symlink in this case.
-			if (environment_variables.Count > 0)
+			if (app.EnvironmentVariables.Count > 0)
 				return false;
 
 			if (app.Registrar == RegistrarMode.Static)
@@ -1037,6 +992,7 @@ namespace Xamarin.Bundler
 
 		static int Main2 (string [] args)
 		{
+			var app = new Application ();
 			var assemblies = new List<string> ();
 
 			if (extra_args != null) {
@@ -1056,13 +1012,13 @@ namespace Xamarin.Bundler
 			{ "f|force", "Forces the recompilation of code, regardless of timestamps", v=>force = true },
 			{ "cache=", "Specify the directory where object files will be cached", v => Cache.Location = v },
 			{ "aot=", "Arguments to the static compiler",
-				v => aot_args = v + (v.EndsWith (",", StringComparison.Ordinal) ? String.Empty : ",") + aot_args
+				v => app.AotArguments = v + (v.EndsWith (",", StringComparison.Ordinal) ? String.Empty : ",") + app.AotArguments
 			},
 			{ "aot-options=", "Non AOT arguments to the static compiler",
 				v => {
 					if (v.Contains ("--profile") || v.Contains ("--attach"))
 						throw new Exception ("Unsupported flag to -aot-options");
-					aot_other_args = v + " " + aot_other_args;
+					app.AotOtherArguments = v + " " + app.AotOtherArguments;
 				}
 			},
 			{ "gsharedvt:", "Generic sharing for value-types - always enabled [Deprecated]", v => {} },
@@ -1070,10 +1026,10 @@ namespace Xamarin.Bundler
 			{ "q", "Quiet", v => verbose-- },
 			{ "time", v => watch_level++ },
 			{ "executable=", "Specifies the native executable name to output", v => app.ExecutableName = v },
-			{ "nofastsim", "Do not run the simulator fast-path build", v => fast_sim = false },
+			{ "nofastsim", "Do not run the simulator fast-path build", v => app.NoFastSim = true },
 			{ "nolink", "Do not link the assemblies", v => app.LinkMode = LinkMode.None },
-			{ "nodebugtrack", "Disable debug tracking of object resurrection bugs", v => debug_track = false },
-			{ "debugtrack:", "Enable debug tracking of object resurrection bugs (enabled by default for the simulator)", v => { debug_track = ParseBool (v, "--debugtrack"); } },
+			{ "nodebugtrack", "Disable debug tracking of object resurrection bugs", v => app.DebugTrack = false },
+			{ "debugtrack:", "Enable debug tracking of object resurrection bugs (enabled by default for the simulator)", v => { app.DebugTrack = ParseBool (v, "--debugtrack"); } },
 			{ "linkerdumpdependencies", "Dump linker dependencies for linker-analyzer tool", v => app.LinkerDumpDependencies = true },
 			{ "linksdkonly", "Link only the SDK assemblies", v => app.LinkMode = LinkMode.SDKOnly },
 			{ "linkskip=", "Skip linking of the specified assembly", v => app.LinkSkipped.Add (v) },
@@ -1101,13 +1057,13 @@ namespace Xamarin.Bundler
 			{ "sim=", "Compile for the Simulator, specify the output directory for code", v =>
 				{
 					SetAction (Action.Build);
-					output_dir = v;
+					app.AppDirectory = v;
 					app.BuildTarget = BuildTarget.Simulator;
 				}
 			},
 			{ "dev=", "Compile for the Device, specify the output directory for the code", v => {
 					SetAction (Action.Build);
-					output_dir = v;
+					app.AppDirectory = v;
 					app.BuildTarget = BuildTarget.Device;
 				}
 			},
@@ -1115,7 +1071,7 @@ namespace Xamarin.Bundler
 			{ "sdk=", "Specifies the name of the SDK to compile against (version, for example \"3.2\")",
 				v => {
 					try {
-						sdk_version = Version.Parse (v);
+						app.SdkVersion = Version.Parse (v);
 					} catch (Exception ex) {
 						ErrorHelper.Error (26, ex, "Could not parse the command line argument '{0}': {1}", "-sdk", ex.Message);
 					}
@@ -1168,7 +1124,7 @@ namespace Xamarin.Bundler
 						throw new MonoTouchException (2, true, "Could not parse the environment variable '{0}'", v);
 					string name = v.Substring (0, eq);
 					string value = v.Substring (eq + 1);
-					environment_variables.Add (name, value);
+					app.EnvironmentVariables.Add (name, value);
 				}
 			},
 			{ "sgen:", "Enable the SGen garbage collector",
@@ -1196,7 +1152,7 @@ namespace Xamarin.Bundler
 			{ "cxx", "Enable C++ support", v => { app.EnableCxx = true; }},
 			{ "enable-repl:", "Enable REPL support (simulator and not linking only)", v => { app.EnableRepl = ParseBool (v, "enable-repl"); }, true /* this is a hidden option until we've actually used it and made sure it works as expected */ },
 			{ "pie:", "Enable (default) or disable PIE (Position Independent Executable).", v => { app.EnablePie = ParseBool (v, "pie"); }},
-			{ "compiler=", "Specify the Objective-C compiler to use (valid values are gcc, g++, clang, clang++ or the full path to a GCC-compatible compiler).", v => { compiler = v; }},
+			{ "compiler=", "Specify the Objective-C compiler to use (valid values are gcc, g++, clang, clang++ or the full path to a GCC-compatible compiler).", v => { app.Compiler = v; }},
 			{ "fastdev", "Build an app that supports fastdev (this app will only work when launched using Xamarin Studio)", v => { app.FastDev = true; }},
 			{ "force-thread-check", "Keep UI thread checks inside (even release) builds", v => { app.ThreadCheck = true; }},
 			{ "disable-thread-check", "Remove UI thread checks inside (even debug) builds", v => { app.ThreadCheck = false; }},
@@ -1205,10 +1161,10 @@ namespace Xamarin.Bundler
 					app.EnableDebug = true;
 					if (v != null){
 						if (v == "all"){
-							debug_all = true;
+							app.DebugAll = true;
 							return;
 						}
-						debug_assemblies.Add (Path.GetFileName (v));
+						app.DebugAssemblies.Add (Path.GetFileName (v));
 					}
 				}
 			},
@@ -1302,7 +1258,7 @@ namespace Xamarin.Bundler
 					}
 				}
 			},
-			{ "llvm-asm", "Make the LLVM compiler emit assembly files instead of object files. [Deprecated]", v => { llvm_asmwriter = true; }, true},
+			{ "llvm-asm", "Make the LLVM compiler emit assembly files instead of object files. [Deprecated]", v => { app.LLVMAsmWriter = true; }, true},
 			{ "http-message-handler=", "Specify the default HTTP message handler for HttpClient", v => { http_message_handler = v; }},
 			{ "output-format=", "Specify the output format for some commands. Possible values: Default, XML", v =>
 				{
@@ -1312,7 +1268,7 @@ namespace Xamarin.Bundler
 			{ "xamarin-framework-directory=", "The framework directory", v => { mtouch_dir = v; }, true },
 		};
 
-			AddSharedOptions (os);
+			AddSharedOptions (app, os);
 
 			try {
 				assemblies = os.Parse (args);
@@ -1347,23 +1303,23 @@ namespace Xamarin.Bundler
 			if (!app.IsLLVM && (app.EnableAsmOnlyBitCode || app.EnableLLVMOnlyBitCode))
 				ErrorHelper.Error (3008, "Bitcode support requires the use of LLVM (--abi=arm64+llvm etc.)");
 
-			if (EnableDebug) {
-				if (!debug_track.HasValue) {
-					debug_track = app.IsSimulatorBuild;
+			if (app.EnableDebug) {
+				if (!app.DebugTrack.HasValue) {
+					app.DebugTrack = app.IsSimulatorBuild;
 				}
 			} else {
-				if (debug_track.HasValue) {
+				if (app.DebugTrack.HasValue) {
 					ErrorHelper.Warning (32, "The option '--debugtrack' is ignored unless '--debug' is also specified.");
 				}
-				debug_track = false;
+				app.DebugTrack = false;
 			}
 
 			if (app.EnableAsmOnlyBitCode)
-				llvm_asmwriter = true;
+				app.LLVMAsmWriter = true;
 
 			ErrorHelper.Verbosity = verbose;
 
-			app.RuntimeOptions = RuntimeOptions.Create (http_message_handler, tls_provider);
+			app.RuntimeOptions = RuntimeOptions.Create (app, http_message_handler, tls_provider);
 
 			ValidateXcode ();
 
@@ -1390,10 +1346,10 @@ namespace Xamarin.Bundler
 				return CallMlaunch ();
 			}
 
-			if (sdk_version == null)
+			if (app.SdkVersion == null)
 				throw new MonoTouchException (25, true, "No SDK version was provided. Please add --sdk=X.Y to specify which {0} SDK should be used to build your application.", app.PlatformName);
 
-			framework_dir = GetFrameworkDir (Platform, sdk_version);
+			var framework_dir = GetFrameworkDirectory (app);
 			Driver.Log ("Xamarin.iOS {0}{1} using framework: {2}", Constants.Version, verbose > 1 ? "." + Constants.Revision : string.Empty, framework_dir);
 
 			if (action == Action.None)
@@ -1404,27 +1360,27 @@ namespace Xamarin.Bundler
 				ErrorHelper.Show (new MonoTouchException (2003, false, "Option '{0}' will be ignored since linking is disabled", "-disable-thread-check"));
 			}
 
-			if (sdk_version < new Version (6, 0) && app.IsArchEnabled (Abi.ARMv7s))
-				throw new MonoTouchException (14, true, "The iOS {0} SDK does not support building applications targeting {1}", sdk_version, "ARMv7s");
+			if (app.SdkVersion < new Version (6, 0) && app.IsArchEnabled (Abi.ARMv7s))
+				throw new MonoTouchException (14, true, "The iOS {0} SDK does not support building applications targeting {1}", app.SdkVersion, "ARMv7s");
 
-			if (sdk_version < new Version (7, 0) && app.IsArchEnabled (Abi.ARM64))
-				throw new MonoTouchException (14, true, "The iOS {0} SDK does not support building applications targeting {1}", sdk_version, "ARM64");
+			if (app.SdkVersion < new Version (7, 0) && app.IsArchEnabled (Abi.ARM64))
+				throw new MonoTouchException (14, true, "The iOS {0} SDK does not support building applications targeting {1}", app.SdkVersion, "ARM64");
 
-			if (sdk_version < new Version (7, 0) && app.IsArchEnabled (Abi.x86_64))
-				throw new MonoTouchException (14, true, "The iOS {0} SDK does not support building applications targeting {1}", sdk_version, "x86_64");
+			if (app.SdkVersion < new Version (7, 0) && app.IsArchEnabled (Abi.x86_64))
+				throw new MonoTouchException (14, true, "The iOS {0} SDK does not support building applications targeting {1}", app.SdkVersion, "x86_64");
 
 			if (!Directory.Exists (framework_dir)) {
 				Console.WriteLine ("Framework does not exist {0}", framework_dir);
-				Console.WriteLine ("   Platform = {0}", Platform);
-				Console.WriteLine ("   SDK = {0}", sdk_version);
+				Console.WriteLine ("   Platform = {0}", GetPlatform (app));
+				Console.WriteLine ("   SDK = {0}", app.SdkVersion);
 				Console.WriteLine ("   Deployment Version: {0}", app.DeploymentTarget);
 			}
 
-			if (!Directory.Exists (PlatformDirectory))
-				throw new MonoTouchException (6, true, "There is no devel platform at {0}, use --platform=PLAT to specify the SDK", PlatformDirectory);
+			if (!Directory.Exists (GetPlatformDirectory (app)))
+				throw new MonoTouchException (6, true, "There is no devel platform at {0}, use --platform=PLAT to specify the SDK", GetPlatformDirectory (app));
 
-			if (!Directory.Exists (output_dir))
-				throw new MonoTouchException (5, true, "The output directory '{0}' does not exist", output_dir);
+			if (!Directory.Exists (app.AppDirectory))
+				throw new MonoTouchException (5, true, "The output directory '{0}' does not exist", app.AppDirectory);
 
 			if (assemblies.Count != 1) {
 				var exceptions = new List<Exception> ();
@@ -1455,7 +1411,6 @@ namespace Xamarin.Bundler
 			Watch ("Setup", 1);
 
 			app.RootAssembly = assemblies [0];
-			app.AppDirectory = output_dir;
 			if (action == Action.RunRegistrar) {
 				app.RunRegistrar ();
 			} else {
@@ -1530,9 +1485,9 @@ namespace Xamarin.Bundler
 			}
 		}
 
-		static string FindGcc (bool gpp)
+		static string FindGcc (Application app, bool gpp)
 		{
-			var usr_bin = Path.Combine (PlatformsDirectory, Platform + ".platform", "Developer", "usr", "bin");
+			var usr_bin = Path.Combine (GetPlatformDirectory (app), GetPlatform (app) + ".platform", "Developer", "usr", "bin");
 			var gcc = (gpp ? "g++" : "gcc");
 			var compiler_path = Path.Combine (usr_bin, gcc + "-4.2");
 
@@ -1544,7 +1499,7 @@ namespace Xamarin.Bundler
 			return compiler_path;
 		}
 
-		public static void CalculateCompilerPath ()
+		public static void CalculateCompilerPath (Application app)
 		{
 			var fallback_to_clang = false;
 			var original_compiler = string.Empty;
@@ -1554,53 +1509,53 @@ namespace Xamarin.Bundler
 			// we try again with clang.
 			//
 
-			if (string.IsNullOrEmpty (compiler)) {
+			if (string.IsNullOrEmpty (app.Compiler)) {
 				// by default we use `gcc` before iOS7 SDK, falling back to `clang`. Otherwise we go directly to `clang`
 				// so we don't get bite by the fact that Xcode5 has a gcc compiler (which calls `clang`, even if not 100% 
 				// compitable wrt options) for the simulator but not for devices!
 				// ref: https://bugzilla.xamarin.com/show_bug.cgi?id=13838
 				if (app.Platform == ApplePlatform.iOS) {
-					fallback_to_clang = sdk_version < new Version (7, 0);
+					fallback_to_clang = app.SdkVersion < new Version (7, 0);
 				} else {
 					fallback_to_clang = false;
 				}
 				if (fallback_to_clang)
-					compiler = app.EnableCxx ? "g++" : "gcc";
+					app.Compiler = app.EnableCxx ? "g++" : "gcc";
 				else
-					compiler = app.EnableCxx ? "clang++" : "clang";
+					app.Compiler = app.EnableCxx ? "clang++" : "clang";
 			}
 
 		tryagain:
-			switch (compiler) {
+			switch (app.Compiler) {
 			case "clang++":
-				compiler_path = Path.Combine (DeveloperDirectory, "Toolchains", "XcodeDefault.xctoolchain", "usr", "bin", "clang++");
+				app.CompilerPath = Path.Combine (DeveloperDirectory, "Toolchains", "XcodeDefault.xctoolchain", "usr", "bin", "clang++");
 				break;
 			case "clang":
-				compiler_path = Path.Combine (DeveloperDirectory, "Toolchains", "XcodeDefault.xctoolchain", "usr", "bin", "clang");
+				app.CompilerPath = Path.Combine (DeveloperDirectory, "Toolchains", "XcodeDefault.xctoolchain", "usr", "bin", "clang");
 				break;
 			case "gcc":
-				compiler_path = FindGcc (false);
+				app.CompilerPath = FindGcc (app, false);
 				break;
 			case "g++":
-				compiler_path = FindGcc (true);
+				app.CompilerPath = FindGcc (app, true);
 				break;
 			default: // This is the full path to a compiler.
-				compiler_path = compiler;
+				app.CompilerPath = app.Compiler;
 				break;
 			}
 
-			if (!File.Exists (compiler_path)) {
+			if (!File.Exists (app.CompilerPath)) {
 				if (fallback_to_clang) {
 					// Couldn't find gcc, try to find clang.
-					original_compiler = compiler;
-					compiler = app.EnableCxx ? "clang++" : "clang";
+					original_compiler = app.Compiler;
+					app.Compiler = app.EnableCxx ? "clang++" : "clang";
 					fallback_to_clang = false;
 					goto tryagain;
 				}
 				if (string.IsNullOrEmpty (original_compiler)) {
-					throw new MonoTouchException (5101, true, "Missing '{0}' compiler. Please install Xcode 'Command-Line Tools' component", compiler);
+					throw new MonoTouchException (5101, true, "Missing '{0}' compiler. Please install Xcode 'Command-Line Tools' component", app.Compiler);
 				} else {
-					throw new MonoTouchException (5103, true, "Could not find neither the '{0}' nor the '{1}' compiler. Please install Xcode 'Command-Line Tools' component", compiler, original_compiler);
+					throw new MonoTouchException (5103, true, "Could not find neither the '{0}' nor the '{1}' compiler. Please install Xcode 'Command-Line Tools' component", app.Compiler, original_compiler);
 				}
 			}
 		}
@@ -1670,7 +1625,7 @@ namespace Xamarin.Bundler
 
 		static string GetFrameworkDir (string platform, Version iphone_sdk)
 		{
-			return Path.Combine (PlatformsDirectory, platform + ".platform", "Developer", "SDKs", platform + sdk_version.ToString () + ".sdk");
+			return Path.Combine (PlatformsDirectory, platform + ".platform", "Developer", "SDKs", platform + iphone_sdk.ToString () + ".sdk");
 		}
 
 		static bool IsBoundAssembly (Assembly s)
@@ -1728,24 +1683,17 @@ namespace Xamarin.Bundler
 			return (buf.st_mode & S_IFLNK) == S_IFLNK;
 		}
 
-		public static Frameworks Frameworks {
-			get {
-				switch (app.Platform) {
-				case ApplePlatform.iOS:
-					return Frameworks.iOSFrameworks;
-				case ApplePlatform.WatchOS:
-					return Frameworks.WatchFrameworks;
-				case ApplePlatform.TVOS:
-					return Frameworks.TVOSFrameworks;
-				default:
-					throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
-				}
-			}
-		}
-
-		public static Version MinOSVersion {
-			get {
-				return app.DeploymentTarget;
+		public static Frameworks GetFrameworks (Application app)
+		{
+			switch (app.Platform) {
+			case ApplePlatform.iOS:
+				return Frameworks.GetiOSFrameworks (app);
+			case ApplePlatform.WatchOS:
+				return Frameworks.WatchFrameworks;
+			case ApplePlatform.TVOS:
+				return Frameworks.TVOSFrameworks;
+			default:
+				throw ErrorHelper.CreateError (71, "Unknown platform: {0}. This usually indicates a bug in Xamarin.iOS; please file a bug report at http://bugzilla.xamarin.com with a test case.", app.Platform);
 			}
 		}
 	}