From e0342a109e6e9a26cf732fdfb3fc14cf6a2b5d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Kr=C3=BCger?= <mike@icsharpcode.net>
Date: Tue, 11 Jan 2005 09:08:26 +0000
Subject: [PATCH] Worked on IL backend. But I don't know how to plug in a new
 msbuild 'language'.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@40 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../Project/CSharpBinding.csproj              |   2 -
 .../{Src/Resources => }/ILAsmBinding.addin    |   5 -
 .../ILAsmBinding/Project/ILAsmBinding.csproj  |  43 +++---
 .../{Src => }/Resources/ILAsm-Mode.xshd       |   0
 .../Project/Src/Gui/ChooseRuntimePanel.cs     |  72 ----------
 .../Project/ILAsmCompilerParameters.cs        |   0
 .../Project/{ => Src}/Project/ILAsmProject.cs |   0
 .../Src/Resources/ChooseRuntimePanel.xfrm     | 133 ------------------
 .../VBNetBinding/Project/VBNetBinding.csproj  |   8 +-
 .../Project/VBNetBinding.csproj.user          |   2 +-
 .../Misc/AddinScout/Project/AddinScout.csproj |   2 +-
 .../Project/ICSharpCode.SharpDevelop.csproj   |   8 +-
 .../ICSharpCode.SharpDevelop.csproj.user      |   2 +-
 .../Core/Test/ICSharpCode.Core.Tests.csproj   |   2 +-
 src/SharpDevelop.sln                          |  68 +++++----
 15 files changed, 68 insertions(+), 279 deletions(-)
 rename src/AddIns/BackendBindings/ILAsmBinding/Project/{Src/Resources => }/ILAsmBinding.addin (96%)
 rename src/AddIns/BackendBindings/ILAsmBinding/Project/{Src => }/Resources/ILAsm-Mode.xshd (100%)
 delete mode 100644 src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Gui/ChooseRuntimePanel.cs
 rename src/AddIns/BackendBindings/ILAsmBinding/Project/{ => Src}/Project/ILAsmCompilerParameters.cs (100%)
 rename src/AddIns/BackendBindings/ILAsmBinding/Project/{ => Src}/Project/ILAsmProject.cs (100%)
 delete mode 100644 src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Resources/ChooseRuntimePanel.xfrm

diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
index 83c27402d4..5ca551a0f7 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
@@ -12,8 +12,6 @@
     <NoConfig>False</NoConfig>
     <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
     <OutputType>Library</OutputType>
-    <AssemblyOriginatorKeyFile />
-    <AssemblyKeyProviderName />
     <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Resources/ILAsmBinding.addin b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin
similarity index 96%
rename from src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Resources/ILAsmBinding.addin
rename to src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin
index a48aaa0078..7c81dd14a4 100644
--- a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Resources/ILAsmBinding.addin
+++ b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.addin
@@ -34,11 +34,6 @@
 			             class = "ICSharpCode.ILAsmBinding.ChooseRuntimePanel"/>
 		</Condition>
 	</Path>
-
-<!-- TODO: 
-	<Path name = "/Workspace/Icons">
-	</Path>
--->
 	
 	<Path name = "/SharpDevelop/Workbench/LanguageBindings">
 		<LanguageBinding id    = "ILAsm"
diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.csproj b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.csproj
index fe7f689c43..bb124c6758 100644
--- a/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.csproj
+++ b/src/AddIns/BackendBindings/ILAsmBinding/Project/ILAsmBinding.csproj
@@ -35,34 +35,29 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="SharpDevelop.Base.dll">
-      <HintPath>..\..\..\..\..\bin\SharpDevelop.Base.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ICSharpCode.Core.dll">
-      <HintPath>..\..\..\..\..\bin\ICSharpCode.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ICSharpCode.XmlForms.dll">
-      <HintPath>..\..\..\..\..\bin\ICSharpCode.XmlForms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ILAsmLanguageBinding.cs" />
-    <Compile Include="ILAsmCompilerManager.cs" />
-    <Compile Include="ILAsmExecutionManager.cs" />
-    <Compile Include="Project\ILAsmCompilerParameters.cs" />
-    <Compile Include="Project\ILAsmProject.cs" />
-    <Compile Include="Gui\CompilerParametersPanel.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Gui\ChooseRuntimePanel.cs" />
-    <EmbeddedResource Include="..\Resources\ChooseRuntimePanel.xfrm" />
-    <EmbeddedResource Include="..\Resources\ILAsm-Mode.xshd" />
+    <Compile Include="Src\Gui\CompilerParametersPanel.cs" />
+    <Compile Include="Src\AssemblyInfo.cs" />
+    <Compile Include="Src\ILAsmCompilerManager.cs" />
+    <Compile Include="Src\ILAsmExecutionManager.cs" />
+    <Compile Include="Src\ILAsmLanguageBinding.cs" />
+    <Compile Include="Src\Project\ILAsmCompilerParameters.cs" />
+    <Compile Include="Src\Project\ILAsmProject.cs" />
+    <EmbeddedResource Include="Resources\ILAsm-Mode.xshd" />
+    <Compile Include="ILAsmBinding.addin">
+      <CopyToOutputDirectory>True</CopyToOutputDirectory>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Project\" />
-    <Folder Include="Gui\" />
+    <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
+      <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
+      <Name>ICSharpCode.SharpDevelop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
+      <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
+      <Name>ICSharpCode.Core</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Resources/ILAsm-Mode.xshd b/src/AddIns/BackendBindings/ILAsmBinding/Project/Resources/ILAsm-Mode.xshd
similarity index 100%
rename from src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Resources/ILAsm-Mode.xshd
rename to src/AddIns/BackendBindings/ILAsmBinding/Project/Resources/ILAsm-Mode.xshd
diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Gui/ChooseRuntimePanel.cs b/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Gui/ChooseRuntimePanel.cs
deleted file mode 100644
index ac4ace3565..0000000000
--- a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Gui/ChooseRuntimePanel.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
-//     <version value="$version"/>
-// </file>
-
-using System;
-using System.Reflection;
-using System.IO;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-
-using ICSharpCode.SharpDevelop.Internal.Project;
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.Core;
-
-namespace ICSharpCode.ILAsmBinding
-{
-	public class ChooseRuntimePanel : AbstractOptionPanel
-	{
-		ILAsmCompilerParameters config = null;
-		
-		public override void LoadPanelContents()
-		{
-			SetupFromXmlStream(Assembly.GetCallingAssembly().GetManifestResourceStream("ChooseRuntimePanel.xfrm"));
-			
-			this.config = (ILAsmCompilerParameters)((Properties)CustomizationObject).Get("Config");
-			
-			((RadioButton)ControlDictionary["msnetRadioButton"]).Checked = config.NetRuntime == NetRuntime.MsNet;
-			((RadioButton)ControlDictionary["monoRadioButton"]).Checked  = config.NetRuntime == NetRuntime.Mono;
-			((RadioButton)ControlDictionary["mintRadioButton"]).Checked  = config.NetRuntime == NetRuntime.MonoInterpreter;
-			
-			((RadioButton)ControlDictionary["cscRadioButton"]).Checked = config.ILAsmCompiler == ILAsmCompiler.Microsoft;
-			((RadioButton)ControlDictionary["mcsRadioButton"]).Checked = config.ILAsmCompiler == ILAsmCompiler.Mono;
-		
-			((RadioButton)ControlDictionary["cscRadioButton"]).CheckedChanged += new EventHandler(CompilerRadioButtonCheckedChanged);
-			
-			
-			((ComboBox)ControlDictionary["compilerVersionComboBox"]).Items.Add("Standard");
-			foreach (string runtime in FileUtility.GetAvaiableRuntimeVersions()) {
-				((ComboBox)ControlDictionary["compilerVersionComboBox"]).Items.Add(runtime);
-			}
-			
-			((ComboBox)ControlDictionary["compilerVersionComboBox"]).Text = config.ILAsmCompilerVersion.Length == 0 ? "Standard" : config.ILAsmCompilerVersion;
-			CompilerRadioButtonCheckedChanged(this, EventArgs.Empty);
-		}
-		
-		void CompilerRadioButtonCheckedChanged(object sender, EventArgs e)
-		{
-			ControlDictionary["compilerVersionLabel"].Enabled    = ((RadioButton)ControlDictionary["cscRadioButton"]).Checked;
-			ControlDictionary["compilerVersionComboBox"].Enabled = ((RadioButton)ControlDictionary["cscRadioButton"]).Checked;
-		}
-		
-		public override bool StorePanelContents()
-		{
-			if (((RadioButton)ControlDictionary["msnetRadioButton"]).Checked) {
-				config.NetRuntime =  NetRuntime.MsNet;
-			} else if (((RadioButton)ControlDictionary["monoRadioButton"]).Checked) {
-				config.NetRuntime =  NetRuntime.Mono;
-			} else {
-				config.NetRuntime =  NetRuntime.MonoInterpreter;
-			}
-			config.ILAsmCompiler = ((RadioButton)ControlDictionary["cscRadioButton"]).Checked ? ILAsmCompiler.Microsoft : ILAsmCompiler.Mono;
-			config.ILAsmCompilerVersion = ControlDictionary["compilerVersionComboBox"].Text;
-			
-			return true;
-		}
-	}
-}
diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/Project/ILAsmCompilerParameters.cs b/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Project/ILAsmCompilerParameters.cs
similarity index 100%
rename from src/AddIns/BackendBindings/ILAsmBinding/Project/Project/ILAsmCompilerParameters.cs
rename to src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Project/ILAsmCompilerParameters.cs
diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/Project/ILAsmProject.cs b/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Project/ILAsmProject.cs
similarity index 100%
rename from src/AddIns/BackendBindings/ILAsmBinding/Project/Project/ILAsmProject.cs
rename to src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Project/ILAsmProject.cs
diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Resources/ChooseRuntimePanel.xfrm b/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Resources/ChooseRuntimePanel.xfrm
deleted file mode 100644
index 94854eb637..0000000000
--- a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/Resources/ChooseRuntimePanel.xfrm
+++ /dev/null
@@ -1,133 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.UserControl>
-    <Name value="CreatedObject01" />
-    <DockPadding value="" />
-    <AccessibleDescription value="" />
-    <Font value="[Font: Name=Tahoma, Size=8, Units=3, GdiCharSet=1, GdiVerticalFont=False]" />
-    <AccessibleName value="" />
-    <ClientSize value="{Width=360, Height=272}" />
-    <Tag value="" />
-    <Controls>
-      <System.Windows.Forms.GroupBox>
-        <Name value="runtimeGroupBox" />
-        <AccessibleName value="" />
-        <ForeColor value="Color [ControlText]" />
-        <TabIndex value="0" />
-        <AccessibleDescription value="" />
-        <Location value="{X=8,Y=8}" />
-        <ImeMode value="NoControl" />
-        <BackColor value="Color [Control]" />
-        <Anchor value="Top, Left, Right" />
-        <Tag value="" />
-        <RightToLeft value="No" />
-        <Size value="{Width=344, Height=100}" />
-        <Text value="${res:Dialog.Options.PrjOptions.ChooseRuntimePanel.RuntimeGroupBox}" />
-        <Controls>
-          <System.Windows.Forms.RadioButton>
-            <Name value="mintRadioButton" />
-            <Location value="{X=8,Y=66}" />
-            <Size value="{Width=328, Height=24}" />
-            <Text value="Mono &amp;Runtime Interpeter" />
-            <Anchor value="Top, Left, Right" />
-            <RightToLeft value="No" />
-            <TabIndex value="2" />
-            <Tag value="" />
-            <AccessibleName value="" />
-            <ForeColor value="Color [ControlText]" />
-            <BackColor value="Color [Control]" />
-            <AccessibleDescription value="" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.RadioButton>
-            <Name value="msnetRadioButton" />
-            <Location value="{X=8,Y=18}" />
-            <Size value="{Width=328, Height=24}" />
-            <Text value="&amp;Microsoft .NET" />
-            <Anchor value="Top, Left, Right" />
-            <RightToLeft value="No" />
-            <TabIndex value="0" />
-            <Tag value="" />
-            <AccessibleName value="" />
-            <ForeColor value="Color [ControlText]" />
-            <BackColor value="Color [Control]" />
-            <AccessibleDescription value="" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.RadioButton>
-            <Name value="monoRadioButton" />
-            <Location value="{X=8,Y=42}" />
-            <Size value="{Width=328, Height=24}" />
-            <Text value="M&amp;ono" />
-            <Anchor value="Top, Left, Right" />
-            <RightToLeft value="No" />
-            <TabIndex value="1" />
-            <Tag value="" />
-            <AccessibleName value="" />
-            <ForeColor value="Color [ControlText]" />
-            <BackColor value="Color [Control]" />
-            <AccessibleDescription value="" />
-          </System.Windows.Forms.RadioButton>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-      <System.Windows.Forms.GroupBox>
-        <Name value="compilerGroupBox" />
-        <AccessibleName value="" />
-        <ForeColor value="Color [ControlText]" />
-        <TabIndex value="1" />
-        <AccessibleDescription value="" />
-        <Location value="{X=8,Y=120}" />
-        <ImeMode value="NoControl" />
-        <BackColor value="Color [Control]" />
-        <Anchor value="Top, Left, Right" />
-        <Tag value="" />
-        <RightToLeft value="No" />
-        <Size value="{Width=344, Height=128}" />
-        <Text value="${res:Dialog.Options.PrjOptions.ChooseRuntimePanel.CompilerGroupBox}" />
-        <Controls>
-          <System.Windows.Forms.ComboBox>
-            <Name value="compilerVersionComboBox" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="3" />
-            <Location value="{X=4,Y=100}" />
-            <Size value="{Width=332, Height=21}" />
-          </System.Windows.Forms.ComboBox>
-          <System.Windows.Forms.Label>
-            <Name value="compilerVersionLabel" />
-            <Text value="Compiler &amp;version" />
-            <TextAlign value="BottomLeft" />
-            <Anchor value="Top, Left, Right" />
-            <TabIndex value="2" />
-            <Size value="{Width=332, Height=23}" />
-            <Location value="{X=4,Y=76}" />
-          </System.Windows.Forms.Label>
-          <System.Windows.Forms.RadioButton>
-            <Name value="mcsRadioButton" />
-            <Location value="{X=8,Y=42}" />
-            <Size value="{Width=328, Height=24}" />
-            <Text value="Mono &amp;mcs" />
-            <Anchor value="Top, Left, Right" />
-            <RightToLeft value="No" />
-            <TabIndex value="1" />
-            <Tag value="" />
-            <AccessibleName value="" />
-            <ForeColor value="Color [ControlText]" />
-            <BackColor value="Color [Control]" />
-            <AccessibleDescription value="" />
-          </System.Windows.Forms.RadioButton>
-          <System.Windows.Forms.RadioButton>
-            <Name value="cscRadioButton" />
-            <Location value="{X=8,Y=18}" />
-            <Size value="{Width=328, Height=24}" />
-            <Text value="Microsoft &amp;csc" />
-            <Anchor value="Top, Left, Right" />
-            <RightToLeft value="No" />
-            <TabIndex value="0" />
-            <Tag value="" />
-            <AccessibleName value="" />
-            <ForeColor value="Color [ControlText]" />
-            <BackColor value="Color [Control]" />
-            <AccessibleDescription value="" />
-          </System.Windows.Forms.RadioButton>
-        </Controls>
-      </System.Windows.Forms.GroupBox>
-    </Controls>
-  </System.Windows.Forms.UserControl>
-</Components>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj
index 71e31dd3e3..dd33fb0cb8 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj
@@ -1,10 +1,10 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.41115</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}</ProjectGuid>
+    <ProjectGuid>{BF38FB72-B380-4196-AF8C-95749D726C61}</ProjectGuid>
     <AssemblyName>VBNetBinding</AssemblyName>
     <OutputTarget>Library</OutputTarget>
     <WarningLevel>4</WarningLevel>
