Remove iOS classic from CI system (#353)beta-2.3.3-pre2

* [CI] Remove classic from build

* [Build] Remove classic forwarder

* [Nuget] Remove classic from Pages azure

* [Build] Remove classic csproj

* [IOS] Remove _UNIFIED_

6 files changed, 109 insertions, 410 deletions

diff --git a/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs b/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
index c4d8eaf0..7614796a 100644
--- a/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
+++ b/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
@@ -1,93 +1,87 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using System.Runtime.Remoting.Lifetime;
+using System.Globalization;
 using System.IO;
-#if __UNIFIED__
-using UIKit;
-using Foundation;
-using CoreGraphics;
 using AdvancedColorPicker;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-using MonoTouch.CoreGraphics;
-#endif
+using CoreGraphics;
+using Foundation;
+using UIKit;
 using Xamarin.Forms;
 using Xamarin.Forms.ControlGallery.iOS;
 using Xamarin.Forms.Controls;
-using Xamarin.Forms.Maps.iOS;
 using Xamarin.Forms.Platform.iOS;
-using System.Globalization;
 
-[assembly: Dependency (typeof (TestCloudService))]
-[assembly: Dependency (typeof (StringProvider))]
-[assembly: Dependency (typeof (CacheService))]
-[assembly: ExportRenderer (typeof (DisposePage), typeof(DisposePageRenderer))]
-[assembly: ExportRenderer (typeof (DisposeLabel), typeof(DisposeLabelRenderer))]
+[assembly: Dependency(typeof(TestCloudService))]
+[assembly: Dependency(typeof(StringProvider))]
+[assembly: Dependency(typeof(CacheService))]
+[assembly: ExportRenderer(typeof(DisposePage), typeof(DisposePageRenderer))]
+[assembly: ExportRenderer(typeof(DisposeLabel), typeof(DisposeLabelRenderer))]
 namespace Xamarin.Forms.ControlGallery.iOS
 {
 	public class CacheService : ICacheService
 	{
-		public void ClearImageCache ()
+		public void ClearImageCache()
 		{
-			var documents = Environment.GetFolderPath (Environment.SpecialFolder.MyDocuments);
-			var cache = Path.Combine (documents, ".config", ".isolated-storage", "ImageLoaderCache");
-			foreach (var file in Directory.GetFiles (cache)) {
-				File.Delete (file); 
+			var documents = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+			var cache = Path.Combine(documents, ".config", ".isolated-storage", "ImageLoaderCache");
+			foreach (var file in Directory.GetFiles(cache))
+			{
+				File.Delete(file);
 			}
 		}
 	}
 
 	public class DisposePageRenderer : PageRenderer
 	{
-		protected override void Dispose (bool disposing)
+		protected override void Dispose(bool disposing)
 		{
-			if (disposing) {
-				((DisposePage) Element).SendRendererDisposed ();
+			if (disposing)
+			{
+				((DisposePage)Element).SendRendererDisposed();
 			}
-			base.Dispose (disposing);
+			base.Dispose(disposing);
 
 		}
 	}
 
 	public class DisposeLabelRenderer : LabelRenderer
 	{
-		protected override void Dispose (bool disposing)
+		protected override void Dispose(bool disposing)
 		{
 
-			if (disposing) {
-				((DisposeLabel) Element).SendRendererDisposed ();
+			if (disposing)
+			{
+				((DisposeLabel)Element).SendRendererDisposed();
 			}
-			base.Dispose (disposing);
+			base.Dispose(disposing);
 		}
 	}
 
 	public class StringProvider : IStringProvider
 	{
-		public string CoreGalleryTitle {
+		public string CoreGalleryTitle
+		{
 			get { return "iOS Core Gallery"; }
 		}
 	}
 
 	public class TestCloudService : ITestCloudService
 	{
-		public bool IsOnTestCloud ()
+		public bool IsOnTestCloud()
 		{
-			var isInTestCloud = Environment.GetEnvironmentVariable ("XAMARIN_TEST_CLOUD");
-		
+			var isInTestCloud = Environment.GetEnvironmentVariable("XAMARIN_TEST_CLOUD");
+
 			return isInTestCloud != null && isInTestCloud.Equals("1");
 		}
 
-		public string GetTestCloudDeviceName ()
+		public string GetTestCloudDeviceName()
 		{
-			return Environment.GetEnvironmentVariable ("XTC_DEVICE_NAME");
+			return Environment.GetEnvironmentVariable("XTC_DEVICE_NAME");
 		}
 
 		public string GetTestCloudDevice()
 		{
-			return Environment.GetEnvironmentVariable ("XTC_DEVICE");
+			return Environment.GetEnvironmentVariable("XTC_DEVICE");
 		}
 	}
 
@@ -135,36 +129,39 @@ namespace Xamarin.Forms.ControlGallery.iOS
 	}
 
 #else
-	[Register ("AppDelegate")]
+	[Register("AppDelegate")]
 	public partial class AppDelegate : FormsApplicationDelegate
 	{
 
-		public override bool FinishedLaunching (UIApplication uiApplication, NSDictionary launchOptions)
+		public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary launchOptions)
 		{
-			App.IOSVersion = int.Parse (UIDevice.CurrentDevice.SystemVersion.Substring (0, 1));
+			App.IOSVersion = int.Parse(UIDevice.CurrentDevice.SystemVersion.Substring(0, 1));
 
-	#if !_CLASSIC_
-			Xamarin.Calabash.Start ();	
-	#endif
-			Forms.Init ();
-			FormsMaps.Init ();
-			Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) => {
+			Xamarin.Calabash.Start();
+			Forms.Init();
+			FormsMaps.Init();
+			Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
+			{
 				// http://developer.xamarin.com/recipes/testcloud/set-accessibilityidentifier-ios/
-				if (null != e.View.AutomationId && null != e.NativeView) {
-				//	e.NativeView.AccessibilityIdentifier = e.View.StyleId;
+				if (null != e.View.AutomationId && null != e.NativeView)
+				{
+					//	e.NativeView.AccessibilityIdentifier = e.View.StyleId;
 				}
 			};
 
-			var app = new App ();
+			var app = new App();
 
 			var mdp = app.MainPage as MasterDetailPage;
 			var detail = mdp?.Detail as NavigationPage;
-			if (detail != null) {
-				detail.Pushed += (sender, args) => {
+			if (detail != null)
+			{
+				detail.Pushed += (sender, args) =>
+				{
 					var nncgPage = args.Page as NestedNativeControlGalleryPage;
 
-					if (nncgPage != null) {
-						AddNativeControls (nncgPage);
+					if (nncgPage != null)
+					{
+						AddNativeControls(nncgPage);
 					}
 
 					var nncgPage1 = args.Page as NativeBindingGalleryPage;
@@ -174,15 +171,16 @@ namespace Xamarin.Forms.ControlGallery.iOS
 						AddNativeBindings(nncgPage1);
 					}
 				};
-			}	
+			}
 
-			LoadApplication (app);
-			return base.FinishedLaunching (uiApplication, launchOptions);
+			LoadApplication(app);
+			return base.FinishedLaunching(uiApplication, launchOptions);
 		}
 
-		void AddNativeControls (NestedNativeControlGalleryPage page)
+		void AddNativeControls(NestedNativeControlGalleryPage page)
 		{
-			if (page.NativeControlsAdded) {
+			if (page.NativeControlsAdded)
+			{
 				return;
 			}
 
@@ -193,93 +191,96 @@ namespace Xamarin.Forms.ControlGallery.iOS
 			var longerText =
 				"I am a native UILabel with considerably more text. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
 
-			var uilabel = new UILabel {
+			var uilabel = new UILabel
+			{
 				MinimumFontSize = 14f,
 				Text = originalText,
 				Lines = 0,
 				LineBreakMode = UILineBreakMode.WordWrap,
-				Font = UIFont.FromName ("Helvetica", 24f)
+				Font = UIFont.FromName("Helvetica", 24f)
 			};
 
-			sl?.Children.Add (uilabel);
+			sl?.Children.Add(uilabel);
 
 			// Create and add a native Button 
-			var uibutton = new UIButton (UIButtonType.RoundedRect);
-			uibutton.SetTitle ("Toggle Text Amount", UIControlState.Normal);
-			uibutton.Font = UIFont.FromName ("Helvetica", 14f);
-			
+			var uibutton = new UIButton(UIButtonType.RoundedRect);
+			uibutton.SetTitle("Toggle Text Amount", UIControlState.Normal);
+			uibutton.Font = UIFont.FromName("Helvetica", 14f);
+
 
-			uibutton.TouchUpInside += (sender, args) => {
+			uibutton.TouchUpInside += (sender, args) =>
+			{
 				uilabel.Text = uilabel.Text == originalText ? longerText : originalText;
-				uilabel.SizeToFit ();
+				uilabel.SizeToFit();
 			};
 
-			sl?.Children.Add (uibutton.ToView ());
+			sl?.Children.Add(uibutton.ToView());
 
 			// Create some control which we know don't behave correctly with regard to measurement
-			var difficultControl0 = new BrokenNativeControl {
+			var difficultControl0 = new BrokenNativeControl
+			{
 				MinimumFontSize = 14f,
-				Font = UIFont.FromName ("Helvetica", 14f),
+				Font = UIFont.FromName("Helvetica", 14f),
 				Lines = 0,
 				LineBreakMode = UILineBreakMode.WordWrap,
 				Text = "Doesn't play nice with sizing. That's why there's a big gap around it."
 			};
 
-			var difficultControl1 = new BrokenNativeControl {
+			var difficultControl1 = new BrokenNativeControl
+			{
 				MinimumFontSize = 14f,
-				Font = UIFont.FromName ("Helvetica", 14f),
+				Font = UIFont.FromName("Helvetica", 14f),
 				Lines = 0,
 				LineBreakMode = UILineBreakMode.WordWrap,
 				Text = "Custom size fix specified. No gaps."
 			};
 
-			var explanation0 = new UILabel {
+			var explanation0 = new UILabel
+			{
 				MinimumFontSize = 14f,
 				Text = "The next control is a customized label with a bad SizeThatFits implementation.",
 				Lines = 0,
 				LineBreakMode = UILineBreakMode.WordWrap,
-				Font = UIFont.FromName ("Helvetica", 24f)
+				Font = UIFont.FromName("Helvetica", 24f)
 			};
 
-			var explanation1 = new UILabel {
+			var explanation1 = new UILabel
+			{
 				MinimumFontSize = 14f,
 				Text = "The next control is the same broken class as above, but we pass in an override to the GetDesiredSize method.",
 				Lines = 0,
 				LineBreakMode = UILineBreakMode.WordWrap,
-				Font = UIFont.FromName ("Helvetica", 24f)
+				Font = UIFont.FromName("Helvetica", 24f)
 			};
 
 			// Add a misbehaving control
-			sl?.Children.Add (explanation0);
-			sl?.Children.Add (difficultControl0);
+			sl?.Children.Add(explanation0);
+			sl?.Children.Add(difficultControl0);
 
 			// Add the misbehaving control with a custom delegate for FixSize
-			sl?.Children.Add (explanation1);
-			sl?.Children.Add (difficultControl1, FixSize);
+			sl?.Children.Add(explanation1);
+			sl?.Children.Add(difficultControl1, FixSize);
 
 			page.NativeControlsAdded = true;
 		}
 
-		SizeRequest? FixSize (NativeViewWrapperRenderer renderer, double width, double height)
+		SizeRequest? FixSize(NativeViewWrapperRenderer renderer, double width, double height)
 		{
 			var uiView = renderer.Control;
 			var view = renderer.Element;
 
-			if (uiView == null || view == null) {
+			if (uiView == null || view == null)
+			{
 				return null;
 			}
 
-#if __UNIFIED__
-			var constraint = new CGSize (width, height);
-#else
-			var constraint = new SizeF ((float)width, (float)height);
-#endif
-			
+			var constraint = new CGSize(width, height);
+
 			// Let the BrokenNativeControl determine its size (which we know will be wrong)
-			var badRect = uiView.SizeThatFits (constraint);
+			var badRect = uiView.SizeThatFits(constraint);
 
 			// And we'll use the width (which is fine) and substitute our own height
-			return new SizeRequest (new Size (badRect.Width, 20));
+			return new SizeRequest(new Size(badRect.Width, 20));
 		}
 
 		void AddNativeBindings(NativeBindingGalleryPage page)
@@ -315,11 +316,9 @@ namespace Xamarin.Forms.ControlGallery.iOS
 			uiView.Add(uilabel);
 			sl?.Children.Add(uiView);
 			sl?.Children.Add(uibuttonColor.ToView());
-#if !_CLASSIC_
 			var colorPicker = new ColorPickerView(new CGRect(0, 0, width, 300));
 			colorPicker.SetBinding("SelectedColor", new Binding("NativeLabelColor", BindingMode.TwoWay, nativeColorConverter), "ColorPicked");
 			sl?.Children.Add(colorPicker);
-#endif
 			page.NativeControlsAdded = true;
 		}
 	}
@@ -340,5 +339,5 @@ namespace Xamarin.Forms.ControlGallery.iOS
 			return value;
 		}
 	}
-#endif
 }
+#endif
diff --git a/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs b/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs
index 37fe4c5f..f8163c19 100644
--- a/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs
+++ b/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs
@@ -1,10 +1,5 @@
-#if __UNIFIED__
 using CoreGraphics;
 using UIKit;
-#else
-using System.Drawing;
-using MonoTouch.UIKit;
-#endif
 
 namespace Xamarin.Forms.ControlGallery.iOS
 {
@@ -16,19 +11,12 @@ namespace Xamarin.Forms.ControlGallery.iOS
 		public override string Text
 		{
 			get { return base.Text; }
-			set { base.Text = value.ToUpper (); }
+			set { base.Text = value.ToUpper(); }
 		}
 
-#if __UNIFIED__
-		public override CGSize SizeThatFits (CGSize size)
+		public override CGSize SizeThatFits(CGSize size)
 		{
 			return new CGSize(size.Width, 150);
 		}
-#else
-		public override SizeF SizeThatFits (SizeF size)
-		{
-			return new SizeF (size.Width, 150);
-		}
-#endif
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs b/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs
index c89e9ef2..6b2ab38f 100644
--- a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs
+++ b/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs
@@ -1,27 +1,15 @@
 using System;
-using Xamarin.Forms.Controls;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.iOS;
-using Xamarin.Forms.ControlGallery.iOS;
 using System.Collections.Generic;
-using System.Linq;
-using System.Drawing;
-using System.Collections;
-
-#if __UNIFIED__
-using UIKit;
-using MapKit;
 using CoreLocation;
 using Foundation;
+using MapKit;
+using UIKit;
+using Xamarin.Forms;
+using Xamarin.Forms.ControlGallery.iOS;
+using Xamarin.Forms.Controls;
+using Xamarin.Forms.Platform.iOS;
 using RectangleF = CoreGraphics.CGRect;
 
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-using MonoTouch.MapKit;
-using MonoTouch.CoreLocation;
-#endif
-
 [assembly: ExportRenderer(typeof(Bugzilla21177.CollectionView), typeof(CollectionViewRenderer))]
 [assembly: ExportRenderer(typeof(Bugzilla31395.CustomContentView), typeof(CustomContentRenderer))]
 [assembly: ExportRenderer(typeof(NativeCell), typeof(NativeiOSCellRenderer))]
@@ -326,7 +314,7 @@ namespace Xamarin.Forms.ControlGallery.iOS
 		public IEnumerable<DataSource> Items
 		{
 			//get{ }
-			set { _tableItems =  new List<DataSource>(value); }
+			set { _tableItems = new List<DataSource>(value); }
 		}
 
 		public NativeiOSListViewSource(NativeListView2 view)
@@ -339,19 +327,10 @@ namespace Xamarin.Forms.ControlGallery.iOS
 		/// Called by the TableView to determine how many cells to create for that particular section.
 		/// </summary>
 
-#if __UNIFIED__
 		public override nint RowsInSection(UITableView tableview, nint section)
 		{
 			return _tableItems.Count;
 		}
-#else
-		public override int RowsInSection (UITableView tableview, int section)
-		{
-			return _tableItems.Count;
-		}
-
-#endif
-
 
 		#region user interaction methods
 
@@ -419,19 +398,11 @@ namespace Xamarin.Forms.ControlGallery.iOS
 			_listView = view;
 		}
 
-#if __UNIFIED__
 		public override nint RowsInSection(UITableView tableview, nint section)
 		{
 			return _tableItems.Count;
 		}
 
-#else
-		public override int RowsInSection (UITableView tableview, int section)
-		{
-			return _tableItems.Count;
-		}
-#endif
-
 		#region user interaction methods
 
 		public override void RowSelected(UITableView tableView, NSIndexPath indexPath)
@@ -537,10 +508,9 @@ namespace Xamarin.Forms.ControlGallery.iOS
 		public override void ViewDidLoad()
 		{
 			base.ViewDidLoad();
-			CollectionView.RegisterClassForCell(typeof (CollectionViewCell), cellId);
+			CollectionView.RegisterClassForCell(typeof(CollectionViewCell), cellId);
 		}
 
-#if __UNIFIED__
 		public override nint NumberOfSections(UICollectionView collectionView)
 		{
 			return 1;
@@ -551,18 +521,6 @@ namespace Xamarin.Forms.ControlGallery.iOS
 			return items.Count;
 		}
 
-#else
-		public override int NumberOfSections (UICollectionView collectionView)
-		{
-			return 1;
-		}
-
-		public override int GetItemsCount (UICollectionView collectionView, int section)
-		{
-			return items.Count;
-		}
-#endif
-
 		public override UICollectionViewCell GetCell(UICollectionView collectionView, NSIndexPath indexPath)
 		{
 			var cell = (CollectionViewCell)collectionView.DequeueReusableCell(cellId, indexPath);
diff --git a/Xamarin.Forms.ControlGallery.iOS/Main.cs b/Xamarin.Forms.ControlGallery.iOS/Main.cs
index 921c475e..f4834f9b 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Main.cs
+++ b/Xamarin.Forms.ControlGallery.iOS/Main.cs
@@ -1,30 +1,16 @@
 using System.Diagnostics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Xamarin.Forms.Controls;
-#if __UNIFIED__
 using UIKit;
-using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
+using Xamarin.Forms.Controls;
 
 namespace Xamarin.Forms.ControlGallery.iOS
 {
 	public class Application
 	{
-		// This is the main entry point of the application.
-		static void Main (string [] args)
+		static void Main(string[] args)
 		{
-			// if you want to use a different Application Delegate class from "AppDelegate"
-			// you can specify it here.
-			#if __UNIFIED__
 			if (!Debugger.IsAttached)
-				Insights.Initialize (App.InsightsApiKey);
-			#endif
-			UIApplication.Main (args, null, "AppDelegate");
+				Insights.Initialize(App.InsightsApiKey);
+			UIApplication.Main(args, null, "AppDelegate");
 		}
 	}
 }
diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.Classic.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.Classic.csproj
deleted file mode 100644
index 5e539bd3..00000000
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.Classic.csproj
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DEEC5844-D609-4F35-BCF0-5B71C91C8133}</ProjectGuid>
-    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Xamarin.Forms.ControlGallery.iOS</RootNamespace>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>XamarinFormsControlGalleryiOS</AssemblyName>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <UseMSBuildEngine>True</UseMSBuildEngine>
-    <DefineConstants>_CLASSIC_</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>classic_bin\iPhoneSimulator\Debug\</OutputPath>
-    <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
-    <DefineConstants>DEBUG;HAVE_OPENTK;_CLASSIC_</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchLink>SdkOnly</MtouchLink>
-    <MtouchDebug>True</MtouchDebug>
-    <MtouchSdkVersion>6.1</MtouchSdkVersion>
-    <MtouchProfiling>False</MtouchProfiling>
-    <MtouchExtraArgs />
-    <MtouchFastDev>False</MtouchFastDev>
-    <MtouchArch>Default, i386</MtouchArch>
-    <MtouchUseLlvm>False</MtouchUseLlvm>
-    <MtouchUseThumb>False</MtouchUseThumb>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
-    <MtouchOptimizePNGs>False</MtouchOptimizePNGs>
-    <MtouchSdkVersion>7.0</MtouchSdkVersion>
-    <MtouchEnableGenericValueTypeSharing>True</MtouchEnableGenericValueTypeSharing>
-    <MtouchI18n />
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>classic_bin\iPhoneSimulator\Release</OutputPath>
-    <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchLink>None</MtouchLink>
-    <DefineConstants>_CLASSIC_</DefineConstants>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>classic_bin\iPhone\Debug</OutputPath>
-    <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
-    <DefineConstants>DEBUG;__MOBILE__;__IOS__;_CLASSIC_</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchDebug>True</MtouchDebug>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchSdkVersion>8.1</MtouchSdkVersion>
-    <IpaPackageName>
-    </IpaPackageName>
-    <MtouchLink>SdkOnly</MtouchLink>
-    <MtouchProfiling>False</MtouchProfiling>
-    <MtouchExtraArgs />
-    <MtouchFastDev>False</MtouchFastDev>
-    <MtouchEnableGenericValueTypeSharing>True</MtouchEnableGenericValueTypeSharing>
-    <MtouchArch>Default, ARMv7</MtouchArch>
-    <MtouchUseLlvm>False</MtouchUseLlvm>
-    <MtouchUseThumb>False</MtouchUseThumb>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
-    <MtouchOptimizePNGs>True</MtouchOptimizePNGs>
-    <MtouchI18n />
-    <BuildIpa>true</BuildIpa>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>classic_bin\iPhone\Release</OutputPath>
-    <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <DefineConstants>_CLASSIC_</DefineConstants>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>classic_bin\iPhone\Ad-Hoc</OutputPath>
-    <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-    <DefineConstants>_CLASSIC_</DefineConstants>
-    <BuildIpa>True</BuildIpa>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>classic_bin\iPhone\AppStore</OutputPath>
-    <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|iPhoneSimulator'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\iPhoneSimulator\Turkey\</OutputPath>
-    <DefineConstants>__MOBILE__;__IOS__;DEBUG;HAVE_OPENTK;_CLASSIC_</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|iPhone'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\iPhone\Turkey\</OutputPath>
-    <DefineConstants>__MOBILE__;__IOS__;DEBUG;__MOBILE__;__IOS__;_CLASSIC_</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhoneSimulator'">
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|iPhoneSimulator'">
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="BrokenNativeControl.cs" />
-    <Compile Include="Main.cs" />
-    <Compile Include="AppDelegate.cs" />
-    <None Include="app.config" />
-    <None Include="Info.plist" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <None Include="packages.config" />
-    <Compile Include="CustomRenderers.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Stubs\Xamarin.Forms.Platform.iOS.Classic\Xamarin.Forms.Platform.iOS.Classic %28Forwarders%29.csproj">
-      <Project>{3e443aef-3ec0-48c4-a524-7c6996339e1b}</Project>
-      <Name>Xamarin.Forms.Platform.iOS.Classic %28Forwarders%29</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj">
-      <Project>{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}</Project>
-      <Name>Xamarin.Forms.Controls</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Maps.iOS\Xamarin.Forms.Maps.iOS.Classic.csproj">
-      <Project>{ca10facd-22ab-463f-a20e-379c212b0858}</Project>
-      <Name>Xamarin.Forms.Maps.iOS.Classic</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj">
-      <Project>{7d13bac2-c6a4-416a-b07e-c169b199e52b}</Project>
-      <Name>Xamarin.Forms.Maps</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS.Classic.csproj">
-      <Project>{4a47b5df-ddfc-476b-ac41-5105ff3b9b8b}</Project>
-      <Name>Xamarin.Forms.Platform.iOS.Classic</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
-      <Project>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</Project>
-      <Name>Xamarin.Forms.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="bank%402x.png" />
-    <Content Include="bank.png" />
-    <Content Include="calculator%402x.png" />
-    <Content Include="calculator.png" />
-    <Content Include="cover1.jpg" />
-    <Content Include="crimson.jpg" />
-    <Content Include="Default-568h%402x.png" />
-    <BundleResource Include="default.css" />
-    <Content Include="Entitlements.plist" />
-    <Content Include="Goobuntu-icon.png" />
-    <Content Include="Intranet-icon.png" />
-    <BundleResource Include="Default%402x.png" />
-    <BundleResource Include="local.html" />
-    <Content Include="oasis.jpg" />
-    <BundleResource Include="oasissmall.jpg" />
-    <Content Include="coffee%402x.png" />
-    <Content Include="settings%402x.png" />
-    <Content Include="menuIcon%402x.png" />
-    <Content Include="crimsonsmall.jpg" />
-    <Content Include="seth%402x.png" />
-    <Content Include="cover1small.jpg" />
-    <Content Include="menuIcon.png" />
-    <Content Include="seth.png" />
-    <BundleResource Include="photo.jpg" />
-    <BundleResource Include="WebImages\XamarinLogo.png" />
-    <BundleResource Include="Images\FlowerBuds.jpg" />
-    <BundleResource Include="Images\FlowerBuds%402x.jpg" />
-    <BundleResource Include="Images\Fruits.jpg" />
-    <BundleResource Include="Images\Fruits%402x.jpg" />
-    <BundleResource Include="Images\Legumes.jpg" />
-    <BundleResource Include="Images\Legumes%402x.jpg" />
-    <BundleResource Include="Images\Vegetables.jpg" />
-    <BundleResource Include="Images\Vegetables%402x.jpg" />
-    <BundleResource Include="toolbar_close.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="monotouch" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- </Project>
diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
index 35951c56..fabf981a 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
+++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@@ -131,7 +131,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|iPhoneSimulator'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\iPhoneSimulator\Turkey\</OutputPath>
-    <DefineConstants>__UNIFIED__;__MOBILE__;__IOS__;DEBUG</DefineConstants>
+    <DefineConstants>__MOBILE__;__IOS__;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>