Update iOS and Android ext projects to use aliased version of Xamarin.Auth to avoid conflicts

paulbatum · paulbatum · commit 2ff6e51b89a5 · 2014-09-15T18:04:07.000-07:00
diff --git a/.gitmodules b/.gitmodules
@@ -6,4 +6,4 @@
 	url = https://github.com/WindowsAzure/queryjs.git
 [submodule "sdk/Managed/src/External/Xamarin.Auth"]
 	path = sdk/Managed/src/External/Xamarin.Auth
-	url = https://github.com/xamarin/Xamarin.Auth.git
+	url = https://github.com/azure/azure-mobile-services-xamarin-auth.git
diff --git a/sdk/Managed/src/External/Xamarin.Auth b/sdk/Managed/src/External/Xamarin.Auth
@@ -1 +1 @@
-Subproject commit ab74344adf08035c661db8dbc84b691c560a0632
+Subproject commit 57fb4217b9203aa764d335ff3916ea941b02c29d
diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices.Android/Authentication/MobileServiceUIAuthentication.cs b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices.Android/Authentication/MobileServiceUIAuthentication.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using Android.Content;
 using System.Threading.Tasks;
-using Xamarin.Auth;
+using Xamarin.Auth._MobileServices;
 using System.Collections.Generic;
 
 namespace Microsoft.WindowsAzure.MobileServices
diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices.iOS/Authentication/MobileServiceUIAuthentication.cs b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices.iOS/Authentication/MobileServiceUIAuthentication.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using MonoTouch.Foundation;
 using MonoTouch.UIKit;
-using Xamarin.Auth;
+using Xamarin.Auth._MobileServices;
 
 namespace Microsoft.WindowsAzure.MobileServices
 {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`	`using MonoTouch.Foundation;`
`6`	`6`	`using MonoTouch.UIKit;`
`7`		`-using Xamarin.Auth;`
	`7`	`+using Xamarin.Auth._MobileServices;`
`8`	`8`
`9`	`9`	`namespace Microsoft.WindowsAzure.MobileServices`
`10`	`10`	`{`