@@ -12,8 +12,6 @@
     <NoConfig>False</NoConfig>
     <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
     <OutputType>Library</OutputType>
-    <AssemblyOriginatorKeyFile />
-    <AssemblyKeyProviderName />
     <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -103,8 +101,6 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <Folder Include="Src\PrettyPrinter\Gui\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj.user b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj.user
index 9cfbe798d4..7ed8936b56 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj.user
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj.user
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
   </PropertyGroup>
diff --git a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
index 7d1e420f88..649661c0cb 100644
--- a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
+++ b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
@@ -4,7 +4,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.41115</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4b8f0f98-8be1-402b-aa8b-c8d548577b38}</ProjectGuid>
+    <ProjectGuid>{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}</ProjectGuid>
     <RootNamespace>NewProject</RootNamespace>
     <AssemblyName>AddinScout</AssemblyName>
     <OutputTarget>Library</OutputTarget>
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 8b06f0beb8..99cfe511dc 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -199,8 +199,7 @@
     <Compile Include="Src\Gui\Dialogs\TipOfTheDay.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Dialogs\TreeViewOptions.cs">
-    </Compile>
+    <Compile Include="Src\Gui\Dialogs\TreeViewOptions.cs" />
     <Compile Include="Src\Gui\Dialogs\ViewGPLDialog.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -258,8 +257,7 @@
     <Compile Include="Src\Gui\Dialogs\Wizard\WizardDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Pads\FileScout.cs">
