[Update] Firebase for iOS v8.10.0 & MLKitVision

common.cake

@@ -99,8 +99,11 @@ void BuildSdkOnPodfile (Artifact artifact)
 	if (artifact.PodSpecs?.Length == 0)
 		return;
 
-	var baseArch = Platform.iOSArmV7;
-	var platforms = new [] { baseArch, Platform.iOSArm64, Platform.iOSSimulator64, Platform.iOSSimulator };
+	var baseArch = Platform.iOSArmV7;	
+	// from iOS 11 only 64-bit builds are supported
+	var platforms = Version.TryParse(GetMinimunSupportedVersion(artifact), out var iosVer) && iosVer.Major > 10
+		? new [] { Platform.iOSArm64, Platform.iOSSimulator64 }
+		: new [] { baseArch, Platform.iOSArm64, Platform.iOSSimulator64, Platform.iOSSimulator };
 	var podsProject = "./Pods/Pods.xcodeproj";
 	var workingDirectory = (DirectoryPath)$"./externals/{artifact.Id}";
 

poco.cake

@@ -1,7 +1,8 @@
 enum ComponentGroup
 {
 	Firebase,
-	Google
+	Google,
+	MLKit
 }
 
 enum FrameworkSource

samples/Firebase/AdMob/AdMobSample/AdMobSample.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -143,5 +143,5 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Firebase\Core\Core.targets" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Google\MobileAds\MobileAds.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets')" />
 </Project>

samples/Firebase/AdMob/AdMobSample/AdsViewController.cs

@@ -7,14 +7,14 @@
 using CoreGraphics;
 
 using Google.MobileAds;
