[MacDev] Moved to main addins

79 files changed, 202 insertions, 46 deletions

diff --git a/.gitignore b/.gitignore
index 7a85e566f7..45f3624d8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ autom4te.cache/
 /main/mdtool
 /main/monodevelop
 /main/monodevelop-core-addins.pc
+/main/monodevelop-core-mac-addins.pc
 /main/monodevelop.pc
 /main/monodevelop.spec
 /profiles/default
@@ -71,6 +72,7 @@ autom4te.cache/
 /main/src/addins/GnomePlatform/Makefile
 /main/src/addins/ILAsmBinding/Makefile
 /main/src/addins/MacPlatform/Makefile
+/main/src/addins/MonoDevelop.MacDev/Makefile
 /main/src/addins/Makefile
 /main/src/addins/MonoDevelop.AssemblyBrowser/Makefile
 /main/src/addins/MonoDevelop.Autotools/Makefile
@@ -165,4 +167,4 @@ autom4te.cache/
 
 #other extras generated stuff
 /extras/JavaBinding/monodevelop-java.pc
-/extras/PyBinding/PyBinding/*.pc
\ No newline at end of file
+/extras/PyBinding/PyBinding/*.pc
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/MonoDevelop.Debugger.Soft.IPhone.csproj b/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/MonoDevelop.Debugger.Soft.IPhone.csproj
index 3d8d945ea9..38db47c10f 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/MonoDevelop.Debugger.Soft.IPhone.csproj
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.Debugger.Soft.IPhone/MonoDevelop.Debugger.Soft.IPhone.csproj
@@ -75,6 +75,11 @@
       <HintPath>..\..\..\main\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="MonoDevelop.MacDev, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\main\build\AddIns\MonoDevelop.MacDev\MonoDevelop.MacDev.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone.sln b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone.sln
index b2700f9ca1..9caac0af06 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone.sln
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone.sln
@@ -5,18 +5,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.IPhone", "MonoD
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Soft.IPhone", "MonoDevelop.Debugger.Soft.IPhone\MonoDevelop.Debugger.Soft.IPhone.csproj", "{325F28AD-2C46-4873-AE54-40FCC74C2695}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.MacDev", "MonoDevelop.MacDev\MonoDevelop.MacDev.csproj", "{150AC48A-E4AE-4232-9959-28D240537906}"

-EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Any CPU = Debug|Any CPU

 		Release|Any CPU = Release|Any CPU

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{150AC48A-E4AE-4232-9959-28D240537906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{150AC48A-E4AE-4232-9959-28D240537906}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{150AC48A-E4AE-4232-9959-28D240537906}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{150AC48A-E4AE-4232-9959-28D240537906}.Release|Any CPU.Build.0 = Release|Any CPU

 		{325F28AD-2C46-4873-AE54-40FCC74C2695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{325F28AD-2C46-4873-AE54-40FCC74C2695}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{325F28AD-2C46-4873-AE54-40FCC74C2695}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj
index 963db37038..ee2d13bd43 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj
@@ -79,6 +79,11 @@
       <HintPath>..\..\..\main\build\AddIns\MonoDevelop.AspNet\MonoDevelop.AspNet.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="MonoDevelop.MacDev, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\main\build\AddIns\MonoDevelop.MacDev\MonoDevelop.MacDev.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -214,19 +219,9 @@
     <None Include="icons\iphone-project-options-panel-16.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="icons\application-x-mono-develop-xib-16.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="templates\IPhonePlist.xft.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="icons\README.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MonoDevelop.MacDev\MonoDevelop.MacDev.csproj">
-      <Project>{150AC48A-E4AE-4232-9959-28D240537906}</Project>
-      <Name>MonoDevelop.MacDev</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
 </Project>
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/gtk-gui/gui.stetic b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/gtk-gui/gui.stetic
index 6bffa12e28..cb156802db 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/gtk-gui/gui.stetic
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/gtk-gui/gui.stetic
@@ -8,7 +8,7 @@
     <widget-library name="../../../../main/build/bin/MonoDevelop.Ide.dll" />
     <widget-library name="../../../../main/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
     <widget-library name="../../../../main/build/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll" />
-    <widget-library name="../../build/MonoDevelop.MacDev.dll" />
+    <widget-library name="../../../../main/build/AddIns/MonoDevelop.MacDev.dll" />
     <widget-library name="../../build/MonoDevelop.IPhone.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.IPhone.Gui.IPhoneSdkSettingsWidget" design-size="488 241">
diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.Debugger.Soft.MonoMac/MonoDevelop.Debugger.Soft.MonoMac.csproj b/extras/MonoDevelop.MonoMac/MonoDevelop.Debugger.Soft.MonoMac/MonoDevelop.Debugger.Soft.MonoMac.csproj
index f645d5e690..a8e7b43611 100644
--- a/extras/MonoDevelop.MonoMac/MonoDevelop.Debugger.Soft.MonoMac/MonoDevelop.Debugger.Soft.MonoMac.csproj
+++ b/extras/MonoDevelop.MonoMac/MonoDevelop.Debugger.Soft.MonoMac/MonoDevelop.Debugger.Soft.MonoMac.csproj
@@ -65,6 +65,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\main\build\AddIns\MonoDevelop.Debugger.Soft\Mono.Debugger.Soft.dll</HintPath>
       <Private>False</Private>
+      <Package>monodevelop-core-addins</Package>
     </Reference>
     <Reference Include="MonoDevelop.AspNet, Version=2.2.0.0, Culture=neutral">
       <Package>monodevelop-core-addins</Package>
@@ -74,15 +75,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\main\build\AddIns\MonoDevelop.Debugger.Soft\Mono.Debugging.Soft.dll</HintPath>
       <Private>False</Private>
+      <Package>monodevelop-core-addins</Package>
     </Reference>
     <Reference Include="Mono.Debugging, Version=0.0.0.0, Culture=neutral, PublicKeyToken=5e9ce85b0923c84f">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\main\build\bin\Mono.Debugging.dll</HintPath>
       <Private>False</Private>
+      <Package>monodevelop</Package>
     </Reference>
     <Reference Include="MonoDevelop.MacDev, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\MonoDevelop.IPhone\build\MonoDevelop.MacDev.dll</HintPath>
+      <HintPath>..\..\..\main\build\AddIns\MonoDevelop.MacDev\MonoDevelop.MacDev.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="MacPlatform, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null">
diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.csproj b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.csproj
index 98ac21447b..d1f2911203 100644
--- a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.csproj
+++ b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.csproj
@@ -78,13 +78,13 @@
     </Reference>
     <Reference Include="MonoDevelop.MacDev, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\MonoDevelop.IPhone\build\MonoDevelop.MacDev.dll</HintPath>
+      <HintPath>..\..\..\main\build\AddIns\MonoDevelop.MacDev\MonoDevelop.MacDev.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="MacPlatform, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
       <HintPath>..\..\..\main\build\AddIns\MacPlatform.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/gtk-gui/gui.stetic b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/gtk-gui/gui.stetic
index a7394a3ee8..b011a084ac 100644
--- a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/gtk-gui/gui.stetic
+++ b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/gtk-gui/gui.stetic
@@ -7,7 +7,7 @@
   <import>
     <widget-library name="MonoDevelop.Ide, Version=2.6.0.0, Culture=neutral" />
     <widget-library name="MonoDevelop.DesignerSupport, Version=2.6.0.0, Culture=neutral" />
-    <widget-library name="../../../MonoDevelop.IPhone/build/MonoDevelop.MacDev.dll" />
+    <widget-library name="../../../../main/build/AddIns/MonoDevelop.MacDev.dll" />
     <widget-library name="../../../../main/build/AddIns/MacPlatform.dll" />
     <widget-library name="../../build/MonoDevelop.MonoMac.dll" internal="true" />
   </import>
diff --git a/main/Main.sln b/main/Main.sln
index 1bb697266f..c691191134 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -152,6 +152,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Tests"
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Tests.TestApp", "src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.Tests.TestApp\MonoDevelop.Debugger.Tests.TestApp.csproj", "{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}"

 EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.MacDev", "src\addins\MonoDevelop.MacDev\MonoDevelop.MacDev.csproj", "{150AC48A-E4AE-4232-9959-28D240537906}"

+EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "contrib\Mono.Cecil\Mono.Cecil.csproj", "{3EC06433-F168-4C5B-A885-99CE4AB617E1}"

@@ -260,6 +262,11 @@ Global
 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.DebugWin32|x86.Build.0 = Debug|Any CPU

 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}.Release|Any CPU.Build.0 = Release|Any CPU

+		{150AC48A-E4AE-4232-9959-28D240537906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{150AC48A-E4AE-4232-9959-28D240537906}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{150AC48A-E4AE-4232-9959-28D240537906}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{150AC48A-E4AE-4232-9959-28D240537906}.DebugWin32|x86.ActiveCfg = Debug|Any CPU

+		{150AC48A-E4AE-4232-9959-28D240537906}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

@@ -803,6 +810,7 @@ Global
 		{33248236-FF84-4336-A73B-65E6B1090D15} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

 		{8EE34CBC-5D7C-4BB3-8B19-26D5522770F6} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

 		{776872D9-76FA-407B-BA69-08E25A24E5CE} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

+		{150AC48A-E4AE-4232-9959-28D240537906} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

 		{19DE0F35-D204-4FD8-A553-A19ECE05E24D} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

 		{0413DB7D-8B35-423F-9752-D75C9225E7DE} = {DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}

diff --git a/main/configure.in b/main/configure.in
index 4ad00bbfbe..6ab824744f 100644
--- a/main/configure.in
+++ b/main/configure.in
@@ -337,6 +337,7 @@ src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile
 src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile
 src/addins/MonoDevelop.HexEditor/Makefile
 src/addins/MonoDevelop.DocFood/Makefile
+src/addins/MonoDevelop.MacDev/Makefile
 tests/Makefile
 tests/UnitTests/Makefile
 Makefile
@@ -344,6 +345,7 @@ monodevelop
 mdtool
 monodevelop.pc
 monodevelop-core-addins.pc
+monodevelop-core-mac-addins.pc
 monodevelop.spec
 po/Makefile
 man/Makefile
diff --git a/main/monodevelop-core-mac-addins.pc.in b/main/monodevelop-core-mac-addins.pc.in
new file mode 100644
index 0000000000..d9b2dc8398
--- /dev/null
+++ b/main/monodevelop-core-mac-addins.pc.in
@@ -0,0 +1,9 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib/monodevelop
+GacPackage=false
+
+Name: MonoDevelop Core Mac Add-ins
+Description: MonoDevelop Core Mac Add-ins
+Version: @VERSION@
+Libs: -r:${libdir}/AddIns/MacPlatform.dll -r:${libdir}/AddIns/MonoDevelop.MacDev.dll
diff --git a/main/src/addins/Makefile.am b/main/src/addins/Makefile.am
index beac7a86cd..c876b8095d 100644
--- a/main/src/addins/Makefile.am
+++ b/main/src/addins/Makefile.am
@@ -32,4 +32,5 @@ SUBDIRS = \
 	MonoDevelop.Debugger.Soft \

 	WindowsPlatform \

 	MonoDevelop.HexEditor \

-	MonoDevelop.DocFood

+	MonoDevelop.DocFood \

+	MonoDevelop.MacDev

diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/AssemblyInfo.cs b/main/src/addins/MonoDevelop.MacDev/AssemblyInfo.cs
index f93afb799e..f93afb799e 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/AssemblyInfo.cs
+++ b/main/src/addins/MonoDevelop.MacDev/AssemblyInfo.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ChangeLog b/main/src/addins/MonoDevelop.MacDev/ChangeLog
index 994ba29b75..994ba29b75 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ChangeLog
+++ b/main/src/addins/MonoDevelop.MacDev/ChangeLog
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/Keychain.cs b/main/src/addins/MonoDevelop.MacDev/Keychain.cs
index 6bb63b09cb..6bb63b09cb 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/Keychain.cs
+++ b/main/src/addins/MonoDevelop.MacDev/Keychain.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MacBuildUtilities.cs b/main/src/addins/MonoDevelop.MacDev/MacBuildUtilities.cs
index b4e196c16f..b4e196c16f 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MacBuildUtilities.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MacBuildUtilities.cs
diff --git a/main/src/addins/MonoDevelop.MacDev/Makefile.am b/main/src/addins/MonoDevelop.MacDev/Makefile.am
new file mode 100644
index 0000000000..9a50201a8d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.MacDev/Makefile.am
@@ -0,0 +1,117 @@
+
+ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.MacDev
+ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.MacDev.dll
+
+DEPS =  \
+	../../../build/AddIns/MacPlatform.dll \
+	../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
+	../../../build/bin/MonoDevelop.Core.dll \
+	../../../build/bin/MonoDevelop.Ide.dll
+
+REFS =  \
+	$(GLIB_SHARP_LIBS) \
+	$(GTK_SHARP_LIBS) \
+	$(MONO_ADDINS_LIBS) \
+	-r:../../../../extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll \
+	-r:Mono.Posix \
+	-r:System \
+	-r:System.Core \
+	-r:System.Xml \
+	-r:System.Xml.Linq
+
+FILES =  \
+	AssemblyInfo.cs \
+	Keychain.cs \
+	MacBuildUtilities.cs \
+	MonoDevelop.MacDev.InterfaceBuilder/Collections.cs \
+	MonoDevelop.MacDev.InterfaceBuilder/IBConnectionRecord.cs \
+	MonoDevelop.MacDev.InterfaceBuilder/IBDocument.cs \
+	MonoDevelop.MacDev.InterfaceBuilder/IBObject.cs \
+	MonoDevelop.MacDev.InterfaceBuilder/IBObjectRecord.cs \
+	MonoDevelop.MacDev.InterfaceBuilder/IBReference.cs \
+	MonoDevelop.MacDev.InterfaceBuilder/UnknownIBObject.cs \
+	MonoDevelop.MacDev.Plist/PlistArray.cs \
+	MonoDevelop.MacDev.Plist/PlistBoolean.cs \
+	MonoDevelop.MacDev.Plist/PlistData.cs \
+	MonoDevelop.MacDev.Plist/PlistDate.cs \
+	MonoDevelop.MacDev.Plist/PlistDictionary.cs \
+	MonoDevelop.MacDev.Plist/PlistDocument.cs \
+	MonoDevelop.MacDev.Plist/PlistInteger.cs \
+	MonoDevelop.MacDev.Plist/PlistObject.cs \
+	MonoDevelop.MacDev.Plist/PlistObjectBase.cs \
+	MonoDevelop.MacDev.Plist/PlistReal.cs \
+	MonoDevelop.MacDev.Plist/PlistString.cs \
+	NativeReferences/NativeReference.cs \
+	NativeReferences/NativeReferenceCommandHandler.cs \
+	NativeReferences/NativeReferenceFolderNodeBuilder.cs \
+	NativeReferences/NativeReferenceNodeBuilder.cs \
+	NativeReferences/NativeReferencePropertyProvider.cs \
+	NativeReferences/ProjectNodeBuilder.cs \
+	ObjCIntegration/IBAction.cs \
+	ObjCIntegration/IBActionParameter.cs \
+	ObjCIntegration/IBOutlet.cs \
+	ObjCIntegration/NSObjectInfo.cs \
+	ObjCIntegration/NSObjectInfoService.cs \
+	ObjCIntegration/NSObjectProjectInfo.cs \
+	SigningIdentityCombo.cs \
+	XcodeIntegration/PBXBuildFile.cs \
+	XcodeIntegration/PBXFileReference.cs \
+	XcodeIntegration/PBXFrameworksBuildPhase.cs \
+	XcodeIntegration/PBXGroup.cs \
+	XcodeIntegration/PBXNativeTarget.cs \
+	XcodeIntegration/PBXProject.cs \
+	XcodeIntegration/PBXResourcesBuildPhase.cs \
+	XcodeIntegration/PBXSourcesBuildPhase.cs \
+	XcodeIntegration/PBXVariantGroup.cs \
+	XcodeIntegration/XCBuildConfiguration.cs \
+	XcodeIntegration/XCConfigurationList.cs \
+	XcodeIntegration/XcodeObject.cs \
+	XcodeIntegration/XcodeProject.cs \
+	XcodeIntegration/XcodeProjectTracker.cs \
+	XcodeIntegration/XcodeType.cs \
+	XcodeInterfaceBuilderDisplayBinding.cs \
+	XibCodeBehind.cs 
+
+RES = MonoDevelop.MacDev.addin.xml
+
+ICON_FILES =  \
+	icons/application-x-mono-develop-xib-48.png \
+	icons/application-x-mono-develop-xib-32.png \
+	icons/application-x-mono-develop-xib-24.png \
+	icons/application-x-mono-develop-xib-22.png \
+	icons/application-x-mono-develop-xib-16.png \
+	icons/xib-template-application.png \
+	icons/xib-template-empty.png \
+	icons/xib-template-view.png \
+	icons/xib-template-window.png
+
+ICON_BUILD = $(addprefix $(ADDIN_BUILD)/icons/, $(notdir $(ICON_FILES)))
+
+$(ICON_BUILD): $(srcdir)$(subst $(ADDIN_BUILD),, $@)
+	mkdir -p $(ADDIN_BUILD)/icons
+	cp $(srcdir)/$(subst $(ADDIN_BUILD),,$@) $@
+
+if ENABLE_MACPLATFORM
+all: $(ASSEMBLY) $(ASSEMBLY).mdb $(ICON_BUILD)
+else
+all:
+endif
+
+$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS)
+	mkdir -p $(ADDIN_BUILD)
+	$(CSC) $(CSC_FLAGS) -unsafe $(REFS) $(build_deps) $(build_resources:%=/resource:%) $(build_sources) -out:$@ -target:library
+
+$(ASSEMBLY).mdb: $(ASSEMBLY)
+
+if ENABLE_MACPLATFORM
+assemblydir = $(MD_ADDIN_DIR)/MonoDevelop.MacDev
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
+iconlibdir = $(assemblydir)/icons
+iconlib_DATA = $(ICON_BUILD)
+endif
+
+
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(ICON_BUILD)
+EXTRA_DIST = $(FILES) $(RES) $(ICON_FILES)
+
+include $(top_srcdir)/Makefile.include
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/Collections.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/Collections.cs
index 58ad998116..58ad998116 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/Collections.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/Collections.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBConnectionRecord.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBConnectionRecord.cs
index efd220f9d9..efd220f9d9 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBConnectionRecord.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBConnectionRecord.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBDocument.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBDocument.cs
index 7ac80aaf6a..7ac80aaf6a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBDocument.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBDocument.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBObject.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBObject.cs
index 9cde67305d..9cde67305d 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBObject.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBObject.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBObjectRecord.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBObjectRecord.cs
index 26226db61a..26226db61a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBObjectRecord.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBObjectRecord.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBReference.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBReference.cs
index 5d43fec62e..5d43fec62e 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBReference.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/IBReference.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/UnknownIBObject.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/UnknownIBObject.cs
index 2aff364bc1..2aff364bc1 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/UnknownIBObject.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.InterfaceBuilder/UnknownIBObject.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistArray.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistArray.cs
index 4b83a53f8a..4b83a53f8a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistArray.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistArray.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistBoolean.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistBoolean.cs
index b796bfdc6f..b796bfdc6f 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistBoolean.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistBoolean.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistData.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistData.cs
index 2e7f0ed054..2e7f0ed054 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistData.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistData.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDate.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDate.cs
index a43c9b152d..a43c9b152d 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDate.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDate.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDictionary.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDictionary.cs
index 1a17ff5af0..1a17ff5af0 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDictionary.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDictionary.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDocument.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDocument.cs
index a8904a6461..a8904a6461 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDocument.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistDocument.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistInteger.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistInteger.cs
index 24fe8bfa65..24fe8bfa65 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistInteger.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistInteger.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistObject.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistObject.cs
index 1718c7baf1..1718c7baf1 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistObject.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistObject.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistObjectBase.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistObjectBase.cs
index 5bdb33748a..5bdb33748a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistObjectBase.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistObjectBase.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistReal.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistReal.cs
index d24ff4db23..d24ff4db23 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistReal.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistReal.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistString.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistString.cs
index 69c50ab12a..69c50ab12a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistString.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.Plist/PlistString.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml
index 7828bbd91e..7828bbd91e 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
index 2981546c6a..146576e866 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
@@ -15,7 +15,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\build</OutputPath>
+    <OutputPath>..\..\..\build\AddIns\MonoDevelop.MacDev</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\build</OutputPath>
+    <OutputPath>..\..\..\build\AddIns\MonoDevelop.MacDev</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -47,30 +47,10 @@
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="MonoDevelop.Core, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\main\build\bin\MonoDevelop.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MonoDevelop.Ide, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\main\build\bin\MonoDevelop.Ide.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MonoDevelop.DesignerSupport, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\main\build\AddIns\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Mono.Posix" />
     <Reference Include="MonoMac, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\main\build\AddIns\MonoMac.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MacPlatform, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\main\build\AddIns\MacPlatform.dll</HintPath>
+      <HintPath>..\..\..\..\extras\MonoDevelop.MonoMac\MonoDevelop.MonoMac\MonoMac.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -155,6 +135,9 @@
     <None Include="icons\application-x-mono-develop-xib-22.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="icons\application-x-mono-develop-xib-16.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="icons\xib-template-application.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -169,4 +152,41 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\MacPlatform\MacPlatform.csproj">
+      <Project>{50D6768C-C072-4E79-AFC5-C1C40767EF45}</Project>
+      <Name>MacPlatform</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
+      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
+      <Name>MonoDevelop.Ide</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
+      <Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
+      <Name>MonoDevelop.DesignerSupport</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
+      <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
+      <Name>MonoDevelop.Core</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties>
+        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+          <BuildFilesVar Sync="true" Name="FILES" />
+          <DeployFilesVar />
+          <ResourcesVar Sync="true" Name="RES" />
+          <OthersVar />
+          <GacRefVar Sync="true" Name="REFS" Prefix="-r:" />
+          <AsmRefVar Sync="true" Name="REFS" Prefix="-r:" />
+          <ProjectRefVar Sync="true" Name="DEPS" />
+        </MonoDevelop.Autotools.MakefileInfo>
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
 </Project>
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/NativeReference.cs b/main/src/addins/MonoDevelop.MacDev/NativeReferences/NativeReference.cs
index 73fc30b13d..73fc30b13d 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/NativeReference.cs
+++ b/main/src/addins/MonoDevelop.MacDev/NativeReferences/NativeReference.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/NativeReferenceCommandHandler.cs b/main/src/addins/MonoDevelop.MacDev/NativeReferences/NativeReferenceCommandHandler.cs
index a7b31aecf9..a7b31aecf9 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/NativeReferenceCommandHandler.cs
+++ b/main/src/addins/MonoDevelop.MacDev/NativeReferences/NativeReferenceCommandHandler.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/NativeReferenceFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.MacDev/NativeReferences/NativeReferenceFolderNodeBuilder.cs
index 89d579e4a4..89d579e4a4 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/NativeReferenceFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.MacDev/NativeReferences/NativeReferenceFolderNodeBuilder.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/NativeReferenceNodeBuilder.cs b/main/src/addins/MonoDevelop.MacDev/NativeReferences/NativeReferenceNodeBuilder.cs
index 47f6d46bf2..47f6d46bf2 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/NativeReferenceNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.MacDev/NativeReferences/NativeReferenceNodeBuilder.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/NativeReferencePropertyProvider.cs b/main/src/addins/MonoDevelop.MacDev/NativeReferences/NativeReferencePropertyProvider.cs
index 155999ae00..155999ae00 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/NativeReferencePropertyProvider.cs
+++ b/main/src/addins/MonoDevelop.MacDev/NativeReferences/NativeReferencePropertyProvider.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/ProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.MacDev/NativeReferences/ProjectNodeBuilder.cs
index 10cbb26bc2..10cbb26bc2 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/NativeReferences/ProjectNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.MacDev/NativeReferences/ProjectNodeBuilder.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/IBAction.cs b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/IBAction.cs
index e4c9c11c2f..e4c9c11c2f 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/IBAction.cs
+++ b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/IBAction.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/IBActionParameter.cs b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/IBActionParameter.cs
index 4cd65c074e..4cd65c074e 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/IBActionParameter.cs
+++ b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/IBActionParameter.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/IBOutlet.cs b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/IBOutlet.cs
index 0a53a070ee..0a53a070ee 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/IBOutlet.cs
+++ b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/IBOutlet.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfo.cs b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfo.cs
index 9d57cc7cb5..9d57cc7cb5 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfo.cs
+++ b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfo.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
index aaa3287354..aaa3287354 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
+++ b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
index 0c8bfd18e8..0c8bfd18e8 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
+++ b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/SigningIdentityCombo.cs b/main/src/addins/MonoDevelop.MacDev/SigningIdentityCombo.cs
index 24cfce7e9f..24cfce7e9f 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/SigningIdentityCombo.cs
+++ b/main/src/addins/MonoDevelop.MacDev/SigningIdentityCombo.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXBuildFile.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXBuildFile.cs
index ed619e4296..ed619e4296 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXBuildFile.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXBuildFile.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXFileReference.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXFileReference.cs
index 68be1c737c..68be1c737c 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXFileReference.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXFileReference.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXFrameworksBuildPhase.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXFrameworksBuildPhase.cs
index 63601ddc74..63601ddc74 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXFrameworksBuildPhase.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXFrameworksBuildPhase.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXGroup.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXGroup.cs
index ec1552c03f..ec1552c03f 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXGroup.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXGroup.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXNativeTarget.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXNativeTarget.cs
index 4c3d41001a..4c3d41001a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXNativeTarget.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXNativeTarget.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXProject.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXProject.cs
index 9922485289..9922485289 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXProject.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXProject.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXResourcesBuildPhase.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXResourcesBuildPhase.cs
index 78f7297b9f..78f7297b9f 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXResourcesBuildPhase.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXResourcesBuildPhase.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXSourcesBuildPhase.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXSourcesBuildPhase.cs
index 8b21be9f46..8b21be9f46 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXSourcesBuildPhase.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXSourcesBuildPhase.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXVariantGroup.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXVariantGroup.cs
index 9a1aeadbd2..9a1aeadbd2 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/PBXVariantGroup.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/PBXVariantGroup.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XCBuildConfiguration.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XCBuildConfiguration.cs
index f285bb7f65..f285bb7f65 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XCBuildConfiguration.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XCBuildConfiguration.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XCConfigurationList.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XCConfigurationList.cs
index 5aea26145a..5aea26145a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XCConfigurationList.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XCConfigurationList.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XcodeObject.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XcodeObject.cs
index 5938b0f93a..5938b0f93a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XcodeObject.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XcodeObject.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XcodeProject.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XcodeProject.cs
index cef1c4c99b..cef1c4c99b 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XcodeProject.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XcodeProject.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XcodeProjectTracker.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XcodeProjectTracker.cs
index bd270558c4..bd270558c4 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XcodeProjectTracker.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XcodeProjectTracker.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XcodeType.cs b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XcodeType.cs
index 987d459c6c..987d459c6c 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeIntegration/XcodeType.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeIntegration/XcodeType.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeInterfaceBuilderDisplayBinding.cs b/main/src/addins/MonoDevelop.MacDev/XcodeInterfaceBuilderDisplayBinding.cs
index b3ddb28d33..b3ddb28d33 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XcodeInterfaceBuilderDisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeInterfaceBuilderDisplayBinding.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XibCodeBehind.cs b/main/src/addins/MonoDevelop.MacDev/XibCodeBehind.cs
index d7732db462..d7732db462 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/XibCodeBehind.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XibCodeBehind.cs
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/icons/application-x-mono-develop-xib-16.png b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-16.png
index 882043c5fe..882043c5fe 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/icons/application-x-mono-develop-xib-16.png
+++ b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-16.png
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-22.png b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-22.png
index e52df865cf..e52df865cf 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-22.png
+++ b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-22.png
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-24.png b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-24.png
index 81f85dc525..81f85dc525 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-24.png
+++ b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-24.png
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-256.png b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-256.png
index 6229529ccf..6229529ccf 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-256.png
+++ b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-256.png
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-32.png b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-32.png
index 56d4281faf..56d4281faf 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-32.png
+++ b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-32.png
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-48.png b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-48.png
index 284d20d069..284d20d069 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-48.png
+++ b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib-48.png
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib.svg b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib.svg
index 462f772f4c..462f772f4c 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/application-x-mono-develop-xib.svg
+++ b/main/src/addins/MonoDevelop.MacDev/icons/application-x-mono-develop-xib.svg
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/mono-develop.svg b/main/src/addins/MonoDevelop.MacDev/icons/mono-develop.svg
index be2b8003b1..be2b8003b1 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/mono-develop.svg
+++ b/main/src/addins/MonoDevelop.MacDev/icons/mono-develop.svg
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/xib-template-application.png b/main/src/addins/MonoDevelop.MacDev/icons/xib-template-application.png
index f403389d0f..f403389d0f 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/xib-template-application.png
+++ b/main/src/addins/MonoDevelop.MacDev/icons/xib-template-application.png
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/xib-template-empty.png b/main/src/addins/MonoDevelop.MacDev/icons/xib-template-empty.png
index d362cecca9..d362cecca9 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/xib-template-empty.png
+++ b/main/src/addins/MonoDevelop.MacDev/icons/xib-template-empty.png
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/xib-template-view.png b/main/src/addins/MonoDevelop.MacDev/icons/xib-template-view.png
index 08ab571fdf..08ab571fdf 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/xib-template-view.png
+++ b/main/src/addins/MonoDevelop.MacDev/icons/xib-template-view.png
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/xib-template-window.png b/main/src/addins/MonoDevelop.MacDev/icons/xib-template-window.png
index 8f0e89cb3a..8f0e89cb3a 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.MacDev/icons/xib-template-window.png
+++ b/main/src/addins/MonoDevelop.MacDev/icons/xib-template-window.png