Merged MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui

  and MD.Components into MD.Ide.

svn path=/trunk/monodevelop/; revision=153749

12 files changed, 24 insertions, 88 deletions

diff --git a/main/src/addins/VBNetBinding/ChangeLog b/main/src/addins/VBNetBinding/ChangeLog
index 43852b6f87..c7b3b5897c 100644
--- a/main/src/addins/VBNetBinding/ChangeLog
+++ b/main/src/addins/VBNetBinding/ChangeLog
@@ -1,3 +1,19 @@
+2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* Makefile.am:
+	* gtk-gui/gui.stetic:
+	* VBNetBinding.csproj:
+	* VBNetBinding.addin.xml:
+	* Gui/ImportsOptionsPanel.cs:
+	* Gui/ProjectOptionsPanel.cs:
+	* VBBindingCompilerServices.cs:
+	* Gui/ImportsOptionsPanelWidget.cs:
+	* Gui/ConfigurationOptionsPanel.cs:
+	* Gui/ProjectOptionsPanelWidget.cs:
+	* Gui/ConfigurationOptionsPanelWidget.cs: Merged MD.Projects
+	  into MD.Core, and MD.Projects.Gui, MD.Core.Gui and
+	  MD.Components into MD.Ide.
+
 2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* Project/VBNetResourceIdBuilder.cs: Track ProjectFile Link
diff --git a/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanel.cs b/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanel.cs
index e213941876..71148c8a1b 100644
--- a/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanel.cs
+++ b/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanel.cs
@@ -29,10 +29,7 @@
 using System;
 
 using MonoDevelop.Projects;
