Merge pull request #791 from xamarin/dev/sandy/nfloat-moving

 Build: Use a 6.0.200 SDK and macos workload P13

30 files changed, 50 insertions, 24 deletions

diff --git a/Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitButton.cs b/Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitButton.cs
index 81e9957..89c9948 100644
--- a/Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitButton.cs
+++ b/Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitButton.cs
@@ -1,5 +1,6 @@
 using System;
 using Foundation;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.Tests.MockControls;
 
 namespace Xamarin.PropertyEditing.Mac.Standalone
@@ -8,7 +9,7 @@ namespace Xamarin.PropertyEditing.Mac.Standalone
 	public class MockedAppKitButton : MockedControlButton<MockNSButton>
 	{
 		// Called when created from unmanaged code
-		public MockedAppKitButton (IntPtr handle) : base (new MockNSButton (), handle)
+		public MockedAppKitButton (NativeHandle handle) : base (new MockNSButton (), handle)
 		{
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac.Standalone/MockedSampleControlButton.cs b/Xamarin.PropertyEditing.Mac.Standalone/MockedSampleControlButton.cs
index 8a441a7..fc1edd2 100644
--- a/Xamarin.PropertyEditing.Mac.Standalone/MockedSampleControlButton.cs
+++ b/Xamarin.PropertyEditing.Mac.Standalone/MockedSampleControlButton.cs
@@ -1,5 +1,6 @@
 using System;
 using Foundation;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.Tests.MockControls;
 
 namespace Xamarin.PropertyEditing.Mac.Standalone
@@ -8,7 +9,7 @@ namespace Xamarin.PropertyEditing.Mac.Standalone
 	public class MockedSampleControlButton : MockedControlButton<MockSampleControl>
 	{
 		// Called when created from unmanaged code
-		public MockedSampleControlButton (IntPtr handle) : base (new MockSampleControl (), handle)
+		public MockedSampleControlButton (NativeHandle handle) : base (new MockSampleControl (), handle)
 		{
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac.Standalone/ViewController.cs b/Xamarin.PropertyEditing.Mac.Standalone/ViewController.cs
index 535dffe..bf91b8f 100644
--- a/Xamarin.PropertyEditing.Mac.Standalone/ViewController.cs
+++ b/Xamarin.PropertyEditing.Mac.Standalone/ViewController.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using AppKit;
 using Foundation;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.Drawing;
 using Xamarin.PropertyEditing.Tests;
 
@@ -10,7 +11,7 @@ namespace Xamarin.PropertyEditing.Mac.Standalone
 {
 	public partial class ViewController : NSViewController
 	{
-		public ViewController (IntPtr handle) : base (handle)
+		public ViewController (NativeHandle handle) : base (handle)
 		{
 			
 		}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BaseSelectorOutlineView.cs b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BaseSelectorOutlineView.cs
index e18c197..b26b06f 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BaseSelectorOutlineView.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BaseSelectorOutlineView.cs
@@ -1,6 +1,7 @@
 using System;
 using AppKit;
 using Foundation;
+using ObjCRuntime;
 
 namespace Xamarin.PropertyEditing.Mac
 {
@@ -12,7 +13,7 @@ namespace Xamarin.PropertyEditing.Mac
 		}
 
 		// Called when created from unmanaged code
-		public BaseSelectorOutlineView (IntPtr handle) : base (handle)
+		public BaseSelectorOutlineView (NativeHandle handle) : base (handle)
 		{
 			Initialize ();
 		}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingEditorWindow.cs b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingEditorWindow.cs
index 3413bb9..734a0f8 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingEditorWindow.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/BindingEditorWindow.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using AppKit;
 using CoreGraphics;
 using Foundation;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.Common;
 using Xamarin.PropertyEditing.ViewModels;
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/HeaderView.cs b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/HeaderView.cs
index 833a76b..7e9a5c6 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/HeaderView.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BindingEditor/HeaderView.cs
@@ -2,6 +2,7 @@ using System;
 using AppKit;
 using CoreAnimation;
 using CoreGraphics;
+using ObjCRuntime;
 
 namespace Xamarin.PropertyEditing.Mac
 {
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
index cb8bc44..53b5513 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BrushEditorControl.cs
@@ -129,7 +129,7 @@ namespace Xamarin.PropertyEditing.Mac
 		{
 			base.AppearanceChanged ();
 
-			this.popover.SetAppearance (HostResources.GetVibrantAppearance (EffectiveAppearance));
+			this.popover.Appearance = HostResources.GetVibrantAppearance (EffectiveAppearance);
 			this.popover.ContentViewController.View.Appearance = EffectiveAppearance;
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs
index 51a0f8a..6bb5105 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/CollectionEditorControl.cs
@@ -299,12 +299,13 @@ namespace Xamarin.PropertyEditing.Mac
 			public override bool WriteRows (NSTableView tableView, NSIndexSet rowIndexes, NSPasteboard pboard)
 			{
 				var item = new NSPasteboardItem ();
-				item.SetDataForType (NSKeyedArchiver.ArchivedDataWithRootObject (rowIndexes), DataTypeName);
+				item.SetDataForType (NSKeyedArchiver.GetArchivedData (rowIndexes), DataTypeName);
 				pboard.WriteObjects (new[] { item });
 				return true;
 			}
 
-			public override NSDragOperation ValidateDrop (NSTableView tableView, NSDraggingInfo info, nint row, NSTableViewDropOperation dropOperation)
+			[Export ("tableView:validateDrop:proposedRow:proposedDropOperation:")]
+			public NSDragOperation ValidateDrop (NSTableView tableView, INSDraggingInfo info, nint row, NSTableViewDropOperation dropOperation)
 			{
 				if (info.DraggingPasteboard.GetDataForType (DataTypeName) != null)
 					return NSDragOperation.Move;
@@ -312,7 +313,8 @@ namespace Xamarin.PropertyEditing.Mac
 				return NSDragOperation.None;
 			}
 
-			public override bool AcceptDrop (NSTableView tableView, NSDraggingInfo info, nint row, NSTableViewDropOperation dropOperation)
+			[Export ("tableView:acceptDrop:row:dropOperation:")]
+			public bool AcceptDrop (NSTableView tableView, INSDraggingInfo info, nint row, NSTableViewDropOperation dropOperation)
 			{
 				NSData data = info.DraggingPasteboard.GetDataForType (DataTypeName);
 				NSIndexSet indexes = NSKeyedUnarchiver.UnarchiveObject (data) as NSIndexSet;
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/AutoClosePopOver.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/AutoClosePopOver.cs
index bb1fafd..f516c13 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/AutoClosePopOver.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/AutoClosePopOver.cs
@@ -21,7 +21,7 @@ namespace Xamarin.PropertyEditing.Mac
 			Delegate = new PopoverFocusRestoreDelegate ();
 			CloseOnEnter = true;
 
-			this.SetAppearance (this.hostResources.GetVibrantAppearance (effectiveAppearance));
+			Appearance = this.hostResources.GetVibrantAppearance (effectiveAppearance);
 		}
 
 		public override void KeyUp (NSEvent theEvent)
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverControl.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverControl.cs
index e4bea5e..b5c27b4 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/BasePopOverControl.cs
@@ -68,7 +68,7 @@ namespace Xamarin.PropertyEditing.Mac
 
 		protected void AppearanceChanged()
 		{
-			this.SetAppearance (HostResources.GetVibrantAppearance (EffectiveAppearance));
+			Appearance = HostResources.GetVibrantAppearance (EffectiveAppearance);
 			this.viewTitle.TextColor = HostResources.GetNamedColor (NamedResources.DescriptionLabelColor);
 		}
 	}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorComponentEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorComponentEditor.cs
index 47caf85..d958e58 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorComponentEditor.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorComponentEditor.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using AppKit;
 using CoreAnimation;
 using CoreGraphics;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.Drawing;
 using Xamarin.PropertyEditing.ViewModels;
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorEditorLayer.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorEditorLayer.cs
index 6657ba1..68f3cfc 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorEditorLayer.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorEditorLayer.cs
@@ -2,6 +2,7 @@ using System;
 using CoreAnimation;
 using CoreGraphics;
 using Foundation;
+using ObjCRuntime;
 
 namespace Xamarin.PropertyEditing.Mac
 {
@@ -16,7 +17,7 @@ namespace Xamarin.PropertyEditing.Mac
 			return null;
 		}
 
-		public ColorEditorLayer (IntPtr handle) : base (handle)
+		public ColorEditorLayer (NativeHandle handle) : base (handle)
 		{
 		}
 
@@ -31,7 +32,7 @@ namespace Xamarin.PropertyEditing.Mac
 		{
 		}
 
-		public UnanimatedGradientLayer (IntPtr handle) : base (handle)
+		public UnanimatedGradientLayer (NativeHandle handle) : base (handle)
 		{
 		}
 
@@ -47,7 +48,7 @@ namespace Xamarin.PropertyEditing.Mac
 		{
 		}
 
-		public UnanimatedLayer (IntPtr handle) : base (handle)
+		public UnanimatedLayer (NativeHandle handle) : base (handle)
 		{
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorEditorView.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorEditorView.cs
index 21f4753..bef2ff2 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorEditorView.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/ColorEditorView.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
 using AppKit;
 using CoreGraphics;
 using Foundation;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.ViewModels;
 
 namespace Xamarin.PropertyEditing.Mac
@@ -25,7 +26,7 @@ namespace Xamarin.PropertyEditing.Mac
 			Adaptor = new NotifyingViewAdaptor<TViewModel> (this);
 		}
 
-		public NotifyingView (IntPtr handle) : base (handle)
+		public NotifyingView (NativeHandle handle) : base (handle)
 		{
 		}
 
@@ -60,7 +61,7 @@ namespace Xamarin.PropertyEditing.Mac
 	{
 		protected const float Padding = 3;
 
-		public ColorEditorView (IntPtr handle) : base (handle)
+		public ColorEditorView (NativeHandle handle) : base (handle)
 		{
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/CommonGradientBrushLayer.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/CommonGradientBrushLayer.cs
index fe9200d..4eb0799 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/CommonGradientBrushLayer.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/CommonGradientBrushLayer.cs
@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using CoreAnimation;
 using CoreGraphics;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.Drawing;
 
 namespace Xamarin.PropertyEditing.Mac
@@ -12,7 +13,7 @@ namespace Xamarin.PropertyEditing.Mac
 		{
 		}
 
-		public CommonGradientBrushLayer (IntPtr handle) : base (handle)
+		public CommonGradientBrushLayer (NativeHandle handle) : base (handle)
 		{
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs
index 988c9cd..cf87d01 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs
@@ -2,6 +2,7 @@ using System;
 using AppKit;
 using CoreGraphics;
 using CoreImage;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.Drawing;
 
 namespace Xamarin.PropertyEditing.Mac
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/HistoryLayer.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/HistoryLayer.cs
index e56786b..9f90d61 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/HistoryLayer.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/HistoryLayer.cs
@@ -2,6 +2,7 @@ using System;
 using AppKit;
 using CoreAnimation;
 using CoreGraphics;
+using ObjCRuntime;
 
 namespace Xamarin.PropertyEditing.Mac
 {
@@ -22,7 +23,7 @@ namespace Xamarin.PropertyEditing.Mac
 			lastClip.AddSublayer (last);
 		}
 
-		public HistoryLayer (IntPtr handle) : base (handle)
+		public HistoryLayer (NativeHandle handle) : base (handle)
 		{
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/HueLayer.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/HueLayer.cs
index c67b138..1fba98a 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/HueLayer.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/HueLayer.cs
@@ -2,6 +2,7 @@ using System;
 using AppKit;
 using CoreAnimation;
 using CoreGraphics;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.Drawing;
 
 namespace Xamarin.PropertyEditing.Mac
@@ -23,7 +24,7 @@ namespace Xamarin.PropertyEditing.Mac
 			Initialize ();
 		}
 
-		public HueLayer (IntPtr handle) : base (handle)
+		public HueLayer (NativeHandle handle) : base (handle)
 		{
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/MaterialView.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/MaterialView.cs
index 45a93b3..7e15a44 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/MaterialView.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/MaterialView.cs
@@ -6,6 +6,7 @@ using AppKit;
 using CoreAnimation;
 using CoreGraphics;
 using Foundation;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.Drawing;
 using Xamarin.PropertyEditing.ViewModels;
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs
index 831dfff..de6f661 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/NumericSpinEditor.cs
@@ -3,6 +3,7 @@ using System;
 using AppKit;
 using CoreGraphics;
 using Foundation;
+using ObjCRuntime;
 
 namespace Xamarin.PropertyEditing.Mac
 {
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/ResourceOutlineView.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/ResourceOutlineView.cs
index 7437ae2..63df3d5 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/ResourceOutlineView.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/ResourceOutlineView.cs
@@ -2,6 +2,7 @@
 using AppKit;
 using CoreGraphics;
 using Foundation;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.ViewModels;
 
 namespace Xamarin.PropertyEditing.Mac
@@ -18,7 +19,7 @@ namespace Xamarin.PropertyEditing.Mac
 		}
 
 		// Called when created from unmanaged code
-		public ResourceOutlineView (IntPtr handle) : base (handle)
+		public ResourceOutlineView (NativeHandle handle) : base (handle)
 		{
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/ShadeLayer.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/ShadeLayer.cs
index 045116e..166f1f4 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/ShadeLayer.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/ShadeLayer.cs
@@ -2,6 +2,7 @@ using System;
 using AppKit;
 using CoreAnimation;
 using CoreGraphics;
+using ObjCRuntime;
 
 namespace Xamarin.PropertyEditing.Mac
 {
@@ -31,7 +32,7 @@ namespace Xamarin.PropertyEditing.Mac
 			});
 		}
 
-		public ShadeLayer (IntPtr handle) : base (handle)
+		public ShadeLayer (NativeHandle handle) : base (handle)
 		{
 		}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/SolidColorBrushEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/SolidColorBrushEditor.cs
index 40304bc..80ee61a 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/Custom/SolidColorBrushEditor.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/SolidColorBrushEditor.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using AppKit;
 using CoreAnimation;
 using CoreGraphics;
+using ObjCRuntime;
 
 using Xamarin.PropertyEditing.Drawing;
 using Xamarin.PropertyEditing.ViewModels;
diff --git a/Xamarin.PropertyEditing.Mac/Controls/PropertyContainer.cs b/Xamarin.PropertyEditing.Mac/Controls/PropertyContainer.cs
index 73a7f5b..8deacbb 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/PropertyContainer.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/PropertyContainer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading;
 using AppKit;
+using ObjCRuntime;
 
 namespace Xamarin.PropertyEditing.Mac
 {
diff --git a/Xamarin.PropertyEditing.Mac/Controls/RequestResource/ResourceTableDelegate.cs b/Xamarin.PropertyEditing.Mac/Controls/RequestResource/ResourceTableDelegate.cs
index c05abc9..ad8738c 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/RequestResource/ResourceTableDelegate.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/RequestResource/ResourceTableDelegate.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using AppKit;
 using Foundation;
+using ObjCRuntime;
 using Xamarin.PropertyEditing.Drawing;
 using Xamarin.PropertyEditing.ViewModels;
 
diff --git a/Xamarin.PropertyEditing.Mac/HostResourceProvider.cs b/Xamarin.PropertyEditing.Mac/HostResourceProvider.cs
index dd2b224..42720a8 100644
--- a/Xamarin.PropertyEditing.Mac/HostResourceProvider.cs
+++ b/Xamarin.PropertyEditing.Mac/HostResourceProvider.cs
@@ -2,6 +2,7 @@ using System;
 using System.IO;
 using AppKit;
 using Foundation;
+using ObjCRuntime;
 
 namespace Xamarin.PropertyEditing.Mac
 {
diff --git a/Xamarin.PropertyEditing.Mac/IHostResourceProvider.cs b/Xamarin.PropertyEditing.Mac/IHostResourceProvider.cs
index 3fb3619..8fd8188 100644
--- a/Xamarin.PropertyEditing.Mac/IHostResourceProvider.cs
+++ b/Xamarin.PropertyEditing.Mac/IHostResourceProvider.cs
@@ -1,5 +1,6 @@
 using System;
 using AppKit;
+using ObjCRuntime;
 
 namespace Xamarin.PropertyEditing.Mac
 {
diff --git a/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs b/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
index ad62967..fc2d975 100644
--- a/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
+++ b/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
@@ -6,6 +6,7 @@ using System.ComponentModel;
 using CoreGraphics;
 using Foundation;
 using AppKit;
+using ObjCRuntime;
 
 using Xamarin.PropertyEditing.ViewModels;
 
@@ -26,7 +27,7 @@ namespace Xamarin.PropertyEditing.Mac
 		}
 
 		// Called when created from unmanaged code
-		public PropertyEditorPanel (IntPtr handle) : base (handle)
+		public PropertyEditorPanel (NativeHandle handle) : base (handle)
 		{
 			this.hostResources = new HostResourceProvider ();
 			Initialize ();
diff --git a/Xamarin.PropertyEditing.Mac/PropertyTableDelegate.cs b/Xamarin.PropertyEditing.Mac/PropertyTableDelegate.cs
index 9410bc5..a38bd55 100644
--- a/Xamarin.PropertyEditing.Mac/PropertyTableDelegate.cs
+++ b/Xamarin.PropertyEditing.Mac/PropertyTableDelegate.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading;
 using AppKit;
 using Foundation;
+using ObjCRuntime;
 
 using Xamarin.PropertyEditing.ViewModels;
 
@@ -211,7 +212,7 @@ namespace Xamarin.PropertyEditing.Mac
 				this.registrations[cellIdentifier] = registration;
 			}
 
-			return registration.GetHeight (vm);
+			return (nfloat) registration.GetHeight (vm);
 		}
 
 		private class EditorRegistration
diff --git a/bot-provisioning/dependencies.csx b/bot-provisioning/dependencies.csx
index 3abd0b6..33f1054 100644
--- a/bot-provisioning/dependencies.csx
+++ b/bot-provisioning/dependencies.csx
@@ -6,7 +6,7 @@ if (IsMac) {
 	DotNetCoreSdk ("../global.json", installDirectory: Env("DOTNET_ROOT"))
 		.Workload(
 			"microsoft.net.sdk.macos",
-			"12.0.101-preview.10.249",
+			"12.1.301-preview.13.7",
 			"https://aka.ms/dotnet6/nuget/index.json",
 			"https://api.nuget.org/v3/index.json");
 
diff --git a/global.json b/global.json
index 2a9ec01..a2ce2ee 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "6.0.101"
+        "version": "6.0.200"
     }
 }