[tests] Remove Classic code from all tests. (#8707)

src/ObjCRuntime/ErrorHelper.cs

@@ -4,33 +4,23 @@ using System;
 using System.Collections.Generic;
 
 #if MONOTOUCH
-#if MTOUCH
+#if MTOUCH || MTOUCH_TESTS
 using ProductException=Xamarin.Bundler.MonoTouchException;
 #else
-#if XAMCORE_2_0
 using ProductException=ObjCRuntime.RuntimeException;
-#else
-using ProductException=MonoTouch.RuntimeException;
-#endif
 #endif
 #elif MONOMAC
-#if MMP
+#if MMP || MMP_TEST
 using ProductException=Xamarin.Bundler.MonoMacException;
 #else
-#if XAMCORE_2_0
 using ProductException=ObjCRuntime.RuntimeException;
-#else
-using ProductException=MonoMac.RuntimeException;
-#endif
 #endif
 #else
 #error Only supports XI or XM
 #endif
 
-#if !MTOUCH && !MMP
-#if XAMCORE_2_0
+#if !MTOUCH && !MMP && !MTOUCH_TESTS && !MMP_TEST
 using ObjCRuntime;
-#endif
 #else
 using System.Linq;
 using Mono.Cecil.Cil;

src/ObjCRuntime/RuntimeException.cs

@@ -3,9 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-#if XAMCORE_2_0
 namespace ObjCRuntime {
-#endif
 
 	public class RuntimeException : Exception {
 		public RuntimeException (string message, params object[] args)
@@ -43,6 +41,4 @@ namespace ObjCRuntime {
 		}
 		*/
 	}
-#if XAMCORE_2_0
 }
-#endif

src/System.Net.Http/CFContentStream.cs

@@ -35,12 +35,9 @@ using System.Runtime.ExceptionServices;
 #if XAMCORE_4_0
 using CFNetwork;
 using CoreFoundation;
-#elif XAMCORE_2_0 || SYSTEM_NET_HTTP
+#else
 using CoreServices;
 using CoreFoundation;
-#else
-using MonoTouch.CoreServices;
-using MonoTouch.CoreFoundation;
 #endif
 
 namespace System.Net.Http

tests/BundledResources/BundledResources.csproj

@@ -13,7 +13,7 @@
     <AssemblyName>BundledResources</AssemblyName>
     <TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
-    <DefineConstants>XAMCORE_2_0</DefineConstants>
+    <DefineConstants></DefineConstants>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' Or '$(Configuration)' == 'Debug64_32' ">

tests/BundledResources/ResourcesTest.cs

@@ -11,13 +11,8 @@ using System;
 using System.IO;
 using NUnit.Framework;
 
-#if XAMCORE_2_0
 using Foundation;
 using ObjCRuntime;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.ObjCRuntime;
-#endif
 
 namespace BundledResources {
 

tests/EmbeddedResources/EmbeddedResources.csproj

@@ -15,7 +15,7 @@
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
-    <DefineConstants>XAMCORE_2_0</DefineConstants>
+    <DefineConstants></DefineConstants>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' Or '$(Configuration)' == 'Debug64_32' ">

tests/EmbeddedResources/ResourcesTest.cs

@@ -15,13 +15,8 @@ using System.Reflection;
 using System.Reflection.Emit;
 using NUnit.Framework;
 
-#if XAMCORE_2_0
 using Foundation;
 using ObjCRuntime;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.ObjCRuntime;
-#endif
 
 namespace EmbeddedResources {
 

tests/api-shared/CoreFoundation/CFNotificationCenterTest.cs

@@ -10,18 +10,8 @@
 using System;
 using System.Net;
 
-#if XAMCORE_2_0
 using Foundation;
 using CoreFoundation;
-#else
-#if MONOMAC
-using MonoMac.CoreFoundation;
-using MonoMac.Foundation;
-#else
-using MonoTouch.CoreFoundation;
-using MonoTouch.Foundation;
-#endif
-#endif
 using NUnit.Framework;
 
 namespace MonoTouchFixtures.CoreFoundation

tests/api-shared/ObjCRuntime/Registrar.cs

@@ -11,16 +11,8 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-#if __UNIFIED__
 using Foundation;
 using ObjCRuntime;
-#elif __IOS__
-using MonoTouch.Foundation;
-using MonoTouch.ObjCRuntime;
-#else
-using MonoMac.Foundation;
-using MonoMac.ObjCRuntime;
-#endif
 
 namespace XamarinTests.ObjCRuntime {
 

tests/api-shared/ObjCRuntime/RegistrarTest.cs

@@ -11,16 +11,8 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.InteropServices;
-#if XAMCORE_2_0
 using Foundation;
 using ObjCRuntime;
-#elif __IOS__
-using MonoTouch.Foundation;
-using MonoTouch.ObjCRuntime;
-#else
-using MonoMac.Foundation;
-using MonoMac.ObjCRuntime;
-#endif
 using NUnit.Framework;
 
 namespace XamarinTests.ObjCRuntime {
@@ -32,7 +24,6 @@ namespace XamarinTests.ObjCRuntime {
 			}
 		}
 
-#if __UNIFIED__
 		[Test]
 		public void IntPtrCtor ()
 		{
@@ -52,7 +43,6 @@ namespace XamarinTests.ObjCRuntime {
 				Messaging.void_objc_msgSend (ptr, Selector.GetHandle ("release"));
 			}
 		}
-#endif
 
 		[Register ("IntPtrCtorTestClass")]
 		class IntPtrCtorTestClass : NSObject {

tests/apitest/apitest.csproj

@@ -13,7 +13,7 @@
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)</IntermediateOutputPath>
     <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
     <XamMacArch>x86_64</XamMacArch>
-    <DefineConstants>XAMCORE_2_0</DefineConstants>
+    <DefineConstants></DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>

tests/apitest/src/AVFoundation/AVAudioIONode.cs

@@ -1,19 +1,11 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.AudioUnit;
-using MonoMac.AVFoundation;
-using AUUnit = MonoMac.AudioUnit.AudioUnit;
-#else
 using AppKit;
 using Foundation;
 using AudioUnit;
 using AUUnit = AudioUnit.AudioUnit;
 using AVFoundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AVFoundation/AVPlayerLayerTest.cs

@@ -1,18 +1,11 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.AudioUnit;
-using MonoMac.AVFoundation;
-#else
 using AppKit;
 using Foundation;
 using AudioUnit;
 using AVFoundation;
 using AUUnit = AudioUnit.AudioUnit;
-#endif
 
 namespace Xamarin.Mac.Tests
 {
@@ -23,11 +16,7 @@ namespace Xamarin.Mac.Tests
 		public void AVPlayerLayer_VideoGravity ()
 		{
 			AVPlayerLayer layer = new AVPlayerLayer ();
-#if XAMCORE_2_0
 			Assert.IsNotNull (layer.VideoGravity);
-#else
-			Assert.IsNotNull (layer.LayerVideoGravity);
-#endif
 		}
 	}
 }

tests/apitest/src/AppKit/NSAppearance.cs

@@ -1,16 +1,9 @@
 using NUnit.Framework;
 using System;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-using nfloat = System.Single;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {
@@ -55,7 +48,6 @@ namespace Xamarin.Mac.Tests
 			Assert.AreNotEqual (appearance, NSAppearance.CurrentAppearance, "NSAppearanceShouldChangeCurrentAppearance - Failed to change appearance.");
 		}
 
-#if XAMCORE_2_0
 		[Test]
 		public void NSAppearanceCustomizationNull ()
 		{
@@ -64,6 +56,5 @@ namespace Xamarin.Mac.Tests
 			using (NSButton b = new NSButton ())
 				b.SetAppearance (null);
 		}
-#endif
 	}
 }

tests/apitest/src/AppKit/NSApplication.cs

@@ -1,15 +1,9 @@
 using NUnit.Framework;
 using System;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSCellTest.cs

@@ -1,15 +1,9 @@
 using System;
 using System.Runtime.InteropServices;
 
-#if XAMCORE_2_0
 using AppKit;
 using Foundation;
 using ObjCRuntime;
-#else
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.ObjCRuntime;
-#endif
 
 using NUnit.Framework;
 

tests/apitest/src/AppKit/NSClipView.cs

@@ -1,15 +1,9 @@
 using NUnit.Framework;
 using System;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using CGRect = System.Drawing.RectangleF;
-#else
 using AppKit;
 using CoreGraphics;
 using ObjCRuntime;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSColor.cs

@@ -2,12 +2,7 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using nfloat = System.Single;
-#else
 using AppKit;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSControl.cs

@@ -1,13 +1,8 @@
 using NUnit.Framework;
 using System;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-#else
 using AppKit;
 using ObjCRuntime;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSDraggingItem.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSFont.cs

@@ -1,19 +1,11 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.CoreText;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
 using CoreGraphics;
 using CoreText;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSGradient.cs

@@ -1,14 +1,8 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using nfloat = System.Single;
-#else
 using AppKit;
 using ObjCRuntime;
-#endif
 
 namespace Xamarin.Mac.Tests  
 {

tests/apitest/src/AppKit/NSImage.cs

@@ -1,15 +1,9 @@
 using NUnit.Framework;
 using System;
 
-#if !XAMCORE_2_0
-using CGSize = System.Drawing.SizeF;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-#else
 using AppKit;
 using CoreGraphics;
 using ObjCRuntime;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSLayoutManagerTests.cs

@@ -1,18 +1,10 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-using CGPoint = System.Drawing.PointF;
-using CGRect = System.Drawing.RectangleF;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
 using CoreGraphics;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSOpenGLPixelFormat.cs

@@ -1,11 +1,7 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-#else
 using AppKit;
-#endif
 
 namespace Xamarin.Mac.Tests {
 	[TestFixture]

tests/apitest/src/AppKit/NSOutlineView.cs

@@ -2,13 +2,8 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {
@@ -20,11 +15,7 @@ namespace Xamarin.Mac.Tests
 		{
 			NSOutlineView v = new NSOutlineView ();
 			v.BeginUpdates (); // We do this to prevent a crash: Insert/remove/move only works within a -beginUpdates/-endUpdates block or a View Based TableView
-#if !XAMCORE_2_0
-			v.InsertItems (new NSIndexSet (0), null, NSTableViewAnimationOptions.EffectFade);
-#else
 			v.InsertItems (new NSIndexSet (0), null, NSTableViewAnimation.None);
-#endif
 			v.EndUpdates ();
 		}
 

tests/apitest/src/AppKit/NSPasteboard.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {
@@ -22,10 +16,6 @@ namespace Xamarin.Mac.Tests
 			NSPasteboard b = NSPasteboard.CreateWithUniqueName();
 			b.WriteObjects (new INSPasteboardWriting [] { (NSString)"asfd" });
 			b.WriteObjects (new NSPasteboardWriting [] { new MyPasteboard () });
-#if !XAMCORE_2_0
-			// Awesome backwards compat API
-			b.WriteObjects (new NSPasteboardReading [] { new MyPasteboard2 () });
-#endif
 		}
 		
 		class MyPasteboard2 : NSPasteboardReading

tests/apitest/src/AppKit/NSPathControl.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSPathControlItem.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSScreen.cs

@@ -2,15 +2,9 @@
 using System;
 using System.Threading;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSSearchField.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSSlider.cs

@@ -1,15 +1,9 @@
 using NUnit.Framework;
 using System;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSSplitViewController.cs

@@ -2,17 +2,9 @@
 using NUnit.Framework;
 using System.Linq;
 
-#if !XAMCORE_2_0
-using System.Drawing;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSSplitViewItem.cs

@@ -2,17 +2,9 @@
 using NUnit.Framework;
 using System.Linq;
 
-#if !XAMCORE_2_0
-using System.Drawing;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSStackView.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSStepperCell.cs

@@ -1,11 +1,7 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-#else
 using AppKit;
-#endif
 
 namespace apitest
 {

tests/apitest/src/AppKit/NSStoryboardSegue.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSTabViewController.cs

@@ -2,17 +2,9 @@
 using NUnit.Framework;
 using System.Linq;
 
-#if !XAMCORE_2_0
-using System.Drawing;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSTabViewItem.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSTableColumn.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSTableRowView.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSTableView.cs

@@ -2,13 +2,8 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSTextField.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSTextFinder.cs

@@ -2,18 +2,10 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.AudioUnit;
-using MonoMac.AudioToolbox;
-using MonoMac.Foundation;
-using nuint = System.UInt32;
-#else
 using AppKit;
 using AudioUnit;
 using AudioToolbox;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSTextInputClient.cs

@@ -1,16 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using CGPoint = System.Drawing.PointF;
-using CGRect = System.Drawing.RectangleF;
-#else
 using AppKit;
 using CoreGraphics;
 using Foundation;
-#endif
 
 namespace apitest
 {

tests/apitest/src/AppKit/NSTextView.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSToolbar.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSToolbarItem.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSUserDefaultsController.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSView.cs

@@ -3,15 +3,9 @@ using System.Collections.Generic;
 using System.Reflection;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {
@@ -86,7 +80,6 @@ namespace Xamarin.Mac.Tests
 			NSStatusBar.SystemStatusBar.CreateStatusItem (10).Menu = null;
 		}
 
-#if XAMCORE_2_0
 		[Test]
 		public void SubviewSort ()
 		{
@@ -134,6 +127,5 @@ namespace Xamarin.Mac.Tests
 				}
 			}
 		}
-#endif
 	}
 }

tests/apitest/src/AppKit/NSViewController.cs

@@ -1,16 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using System.Drawing;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSVisualEffectView.cs

@@ -1,15 +1,9 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSWindowController.cs

@@ -3,15 +3,9 @@ using System.Collections.Generic;
 using System.Reflection;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AppKit/NSWorkspace.cs

@@ -1,13 +1,8 @@
 using NUnit.Framework;
 using System;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-#else
 using AppKit;
 using ObjCRuntime;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/Asserts.cs

@@ -4,13 +4,8 @@ using System.Reflection;
 using NUnit.Framework;
 using Xamarin.Tests;
 
-#if !XAMCORE_2_0
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-#else
 using ObjCRuntime;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/AudioUnit/AUGraphTest.cs

@@ -2,15 +2,9 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.AudioUnit;
-using MonoMac.AudioToolbox;
-#else
 using AppKit;
 using AudioUnit;
 using AudioToolbox;
-#endif
 
 namespace Xamarin.Mac.Tests
 {
@@ -20,11 +14,7 @@ namespace Xamarin.Mac.Tests
 		int graphRenderCallbackCount = 0;
 		int mixerRenderCallbackCount = 0;
 		AUGraph graph;
-#if XAMCORE_2_0
 		AudioUnit.AudioUnit mMixer;
-#else
-		AudioUnit mMixer;
-#endif
 
 		void SetupAUGraph ()
 		{
@@ -73,15 +63,6 @@ namespace Xamarin.Mac.Tests
 			await WaitOnGraphAndMixerCallbacks ();
 		}
 
-#if !XAMCORE_2_0
-#pragma warning disable 0612
-		void HandleRenderCallback (object sender, AudioGraphEventArgs e)
-		{
-			graphRenderCallbackCount++;
-		}
-#pragma warning restore 0612
-#endif
-
 		AudioUnitStatus GraphRenderCallback (AudioUnitRenderActionFlags actionFlags, AudioTimeStamp timeStamp, uint busNumber, uint numberFrames, AudioBuffers data)
 		{
 			graphRenderCallbackCount++;

tests/apitest/src/AudioUnit/AudioUnit.cs

@@ -2,17 +2,10 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.AudioUnit;
-using theUnit = MonoMac.AudioUnit.AudioUnit; // Namespace fun
-#else
 using AppKit;
 using AudioUnit;
 using theUnit = AudioUnit.AudioUnit;
 
-#endif
-
 namespace Xamarin.Mac.Tests
 {
 	[TestFixture]

tests/apitest/src/CoreAnimation/CABasicAnimation.cs

@@ -2,18 +2,10 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreGraphics;
-using MonoMac.Foundation;
-using CGRect = System.Drawing.RectangleF;
-#else
 using AppKit;
 using CoreAnimation;
 using CoreGraphics;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/CoreAnimation/CAKeyFrameAnimation.cs

@@ -2,18 +2,10 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreGraphics;
-using MonoMac.Foundation;
-using CGRect = System.Drawing.RectangleF;
-#else
 using AppKit;
 using CoreAnimation;
 using CoreGraphics;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/CoreAnimation/CALayer.cs

@@ -2,18 +2,10 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreGraphics;
-using MonoMac.Foundation;
-using CGRect = System.Drawing.RectangleF;
-#else
 using AppKit;
 using CoreAnimation;
 using CoreGraphics;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/CoreAnimation/CAOpenGLLayer.cs

@@ -1,19 +1,11 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreAnimation;
-using MonoMac.OpenGL;
-using MonoMac.ObjCRuntime;
-#else
 using AppKit;
 using Foundation;
 using CoreAnimation;
 using OpenGL;
 using ObjCRuntime;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/CoreImage/CIFilter.cs

@@ -1,19 +1,10 @@
 using NUnit.Framework;
 using System;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreImage;
-using MonoMac.CoreGraphics;
-using CGSize = System.Drawing.SizeF;
-using CGRect = System.Drawing.RectangleF;
-#else
 using AppKit;
 using ObjCRuntime;
 using CoreImage;
 using CoreGraphics;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/Darwin/KernelNotificationTest.cs

@@ -1,11 +1,7 @@
 using System;
 using System.Diagnostics;
 
-#if XAMCORE_2_0
 using Darwin;
-#else
-using MonoMac.Darwin;
-#endif
 
 using NUnit.Framework;
 

tests/apitest/src/DelegateAndDataSourceTest.cs

@@ -5,16 +5,9 @@ using System.Reflection;
 using NUnit.Framework;
 using System.Runtime.CompilerServices;
 
-
-#if !XAMCORE_2_0
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-#else
 using Foundation;
 using AppKit;
 using ObjCRuntime;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/DerivedEventTest.cs

@@ -1,4 +1,3 @@
-#if XAMCORE_2_0
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -77,4 +76,3 @@ namespace Xamarin.Mac.Tests
 		}
 	}
 }
-#endif

tests/apitest/src/EveryFrameworkSmokeTest.cs

@@ -7,16 +7,9 @@ using System.Runtime.CompilerServices;
 
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac;
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.ObjCRuntime;
-#else
 using AppKit;
 using Foundation;
 using ObjCRuntime;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/Foundation/AppleScript.cs

@@ -1,13 +1,8 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using Foundation;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/Foundation/NSFormatter.cs

@@ -1,13 +1,8 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-#else
 using Foundation;
 using AppKit;
-#endif
 
 namespace apitest
 {

tests/apitest/src/Foundation/NSIndexSet.cs

@@ -2,17 +2,10 @@ using System;
 using System.Linq;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-using nint = System.Int32;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
 using CoreGraphics;
-#endif
 
 namespace Xamarin.Mac.Tests
 {
@@ -24,10 +17,8 @@ namespace Xamarin.Mac.Tests
 		{
 #pragma warning disable 0219
 			NSIndexSet a = new NSIndexSet ((int)5);
-#if XAMCORE_2_0
 			NSIndexSet b = new NSIndexSet ((uint)5);
 			NSIndexSet c = new NSIndexSet ((nint)5);
-#endif
 #pragma warning restore 0219
 		}
 

tests/apitest/src/Foundation/NSLayoutConstraint.cs

@@ -1,8 +1,4 @@
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-#else
 using AppKit;
-#endif
 using NUnit.Framework;
 
 namespace Xamarin.Mac.Tests

tests/apitest/src/Foundation/NSMetadataItem.cs

@@ -1,10 +1,5 @@
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-#else
 using AppKit;
 using Foundation;
-#endif
 using NUnit.Framework;
 
 namespace Xamarin.Mac.Tests {
@@ -25,9 +20,7 @@ namespace Xamarin.Mac.Tests {
 				Assert.NotNull (mi.FileSystemContentChangeDate, "FileSystemContentChangeDate");
 				Assert.NotNull (mi.FileSystemCreationDate, "FileSystemCreationDate");
 				Assert.That (mi.FileSystemName.ToString (), Is.EqualTo ("apitest.app"), "FileSystemName");
-#if XAMCORE_2_0
 				Assert.That (mi.FileSystemSize.UInt64Value, Is.GreaterThan (0), "FileSystemSize");
-#endif
 				Assert.False (mi.IsUbiquitous, "IsUbiquitous");
 				Assert.That (mi.Path.ToString (), Is.StringEnding ("/apitest.app"), "Path");
 				Assert.False (mi.UbiquitousItemHasUnresolvedConflicts, "UbiquitousItemHasUnresolvedConflicts");

tests/apitest/src/Foundation/NSObject.cs

@@ -2,17 +2,10 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-using nint = System.Int32;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
 using CoreGraphics;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/Foundation/NSScriptCommandArgumentDescriptionTest.cs

@@ -1,13 +1,8 @@
 // Copyright 2015 Xamarin, Inc.
 
 using System;
-#if XAMCORE_2_0
 using Foundation;
 using ObjCRuntime;
-#else
-using MonoMac.Foundation;
-using MonoMac.ObjCRuntime;
-#endif
 using NUnit.Framework;
 
 namespace MonoTouchFixtures.Foundation {

tests/apitest/src/Foundation/NSScriptCommandDescriptionTest.cs

@@ -3,13 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-#if XAMCORE_2_0
 using Foundation;
 using ObjCRuntime;
-#else
-using MonoMac.Foundation;
-using MonoMac.ObjCRuntime;
-#endif
 using NUnit.Framework;
 
 namespace MonoTouchFixtures.Foundation {

tests/apitest/src/Foundation/NSString.cs

@@ -1,20 +1,10 @@
 using System;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-using nuint = System.UInt32;
-using nint = System.Int32;
-using CGRect = System.Drawing.RectangleF;
-using CGSize = System.Drawing.SizeF;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
 using CoreGraphics;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/Foundation/NSThread.cs

@@ -2,17 +2,10 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
-using nint = System.Int32;
-#else
 using AppKit;
 using ObjCRuntime;
 using Foundation;
 using CoreGraphics;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/MonoMac/AssemblyTest.cs

@@ -9,11 +9,7 @@
 
 using System;
 using System.Reflection;
-#if XAMCORE_2_0
 using Foundation;
-#else
-using MonoMac.Foundation;
-#endif
 using NUnit.Framework;
 
 namespace MonoMacFixtures {

tests/apitest/src/MonoMac/CBUUID.cs

@@ -9,15 +9,9 @@
 
 using System;
 
-#if XAMCORE_2_0
 using Foundation;
 using CoreBluetooth;
 using ObjCRuntime;
-#else
-using MonoMac.Foundation;
-using MonoMac.CoreBluetooth;
-using MonoMac.ObjCRuntime;
-#endif
 
 using NUnit.Framework;
 using Xamarin.Mac.Tests;

tests/apitest/src/NSScriptCommandDescriptionDictionaryTest.cs

@@ -4,13 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-#if XAMCORE_2_0
 using Foundation;
 using ObjCRuntime;
-#else
-using MonoMac.Foundation;
-using MonoMac.ObjCRuntime;
-#endif
 using NUnit.Framework;
 
 namespace MonoTouchFixtures.Foundation {

tests/apitest/src/ObjCRuntime/ClassTest.cs

@@ -10,13 +10,8 @@
 using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
-#if XAMCORE_2_0
 using Foundation;
 using ObjCRuntime;
-#else
-using MonoMac.Foundation;
-using MonoMac.ObjCRuntime;
-#endif
 using NUnit.Framework;
 
 namespace MonoMacFixtures.ObjCRuntime {

tests/apitest/src/ObjCRuntime/SimpleRegistrarTest.cs

@@ -2,15 +2,9 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.Foundation;
-using MonoMac.ObjCRuntime;
-#else
 using Foundation;
 using ObjCRuntime;
 
-#endif
-
 namespace Xamarin.Mac.Tests
 {
 	[Register ("RegistrarTestClass")]

tests/apitest/src/SceneKit/SCNGeometrySource.cs

@@ -2,13 +2,8 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.Foundation;
-using MonoMac.SceneKit;
-#else
 using Foundation;
 using SceneKit;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/SceneKit/SCNMaterial.cs

@@ -2,15 +2,9 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.SceneKit;
-#else
 using AppKit;
 using Foundation;
 using SceneKit;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/SceneKit/SCNNode.cs

@@ -2,17 +2,10 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreAnimation;
-using MonoMac.SceneKit;
-#else
 using AppKit;
 using Foundation;
 using CoreAnimation;
 using SceneKit;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/SceneKit/SCNScene.cs

@@ -2,14 +2,8 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.Foundation;
-using MonoMac.SceneKit;
-
-#else
 using Foundation;
 using SceneKit;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/SceneKit/SCNView.cs

@@ -2,19 +2,11 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreAnimation;
-using MonoMac.SceneKit;
-using CGRect = System.Drawing.RectangleF;
-#else
 using AppKit;
 using Foundation;
 using CoreAnimation;
 using CoreGraphics;
 using SceneKit;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/SceneKit/SCNWorld.cs

@@ -2,17 +2,10 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreAnimation;
-using MonoMac.SceneKit;
-#else
 using AppKit;
 using Foundation;
 using CoreAnimation;
 using SceneKit;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/SceneKit/SceneKit.cs

@@ -2,19 +2,11 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreAnimation;
-using MonoMac.SceneKit;
-using CGRect = System.Drawing.RectangleF;
-#else
 using AppKit;
 using Foundation;
 using CoreAnimation;
 using CoreGraphics;
 using SceneKit;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/SearchKit/SearchKitTest.cs

@@ -4,7 +4,6 @@ using System.Runtime.InteropServices;
 
 using NUnit.Framework;
 
-#if XAMCORE_2_0
 using Foundation;
 using SearchKit;
 
@@ -158,4 +157,3 @@ namespace apitest {
 		}
 	}
 }
-#endif

tests/apitest/src/SpriteKit/SKPaymentTests.cs

@@ -2,16 +2,9 @@ using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if !XAMCORE_2_0
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.StoreKit;
-using nuint = System.UInt32;
-#else
 using AppKit;
 using Foundation;
 using StoreKit;
-#endif
 
 namespace Xamarin.Mac.Tests
 {

tests/apitest/src/SpriteKit/SKScene.cs

@@ -1,4 +1,3 @@
-#if XAMCORE_2_0
 using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -49,4 +48,3 @@ namespace Xamarin.Mac.Tests
 		}
 	}
 }
-#endif

tests/bindings-framework-test/ApiDefinition.cs

@@ -1,22 +1,14 @@
 using System;
 
-#if __UNIFIED__
 using ObjCRuntime;
 using Foundation;
 using UIKit;
-#else
-using MonoTouch.ObjCRuntime;
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-#endif
 
 namespace Bindings.Test {
-#if __UNIFIED__
 	[BaseType (typeof (NSObject))]
 	public interface FrameworkTest
 	{
 		[Export ("func")]
 		int Func ();
 	}
-#endif
 }

tests/bindings-framework-test/XTest.framework.linkwith.cs

@@ -1,16 +1,10 @@
 using System;
-#if __UNIFIED__
 using ObjCRuntime;
-#else
-using MonoTouch.ObjCRuntime;
-#endif
 using System.Runtime.InteropServices;
 
-#if __UNIFIED__
 [assembly: LinkWith ("XTest.framework", Frameworks = LinkWithConstants.Frameworks)]
 [assembly: LinkWith ("XStaticObjectTest.framework", LinkerFlags = "-lz", Frameworks = LinkWithConstants.Frameworks)]
 [assembly: LinkWith ("XStaticArTest.framework", Frameworks = LinkWithConstants.Frameworks)]
-#endif
 
 static class LinkWithConstants
 {

tests/bindings-framework-test/bindings-framework-test.csproj

@@ -15,7 +15,7 @@
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
-    <DefineConstants>XAMCORE_2_0</DefineConstants>
+    <DefineConstants></DefineConstants>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' Or '$(Configuration)' == 'Debug64_32' ">

tests/bindings-test/ApiDefinition.cs

@@ -1,6 +1,5 @@
 using System;
 
-#if __UNIFIED__
 using ObjCRuntime;
 using Foundation;
 #if __MACOS__
@@ -8,17 +7,9 @@ using AppKit;
 #else
 using UIKit;
 #endif
-#else
-#if !__WATCHOS__
-using System.Drawing;
-#endif
-using MonoTouch.ObjCRuntime;
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-#endif
 
 namespace Bindings.Test {
-#if __UNIFIED__ && FRAMEWORK_TEST
+#if FRAMEWORK_TEST
 	[BaseType (typeof (NSObject))]
 	public interface FrameworkTest
 	{

tests/bindings-test/ApiProtocol.cs

@@ -1,6 +1,5 @@
 using System;
 
-#if __UNIFIED__
 using ObjCRuntime;
 using Foundation;
 #if __MACOS__
@@ -8,14 +7,6 @@ using AppKit;
 #else
 using UIKit;
 #endif
-#else
-#if !__WATCHOS__
-using System.Drawing;
-#endif
-using MonoTouch.ObjCRuntime;
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-#endif
 
 namespace Bindings.Test.Protocol {
 	

tests/bindings-test/CodeBehind.cs

@@ -1,12 +1,8 @@
 using System;
 using System.Runtime.InteropServices;
 
-#if !__UNIFIED__
-using nint=System.Int32;
-#else
 using Foundation;
 using ObjCRuntime;
-#endif
 
 using MatrixFloat2x2 = global::OpenTK.NMatrix2;
 using MatrixFloat3x3 = global::OpenTK.NMatrix3;

tests/bindings-test/ProtocolTest.cs

@@ -3,13 +3,8 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Linq;
 
-#if __UNIFIED__
 using Foundation;
 using ObjCRuntime;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.ObjCRuntime;
-#endif
 
 using NUnit.Framework;
 

tests/bindings-test/RegistrarBindingTest.cs

@@ -1,13 +1,8 @@
 using System;
 using System.Threading;
 
-#if __UNIFIED__
 using Foundation;
 using ObjCRuntime;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.ObjCRuntime;
-#endif
 
 using NUnit.Framework;
 

tests/bindings-test/RuntimeTest.cs

@@ -1,13 +1,8 @@
 using System;
 using System.Threading;
 
-#if __UNIFIED__
 using Foundation;
 using ObjCRuntime;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.ObjCRuntime;
-#endif
 
 using NUnit.Framework;