Merge commit '2272efbb189d457dc6c599cefd875425baad92a5' into framework-sdk

Make.config

@@ -58,9 +58,9 @@ MAX_MONO_VERSION=4.8.99
 MIN_MONO_URL=http://bosstoragemirror.blob.core.windows.net/wrench/mono-4.8.0/e5/e51aa0a7043a8185e264d6332ac7bc1f8f87cd39/MonoFramework-MDK-4.8.0.269.macos10.xamarin.universal.pkg
 
 # Minimum Xamarin Studio version
-MIN_XAMARIN_STUDIO_URL=https://files.xamarin.com/~rolf/XamarinStudio-6.1.0.4373.dmg
+MIN_XAMARIN_STUDIO_URL=https://bosstoragemirror.blob.core.windows.net/wrench/monodevelop-lion-master/a0/a04f5191c0d91121215fbbaa866f9d420521b6ee/XamarinStudio-6.4.0.5.dmg
-MIN_XAMARIN_STUDIO_VERSION=6.1.0.4373
+MIN_XAMARIN_STUDIO_VERSION=6.4.0.5
-MAX_XAMARIN_STUDIO_VERSION=6.3.0.9999
+MAX_XAMARIN_STUDIO_VERSION=6.4.0.9999
 
 # Minimum CMake version
 MIN_CMAKE_URL=https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.dmg

external/mono

@@ -1 +1 @@
-Subproject commit 5aba8a05f147ab1d12414c8f072657531b1c97f1
+Subproject commit 21c2ed435a5533719ee80647c7c3cae150e013c3

mk/xamarin.mk

@@ -1,5 +1,5 @@
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 5aca47d09bfd13f2cea370ac01dc2d9d371acb2c
+NEEDED_MACCORE_VERSION := d576fd8274e3fea113171bf7586175735b6dd42c
 NEEDED_MACCORE_BRANCH := master
 
 MACCORE_DIRECTORY := maccore

msbuild/Xamarin.Mac.Tasks.Core/Tasks/DetectSdkLocationsTaskBase.cs

@@ -49,6 +49,11 @@ namespace Xamarin.Mac.Tasks
 			get; set;
 		}
 
+		[Output]
+		public bool IsXcode8 {
+			get; set;
+		}
+
 		#endregion Outputs
 
 		public override bool Execute ()
@@ -60,6 +65,8 @@ namespace Xamarin.Mac.Tasks
 			EnsureXamarinSdkRoot ();
 			EnsureSdkPath ();
 
+			IsXcode8 = AppleSdkSettings.XcodeVersion.Major >= 8;
+
 			return !Log.HasLoggedErrors;
 		}
 

msbuild/Xamarin.Mac.Tasks/Tasks/BTouch.cs

@@ -40,14 +40,28 @@ namespace Xamarin.Mac.Tasks
 			var sb = new StringBuilder ();
 			if (isMobile) {
 				sb.Append (Path.Combine (FrameworkRoot, "lib", "bmac", "bmac-mobile.exe"));
-				sb.Append (" --target-framework=Xamarin.Mac,Version=v2.0,Profile=Mobile ");
 			} else {
 				sb.Append (Path.Combine (FrameworkRoot, "lib", "bmac", "bmac-full.exe"));
-				sb.Append (" --target-framework=Xamarin.Mac,Version=v4.5,Profile=Full ");
 			}
-			sb.Append ("-nostdlib ");
+			sb.Append (" -nostdlib ");
 			sb.Append (base.GenerateCommandLineCommands ());
 			return sb.ToString ();
 		}
+
+		protected override string GetTargetFrameworkArgument ()
+		{
+			switch (TargetFrameworkIdentifier) {
+				case null:
+				case "":
+				case "Xamarin.Mac":
+					return "/target-framework=Xamarin.Mac,Version=v2.0,Profile=Mobile";
+				case ".NETFramework":
+					return "/target-framework=Xamarin.Mac,Version=v4.5,Profile=Full";
+				default:
+					Log.LogError ($"Unknown target framework identifier: {TargetFrameworkIdentifier}.");
+					return string.Empty;
+			}
+		}
+
 	}
 }

msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Common.targets

@@ -357,13 +357,21 @@ Copyright (C) 2014 Xamarin. All rights reserved.
 	<Target Name="_ForgeMetal" Condition="'$(_CanOutputAppBundle)' == 'true' And '@(_SmeltedMetal)' != ''" DependsOnTargets="_SmeltMetal"
 		Inputs="@(_SmeltedMetal)" Outputs="$(IntermediateOutputPath)metal\default.metal-ar">
 		<ArTool
-			Condition="'$(IsMacEnabled)' == 'true'"
+			Condition="'$(IsMacEnabled)' == 'true' and '$(_IsXcode8)' == 'false'"
 			SessionId="$(BuildSessionId)"
 			Items="@(_SmeltedMetal)"
 			Archive="$(IntermediateOutputPath)metal\default.metal-ar">
 		</ArTool>
 
-		<CreateItem Include="$(IntermediateOutputPath)metal\default.metal-ar">
+		<!-- If !Xcode8 -->
+		<CreateItem Include="$(IntermediateOutputPath)metal\default.metal-ar"
+					Condition="'$(_IsXcode8)' == 'false'">
+			<Output TaskParameter="Include" ItemName="_ForgedMetal" />
+		</CreateItem>
+
+		<!-- Else -->
+		<CreateItem Include="@(_SmeltedMetal)"
+					Condition="'$(_IsXcode8)' == 'true'">
 			<Output TaskParameter="Include" ItemName="_ForgedMetal" />
 		</CreateItem>
 	</Target>
@@ -453,6 +461,7 @@ Copyright (C) 2014 Xamarin. All rights reserved.
 			<Output TaskParameter="SdkBinPath" PropertyName="_SdkBinPath" />
 			<Output TaskParameter="SdkDevPath" PropertyName="_SdkDevPath" />
 			<Output TaskParameter="SdkUsrPath" PropertyName="_SdkUsrPath" />
+			<Output TaskParameter="IsXcode8" PropertyName="_IsXcode8" />
 		</DetectSdkLocations>
 	</Target>
 

msbuild/Xamarin.MacDev.Tasks.Core/LoggingExtensions.cs

@@ -51,6 +51,11 @@ namespace Xamarin.MacDev.Tasks
 			log.LogMessage (TaskPropertyImportance, "  {0}: {1}", propertyName, value);
 		}
 
