Added ReactiveUI_Mac64 project, updated usings

Author: Michael Teper

CommonAssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 
 [assembly: AssemblyVersion("6.3.1")]
 [assembly: AssemblyFileVersion("6.3.1")]

ReactiveUI.Tests/ReactiveUI.Tests_Android.csproj

@@ -142,7 +142,4 @@
       <Name>ReactiveUI_Android</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Android\" />
-  </ItemGroup>
 </Project>

ReactiveUI/AutoPersistHelper.cs

@@ -1,4 +1,4 @@
-using ReactiveUI;
+using ReactiveUI;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;

ReactiveUI/BindingTypeConverters.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Reflection;

ReactiveUI/Cocoa/AppKitAutoSuspendHelper.cs

@@ -1,13 +1,19 @@
-using System;
+using System;
 using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Subjects;
 using System.Reactive.Linq;
-using MonoMac.Foundation;
-using MonoMac.AppKit;
 using System.Reactive.Disposables;
 using Splat;
 
+#if UNIFIED
+using AppKit;
+using Foundation;
+#else
+using MonoMac.AppKit;
+using MonoMac.Foundation;
+#endif
+
 namespace ReactiveUI
 {
     public class AutoSuspendHelper : IEnableLogger

ReactiveUI/Cocoa/AutoLayoutViewModelViewHost.cs

@@ -1,5 +1,7 @@
-#if UNIFIED && UIKIT
+#if UNIFIED && UIKIT
 using NSView = UIKit.UIView;
+#elif UNIFIED && COCOA
+using AppKit;
 #elif UIKIT
 using NSView = MonoTouch.UIKit.UIView;
 #else

ReactiveUI/Cocoa/CocoaDefaultPropertyBinding.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Linq;
 
-#if UNIFIED
+#if UNIFIED && UIKIT
 using UIKit;
+#elif UNIFIED && COCOA
+using AppKit;
 #elif UIKIT
 using MonoTouch.UIKit;
 #else

ReactiveUI/Cocoa/KVOObservableForProperty.cs

@@ -1,22 +1,22 @@
 using System;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Reflection;
-using ReactiveUI;
 using System.Runtime.InteropServices;
+using ReactiveUI;
 using Splat;
 
-#if UNIFIED
-using Foundation;
+#if UNIFIED && UIKIT
 using UIKit;
+using Foundation;
+#elif UNIFIED && COCOA
+using Foundation;
 #elif UIKIT
 using MonoTouch.UIKit;
 using MonoTouch.Foundation;
 #else
-using MonoMac.AppKit;
 using MonoMac.Foundation;
 #endif
 

ReactiveUI/Cocoa/NSRunloopScheduler.cs

@@ -1,21 +1,16 @@
 using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
 
 #if UNIFIED
-using UIKit;
-using Foundation;
 using CoreFoundation;
+using Foundation;
 using NSAction = System.Action;
 #elif UIKIT
 using MonoTouch.UIKit;
 using MonoTouch.Foundation;
 using MonoTouch.CoreFoundation;
 #else
-using MonoMac.AppKit;
 using MonoMac.Foundation;
 using MonoMac.CoreFoundation;
 #endif

ReactiveUI/Cocoa/PlatformOperations.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace ReactiveUI
 {
     /// <summary>
@@ -9,7 +7,7 @@ public class PlatformOperations : IPlatformOperations
     {
         public string GetOrientation()
         {
-#if UNIFIED
+#if UNIFIED && UIKIT
             return UIKit.UIDevice.CurrentDevice.Orientation.ToString();
 #elif UIKIT
             return MonoTouch.UIKit.UIDevice.CurrentDevice.Orientation.ToString();
@@ -19,4 +17,3 @@ public string GetOrientation()
         }
     }
 }
-