+using Foundation;
 
 namespace AdMobSample
 {
-	public class AdsViewController : DialogViewController
-	{
+	public class AdsViewController : DialogViewController {
 		BannerView adViewTableView;
 		BannerView adViewWindow;
-		Interstitial adInterstitial;
+		InterstitialAd adInterstitial;
 
 		bool adOnTable;
 		bool adOnWindow;
@@ -46,9 +46,10 @@ void AddToTableView ()
 			if (adViewTableView == null) {
 				// Setup your BannerView, review AdSizeCons class for more Ad sizes. 
 				adViewTableView = new BannerView (size: AdSizeCons.SmartBannerPortrait) {
-					AdUnitId = AdMobConstants.BannerId,
+
 					RootViewController = NavigationController
 				};
+				adViewTableView.AdUnitId = AdMobConstants.BannerId;
 
 				// Wire AdReceived event to know when the Ad is ready to be displayed
 				adViewTableView.AdReceived += (object sender, EventArgs e) => {
@@ -85,10 +86,10 @@ void AddToWindow ()
 				// Setup your GADBannerView, review AdSizeCons class for more Ad sizes. 
 				adViewWindow = new BannerView (size: AdSizeCons.SmartBannerPortrait,
 				                               origin: new CGPoint (0, UIScreen.MainScreen.Bounds.Size.Height - AdSizeCons.Banner.Size.Height)) {
-					AdUnitId = AdMobConstants.BannerId,
+
 					RootViewController = NavigationController
 				};
-
+				adViewWindow.AdUnitId = AdMobConstants.BannerId;
 				// Wire AdReceived event to know when the Ad is ready to be displayed
 				adViewWindow.AdReceived += (object sender, EventArgs e) => {
 					if (!adOnWindow) {
@@ -119,30 +120,35 @@ void RemoveAdFromWindow ()
 
 		void AddToView ()
 		{
-			if (!adInterstitial.IsReady)
-				return;
+			if (adInterstitial?.CanPresent (NavigationController, out _) == true) {				
+				adInterstitial.DismissedContent += (sender, args) => {
+					// Interstitial is a one time use object. That means once an interstitial is shown, HasBeenUsed 
+					// returns true and the interstitial can't be used to load another ad. 
+					// To request another interstitial, you'll need to create a new Interstitial object.
+					adInterstitial.Dispose ();
+					adInterstitial = null;
+					CreateAndRequestInterstitial ();
+				};
 
-			adInterstitial.Present (NavigationController);
+				adInterstitial.Present (NavigationController);
+			}
 		}
 
 		void CreateAndRequestInterstitial ()
 		{
-			adInterstitial = new Interstitial (AdMobConstants.IntersitialId);
-			adInterstitial.ScreenDismissed += (sender, e) => {
-				// Interstitial is a one time use object. That means once an interstitial is shown, HasBeenUsed 
-				// returns true and the interstitial can't be used to load another ad. 
-				// To request another interstitial, you'll need to create a new Interstitial object.
-				adInterstitial.Dispose ();
-				adInterstitial = null;
-				CreateAndRequestInterstitial ();
-			};
-			adInterstitial.LoadRequest (GetRequest ());
+			if (adInterstitial == null) {
+				InterstitialAd.Load (AdMobConstants.IntersitialId, GetRequest (), (ad, err) => {
+					if (ad != null) {
+						adInterstitial = ad;
+					}
+				});				
+			}
 		}
 
 		Request GetRequest ()
 		{
 			var request = Request.GetDefaultRequest ();
 			return request;
 		}
-	}
+	}	
 }

samples/Firebase/AdMob/AdMobSample/Info.plist

@@ -13,7 +13,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
-	<string>8.0</string>
+	<string>9.0</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>

samples/Firebase/AdMob/AdMobSample/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Build.Download" version="0.10.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Build.Download" version="0.11.0" targetFramework="xamarinios10" />
 </packages>

samples/Firebase/Analytics/AnalyticsSample/AnalyticsSample.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -152,5 +152,5 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Firebase\Core\Core.targets" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Firebase\Analytics\Analytics.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets')" />
 </Project>

samples/Firebase/Analytics/AnalyticsSample/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Build.Download" version="0.10.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Build.Download" version="0.11.0" targetFramework="xamarinios10" />
 </packages>

samples/Firebase/Auth/AuthSample/AuthSample.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -184,5 +184,5 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Firebase\Core\Core.targets" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Google\SignIn\SignIn.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets')" />
 </Project>

samples/Firebase/Auth/AuthSample/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
-  <package id="Xamarin.Build.Download" version="0.10.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Build.Download" version="0.11.0" targetFramework="xamarinios10" />
   <package id="Xamarin.Facebook.CoreKit.iOS" version="5.12.0" targetFramework="xamarinios10" />
   <package id="Xamarin.Facebook.LoginKit.iOS" version="5.12.0" targetFramework="xamarinios10" />
 </packages>

samples/Firebase/CloudFirestore/CloudFirestoreSample/CloudFirestoreSample.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -164,5 +164,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Firebase\Core\Core.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets')" />
 </Project>

samples/Firebase/CloudFirestore/CloudFirestoreSample/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Build.Download" version="0.10.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Build.Download" version="0.11.0" targetFramework="xamarinios10" />
 </packages>

samples/Firebase/CloudFunctions/CloudFunctionsSample/CloudFunctionsSample.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -142,5 +142,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Firebase\Core\Core.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets')" />
 </Project>

samples/Firebase/CloudFunctions/CloudFunctionsSample/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Build.Download" version="0.10.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Build.Download" version="0.11.0" targetFramework="xamarinios10" />
 </packages>

samples/Firebase/CloudMessaging/CloudMessagingSample/AppDelegate.cs

@@ -2,7 +2,6 @@
 using UIKit;
 using UserNotifications;
 
-using Firebase.InstanceID;
 using Firebase.Core;
 using Firebase.CloudMessaging;
 using System;
@@ -61,21 +60,9 @@ public override bool FinishedLaunching (UIApplication application, NSDictionary
 
 			Messaging.SharedInstance.Delegate = this;
 
-			InstanceId.SharedInstance.GetInstanceId (InstanceIdResultHandler);
-
 			return true;
 		}
 
-		void InstanceIdResultHandler (InstanceIdResult result, NSError error)
-		{
-			if (error != null) {
-				LogInformation (nameof (InstanceIdResultHandler), $"Error: {error.LocalizedDescription}");
-				return;
-			}
-
-			LogInformation (nameof (InstanceIdResultHandler), $"Remote Instance Id token: {result.Token}");
-		}
-
 		[Export ("messaging:didReceiveRegistrationToken:")]
 		public void DidReceiveRegistrationToken (Messaging messaging, string fcmToken)
 		{
@@ -113,15 +100,6 @@ public override void DidReceiveRemoteNotification (UIApplication application, NS
 			completionHandler (UIBackgroundFetchResult.NewData);
 		}
 
-		[Export ("messaging:didReceiveMessage:")]
-		public void DidReceiveMessage (Messaging messaging, RemoteMessage remoteMessage)
-		{
-			// Handle Data messages for iOS 10 and above.
-			HandleMessage (remoteMessage.AppData);
-
-			LogInformation (nameof (DidReceiveMessage), remoteMessage.AppData);
-		}
-
 		void HandleMessage (NSDictionary message)
 		{
 			if (MessageReceived == null)

samples/Firebase/CloudMessaging/CloudMessagingSample/CloudMessagingSample.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -130,10 +130,6 @@
       <Project>{9335A59B-3B54-4ED5-8201-B68CFD05CAFB}</Project>
       <Name>Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\source\Firebase\InstanceID\InstanceID.csproj">
-      <Project>{754D8F56-C3DB-4E33-91D5-45445AB286EF}</Project>
-      <Name>InstanceID</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\source\Firebase\Installations\Installations.csproj">
       <Project>{65ACD945-5A8A-419D-B9FB-8DFD03C532F4}</Project>
       <Name>Installations</Name>
@@ -148,5 +144,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Firebase\Core\Core.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets')" />
 </Project>

samples/Firebase/CloudMessaging/CloudMessagingSample/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Build.Download" version="0.10.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Build.Download" version="0.11.0" targetFramework="xamarinios10" />
 </packages>

samples/Firebase/Crashlytics/CrashlyticsSample/CrashlyticsSample.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.props')" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Firebase\Crashlytics\Crashlytics.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -145,5 +145,5 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Firebase\Core\Core.targets" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\source\Firebase\Crashlytics\Crashlytics.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.11.0\build\Xamarin.Build.Download.targets')" />
 </Project>

samples/Firebase/Crashlytics/CrashlyticsSample/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Build.Download" version="0.10.0" targetFramework="xamarinios10" />
+  <package id="Xamarin.Build.Download" version="0.11.0" targetFramework="xamarinios10" />
 </packages>