+		public static void LogTaskProperty (this TaskLoggingHelper log, string propertyName, int value)
+		{
+			log.LogMessage (TaskPropertyImportance, "  {0}: {1}", propertyName, value);
+		}
+
 		public static void LogTaskName (this TaskLoggingHelper log, string taskName)
 		{
 			log.LogMessage (TaskPropertyImportance, "{0} Task", taskName);

msbuild/Xamarin.MacDev.Tasks.Core/PathUtils.cs

@@ -33,7 +33,7 @@ namespace Xamarin.MacDev
 			try {
 				buffer = Marshal.AllocHGlobal (PATHMAX);
 				var result = realpath (path, buffer);
-				return result == IntPtr.Zero ? "" : Marshal.PtrToStringAuto (buffer);
+				return result == IntPtr.Zero ? path : Marshal.PtrToStringAuto (buffer);
 			} finally {
 				if (buffer != IntPtr.Zero)
 					Marshal.FreeHGlobal (buffer);
@@ -42,7 +42,7 @@ namespace Xamarin.MacDev
 
 		public static string AbsoluteToRelative (string baseDirectory, string absolute)
 		{
-			if (!Path.IsPathRooted (absolute) || string.IsNullOrEmpty (baseDirectory))
+			if (string.IsNullOrEmpty (baseDirectory))
 				return absolute;
 
 			// canonicalize the paths

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/BTouchTaskBase.cs

@@ -183,19 +183,23 @@ namespace Xamarin.MacDev.Tasks {
 			if (GeneratedSourcesFileList != null)
 				cmd.AppendSwitchIfNotNull ("/sourceonly:", Path.GetFullPath (GeneratedSourcesFileList));
 
+			cmd.AppendSwitch (GetTargetFrameworkArgument ());
+
+			return cmd.ToString ();
+		}
+
+		protected virtual string GetTargetFrameworkArgument ()
+		{
 			switch (TargetFrameworkIdentifier) {
 				case "MonoTouch":
 				case "Xamarin.iOS":
 				case "Xamarin.TVOS":
 				case "Xamarin.WatchOS":
-					cmd.AppendSwitch ($"/target-framework={TargetFrameworkIdentifier},v1.0");
+					return $"/target-framework={TargetFrameworkIdentifier},v1.0";
-					break;
 				default:
 					Log.LogError ($"Unknown target framework identifier: {TargetFrameworkIdentifier}.");
-					break;
+					return string.Empty;
 			}
-
-			return cmd.ToString ();
 		}
 
 		public override bool Execute ()

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/XcodeCompilerToolTask.cs

@@ -177,16 +177,21 @@ namespace Xamarin.MacDev.Tasks
 			}
 
 			if (exitCode != 0) {
+				// Note: ibtool or actool exited with an error. Dump everything we can to help the user
+				// diagnose the issue and then delete the manifest log file so that rebuilding tries
+				// again (in case of ibtool's infamous spurious errors).
 				if (errors.Length > 0)
 					Log.LogError (null, null, null, items[0].ItemSpec, 0, 0, 0, 0, "{0}", errors);
 
+				Log.LogError ("{0} exited with code {1}", ToolName, exitCode);
+
+				// Note: If the log file exists and is parseable, log those warnings/errors as well...
 				if (File.Exists (manifest.ItemSpec)) {
 					try {
 						var plist = PDictionary.FromFile (manifest.ItemSpec);
 
 						LogWarningsAndErrors (plist, items[0]);
 					} catch (FormatException) {
-						Log.LogError ("{0} exited with code {1}", ToolName, exitCode);
 					}
 
 					File.Delete (manifest.ItemSpec);

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/Copy.cs

@@ -1,6 +1,22 @@
-namespace Microsoft.Build.Tasks
+using Xamarin.MacDev.Tasks;
+
+namespace Microsoft.Build.Tasks
 {
 	public class Copy : CopyBase
 	{
+		public override bool Execute ()
+		{
+			Log.LogTaskName ("Copy");
+			Log.LogTaskProperty ("DestinationFiles", DestinationFiles);
+			Log.LogTaskProperty ("DestinationFolder", DestinationFolder);
+			Log.LogTaskProperty ("OverwriteReadOnlyFiles", OverwriteReadOnlyFiles);
+			Log.LogTaskProperty ("Retries", Retries);
+			Log.LogTaskProperty ("RetryDelayMilliseconds", RetryDelayMilliseconds);
+			Log.LogTaskProperty ("SkipUnchangedFiles", SkipUnchangedFiles);
+			Log.LogTaskProperty ("SourceFiles", SourceFiles);
+			Log.LogTaskProperty ("UseHardlinksIfPossible", UseHardlinksIfPossible);
+
+			return base.Execute ();
+		}
 	}
 }

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/Delete.cs

@@ -1,6 +1,16 @@
-namespace Microsoft.Build.Tasks
+using Xamarin.MacDev.Tasks;
+
+namespace Microsoft.Build.Tasks
 {
 	public class Delete : DeleteBase
 	{
+		public override bool Execute ()
+		{
+			Log.LogTaskName ("Delete");
+			Log.LogTaskProperty ("Files", Files);
+			Log.LogTaskProperty ("TreatErrorsAsWarnings", TreatErrorsAsWarnings);
+
+			return base.Execute ();
+		}
 	}
 }

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/Exec.cs

@@ -1,6 +1,22 @@
-namespace Microsoft.Build.Tasks
+using Xamarin.MacDev.Tasks;
+
+namespace Microsoft.Build.Tasks
 {
 	public class Exec : ExecBase
 	{
+		public override bool Execute ()
+		{
+			Log.LogTaskName ("Exec");
+			Log.LogTaskProperty ("Command", Command);
+			Log.LogTaskProperty ("CustomErrorRegularExpression", CustomErrorRegularExpression);
+			Log.LogTaskProperty ("CustomWarningRegularExpression", CustomWarningRegularExpression);
+			Log.LogTaskProperty ("IgnoreExitCode", IgnoreExitCode);
+			Log.LogTaskProperty ("IgnoreStandardErrorWarningFormat", IgnoreStandardErrorWarningFormat);
+			Log.LogTaskProperty ("StdErrEncoding", StdErrEncoding);
+			Log.LogTaskProperty ("StdOutEncoding", StdOutEncoding);
+			Log.LogTaskProperty ("WorkingDirectory", WorkingDirectory);
+
+			return base.Execute ();
+		}
 	}
 }

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/MakeDir.cs

@@ -1,6 +1,15 @@
-namespace Microsoft.Build.Tasks
+using Xamarin.MacDev.Tasks;
+
+namespace Microsoft.Build.Tasks
 {
 	public class MakeDir : MakeDirBase
 	{
+		public override bool Execute ()
+		{
+			Log.LogTaskName ("MakeDir");
+			Log.LogTaskProperty ("Directories", Directories);
+
+			return base.Execute ();
+		}
 	}
 }

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/Move.cs

@@ -1,6 +1,17 @@
-namespace Microsoft.Build.Tasks
+using Xamarin.MacDev.Tasks;
+
+namespace Microsoft.Build.Tasks
 {
 	public class Move : MoveTaskBase
 	{
+		public override bool Execute ()
+		{
+			Log.LogTaskName ("Move");
+			Log.LogTaskProperty ("DestinationFiles", DestinationFiles);
+			Log.LogTaskProperty ("DestinationFolder", DestinationFolder);
+			Log.LogTaskProperty ("SourceFiles", SourceFiles);
+
+			return base.Execute ();
+		}
 	}
 }

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/RemoveDir.cs

@@ -1,6 +1,15 @@
+using Xamarin.MacDev.Tasks;
+
 namespace Microsoft.Build.Tasks
 {
 	public class RemoveDir : RemoveDirBase
 	{
+		public override bool Execute ()
+		{
+			Log.LogTaskName ("RemoveDir");
+			Log.LogTaskProperty ("Directories", Directories);
+
+			return base.Execute ();
+		}
 	}
 }

msbuild/Xamarin.MacDev.Tasks/MsBuildTasks/Touch.cs

@@ -1,6 +1,18 @@
-namespace Microsoft.Build.Tasks
+using Xamarin.MacDev.Tasks;
+
+namespace Microsoft.Build.Tasks
 {
 	public class Touch : TouchBase
 	{
+		public override bool Execute ()
+		{
+			Log.LogTaskName ("Touch");
+			Log.LogTaskProperty ("AlwaysCreate", AlwaysCreate);
+			Log.LogTaskProperty ("Files", Files);
+			Log.LogTaskProperty ("ForceTouch", ForceTouch);
+			Log.LogTaskProperty ("Time", Time);
+
+			return base.Execute ();
+		}
 	}
 }

msbuild/Xamarin.iOS.Tasks.Core/Tasks/DetectSdkLocationsTaskBase.cs

@@ -69,6 +69,11 @@ namespace Xamarin.iOS.Tasks
 			get; set;
 		}
 
+		[Output]
+		public bool IsXcode8 {
+			get; set;
+		}
+
 #endregion Outputs
 
 		public PlatformFramework Framework {
@@ -92,6 +97,8 @@ namespace Xamarin.iOS.Tasks
 
 			SdkIsSimulator = (architectures & (TargetArchitecture.i386 | TargetArchitecture.x86_64)) != 0;
 
+			IsXcode8 = AppleSdkSettings.XcodeVersion.Major >= 8;
+
 			EnsureAppleSdkRoot ();
 			EnsureXamarinSdkRoot ();
 			switch (Framework) {

msbuild/Xamarin.iOS.Tasks.Core/Tasks/MTouchTaskBase.cs

@@ -605,7 +605,7 @@ namespace Xamarin.iOS.Tasks
 			args.Add ("--target-framework");
 			args.Add (TargetFrameworkIdentifier + "," + TargetFrameworkVersion);
 
-			args.AddQuoted (MainAssembly.ItemSpec);
+			args.AddQuoted (Path.GetFullPath (MainAssembly.ItemSpec));
 
 			// We give the priority to the ExtraArgs to set the mtouch verbosity.
 			if (string.IsNullOrEmpty (ExtraArgs) || (!string.IsNullOrEmpty (ExtraArgs) && !ExtraArgs.Contains ("-q") && !ExtraArgs.Contains ("-v")))

msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets

@@ -533,12 +533,20 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		Inputs="@(_SmeltedMetal)" Outputs="$(DeviceSpeficicIntermediateOutputPath)metal\default.metal-ar">
 		<ArTool
 			SessionId="$(BuildSessionId)"
-			Condition="'$(IsMacEnabled)' == 'true'"
+			Condition="'$(IsMacEnabled)' == 'true' and '$(_IsXcode8)' == 'false'"
 			Items="@(_SmeltedMetal)"
 			Archive="$(DeviceSpecificIntermediateOutputPath)metal\default.metal-ar">
 		</ArTool>
 
-		<CreateItem Include="$(DeviceSpecificIntermediateOutputPath)metal\default.metal-ar">
+		<!-- If !Xcode8 -->
+		<CreateItem Include="$(DeviceSpecificIntermediateOutputPath)metal\default.metal-ar"
+					Condition="'$(_IsXcode8)' == 'false'">
+			<Output TaskParameter="Include" ItemName="_ForgedMetal" />
+		</CreateItem>
+
+		<!-- Else -->
+		<CreateItem Include="@(_SmeltedMetal)"
+					Condition="'$(_IsXcode8)' == 'true'">
 			<Output TaskParameter="Include" ItemName="_ForgedMetal" />
 		</CreateItem>
 	</Target>
@@ -593,6 +601,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 			<Output TaskParameter="SdkUsrPath" PropertyName="_SdkUsrPath" />
 			<Output TaskParameter="SdkPlatform" PropertyName="_SdkPlatform" />
 			<Output TaskParameter="SdkIsSimulator" PropertyName="_SdkIsSimulator" />
+			<Output TaskParameter="IsXcode8" PropertyName="_IsXcode8" />
 		</DetectSdkLocations>
 	</Target>
 

runtime/monotouch-debug.m

@@ -561,8 +561,11 @@ void monotouch_configure_debugging ()
 
 #if MONOTOUCH && (defined(__i386__) || defined (__x86_64__))
 	// Try to read shared memory as well
-	key_t shmkey = ftok ("/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mtouch", 0);
+	key_t shmkey;
-	if (shmkey == -1) {
+	if (!xamarin_is_extension) {
+		// Don't read shared memory in normal apps, because we're always able to pass
+		// the debug data (host/port) using either command-line arguments or environment variables
+	} else if ((shmkey = ftok ("/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mtouch", 0)) == -1) {
 		LOG (PRODUCT ": Could not create shared memory key: %s\n", strerror (errno));
 	} else {
 		int shmsize = 1024;

src/NetworkExtension/NEPacketTunnelFlow.cs

@@ -0,0 +1,23 @@
+using XamCore.Foundation;
+
+namespace XamCore.NetworkExtension {
+
+	// needed for generated Async support
+	//public delegate void NEPacketTunnelFlowReadHandler (NSData [] packets, NSNumber [] protocols);
+
+	// avoid generator default `Arg1` and `Arg2` since Action<> was used
+	public class NEPacketTunnelFlowReadResult {
+
+#if !COREBUILD
+		public NEPacketTunnelFlowReadResult (NSData [] packets, NSNumber [] protocols)
+		{
+			Packets = packets;
+			Protocols = protocols;
+		}
+
+		public NSData [] Packets { get; set; }
+
+		public NSNumber [] Protocols { get; set; }
+#endif
+	}
+}

src/TVMLKit/TVViewElement.cs

@@ -0,0 +1,21 @@
+using System;
+using XamCore.Foundation;
+using XamCore.ObjCRuntime;
+
+namespace XamCore.TVMLKit {
+
+	public class TVViewElementDispatchResult {
+
+#if !COREBUILD
+		public TVViewElementDispatchResult (bool isDispatched, bool isCancelled)
+		{
+			IsDispatched = isDispatched;
+			IsCancelled = isCancelled;
+		}
+
+		public bool IsDispatched { get; set; }
+
+		public bool IsCancelled { get; set; }
+#endif
+	}
+}

src/WatchKit/WKInterfaceController.cs

@@ -10,6 +10,7 @@ using XamCore.UIKit;
 
 namespace XamCore.WatchKit {
 
+#if !COREBUILD
 	public partial class WKInterfaceController {
 
 		public void PushController (string name, string context)
@@ -92,6 +93,21 @@ namespace XamCore.WatchKit {
 			Runtime.ConnectMethod (mi, sel);
 		}
 	}
+#endif
+
+	public class WKPresentMediaPlayerResult {
+#if !COREBUILD
+		public WKPresentMediaPlayerResult (bool didPlayToEnd, double /* NSTimeInterval */ endTime)
+		{
+			DidPlayToEnd = didPlayToEnd;
+			EndTime = endTime;
+		}
+
+		public bool DidPlayToEnd { get; set; }
+
+		public double EndTime { get; set; }
+#endif
+	}
 }
 
 #endif // WATCH || IOS

src/audiounit.cs

@@ -81,6 +81,7 @@ namespace XamCore.AudioUnit {
 
 		[Static]
 		[Export ("instantiateWithComponentDescription:options:completionHandler:")]
+		[Async]
 		void FromComponentDescription (AudioComponentDescription componentDescription, AudioComponentInstantiationOptions options, Action<AUAudioUnit, NSError> completionHandler);
 
 		[Export ("componentDescription")]

src/avfoundation.cs

@@ -1267,15 +1267,19 @@ namespace XamCore.AVFoundation {
 		[Export ("playing")]
 		bool Playing { [Bind ("isPlaying")] get; }
 
+		[Async]
 		[Export ("scheduleBuffer:completionHandler:")]
 		void ScheduleBuffer (AVAudioPcmBuffer buffer, [NullAllowed] Action completionHandler);
 
+		[Async]
 		[Export ("scheduleBuffer:atTime:options:completionHandler:")]
 		void ScheduleBuffer (AVAudioPcmBuffer buffer, [NullAllowed] AVAudioTime when, AVAudioPlayerNodeBufferOptions options, [NullAllowed] Action completionHandler);
 
+		[Async]
 		[Export ("scheduleFile:atTime:completionHandler:")]
 		void ScheduleFile (AVAudioFile file, [NullAllowed] AVAudioTime when, [NullAllowed] Action completionHandler);
 
+		[Async]
 		[Export ("scheduleSegment:startingFrame:frameCount:atTime:completionHandler:")]
 		void ScheduleSegment (AVAudioFile file, long startFrame, uint /* AVAudioFrameCount = uint32_t */ numberFrames, [NullAllowed] AVAudioTime when, [NullAllowed] Action completionHandler);
 
@@ -2071,6 +2075,7 @@ namespace XamCore.AVFoundation {
 		[iOS (9,0), Mac (10,11)]
 		[Static]
 		[Export ("instantiateWithComponentDescription:options:completionHandler:")]
+		[Async]
 		void FromComponentDescription (AudioComponentDescription audioComponentDescription, AudioComponentInstantiationOptions options, Action<AVAudioUnit, NSError> completionHandler);
 
 		[iOS (9,0), Mac (10,11, onlyOn64 : true)]

src/corespotlight.cs

@@ -69,15 +69,19 @@ namespace XamCore.CoreSpotlight {
 #endif
 
 		[Export ("indexSearchableItems:completionHandler:")]
+		[Async]
 		void Index (CSSearchableItem [] items, [NullAllowed] Action<NSError> completionHandler);
 
 		[Export ("deleteSearchableItemsWithIdentifiers:completionHandler:")]
+		[Async]
 		void Delete (string [] identifiers, [NullAllowed] Action<NSError> completionHandler);
 
 		[Export ("deleteSearchableItemsWithDomainIdentifiers:completionHandler:")]
+		[Async]
 		void DeleteWithDomain (string [] domainIdentifiers, [NullAllowed] Action<NSError> completionHandler);
 
 		[Export ("deleteAllSearchableItemsWithCompletionHandler:")]
+		[Async]
 		void DeleteAll ([NullAllowed] Action<NSError> completionHandler);
 	}
 

src/error.cs

@@ -74,6 +74,7 @@ using ProductException=BindingException;
 //		BI1051 Internal error: Don't know how to get attributes for {0}. Please file a bug report (http://bugzilla.xamarin.com) with a test case.
 //		BI1052 Internal error: Could not find the type {0} in the assembly {1}. Please file a bug report (http://bugzilla.xamarin.com) with a test case.
 //		BI1053 Internal error: unknown target framework '{0}'.
+//		BI1060 The {0} protocol is decorated with [Model], but not [BaseType]. Please verify that [Model] is relevant for this protocol; if so, add [BaseType] as well, otherwise remove [Model].
 //	BI11xx	warnings
 //		BI1101 Trying to use a string as a [Target]
 //		BI1102 Using the deprecated EventArgs for a delegate signature in {0}.{1}, please use DelegateName instead

src/foundation.cs

@@ -3338,6 +3338,7 @@ namespace XamCore.Foundation
 		[Export ("inputItems", ArgumentSemantic.Copy)]
 		NSExtensionItem [] InputItems { get; }
 
+		[Async]
 		[Export ("completeRequestReturningItems:completionHandler:")]
 		void CompleteRequest (NSExtensionItem [] returningItems, [NullAllowed] Action<bool> completionHandler);
 
@@ -5734,6 +5735,7 @@ namespace XamCore.Foundation
 		NSString ChangedNotification { get; }
 
 		[iOS (8,0), Mac (10,10)]
+		[Async]
 		[Export ("getCredentialsForProtectionSpace:task:completionHandler:")]
 		void GetCredentials (NSUrlProtectionSpace protectionSpace, NSUrlSessionTask task, [NullAllowed] Action<NSDictionary> completionHandler);
 
@@ -5746,6 +5748,7 @@ namespace XamCore.Foundation
 		void RemoveCredential (NSUrlCredential credential, NSUrlProtectionSpace protectionSpace, NSDictionary options, NSUrlSessionTask task);
 
 		[iOS (8,0), Mac (10,10)]
+		[Async]
 		[Export ("getDefaultCredentialForProtectionSpace:task:completionHandler:")]
 		void GetDefaultCredential (NSUrlProtectionSpace space, NSUrlSessionTask task, [NullAllowed] Action<NSUrlCredential> completionHandler);
 
@@ -8233,6 +8236,7 @@ namespace XamCore.Foundation
 		
 #if !MONOMAC || XAMCORE_2_0
 		[Mac (10,10)][iOS (8,0)]
+		[Async]
 		[Export ("getCookiesForTask:completionHandler:")]
 		void GetCookiesForTask (NSUrlSessionTask task, Action<NSHttpCookie []> completionHandler);
 
@@ -8724,6 +8728,7 @@ namespace XamCore.Foundation
 		[Export ("hasItemConformingToTypeIdentifier:")]
 		bool HasItemConformingTo (string typeIdentifier);
 
+		[Async]
 		[Export ("loadItemForTypeIdentifier:options:completionHandler:")]
 		void LoadItem (string typeIdentifier, [NullAllowed] NSDictionary options, [NullAllowed] Action<NSObject,NSError> completionHandler);
 
@@ -8733,6 +8738,7 @@ namespace XamCore.Foundation
 		[Export ("setPreviewImageHandler:")]
 		void SetPreviewImageHandler (NSItemProviderLoadHandler handler);
 
+		[Async]
 		[Export ("loadPreviewImageWithOptions:completionHandler:")]
 		void LoadPreviewImage (NSDictionary options, Action<NSObject,NSError> completionHandler);
 
@@ -11151,6 +11157,7 @@ namespace XamCore.Foundation
 		[Mac (10,10)]
 		[iOS (8,0)]
 		[Static]
+		[Async]
 		[Export ("getNonlocalVersionsOfItemAtURL:completionHandler:")]
 		void GetNonlocalVersions (NSUrl url, NSFileVersionNonlocalVersionsCompletionHandler completionHandler);
 

src/frameworks.sources

@@ -976,6 +976,7 @@ NETWORKEXTENSION_API_SOURCES = \
 
 NETWORKEXTENSION_CORE_SOURCES = \
 	NetworkExtension/NEHotspotHelperOptions.cs \
+	NetworkExtension/NEPacketTunnelFlow.cs \
 	NetworkExtension/NEVpnConnectionStartOptions.cs \
 
 NETWORKEXTENSION_SOURCES = \
@@ -1245,7 +1246,8 @@ SYSTEMCONFIGURATION_SOURCES = \
 
 # TVMLKit
 
-TVMLKIT_CORE_SOURCES =
+TVMLKIT_CORE_SOURCES = \
+	TVMLKit/TVViewElement.cs \
 
 # TVServices
 
@@ -1386,9 +1388,11 @@ WATCHCONNECTIVITY_CORE_SOURCES = \
 WATCHKIT_API_SOURCES = \
     WatchKit/WKDefs.cs \
 
+WATCHKIT_CORE_SOURCES = \
+	WatchKit/WKInterfaceController.cs \
+
 WATCHKIT_SOURCES = \
 	WatchKit/WKAccessibility.cs \
-	WatchKit/WKInterfaceController.cs \
 	WatchKit/WKInterfaceDevice.cs \
 
 # WebKit (Mac version)

src/gamecontroller.cs

@@ -280,6 +280,7 @@ namespace XamCore.GameController {
 		GCController [] Controllers { get; }
 
 		[Static, Export ("startWirelessControllerDiscoveryWithCompletionHandler:")]
+		[Async]
 		void StartWirelessControllerDiscovery ([NullAllowed] Action completionHandler);
 
 		[Static, Export ("stopWirelessControllerDiscovery")]

src/gamekit.cs

@@ -773,6 +773,7 @@ namespace XamCore.GameKit {
 		void UnregisterAllListeners ();
 
 		[iOS (7,0), Mac (10,10)]
+		[Async (ResultTypeName = "GKIdentityVerificationSignatureResult")]
 		[Export ("generateIdentityVerificationSignatureWithCompletionHandler:")]
 		void GenerateIdentityVerificationSignature ([NullAllowed] GKIdentityVerificationSignatureHandler completionHandler);
 
@@ -897,6 +898,7 @@ namespace XamCore.GameKit {
 
 		[iOS (8,0), Mac (10,10)]
 		[Export ("chooseBestHostingPlayerWithCompletionHandler:")]
+		[Async]
 		void ChooseBestHostingPlayer (Action<GKPlayer> completionHandler);
 
 		[iOS (8,0), Mac(10,10)]

src/generator.cs

@@ -1098,7 +1098,6 @@ public partial class Generator : IMemberGatherer {
 		throw new BindingException (1017, true, "Do not know how to make a signature for {0}", mai.Type);
 	}
 
-	static HashSet<Type> missing_base_type_warning_shown = new HashSet<Type> ();
 	static bool IsProtocolInterface (Type type, bool checkPrefix = true)
 	{
 		// for subclassing the type (from the binding files) is not yet prefixed by an `I`
@@ -5451,12 +5450,9 @@ public partial class Generator : IMemberGatherer {
 			if (is_protocol) {
 				if (is_static_class)
 					throw new BindingException (1025, true, "[Static] and [Protocol] are mutually exclusive ({0})", type.FullName);
-				if (is_model && base_type == TypeManager.System_Object){
+				if (is_model && base_type == TypeManager.System_Object)
-					if (!missing_base_type_warning_shown.Contains (type)){
+					throw new BindingException (1060, true, "The {0} protocol is decorated with [Model], but not [BaseType]. Please verify that [Model] is relevant for this protocol; if so, add [BaseType] as well, otherwise remove [Model].", type.FullName);
-						missing_base_type_warning_shown.Add (type);
+
-						Console.WriteLine ("Warning, protocol {0} does not have a BaseType, wont generate the class, only the interface and extensions class", type.FullName);
-					}
-				}
 				var protocol = AttributeManager.GetCustomAttribute<ProtocolAttribute> (type);
 				GenerateProtocolTypes (type, class_visibility, TypeName, protocol.Name ?? objc_type_name, protocol);
 			}

src/healthkit.cs

@@ -412,19 +412,23 @@ namespace XamCore.HealthKit {
 		HKBloodTypeObject GetBloodType (out NSError error);
 
 		[NoWatch]
+		[Async]
 		[Export ("enableBackgroundDeliveryForType:frequency:withCompletion:")]
 		void EnableBackgroundDelivery (HKObjectType type, HKUpdateFrequency frequency, Action<bool, NSError> completion);
 
 		[NoWatch]
+		[Async]
 		[Export ("disableBackgroundDeliveryForType:withCompletion:")]
 		void DisableBackgroundDelivery (HKObjectType type, Action<bool, NSError> completion);
 
 		[NoWatch]
+		[Async]
 		[Export ("disableAllBackgroundDeliveryWithCompletion:")]
 		void DisableAllBackgroundDelivery (Action<bool, NSError> completion);
 
 		// FIXME NS_EXTENSION_UNAVAILABLE("Not available to extensions") ;
 		[NoWatch]
+		[Async]
 		[iOS (9,0)]
 		[Export ("handleAuthorizationForExtensionWithCompletion:")]
 		void HandleAuthorizationForExtension (Action<bool, NSError> completion);

src/homekit.cs

@@ -691,6 +691,7 @@ namespace XamCore.HomeKit {
 		[NoTV]
 		[NoWatch]
 		[iOS (9,0)]
+		[Async]
 		[Export ("manageUsersWithCompletionHandler:")]
 		void ManageUsers (Action<NSError> completion);
 
@@ -1128,6 +1129,7 @@ namespace XamCore.HomeKit {
 
 		[NoTV]
 		[NoWatch]
+		[Async]
 		[Export ("updateTriggerValue:completionHandler:")]
 		void UpdateTriggerValue ([NullAllowed] INSCopying triggerValue, Action<NSError> completion);
 	}
@@ -1182,16 +1184,19 @@ namespace XamCore.HomeKit {
 
 		[NoTV]
 		[NoWatch]
+		[Async]
 		[Export ("addEvent:completionHandler:")]
 		void AddEvent (HMEvent @event, Action<NSError> completion);
 
 		[NoTV]
 		[NoWatch]
+		[Async]
 		[Export ("removeEvent:completionHandler:")]
 		void RemoveEvent (HMEvent @event, Action<NSError> completion);
 
 		[NoTV]
 		[NoWatch]
+		[Async]
 		[Export ("updatePredicate:completionHandler:")]
 		void UpdatePredicate ([NullAllowed] NSPredicate predicate, Action<NSError> completion);
 	}
@@ -1233,6 +1238,7 @@ namespace XamCore.HomeKit {
 
 		[NoTV]
 		[NoWatch]
+		[Async]
 		[Export ("updateRegion:completionHandler:")]
 		void UpdateRegion (CLRegion region, Action<NSError> completion);
 	}

src/iad.cs

@@ -263,6 +263,7 @@ namespace XamCore.iAd {
 
 		[iOS (9,0)]
 		[Export ("requestAttributionDetailsWithBlock:")]
+		[Async]
 		void RequestAttributionDetails (Action<NSDictionary, NSError> completionHandler);
 
 #if !XAMCORE_4_0

src/mapkit.cs

@@ -1246,11 +1246,9 @@ namespace XamCore.MapKit {
 #endif
 	interface MKLocalSearchRequest : NSCopying {
 
-#if !XAMCORE_2_0 && !MONOMAC
+		[TV (9,2)][NoWatch][iOS (9,3)][Mac (10,11,4, onlyOn64 : true)]
-		[TV (9,2)][NoWatch][iOS (9,3)]
 		[Export ("initWithCompletion:")]
 		IntPtr Constructor (MKLocalSearchCompletion completion);
-#endif
 
 		[Export ("naturalLanguageQuery", ArgumentSemantic.Copy)]
 		[NullAllowed]
@@ -1302,6 +1300,7 @@ namespace XamCore.MapKit {
 		IntPtr Constructor (MKDirectionsRequest request);
 
 		[Export ("calculateDirectionsWithCompletionHandler:")]
+		[Async]
 		void CalculateDirections (MKDirectionsHandler completionHandler);
 
 		[Export ("cancel")]
@@ -1311,6 +1310,7 @@ namespace XamCore.MapKit {
 		bool Calculating { [Bind ("isCalculating")] get; }
 
 		[Export ("calculateETAWithCompletionHandler:")]
+		[Async]
 		void CalculateETA (MKETAHandler completionHandler);
 	}
 
@@ -1533,9 +1533,11 @@ namespace XamCore.MapKit {
 		IntPtr Constructor (MKMapSnapshotOptions options);
 
 		[Export ("startWithCompletionHandler:")]
+		[Async]
 		void Start (MKMapSnapshotCompletionHandler completionHandler);
 
 		[Export ("startWithQueue:completionHandler:")]
+		[Async]
 		void Start (DispatchQueue queue, MKMapSnapshotCompletionHandler completionHandler);
 
 		[Export ("cancel")]

src/metalkit.cs

@@ -219,18 +219,21 @@ namespace XamCore.MetalKit {
 		void FromUrl (NSUrl url, [NullAllowed] NSDictionary options, MTKTextureLoaderCallback completionHandler);
 
 		[Wrap ("FromUrl (url, options == null ? null : options.Dictionary, completionHandler)")]
+		[Async]
 		void FromUrl (NSUrl url, [NullAllowed] MTKTextureLoaderOptions options, MTKTextureLoaderCallback completionHandler);
 
 		[Export ("newTextureWithData:options:completionHandler:"), Internal]
 		void FromData (NSData data, [NullAllowed] NSDictionary options, MTKTextureLoaderCallback completionHandler);
 
 		[Wrap ("FromData (data, options == null ? null : options.Dictionary, completionHandler)")]
+		[Async]
 		void FromData (NSData data, [NullAllowed] MTKTextureLoaderOptions options, MTKTextureLoaderCallback completionHandler);
 
 		[Export ("newTextureWithCGImage:options:completionHandler:"), Internal]
 		void FromCGImage (CGImage cgImage, [NullAllowed] NSDictionary options, MTKTextureLoaderCallback completionHandler);
 
 		[Wrap ("FromCGImage (cgImage, options == null ? null : options.Dictionary, completionHandler)")]
+		[Async]
 		void FromCGImage (CGImage cgImage, [NullAllowed] MTKTextureLoaderOptions options, MTKTextureLoaderCallback completionHandler);
 
 		[Export ("newTextureWithContentsOfURL:options:error:"), Internal]
@@ -243,10 +246,12 @@ namespace XamCore.MetalKit {
 
 		[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
 		[Export ("newTexturesWithContentsOfURLs:options:completionHandler:")]
+		[Async]
 		void FromUrls (NSUrl[] urls, [NullAllowed] NSDictionary options, MTKTextureLoaderArrayCallback completionHandler);
 
 		[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
 		[Wrap ("FromUrls (urls, options == null ? null : options.Dictionary, completionHandler)")]
+		[Async]
 		void FromUrls (NSUrl[] urls, [NullAllowed] MTKTextureLoaderOptions options, MTKTextureLoaderArrayCallback completionHandler);
 
 		[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
@@ -275,18 +280,22 @@ namespace XamCore.MetalKit {
 
 		[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
 		[Export ("newTextureWithName:scaleFactor:bundle:options:completionHandler:")]
+		[Async]
 		void FromName (string name, nfloat scaleFactor, [NullAllowed] NSBundle bundle, [NullAllowed] NSDictionary options, MTKTextureLoaderCallback completionHandler);
 
 		[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
 		[Wrap ("FromName (name, scaleFactor, bundle, options == null ? null : options.Dictionary, completionHandler)")]
+		[Async]
 		void FromName (string name, nfloat scaleFactor, [NullAllowed] NSBundle bundle, [NullAllowed] MTKTextureLoaderOptions options, MTKTextureLoaderCallback completionHandler);
 
 		[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
 		[Export ("newTexturesWithNames:scaleFactor:bundle:options:completionHandler:")]
+		[Async]
 		void FromNames (string[] names, nfloat scaleFactor, [NullAllowed] NSBundle bundle, [NullAllowed] NSDictionary options, MTKTextureLoaderArrayCallback completionHandler);
 
 		[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
 		[Wrap ("FromNames (names, scaleFactor, bundle, options == null ? null : options.Dictionary, completionHandler)")]
+		[Async]
 		void FromNames (string[] names, nfloat scaleFactor, [NullAllowed] NSBundle bundle, [NullAllowed] MTKTextureLoaderOptions options, MTKTextureLoaderArrayCallback completionHandler);
 
 		[iOS (10,0)][Mac (10,12, onlyOn64 : true)]

src/networkextension.cs

@@ -627,6 +627,7 @@ namespace XamCore.NetworkExtension {
 
 		[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
 		[Export ("displayMessage:completionHandler:")]
+		[Async]
 		void DisplayMessage (string message, Action<bool> completionHandler);
 	}
 
@@ -1321,6 +1322,7 @@ namespace XamCore.NetworkExtension {
 	[BaseType (typeof(NSObject))]
 	interface NEPacketTunnelFlow {
 		[Export ("readPacketsWithCompletionHandler:")]
+		[Async (ResultType = typeof (NEPacketTunnelFlowReadResult))]
 		void ReadPackets (Action<NSData[], NSNumber[]> completionHandler);
 
 		[Export ("writePackets:withProtocols:")]

src/passkit.cs

@@ -73,6 +73,7 @@ namespace XamCore.PassKit {
 
 		[Since (7,0)]
 		[Export ("addPasses:withCompletionHandler:")]
+		[Async]
 		void AddPasses (PKPass[] passes, [NullAllowed] Action<PKPassLibraryAddPassesStatus> completion);
 
 		[Field ("PKPassLibraryDidChangeNotification")]
@@ -95,11 +96,13 @@ namespace XamCore.PassKit {
 
 		[NoWatch]
 		[iOS (8,0)]
+		[Async]
 		[Export ("activatePaymentPass:withActivationData:completion:")]
 		void ActivatePaymentPass (PKPaymentPass paymentPass, NSData activationData, [NullAllowed] Action<bool, NSError> completion);
 
 		[NoWatch]
 		[iOS (8,0)]
+		[Async]
 		[Export ("activatePaymentPass:withActivationCode:completion:")]
 		void ActivatePaymentPass (PKPaymentPass paymentPass, string activationCode, [NullAllowed] Action<bool, NSError> completion);
 

src/photos.cs

@@ -343,6 +343,7 @@ namespace XamCore.Photos
 		int RequestData (PHAssetResource forResource, [NullAllowed] PHAssetResourceRequestOptions options, Action<NSData> handler, Action<NSError> completionHandler);
 
 		[Export ("writeDataForAssetResource:toFile:options:completionHandler:")]
+		[Async]
 		void WriteData (PHAssetResource forResource, NSUrl fileURL, [NullAllowed] PHAssetResourceRequestOptions options, Action<NSError> completionHandler);
 
 		[Export ("cancelDataRequest:")]
@@ -999,6 +1000,7 @@ namespace XamCore.Photos
 		[Async]
 		void RequestAuthorization (Action<PHAuthorizationStatus> handler);
 
+		// no [Async] since we're binding performChangesAndWait:error: too
 		[Export ("performChanges:completionHandler:")]
 		void PerformChanges (Action changeHandler, Action<bool, NSError> completionHandler);
 

src/scenekit.cs

@@ -2220,6 +2220,7 @@ namespace XamCore.SceneKit {
 		[Abstract] // this protocol existed before iOS 9 (or OSX 10.11) and we cannot add abstract members to it (breaking changes)
 	#endif
 		[iOS (9,0)][Mac (10,11, onlyOn64 : true)] // SKTransition -> SpriteKit -> only on 64 bits
+		[Async]
 		[Export ("presentScene:withTransition:incomingPointOfView:completionHandler:")]
 		void PresentScene (SCNScene scene, SKTransition transition, [NullAllowed] SCNNode pointOfView, [NullAllowed] Action completionHandler);
 #endif

src/spritekit.cs

@@ -217,6 +217,7 @@ namespace XamCore.SpriteKit {
 		[Export ("runAction:")]
 		void RunAction (SKAction action);
 
+		[Async]
 		[Export ("runAction:completion:")]
 		void RunAction (SKAction action, Action completionHandler);
 

src/tvmlkit.cs

@@ -178,6 +178,7 @@ namespace XamCore.TVMLKit {
 		UINavigationController NavigationController { get; }
 
 		[Export ("evaluateInJavaScriptContext:completion:")]
+		[Async]
 		void Evaluate (Action<JSContext> evaluation, [NullAllowed] Action<bool> completion);
 
 		[Export ("stop")]
@@ -744,9 +745,11 @@ namespace XamCore.TVMLKit {
 		void Reset (TVElementResettableProperty resettableProperty);
 
 		[Export ("dispatchEventOfType:canBubble:cancellable:extraInfo:completion:")]
+		[Async (ResultType = typeof (TVViewElementDispatchResult))]
 		void DispatchEvent (TVElementEventType type, bool canBubble, bool isCancellable, [NullAllowed] NSDictionary<NSString, NSObject> extraInfo, [NullAllowed] Action<bool, bool> completion);
 
 		[Export ("dispatchEventWithName:canBubble:cancellable:extraInfo:completion:")]
+		[Async (ResultType = typeof (TVViewElementDispatchResult))]
 		void DispatchEvent (string eventName, bool canBubble, bool isCancellable, [NullAllowed] NSDictionary<NSString, NSObject> extraInfo, [NullAllowed] Action<bool, bool> completion);
 	}
 

src/uikit.cs

@@ -279,6 +279,7 @@ namespace XamCore.UIKit {
 	[NoWatch]
 	[NoTV]
 	[iOS (8,0)]
+	[ThreadSafe]
 	[BaseType (typeof (NSObject))]
 	partial interface NSFileProviderExtension {
 	    [Static, Export ("writePlaceholderAtURL:withMetadata:error:")]
@@ -2514,6 +2515,7 @@ namespace XamCore.UIKit {
 
 		[iOS (10,0), TV (10,0)]
 		[Wrap ("OpenUrl (url, options?.Dictionary, completion)")]
+		[Async]
 		void OpenUrl (NSUrl url, UIApplicationOpenUrlOptions options, [NullAllowed] Action<bool> completion);
 
 		[Export ("canOpenURL:")]
@@ -14699,6 +14701,7 @@ namespace XamCore.UIKit {
 		UIPrinter FromUrl (NSUrl url);
 	
 		[Export ("contactPrinter:")]
+		[Async]
 		void ContactPrinter (UIPrinterContactPrinterHandler completionHandler);
 	}
 
@@ -15644,6 +15647,7 @@ namespace XamCore.UIKit {
 		NSObject WeakDelegate { get; set; }
 
 		[Export ("addOptionWithTitle:image:order:handler:")]
+		[Async]
 		void AddOption (string title, [NullAllowed] UIImage image, UIDocumentMenuOrder order, Action completionHandler);
 	}
 
@@ -15833,6 +15837,7 @@ namespace XamCore.UIKit {
 	[BaseType (typeof (NSObject))]
 	interface UIFocusAnimationCoordinator {
 		[Export ("addCoordinatedAnimations:completion:")]
+		[Async]
 		void AddCoordinatedAnimations ([NullAllowed] Action animations, [NullAllowed] Action completion);
 	}
 

src/watchkit.cs

@@ -145,10 +145,12 @@ namespace XamCore.WatchKit {
 
 		[ThreadSafe (false)]
 		[Export ("presentTextInputControllerWithSuggestions:allowedInputMode:completion:")]
+		[Async]
 		void PresentTextInputController ([NullAllowed] string [] suggestions, WKTextInputMode inputMode, Action<NSArray> completion);
 
 		[iOS (9,0)]
 		[Export ("presentTextInputControllerWithSuggestionsForLanguage:allowedInputMode:completion:")]
+		[Async]
 		void PresentTextInputController ([NullAllowed] Func<NSString, NSArray> suggestionsHandler, WKTextInputMode inputMode, Action<NSArray> completion);
 
 		[NoWatch]
@@ -170,6 +172,7 @@ namespace XamCore.WatchKit {
 
 		[Watch (2,0)]
 		[Export ("presentAudioRecorderControllerWithOutputURL:preset:options:completion:")]
+		[Async]
 		void PresentAudioRecorderController (NSUrl outputUrl, WKAudioRecorderPreset preset, [NullAllowed] NSDictionary options, Action<bool, NSError> completion);
 
 		[Watch (2,0)]
@@ -183,6 +186,7 @@ namespace XamCore.WatchKit {
 		void PresentAlertController ([NullAllowed] string title, [NullAllowed] string message, WKAlertControllerStyle preferredStyle, WKAlertAction[] actions);
 
 		[Export ("presentAddPassesControllerWithPasses:completion:")]
+		[Async]
 		void PresentAddPassesController (PKPass[] passes, Action completion);
 
 		[Export ("dismissAddPassesController")]
@@ -205,6 +209,7 @@ namespace XamCore.WatchKit {
 #endif
 		[NoiOS]
 		[Export ("presentMediaPlayerControllerWithURL:options:completion:")]
+		[Async (ResultType = typeof (WKPresentMediaPlayerResult))]
 		void PresentMediaPlayerController (NSUrl url, [NullAllowed] NSDictionary options, Action<bool, double, NSError> completion);
 
 		[Watch (3,0)][NoiOS]

src/wkwebkit.cs

@@ -281,12 +281,15 @@ namespace XamCore.WebKit
 		NSSet<NSString> AllWebsiteDataTypes { get; }
 	
 		[Export ("fetchDataRecordsOfTypes:completionHandler:")]
+		[Async]
 		void FetchDataRecordsOfTypes (NSSet<NSString> dataTypes, Action<NSArray> completionHandler);
 	
 		[Export ("removeDataOfTypes:forDataRecords:completionHandler:")]
+		[Async]
 		void RemoveDataOfTypes (NSSet<NSString> dataTypes, WKWebsiteDataRecord[] dataRecords, Action completionHandler);
 	
 		[Export ("removeDataOfTypes:modifiedSince:completionHandler:")]
+		[Async]
 		void RemoveDataOfTypes (NSSet<NSString> websiteDataTypes, NSDate date, Action completionHandler);
 	}
 	

tests/common/Configuration.cs

@@ -295,7 +295,10 @@ namespace Xamarin.Tests
 
 		public static string MlaunchPath {
 			get {
-				return Path.Combine (XSIphoneDir, "mlaunch.app", "Contents", "MacOS", "mlaunch");
+				var env = Environment.GetEnvironmentVariable ("MLAUNCH_PATH");
+				if (!string.IsNullOrEmpty (env))
+					return env;
+				return Path.Combine (BinDirXI, "mlaunch");
 			}
 		}
 	}

tests/generator/Makefile

@@ -14,7 +14,7 @@ include $(TOP)/Make.config
 IOS_CURRENT_DIR=$(IOS_DESTDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current
 IOS_GENERATOR = $(IOS_CURRENT_DIR)/bin/btouch-native /baselib:$(IOS_CURRENT_DIR)/lib/mono/Xamarin.iOS/Xamarin.iOS.dll /unsafe
 IOS_TESTS = bug15283 bug15307 bug15799 bug16036 sof20696157 bug23041 bug27430 bug27428 bug34042 btouch-with-hyphen-in-name property-redefination-ios arrayfromhandlebug bug36457 bug39614 bug40282 bug17232 bug24078-ignore-methods-events strong-dict-support-templated-dicts bug43579 bindastests
-IOS_CUSTOM_TESTS = forum54078 desk63279 desk79124 multiple-api-definitions1 multiple-api-definitions2 bug29493 classNameCollision bi1036 bug37527 bug27986 bug35176 bi1046 bindas1048error bindas1049error bindas1050modelerror bindas1050protocolerror virtualwrap
+IOS_CUSTOM_TESTS = forum54078 desk63279 desk79124 multiple-api-definitions1 multiple-api-definitions2 bug29493 classNameCollision bi1036 bug37527 bug27986 bug35176 bi1046 bindas1048error bindas1049error bindas1050modelerror bindas1050protocolerror virtualwrap bug42855
 
 MAC_CURRENT_DIR=$(MAC_DESTDIR)/Library/Frameworks/Xamarin.Mac.framework/Versions/Current
 MAC_GENERATOR = $(MAC_CURRENT_DIR)/bin/bmac
@@ -61,6 +61,7 @@ $(eval $(call iOSErrorCodeTestTemplate,bindas1048error,1048))
 $(eval $(call iOSErrorCodeTestTemplate,bindas1049error,1049))
 $(eval $(call iOSErrorCodeTestTemplate,bindas1050modelerror,1050))
 $(eval $(call iOSErrorCodeTestTemplate,bindas1050protocolerror,1050))
+$(eval $(call iOSErrorCodeTestTemplate,bug42855,1060))
 
 classNameCollision:
 	@rm -Rf $@.tmpdir

tests/generator/bug42855.cs

@@ -0,0 +1,16 @@
+using System;
+using Foundation;
+
+namespace Bug42855Tests {
+
+	[Protocol][Model]
+	interface MyFooClass {
+
+		[Abstract]
+		[Export ("stringMethod:")]
+		NSString StringMethod (int arg1);
+
+		[Export ("stringMethod2:")]
+		NSString StringMethod2 (int arg1);
+	}
+}

tests/introspection/ApiSignatureTest.cs

@@ -865,5 +865,115 @@ namespace Introspection {
 					ReportError ($"`{t.Name}.{m.Name}` return type `{rt.Name}` is a concrete type `[Model]` and not an interface `[Protocol]`");
 			}
 		}
+
+		static bool IsDiscouraged (MemberInfo mi)
+		{
+			foreach (var ca in mi.GetCustomAttributes ()) {
+				switch (ca.GetType ().Name) {
+				case "ObsoleteAttribute":
+				case "AdviceAttribute":
+				case "ObsoletedAttribute":
+				case "DeprecatedAttribute":
+					return true;
+				}
+			}
+			return false;
+		}
+
+#if !MONOMAC
+		[Test]
+#endif
+		public void AsyncCandidates ()
+		{
+			int n = 0;
+			Errors = 0;
+			ErrorData.Clear ();
+
+			foreach (Type t in Assembly.GetTypes ()) {
+
+				// e.g. delegates used for events
+				if (t.IsNested)
+					continue;
+
+				if (!NSObjectType.IsAssignableFrom (t))
+					continue;
+
+				if (t.GetCustomAttribute<ProtocolAttribute> () != null)
+					continue;
+				if (t.GetCustomAttribute<ModelAttribute> () != null)
+					continue;
+
+				// let's not encourage the use of some API
+				if (IsDiscouraged (t))
+					continue;
+
+				CurrentType = t;
+
+				var methods = t.GetMethods (Flags);
+				foreach (MethodInfo m in methods) {
+					if (m.DeclaringType != t)
+						continue;
+
+					// skip properties / events
+					if (m.IsSpecialName)
+						continue;
+
+					if (IgnoreAsync (m))
+						continue;
+
+					if (m.ReturnType.Name != "Void")
+						continue;
+
+					// some calls are "natively" async
+					if (m.Name.IndexOf ("Async", StringComparison.Ordinal) != -1)
+						continue;
+
+					// let's not encourage the use of some API
+					if (IsDiscouraged (m))
+						continue;
+
+					// is it a candidate ?
+					var p = m.GetParameters ();
+					if (p.Length == 0)
+						continue;
+					var last = p [p.Length - 1];
+					// trying to limit false positives and the need for large ignore lists to maintain
+					// unlike other introspection tests a failure does not mean a broken API
+					switch (last.Name) {
+					case "completionHandler":
+					case "completion":
+						break;
+					default:
+						continue;
+					}
+					if (!last.ParameterType.IsSubclassOf (typeof (Delegate)))
+						continue;
+
+					// did we provide a async wrapper ?
+					string ma = m.Name + "Async";
+					if (methods.Where ((mi) => mi.Name == ma).FirstOrDefault () != null)
+						continue;
+
+					var name = m.ToString ();
+					var i = name.IndexOf (' ');
+					ErrorData.AppendLine (name.Insert (i + 1, m.DeclaringType.Name + "::"));
+					Errors++;
+				}
+			}
+			AssertIfErrors ("{0} errors found in {1} signatures validated{2}", Errors, n, Errors == 0 ? string.Empty : ":\n" + ErrorData.ToString () + "\n");
+		}
+
+		protected virtual bool IgnoreAsync (MethodInfo m)
+		{
+			switch (m.Name) {
+			// we bind PerformChangesAndWait which does the same
+			case "PerformChanges":
+				return m.DeclaringType.Name == "PHPhotoLibrary";
+			// it sets the callback, it will never call it
+			case "SetCompletionBlock":
+				return m.DeclaringType.Name == "SCNTransaction";
+			}
+			return false;
+		}
 	}
 }

tests/introspection/iOS/iOSApiSignatureTest.cs

@@ -214,5 +214,23 @@ namespace Introspection {
 #endif
 			base.CheckManagedMemberSignatures (m, t, ref n);
 		}
+
+		protected override bool IgnoreAsync (MethodInfo m)
+		{
+			switch (m.Name) {
+			// Called by the OS, i.e. meant to be overridden (not called) by user code.
+			case "DidReceiveNotification":
+				return m.DeclaringType.Name == "WKUserNotificationInterfaceController";
+			case "AddCompletion":
+				return true;
+			// comes from NSFilePresenter protocol, where we cannot put [Async] today
+			// proposal: https://trello.com/c/dSOh6PXE/680-rfc-async-on-protocol-proposal
+			case "AccommodatePresentedItemDeletion":
+			case "AccommodatePresentedSubitemDeletion":
+			case "SavePresentedItemChanges":
+				return m.DeclaringType.Name == "UIDocument";
+			}
+			return base.IgnoreAsync (m);
+		}
 	}
 }

tests/linker-ios/link all/link all.csproj

@@ -30,7 +30,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\iPhoneSimulator\$(Configuration)-unified</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -87,7 +87,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\iPhone\$(Configuration)-unified</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -101,7 +101,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release32|iPhone' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\iPhone\$(Configuration)-unified</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -115,7 +115,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release64|iPhone' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\iPhone\$(Configuration)-unified</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -129,7 +129,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-bitcode|iPhone' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\iPhone\$(Configuration)-bitcode-unified</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

tests/linker-ios/link sdk/link sdk.csproj

@@ -29,7 +29,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\iPhoneSimulator\$(Configuration)-unified</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -81,7 +81,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\iPhone\$(Configuration)-unified</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -93,7 +93,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release32|iPhone' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\iPhone\$(Configuration)-unified</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -105,7 +105,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release64|iPhone' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\iPhone\$(Configuration)-unified</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -117,7 +117,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-bitcode|iPhone' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\iPhone\$(Configuration)-unified</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

tests/xharness/Harness.cs

@@ -205,6 +205,7 @@ namespace xharness
 					var filename = Path.GetFullPath (Path.Combine (IOS_DESTDIR, "Library", "Frameworks", "Xamarin.iOS.framework", "Versions", "Current", "bin", "mlaunch"));
 					if (File.Exists (filename)) {
 						Log ("Found mlaunch: {0}", filename);
+						Environment.SetEnvironmentVariable ("MLAUNCH_PATH", filename);
 						return mlaunch = filename;
 					}
 
@@ -217,6 +218,7 @@ namespace xharness
 					}
 					if (File.Exists (filename)) {
 						Log ("Found mlaunch: {0}", filename);
+						Environment.SetEnvironmentVariable ("MLAUNCH_PATH", filename);
 						return mlaunch = filename;
 					}
 
@@ -226,6 +228,7 @@ namespace xharness
 					filename = "/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mlaunch";
 					if (File.Exists (filename)) {
 						Log ("Found mlaunch: {0}", filename);
+						Environment.SetEnvironmentVariable ("MLAUNCH_PATH", filename);
 						return mlaunch = filename;
 					}