Merge pull request #10 from HinTak/master

Update to build for xamarin.mac unified api

BasicMenu/BasicMenu.csproj

@@ -57,8 +57,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <InterfaceDefinition Include="MainWindow.xib" xmlns="" />
-    <InterfaceDefinition Include="MainMenu.xib" xmlns="" />
+    <InterfaceDefinition Include="MainWindow.xib" />
+    <InterfaceDefinition Include="MainMenu.xib" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />

ListboxSample/ListboxSample.csproj

@@ -50,7 +50,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <InterfaceDefinition Include="MainMenu.xib" xmlns="" />
+    <InterfaceDefinition Include="MainMenu.xib" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />

MonoMac.Windows.Forms/CocoaHelpers/ComboBoxHelper.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 using System.Drawing;
 namespace System.Windows.Forms
 {

MonoMac.Windows.Forms/CocoaHelpers/ContextMenuHelper.cs

@@ -12,8 +12,8 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
+using AppKit;
+using ObjCRuntime;
 namespace System.Windows.Forms
 {
 	internal class ContextMenuHelper : NSMenu

MonoMac.Windows.Forms/CocoaHelpers/FileDialogHelper.cs

@@ -13,7 +13,7 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 using System;
-using MonoMac.AppKit;
+using AppKit;
 using System.Threading;
 namespace System.Windows.Forms
 {
@@ -27,7 +27,7 @@ public FileDialogHelper (CommonDialog host)
 			this.CanChooseFiles = true;
 			this.CanChooseDirectories = false;
 		}
-		public override void Cancel (MonoMac.Foundation.NSObject sender)
+		public override void Cancel (Foundation.NSObject sender)
 		{
 			if(CancelEvent != null)
 				CancelEvent(this,null);

MonoMac.Windows.Forms/CocoaHelpers/FlippedView.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 
 namespace System.Windows.Forms
 {

MonoMac.Windows.Forms/CocoaHelpers/FolderDialogHelper.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	internal class FolderDialogHelper : FileDialogHelper

MonoMac.Windows.Forms/CocoaHelpers/GroupBoxHelper.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 using System.Drawing;
 namespace System.Windows.Forms
 {

MonoMac.Windows.Forms/CocoaHelpers/MenuItemHelper.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	public class MenuItemHelper : NSMenuItem

MonoMac.Windows.Forms/CocoaHelpers/TabViewHelper.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	internal class TabViewHelper : NSTabView , IViewHelper

MonoMac.Windows.Forms/CocoaHelpers/TabViewItemHelper.cs

@@ -13,7 +13,7 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
 using System.Windows.Forms;
-using MonoMac.AppKit;
+using AppKit;
 using System.Drawing;
 
 namespace System.Windows.Forms

MonoMac.Windows.Forms/CocoaHelpers/TableViewHelper.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 using System.Drawing;
 namespace System.Windows.Forms
 {

MonoMac.Windows.Forms/CocoaHelpers/TextBoxHelper.cs

@@ -12,8 +12,8 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
-using MonoMac.Foundation;
+using AppKit;
+using Foundation;
 using System.Drawing;
 namespace System.Windows.Forms
 {

MonoMac.Windows.Forms/CocoaHelpers/ToolBarHelper.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 using System.Linq;
 using System.Collections.Generic;
 using System.Collections;

MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinner.cs

@@ -13,7 +13,7 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
 using System.Drawing;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	internal sealed class UpDownSpinner : Control

MonoMac.Windows.Forms/CocoaHelpers/UpDownSpinnerHelper.cs

@@ -12,23 +12,23 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	internal class UpDownSpinnerHelper: NSStepper, IViewHelper
 	{
 		public UpDownSpinnerHelper ()
 		{
 		}
-		public override void DidChange (MonoMac.Foundation.NSKeyValueChange changeKind, MonoMac.Foundation.NSIndexSet indexes, MonoMac.Foundation.NSString forKey)
+		public override void DidChange (Foundation.NSKeyValueChange changeKind, Foundation.NSIndexSet indexes, Foundation.NSString forKey)
 		{
 			base.DidChange (changeKind, indexes, forKey);
 		}
 		public override void DidChangeValue (string forKey)
 		{
 			base.DidChangeValue (forKey);
 		}
-		public override void DidChange (MonoMac.Foundation.NSString forKey, MonoMac.Foundation.NSKeyValueSetMutationKind mutationKind, MonoMac.Foundation.NSSet objects)
+		public override void DidChange (Foundation.NSString forKey, Foundation.NSKeyValueSetMutationKind mutationKind, Foundation.NSSet objects)
 		{
 			base.DidChange (forKey, mutationKind, objects);
 		}

MonoMac.Windows.Forms/CocoaHelpers/ViewHelper.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 using System.Drawing;
 namespace System.Windows.Forms
 {

MonoMac.Windows.Forms/EventArgs/KeyEventArgs.cs

@@ -1,4 +1,4 @@
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
     using System;

MonoMac.Windows.Forms/Extenders/ColorExtenders.cs

@@ -13,7 +13,7 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
 using System.Drawing;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	public static class ColorExtenders

MonoMac.Windows.Forms/Extenders/FontExtender.cs

@@ -13,7 +13,7 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
 using System.Drawing;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	public static class FontExtender

MonoMac.Windows.Forms/Extenders/ImageExtenders.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 using System.Drawing;
 using System.Drawing.Imaging;
 

MonoMac.Windows.Forms/Extenders/MiscExtenders.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	public static class MiscExtenders

MonoMac.Windows.Forms/Extenders/NSIndexSetExtender.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.Foundation;
+using Foundation;
 using System.Collections.Generic;
 namespace System.Windows.Forms
 {

MonoMac.Windows.Forms/Extenders/NSViewExtender.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.AppKit;
+using AppKit;
 using System.Linq;
 namespace System.Windows.Forms
 {

MonoMac.Windows.Forms/Interfaces/IViewHelper.cs

@@ -1,5 +1,5 @@
 using System;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	public interface IViewHelper 

MonoMac.Windows.Forms/System.Windows.Forms.csproj

@@ -49,9 +49,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
-    <Reference Include="MonoMac, Version=0.0.0.0, Culture=neutral">
-      <Private>False</Private>
-      <Package>monodevelop-core-mac-addins</Package>
+    <Reference Include="Xamarin.Mac">
+      <HintPath>..\References\Xamarin.Mac.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -462,4 +461,4 @@
     <None Include="test-results\MonoMac.Windows.Forms.csproj.test-cache" />
     <None Include="System.Windows.Forms\ScrollableControl_Old.cs" />
   </ItemGroup>
-</Project>
+</Project>

MonoMac.Windows.Forms/System.Windows.Forms/Application.cs

@@ -1,11 +1,11 @@
 using System;
-using MonoMac.AppKit;
-using MonoMac.Foundation;
+using AppKit;
+using Foundation;
 using System.IO;
 
 namespace System.Windows.Forms
 {
-	[MonoMac.Foundation.Register("Form")]
+	[Foundation.Register("Form")]
 	public partial class Application : NSApplication
 	{
 		static ApplicationContext context;

MonoMac.Windows.Forms/System.Windows.Forms/ApplicationContext.cs

@@ -1,10 +1,10 @@
 using System;
-using MonoMac.AppKit;
+using AppKit;
 using System.Drawing;
 namespace System.Windows.Forms
 {
 
-	[MonoMac.Foundation.Register("AppDelegate")]
+	[Foundation.Register("AppDelegate")]
 	public class ApplicationContext : NSApplicationDelegate
 	{
 		Form main_form;
@@ -18,7 +18,7 @@ public ApplicationContext (Func<Form> mainForm) : base()
 			mainFormFunc = mainForm;
 		}
 
-		public override void FinishedLaunching (MonoMac.Foundation.NSObject notification)
+		public override void FinishedLaunching (Foundation.NSObject notification)
 		{
 			if (mainFormFunc != null)
 				main_form = mainFormFunc ();
@@ -59,7 +59,7 @@ protected virtual void Dispose (bool disposing)
 		{
 			MainForm = null;
 		}
-		public override void WillTerminate (MonoMac.Foundation.NSNotification notification)
+		public override void WillTerminate (Foundation.NSNotification notification)
 		{
 			OnMainFormClosed (notification.Object, new EventArgs ());
 			//base.WillTerminate (notification);

MonoMac.Windows.Forms/System.Windows.Forms/Button.cocoa.cs

@@ -1,7 +1,7 @@
 using System;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoMac.Foundation;
+using AppKit;
+using ObjCRuntime;
+using Foundation;
 using System.Drawing;
 using System.Collections.Generic;
 namespace System.Windows.Forms

MonoMac.Windows.Forms/System.Windows.Forms/ButtonBase.cocoa.cs

@@ -3,7 +3,7 @@
 using System.Drawing;
 using System.Drawing.Text;
 using System.Runtime.InteropServices;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	public abstract partial class ButtonBase

MonoMac.Windows.Forms/System.Windows.Forms/CheckBox.cocoa.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Drawing;
 using System.Runtime.InteropServices;
-using MonoMac.AppKit;
+using AppKit;
 namespace System.Windows.Forms
 {
 	public partial class CheckBox 

MonoMac.Windows.Forms/System.Windows.Forms/CheckedListBox.cocoa.cs

@@ -12,7 +12,7 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.using System;
-using MonoMac.Foundation;
+using Foundation;
 namespace System.Windows.Forms
 {
 	//TODO: Create

MonoMac.Windows.Forms/System.Windows.Forms/ComboBox.cocoa.cs

@@ -20,8 +20,8 @@
 using System.Globalization;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using MonoMac.AppKit;
-using MonoMac.Foundation;
+using AppKit;
+using Foundation;
 using System.Linq;
 using System.Collections.Generic;
 namespace System.Windows.Forms

MonoMac.Windows.Forms/System.Windows.Forms/ContainerControl.cocoa.cs

@@ -12,8 +12,8 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
-using MonoMac.AppKit;
-using MonoMac.Foundation;
+using AppKit;
+using Foundation;
 using System.Collections;
 using System.ComponentModel;
 using System.ComponentModel.Design;