-    </Compile>
+    <Compile Include="Src\Gui\Pads\FileScout.cs" />
     <Compile Include="Src\Gui\Pads\OpenTaskView.cs" />
     <Compile Include="Src\Gui\Pads\PropertyPad\PropertyPad.cs" />
     <Compile Include="Src\Gui\Pads\SideBarView.cs" />
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user
index 746ae1f782..a424bd7b03 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <PropertyGroup>
diff --git a/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj b/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj
index b70b66a0a1..7850ed30d2 100644
--- a/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj
+++ b/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj
@@ -4,7 +4,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.40607</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{ad6faa08-d6f5-4dba-af85-f4da9f40c3b5}</ProjectGuid>
+    <ProjectGuid>{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}</ProjectGuid>
     <RootNamespace>ICSharpCode.Core.Tests</RootNamespace>
     <AssemblyName>ICSharpCode.Core.Tests</AssemblyName>
     <OutputTarget>Library</OutputTarget>
diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln
index eb58ebf133..dddb080852 100644
--- a/src/SharpDevelop.sln
+++ b/src/SharpDevelop.sln
@@ -1,56 +1,68 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# SharpDevelop 2.0.0.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormDesigner", "AddIns\DisplayBindings\FormDesigner\Project\FormDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitPad", "AddIns\Misc\NUnitPad\Project\NUnitPad.csproj", "{A82F44D7-F336-4AD6-B2EE-D2C082D094EC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitPad", "AddIns\Misc\NUnitPad\Project\NUnitPad.csproj", "{A82F44D7-F336-4AD6-B2EE-D2C082D094EC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormDesigner", "AddIns\DisplayBindings\FormDesigner\Project\FormDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -146,15 +158,15 @@ Global
 		{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
+		{BF38FB72-B380-4196-AF8C-95749D726C61} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
+		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{A82F44D7-F336-4AD6-B2EE-D2C082D094EC} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
-		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
-		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
-		{BF38FB72-B380-4196-AF8C-95749D726C61} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
 	EndGlobalSection
 EndGlobal