-using MonoDevelop.Projects.Gui.Dialogs;
-using MonoDevelop.Core;
-using Mono.Addins;
-using MonoDevelop.Components;
+using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.VBNetBinding
 {	
diff --git a/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanelWidget.cs b/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanelWidget.cs
index ea5a8c172f..f33ef1642b 100644
--- a/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanelWidget.cs
+++ b/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanelWidget.cs
@@ -26,17 +26,8 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
  */
 
-using System;
 using MonoDevelop.Projects;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Parser;
-using MonoDevelop.Projects.Text;
-using MonoDevelop.Core.Gui.Dialogs;
-using MonoDevelop.Core.Gui;
-using MonoDevelop.Core;
-using Mono.Addins;
-using MonoDevelop.Components;
-
+ 
 namespace MonoDevelop.VBNetBinding
 {
 	[System.ComponentModel.ToolboxItem(true)]
diff --git a/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanel.cs b/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanel.cs
index fc0a306e19..76fb8745fa 100644
--- a/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanel.cs
+++ b/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanel.cs
@@ -24,15 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using System;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Gui;
-using MonoDevelop.Projects.Gui.Dialogs;
-using MonoDevelop.Core.Gui.Dialogs;
-using MonoDevelop.Core;
-using Mono.Addins;
-using MonoDevelop.Components;
+using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.VBNetBinding
 {
diff --git a/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanelWidget.cs b/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanelWidget.cs
index 1fbb889dce..d71c87fa2d 100644
--- a/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanelWidget.cs
+++ b/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanelWidget.cs
@@ -26,18 +26,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
-
-using Mono.Addins;
 using MonoDevelop.Projects;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Parser;
-using MonoDevelop.Projects.Text;
-using MonoDevelop.Core.Gui.Dialogs;
-using MonoDevelop.Core.Gui;
-using MonoDevelop.Core;
-using MonoDevelop.Components;
-
 
 namespace MonoDevelop.VBNetBinding
 {
diff --git a/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanel.cs b/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanel.cs
index 5ba1a72ac0..a456dc913b 100644
--- a/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanel.cs
+++ b/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanel.cs
@@ -26,15 +26,8 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
  */
 
-using System;
 
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Gui;
-using MonoDevelop.Projects.Gui.Dialogs;
-using MonoDevelop.Core.Gui.Dialogs;
-using MonoDevelop.Core;
-using Mono.Addins;
-using MonoDevelop.Components;
+using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.VBNetBinding
 {
diff --git a/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs b/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs
index d0edd4f418..211b6a8f7a 100644
--- a/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs
+++ b/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs
@@ -27,18 +27,11 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 
-using Mono.Addins;
 using MonoDevelop.Projects;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Parser;
 using MonoDevelop.Projects.Text;
-using MonoDevelop.Core.Gui.Dialogs;
-using MonoDevelop.Core.Gui;
+ 
 using MonoDevelop.Core;
-using MonoDevelop.Components;
 
 namespace MonoDevelop.VBNetBinding
 {
diff --git a/main/src/addins/VBNetBinding/Makefile.am b/main/src/addins/VBNetBinding/Makefile.am
index ffc83eee95..ae53592b04 100644
--- a/main/src/addins/VBNetBinding/Makefile.am
+++ b/main/src/addins/VBNetBinding/Makefile.am
@@ -3,12 +3,8 @@ ADDIN_BUILD = $(top_builddir)/build/AddIns/BackendBindings
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.VBNetBinding.dll
 
 DEPS =  \
-	$(top_builddir)/build/bin/MonoDevelop.Components.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Projects.Gui.dll 
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll 
 	
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
diff --git a/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs b/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
index 5ee3d089d9..fc28c28649 100644
--- a/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
+++ b/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
@@ -32,18 +32,13 @@
 using System;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Diagnostics;
 using System.CodeDom.Compiler;
-using System.Threading;
 
 using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
-using MonoDevelop.Core.Gui;
-using MonoDevelop.Core.Gui.Components;
-using MonoDevelop.Core.Serialization;
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Text;
 
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
index b362be5a64..5ea92e06fc 100644
--- a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
+++ b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
@@ -9,10 +9,7 @@
        version     = "2.2">
 
 	<Dependencies>
-	    <Addin id="Core" version="2.2"/>
-	    <Addin id="Core.Gui" version="2.2"/>
-	    <Addin id="Projects" version="2.2"/>
-		<Addin id="Projects.Gui" version="2.2"/>
+		<Addin id="Core" version="2.2"/>
 		<Addin id="Ide" version="2.2"/>
 	</Dependencies>
 	
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.csproj b/main/src/addins/VBNetBinding/VBNetBinding.csproj
index 63b47f4d5a..37b45e4785 100644
--- a/main/src/addins/VBNetBinding/VBNetBinding.csproj
+++ b/main/src/addins/VBNetBinding/VBNetBinding.csproj
@@ -40,31 +40,11 @@
       <Name>MonoDevelop.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\MonoDevelop.Core.Gui\MonoDevelop.Core.Gui.csproj">
-      <Project>{659B0888-3956-4040-BDB1-B45F6D64E7FA}</Project>
-      <Name>MonoDevelop.Core.Gui</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\MonoDevelop.Projects\MonoDevelop.Projects.csproj">
-      <Project>{04BED15A-DDC5-48BC-A36C-3E360A0348C0}</Project>
-      <Name>MonoDevelop.Projects</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="..\..\core\MonoDevelop.Components\MonoDevelop.Components.csproj">
-      <Project>{3344D566-484B-4AEC-BBCF-86BC484D14B0}</Project>
-      <Name>MonoDevelop.Components</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\MonoDevelop.Projects.Gui\MonoDevelop.Projects.Gui.csproj">
-      <Project>{00E87426-F1BD-4B55-9B3E-7267EE93E002}</Project>
-      <Name>MonoDevelop.Projects.Gui</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/main/src/addins/VBNetBinding/gtk-gui/gui.stetic b/main/src/addins/VBNetBinding/gtk-gui/gui.stetic
index 48ada6f99c..269949c73a 100644
--- a/main/src/addins/VBNetBinding/gtk-gui/gui.stetic
+++ b/main/src/addins/VBNetBinding/gtk-gui/gui.stetic
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <stetic-interface>
   <configuration>
     <images-root-path>..</images-root-path>
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
-    <widget-library name="../../../../build/bin/MonoDevelop.Core.Gui.dll" />
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/bin/MonoDevelop.Components.dll" />
-    <widget-library name="../../../../build/bin/MonoDevelop.Projects.Gui.dll" />
     <widget-library name="../../../../build/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget" design-size="366 318">