update Xamarin unified support for Xamarin.iOS 8.6

paulbatum · paulbatum · commit da537b156bb0 · 2014-12-23T15:16:33.000-08:00
diff --git a/sdk/Managed/src/External/Xamarin.Auth b/sdk/Managed/src/External/Xamarin.Auth
@@ -1 +1 @@
-Subproject commit 0f329316b7537bbca4cef09b77b453be0e79c275
+Subproject commit 1f38de217cd16dde24af91f6126ceb8820f090d0
diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices.iOS/Push/ApnsRegistration.cs b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices.iOS/Push/ApnsRegistration.cs
@@ -5,7 +5,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using MonoTouch.Foundation;
+using Foundation;
 
 namespace Microsoft.WindowsAzure.MobileServices
 {
diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices.iOS/Push/ApnsTemplateRegistration.cs b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices.iOS/Push/ApnsTemplateRegistration.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
-using MonoTouch.Foundation;
+using Foundation;
 using Newtonsoft.Json;
 
 namespace Microsoft.WindowsAzure.MobileServices
diff --git a/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices.iOS/Push/Push.cs b/sdk/Managed/src/Microsoft.WindowsAzure.MobileServices.iOS/Push/Push.cs
@@ -9,7 +9,7 @@ namespace Microsoft.WindowsAzure.MobileServices
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using MonoTouch.Foundation;
+    using Foundation;
 
     /// <summary>
     /// Define a class help to create/update/delete notification registrations
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.WindowsStore.Test/Functional/PushFunctional.Test.cs b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.WindowsStore.Test/Functional/PushFunctional.Test.cs
@@ -1,4 +1,4 @@
-﻿// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // ----------------------------------------------------------------------------
 
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.WindowsStore.Test/TestPlatform/CurrentTestPlatform.cs b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.WindowsStore.Test/TestPlatform/CurrentTestPlatform.cs
@@ -1,4 +1,4 @@
-﻿// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // ----------------------------------------------------------------------------
 
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/AppDelegate.cs b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/AppDelegate.cs
@@ -1,13 +1,14 @@
-﻿using System.Reflection;
+using System.Reflection;
 using Microsoft.WindowsAzure.MobileServices;
 using Microsoft.WindowsAzure.MobileServices.Test;
 using Microsoft.WindowsAzure.MobileServices.TestFramework;
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
+using Foundation;
+using UIKit;
+using CoreGraphics;
 
 namespace MicrosoftWindowsAzureMobileiOSTest
 {
-	[Register("AppDelegate")]
+	[Foundation.Register("AppDelegate")]
 	public partial class AppDelegate : UIApplicationDelegate
 	{
 		UIWindow window;
@@ -25,7 +26,7 @@ static AppDelegate()
 
 		public override bool FinishedLaunching (UIApplication app, NSDictionary options)
 		{
-			window = new UIWindow (UIScreen.MainScreen.Bounds);
+			window = new UIWindow ((CGRect)UIScreen.MainScreen.Bounds);
 		    window.RootViewController = new UINavigationController (new LoginViewController());
 			window.MakeKeyAndVisible();
 
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/Info.plist b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/Info.plist
@@ -11,7 +11,7 @@
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
 	<key>MinimumOSVersion</key>
-	<string>3.2</string>
+	<string>5.2</string>
 	<key>NSMainNibFile</key>
 	<string></string>
 	<key>UIStatusBarTintParameters</key>
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/Main.cs b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/Main.cs
@@ -1,4 +1,4 @@
-﻿using MonoTouch.UIKit;
+using UIKit;
 
 namespace MicrosoftWindowsAzureMobileiOSTest
 {
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/Microsoft.WindowsAzure.Mobile.iOS.Test.csproj b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/Microsoft.WindowsAzure.Mobile.iOS.Test.csproj
@@ -6,7 +6,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{977A5F48-B0F3-4860-AA1A-5B3081ED7D98}</ProjectGuid>
-    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>Microsoft.WindowsAzure.Mobile.iOS.Test</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
@@ -126,7 +126,7 @@
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
-    <Reference Include="monotouch" />
+    <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\Default%402x.png" />
@@ -135,9 +135,10 @@
     <BundleResource Include="Resources\Default-568h%402x.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.WindowsAzure.MobileServices.iOS\Microsoft.WindowsAzure.Mobile.Ext.iOS-Classic.csproj">
+    <ProjectReference Include="..\..\src\Microsoft.WindowsAzure.MobileServices.iOS\Microsoft.WindowsAzure.Mobile.Ext.iOS.csproj">
       <Project>{a871b137-83a8-4e9b-913d-30ee0288e161}</Project>
-      <Name>Microsoft.WindowsAzure.Mobile.Ext.iOS-Classic</Name>
+      <Name>Microsoft.WindowsAzure.Mobile.Ext.iOS</Name>
+      <IsAppExtension>false</IsAppExtension>
     </ProjectReference>
     <ProjectReference Include="..\..\src\Microsoft.WindowsAzure.MobileServices\Microsoft.WindowsAzure.Mobile.csproj">
       <Project>{75557793-e36e-4190-8714-5bd2665859fb}</Project>
@@ -153,7 +154,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
     <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/Properties/AssemblyInfo.cs b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-﻿using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/TestPlatform/PushTestUtility.cs b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/TestPlatform/PushTestUtility.cs
@@ -1,4 +1,4 @@
-﻿// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // ----------------------------------------------------------------------------
 
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/UI/HarnessViewController.cs b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/UI/HarnessViewController.cs
@@ -1,10 +1,10 @@
 using System;
-using System.Drawing;
+using CoreGraphics;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.WindowsAzure.MobileServices.TestFramework;
 using MonoTouch.Dialog;
-using MonoTouch.UIKit;
+using UIKit;
 
 namespace MicrosoftWindowsAzureMobileiOSTest
 {
@@ -14,7 +14,7 @@ public class HarnessViewController
         public HarnessViewController()
 	        : base (UITableViewStyle.Grouped, null, pushing: true)
         {
-            this.progress = new UIProgressView (new RectangleF (0, 0, View.Bounds.Width, 5)) {
+            this.progress = new UIProgressView (new CGRect (0, 0, View.Bounds.Width, 5)) {
 	            AutoresizingMask = UIViewAutoresizing.FlexibleWidth
             };
 
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/UI/LoginViewController.cs b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/UI/LoginViewController.cs
@@ -1,7 +1,7 @@
-﻿using Microsoft.WindowsAzure.MobileServices;
+using Microsoft.WindowsAzure.MobileServices;
 using MonoTouch.Dialog;
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
+using Foundation;
+using UIKit;
 
 namespace MicrosoftWindowsAzureMobileiOSTest
 {
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/UI/TestViewController.cs b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/UI/TestViewController.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.WindowsAzure.MobileServices.TestFramework;
 using MonoTouch.Dialog;
-using MonoTouch.UIKit;
+using UIKit;
 
 namespace MicrosoftWindowsAzureMobileiOSTest
 {
diff --git a/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/UnitTests/PushPlatformTest.cs b/sdk/Managed/test/Microsoft.WindowsAzure.MobileServices.iOS.Test/UnitTests/PushPlatformTest.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.WindowsAzure.MobileServices.TestFramework;
-using MonoTouch.Foundation;
+using Foundation;
 
 namespace Microsoft.WindowsAzure.MobileServices.Test
 {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using Newtonsoft.Json;`
`6`	`6`	`using System;`
`7`	`7`	`using System.Collections.Generic;`
`8`		`-using MonoTouch.Foundation;`
	`8`	`+using Foundation;`
`9`	`9`
`10`	`10`	`namespace Microsoft.WindowsAzure.MobileServices`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// ----------------------------------------------------------------------------`
	`1`	`+// ----------------------------------------------------------------------------`
`2`	`2`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`3`	`3`	`// ----------------------------------------------------------------------------`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using MonoTouch.UIKit;`
	`1`	`+using UIKit;`
`2`	`2`
`3`	`3`	`namespace MicrosoftWindowsAzureMobileiOSTest`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Reflection;`
	`1`	`+using System.Reflection;`
`2`	`2`	`using System.Runtime.CompilerServices;`
`3`	`3`	`using System.Runtime.InteropServices;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Microsoft.WindowsAzure.MobileServices.TestFramework;`
`3`	`3`	`using MonoTouch.Dialog;`
`4`		`-using MonoTouch.UIKit;`
	`4`	`+using UIKit;`
`5`	`5`
`6`	`6`	`namespace MicrosoftWindowsAzureMobileiOSTest`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System.Linq;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`	`using Microsoft.WindowsAzure.MobileServices.TestFramework;`
`10`		`-using MonoTouch.Foundation;`
	`10`	`+using Foundation;`
`11`	`11`
`12`	`12`	`namespace Microsoft.WindowsAzure.MobileServices.Test`
`13`	`13`	`{`