diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
index 2e035f9a31..e7d7fd1889 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.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>
@@ -29,6 +29,12 @@
<OutputPath>..\..\..\..\..\AddIns\AddIns\BackendBindings\CSharpBinding\</OutputPath>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.XML" />
+ </ItemGroup>
<ItemGroup>
<Compile Include="Configuration\AssemblyInfo.cs" />
<EmbeddedResource Include="Resources\AdvancedBuildOptionsDialog.xfrm" />
@@ -52,7 +58,7 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\BuildOptions.cs">
- <SubType>UserControl</SubType>
+ <SubType>Form</SubType>
</Compile>
<Compile Include="Src\OptionPanels\DebugOptions.cs">
<SubType>UserControl</SubType>
@@ -69,6 +75,9 @@
<Compile Include="Src\Parser\ExpressionFinder.cs" />
<Compile Include="Src\Parser\Parser.cs" />
<Compile Include="Src\Project\CSharpProject.cs" />
+ <None Include="CSharpBinding.addin">
+ <CopyToOutputDirectory>True</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
@@ -91,19 +100,6 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.XML" />
- </ItemGroup>
- <ItemGroup>
- <None Include="CSharpBinding.addin">
- <CopyToOutputDirectory>True</CopyToOutputDirectory>
- </None>
- </ItemGroup>
- <ItemGroup>
<Folder Include="Src\PrettyPrinter\Gui\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user
index 9cfbe798d4..7ed8936b56 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.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/DisplayBindings/FormDesigner/Project/FormDesigner.csproj b/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj
index f8ee5d5662..191dc02e1d 100644
--- a/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj
+++ b/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.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>
@@ -99,6 +99,11 @@
<Compile Include="Src\FormDesigner\UndoRedo\ComponentRemovedUndoAction.cs" />
<Compile Include="Src\FormDesigner\UndoRedo\SelectComponentsUndoAction.cs" />
<Compile Include="Src\FormDesigner\UndoRedo\UndoHandler.cs" />
+ <EmbeddedResource Include="Src\FormDesigner\Gui\ICSharpCode.SharpDevelop.FormDesigner.Gui.AssemblyList.resources" />
+ <EmbeddedResource Include="Src\FormDesigner\Gui\ICSharpCode.SharpDevelop.Gui.Dialogs.OptionPanels.ControlLibrariesPanel.resources" />
+ <None Include="FormDesigner.addin">
+ <CopyToOutputDirectory>True</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
@@ -121,17 +126,6 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Src\FormDesigner\Gui\ICSharpCode.SharpDevelop.FormDesigner.Gui.AssemblyList.resources" />
- <EmbeddedResource Include="Src\FormDesigner\Gui\ICSharpCode.SharpDevelop.Gui.Dialogs.OptionPanels.ControlLibrariesPanel.resources" />
- </ItemGroup>
- <ItemGroup>
- <None Include="FormDesigner.addin">
- <CopyToOutputDirectory>True</CopyToOutputDirectory>
- </None>
- </ItemGroup>
- <ItemGroup>
<Folder Include="Src\FormDesigner\Util\" />
<Folder Include="Src\FormDesigner\Xml\" />
</ItemGroup>
diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj.user b/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj.user
index 96135953c3..1f424f4743 100644
--- a/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj.user
+++ b/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.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/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj
index 8e50efa532..664d016569 100644
--- a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj
+++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.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>
@@ -60,6 +60,7 @@
<Compile Include="Src\ResourceEdit\ResourceItemHashtable.cs" />
<Compile Include="Src\ResourceEdit\ResourceList.cs" />
<Compile Include="Src\ResourceEdit\TextView.cs" />
+ <None Include="ResourceEditor.addin" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
@@ -73,8 +74,5 @@
<Private>False</Private>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <None Include="ResourceEditor.addin" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user
index 746ae1f782..a424bd7b03 100644
--- a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user
+++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.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/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj
index c88c797cf5..026154384f 100644
--- a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj
+++ b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.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>
@@ -29,12 +29,19 @@
<OutputPath>..\..\..\AddIns\Misc\FiletypeRegisterer\</OutputPath>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.XML" />
+ </ItemGroup>
<ItemGroup>
<Compile Include="Configuration\AssemblyInfo.cs" />
<Compile Include="Src\RegisterFiletypesCommand.cs" />
<Compile Include="Src\RegisterFiletypesPanel.cs">
<SubType>UserControl</SubType>
</Compile>
+ <None Include="FiletypeRegisterer.addin" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
@@ -47,11 +54,6 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Include="FiletypeRegisterer.addin" />
- </ItemGroup>
- <ItemGroup>
<Content Include="Src\filetypes\cmbx.ico" />
<Content Include="Src\filetypes\cs.ico" />
<Content Include="Src\filetypes\Filetypes.xml" />
@@ -61,14 +63,6 @@
<Content Include="Src\filetypes\vb.ico" />
<Content Include="Src\filetypes\xfrm.ico" />
<Content Include="Src\filetypes\xml.ico" />
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.XML" />
- </ItemGroup>
- <ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
diff --git a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj.user b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj.user
index 746ae1f782..a424bd7b03 100644
--- a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj.user
+++ b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.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/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj
index ddc78e514f..875d903bb0 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj
+++ b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.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>
@@ -29,6 +29,12 @@
<OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\HighlightingEditor\</OutputPath>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.XML" />
+ </ItemGroup>
<ItemGroup>
<Compile Include="Configuration\AssemblyInfo.cs" />
<EmbeddedResource Include="Resources\ColorDialog.xfrm" />
@@ -100,6 +106,9 @@
<Compile Include="Src\Nodes\SpansNode.cs">
<SubType>UserControl</SubType>
</Compile>
+ <None Include="HighlightingEditor.addin">
+ <CopyToOutputDirectory>True</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
@@ -117,16 +126,5 @@
<Name>ICSharpCode.Core</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <None Include="HighlightingEditor.addin">
- <CopyToOutputDirectory>True</CopyToOutputDirectory>
- </None>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.XML" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj.user b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj.user
index 96135953c3..1f424f4743 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj.user
+++ b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.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/RegExpTk/Project/RegExpTk.csproj b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj
index 74b1bc52f6..3799a68d5d 100644
--- a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj
+++ b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.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>
@@ -29,6 +29,12 @@
<OutputPath>..\..\..\AddIns\Misc\RegExpTk\</OutputPath>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.XML" />
+ </ItemGroup>
<ItemGroup>
<Compile Include="Src\Commands\MenuCommand.cs" />
<Compile Include="Src\Dialogs\MainWindow.cs">
@@ -40,6 +46,9 @@
<EmbeddedResource Include="Resources\RegExpTkGroupForm.xfrm" />
<EmbeddedResource Include="Resources\RegExpTkMainForm.xfrm" />
<Compile Include="Configuration\AssemblyInfo.cs" />
+ <None Include="RegExpTk.addin">
+ <CopyToOutputDirectory>True</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
@@ -53,16 +62,5 @@
<Private>False</Private>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <None Include="RegExpTk.addin">
- <CopyToOutputDirectory>True</CopyToOutputDirectory>
- </None>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.XML" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj.user b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj.user
index 96135953c3..1f424f4743 100644
--- a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj.user
+++ b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.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/StartPage/Project/StartPage.csproj b/src/AddIns/Misc/StartPage/Project/StartPage.csproj
index 5caac3a2c9..57054f49db 100644
--- a/src/AddIns/Misc/StartPage/Project/StartPage.csproj
+++ b/src/AddIns/Misc/StartPage/Project/StartPage.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>
@@ -39,6 +39,9 @@
<Compile Include="Src\ICSharpCodePage.cs" />
<Compile Include="Src\Main.cs" />
<Compile Include="Src\StartPage.cs" />
+ <None Include="StartPage.addin">
+ <CopyToOutputDirectory>True</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
@@ -52,10 +55,5 @@
<Private>False</Private>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <None Include="StartPage.addin">
- <CopyToOutputDirectory>True</CopyToOutputDirectory>
- </None>
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user b/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user
index 9cfbe798d4..7ed8936b56 100644
--- a/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user
+++ b/src/AddIns/Misc/StartPage/Project/StartPage.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/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj b/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj
index 4be2951799..89923814c6 100644
--- a/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj
+++ b/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.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>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.41115</ProductVersion>
@@ -48,30 +48,11 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="System.Data1, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86">
- <HintPath>..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.Data.dll</HintPath>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- <Reference Include="System.Design1, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.Design.dll</HintPath>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- <Reference Include="System.Drawing1, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.Drawing.dll</HintPath>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- <Reference Include="System.Windows.Forms1, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.Windows.Forms.dll</HintPath>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- <Reference Include="System.XML1, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.XML.dll</HintPath>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- <Reference Include="System1, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <HintPath>..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.dll</HintPath>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Design" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs">
@@ -85,9 +66,7 @@
<Compile Include="DockAreasEditor.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="DockContent.cs">
- <SubType>Form</SubType>
- </Compile>
+ <Compile Include="DockContent.cs" />
<Compile Include="DockContentCollection.cs">
<SubType>Code</SubType>
</Compile>
@@ -97,9 +76,7 @@
<Compile Include="DockList.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="DockPane.cs">
- <SubType>UserControl</SubType>
- </Compile>
+ <Compile Include="DockPane.cs" />
<Compile Include="DockPaneCollection.cs">
<SubType>Code</SubType>
</Compile>
@@ -129,15 +106,11 @@
<Compile Include="EventArgs.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="FloatWindow.cs">
- <SubType>Form</SubType>
- </Compile>
+ <Compile Include="FloatWindow.cs" />
<Compile Include="FloatWindowCollection.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="HiddenMdiChild.cs">
- <SubType>Form</SubType>
- </Compile>
+ <Compile Include="HiddenMdiChild.cs" />
<Compile Include="InertButton.cs" />
<Compile Include="Interfaces.cs">
<SubType>Code</SubType>
@@ -181,8 +154,6 @@
<EmbeddedResource Include="Resources\DockPane.ToolWindowCloseDisabled.bmp" />
<EmbeddedResource Include="Resources\DockPane.ToolWindowCloseEnabled.bmp" />
<EmbeddedResource Include="Strings.resX" />
- </ItemGroup>
- <ItemGroup>
<None Include="..\..\..\Main\Core\Project\Resources\ICSharpCode.Core.snk">
<Link>ICSharpCode.Core.snk</Link>
</None>
diff --git a/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user b/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user
index 3510dbafd9..910657fe3b 100644
--- a/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user
+++ b/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.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>
<LastOpenVersion>8.0.41115</LastOpenVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj
index fd6babd6d1..de6e9e5d28 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.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>
diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj.user b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj.user
index 7f07a92508..5328e1bc4f 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj.user
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.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/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs
index 0adf917b24..752db102ec 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs
@@ -170,7 +170,7 @@ namespace ICSharpCode.TextEditor
ResizeRedraw = true;
- SetStyle(ControlStyles.OptimizedDoubleBuffer, false);
+ SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
// SetStyle(ControlStyles.AllPaintingInWmPaint, true);
// SetStyle(ControlStyles.UserPaint, true);
SetStyle(ControlStyles.Opaque, false);
diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj b/src/Libraries/NRefactory/Project/NRefactory.csproj
index 3823cba3ca..fe0d5119f9 100644
--- a/src/Libraries/NRefactory/Project/NRefactory.csproj
+++ b/src/Libraries/NRefactory/Project/NRefactory.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>
@@ -193,8 +193,6 @@
<Content Include="Src\Parser\Frames\OldSharpCoco.exe" />
<Content Include="Src\Parser\Frames\SharpCoco.exe" />
<Content Include="Src\Parser\Frames\trace.txt" />
- </ItemGroup>
- <ItemGroup>
<Folder Include="Src\Parser\AST\CSharp\GlobalScope\" />
<Folder Include="Src\Parser\AST\VBNet\Expressions\Tests\" />
<Folder Include="Src\Parser\AST\VBNet\GlobalScope\Tests\" />
diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj.user b/src/Libraries/NRefactory/Project/NRefactory.csproj.user
index 54a53d68a8..2397512bef 100644
--- a/src/Libraries/NRefactory/Project/NRefactory.csproj.user
+++ b/src/Libraries/NRefactory/Project/NRefactory.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/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 37deb2f2b7..03742a6b57 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>
@@ -33,6 +33,19 @@
<OutputPath>..\..\..\..\bin\</OutputPath>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
+ <ItemGroup>
+ <Reference Include="ICSharpCode.SharpZipLib, Version=0.82.0.1709, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
+ <HintPath>..\RequiredLibraries\ICSharpCode.SharpZipLib.dll</HintPath>
+ <SpecificVersion>False</SpecificVersion>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Design" />
+ <Reference Include="System.DirectoryServices" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Web.Services" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.XML" />
+ </ItemGroup>
<ItemGroup>
<Compile Include="Src\Internal\ExternalTool\ExternalTool.cs" />
<Compile Include="Src\Internal\Templates\CodeTemplate.cs" />
@@ -171,7 +184,7 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\CommonAboutDialog.cs">
- <SubType>UserControl</SubType>
+ <SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\DirtyFilesDialog.cs" />
<Compile Include="Src\Gui\Dialogs\FolderDialog.cs" />
@@ -187,9 +200,10 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\TipOfTheDay.cs">
- <SubType>UserControl</SubType>
+ <SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\TreeViewOptions.cs">
+ <SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\ViewGPLDialog.cs">
<SubType>Form</SubType>
@@ -249,6 +263,7 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Pads\FileScout.cs">
+ <SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Pads\OpenTaskView.cs" />
<Compile Include="Src\Gui\Pads\PropertyPad\PropertyPad.cs" />
@@ -259,9 +274,7 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\Workbench\Layouts\SdiWorkspaceLayout.cs" />
- <Compile Include="Src\Gui\Workbench\Layouts\SdiWorkspaceWindow.cs">
- <SubType>Form</SubType>
- </Compile>
+ <Compile Include="Src\Gui\Workbench\Layouts\SdiWorkspaceWindow.cs" />
<Compile Include="Src\Gui\XmlForms\SharpDevelopObjectCreator.cs" />
<Compile Include="Src\Gui\XmlForms\SharpDevelopPropertyValueCreator.cs" />
<Compile Include="Src\Gui\XmlForms\SharpDevelopStringValueFilter.cs" />
@@ -627,18 +640,5 @@
<Name>ICSharpCode.Core</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <Reference Include="ICSharpCode.SharpZipLib, Version=0.82.0.1709, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
- <HintPath>..\RequiredLibraries\ICSharpCode.SharpZipLib.dll</HintPath>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Design" />
- <Reference Include="System.DirectoryServices" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Web.Services" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.XML" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>
\ No newline at end of file
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/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs
index 5e6fde2adb..86a2c82635 100644
--- a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs
+++ b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs
@@ -36,6 +36,7 @@ namespace ICSharpCode.SharpDevelop.Gui
HideSelection = false;
AllowDrop = true;
this.TreeViewNodeSorter = new ExtTreeViewComparer();
+ SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
}
public void SortNodes(TreeNode node)
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs
index 44e855fe22..c789f5d3e7 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs
@@ -72,7 +72,9 @@ namespace ICSharpCode.SharpDevelop.Project
}
void ProjectServiceSolutionFolderRemoved(object sender, SolutionFolderEventArgs e)
{
+ Console.WriteLine("projectbrowser: Solution folder remove!!!");
CallVisitor(new SolutionFolderRemoveVisitor(e.SolutionFolder));
+ Console.WriteLine("projectbrowser: Solution folder remove done.!!!");
}
void ProjectServiceReferenceAdded(object sender, ProjectReferenceEventArgs e)
{
@@ -81,12 +83,16 @@ namespace ICSharpCode.SharpDevelop.Project
void FileServiceFileRemoving(object sender, FileEventArgs e)
{
+ Console.WriteLine("projectbrowser: Solution file removing!!!");
CallVisitor(new FileRemoveTreeNodeVisitor(e.FileName));
+ Console.WriteLine("projectbrowser: Solution file removing!!!");
}
void FileServiceFileRenaming(object sender, FileRenameEventArgs e)
{
+ Console.WriteLine("projectbrowser: Solution file renaming!!!");
CallVisitor(new FileRenameTreeNodeVisitor(e.SourceFile, e.TargetFile));
+ Console.WriteLine("projectbrowser: Solution file renaming!!!");
}
void SelectFile(ProjectNode projectNode, string fileName)
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRemoveTreeNodeVisitor.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRemoveTreeNodeVisitor.cs
index 4918417d9a..b5d8ceacb0 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRemoveTreeNodeVisitor.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRemoveTreeNodeVisitor.cs
@@ -24,6 +24,15 @@ namespace ICSharpCode.SharpDevelop.Project
return data;
}
+
+ public override object Visit(ProjectNode projectNode, object data)
+ {
+ if (FileUtility.IsBaseDirectory(projectNode.Directory, fileName)) {
+ projectNode.AcceptChildren(this, data);
+ }
+ return data;
+ }
+
public override object Visit(DirectoryNode directoryNode, object data)
{
if (FileUtility.IsBaseDirectory(fileName, directoryNode.Directory)) {
@@ -33,7 +42,9 @@ namespace ICSharpCode.SharpDevelop.Project
parent.Refresh();
}
} else {
- directoryNode.AcceptChildren(this, data);
+ if (FileUtility.IsBaseDirectory(directoryNode.Directory, fileName)) {
+ directoryNode.AcceptChildren(this, data);
+ }
}
return data;
}
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRenameTreeNodeVisitor.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRenameTreeNodeVisitor.cs
index 90176474d2..f41003385a 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRenameTreeNodeVisitor.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRenameTreeNodeVisitor.cs
@@ -24,16 +24,32 @@ namespace ICSharpCode.SharpDevelop.Project
return data;
}
+
+ public override object Visit(ProjectNode projectNode, object data)
+ {
+ if (FileUtility.IsBaseDirectory(oldName, projectNode.Directory) ||
+ FileUtility.IsBaseDirectory(projectNode.Directory, oldName)) {
+ projectNode.AcceptChildren(this, data);
+ }
+ return data;
+ }
+
public override object Visit(DirectoryNode directoryNode, object data)
{
- directoryNode.Directory = FileUtility.RenameBaseDirectory(directoryNode.Directory, oldName, newName);
- directoryNode.AcceptChildren(this, data);
+ if (FileUtility.IsBaseDirectory(oldName, directoryNode.Directory)) {
+ directoryNode.Directory = FileUtility.RenameBaseDirectory(directoryNode.Directory, oldName, newName);
+ directoryNode.AcceptChildren(this, data);
+ } else if (FileUtility.IsBaseDirectory(directoryNode.Directory, oldName)) {
+ directoryNode.AcceptChildren(this, data);
+ }
return data;
}
public override object Visit(FileNode fileNode, object data)
{
- fileNode.FileName = FileUtility.RenameBaseDirectory(fileNode.FileName, oldName, newName);
+ if (FileUtility.IsEqualFile(oldName, fileNode.FileName)) {
+ fileNode.FileName = FileUtility.RenameBaseDirectory(fileNode.FileName, oldName, newName);
+ }
fileNode.AcceptChildren(this, data);
return data;
}
diff --git a/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs b/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs
index 56e716fcf5..029c3fcf6c 100644
--- a/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs
+++ b/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs
@@ -37,6 +37,7 @@ namespace ICSharpCode.SharpDevelop.Project
static void FileServiceFileRenamed(object sender, FileRenameEventArgs e)
{
+ Console.WriteLine("File service file renamed.");
if (OpenSolution == null) {
return;
}
@@ -60,10 +61,12 @@ namespace ICSharpCode.SharpDevelop.Project
}
}
}
+ Console.WriteLine("File service file renamed. DONE.");
}
static void FileServiceFileRemoved(object sender, FileEventArgs e)
{
+ Console.WriteLine("File service file removed.");
if (OpenSolution == null) {
return;
}
@@ -90,6 +93,7 @@ namespace ICSharpCode.SharpDevelop.Project
}
}
}
+ Console.WriteLine("File service file removed. DONE.");
}
static void ActiveWindowChanged(object sender, EventArgs e)
diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj b/src/Main/Core/Project/ICSharpCode.Core.csproj
index 89e0436dc5..bc1571116f 100644
--- a/src/Main/Core/Project/ICSharpCode.Core.csproj
+++ b/src/Main/Core/Project/ICSharpCode.Core.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>
@@ -38,8 +38,6 @@
<ItemGroup>
<None Include="Resources\ICSharpCode.Core.doc" />
<None Include="Resources\ICSharpCode.Core.snk" />
- </ItemGroup>
- <ItemGroup>
<Compile Include="Configuration\AssemblyInfo.cs" />
<Compile Include="Src\AddInTree\AddIn\AddIn.cs" />
<Compile Include="Src\AddInTree\AddIn\AddInLoadException.cs" />
@@ -125,7 +123,5 @@
<Compile Include="Src\Util\ICommand.cs" />
<Compile Include="Src\Util\RightToLeftConverter.cs" />
</ItemGroup>
- <ItemGroup>
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>
\ No newline at end of file
diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj.user b/src/Main/Core/Project/ICSharpCode.Core.csproj.user
index 746ae1f782..a424bd7b03 100644
--- a/src/Main/Core/Project/ICSharpCode.Core.csproj.user
+++ b/src/Main/Core/Project/ICSharpCode.Core.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/StartUp/Project/StartUp.csproj b/src/Main/StartUp/Project/StartUp.csproj
index ef07f85d4b..3d0c27029f 100644
--- a/src/Main/StartUp/Project/StartUp.csproj
+++ b/src/Main/StartUp/Project/StartUp.csproj
@@ -1,12 +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>{1152B71B-3C05-4598-B20D-823B5D40559E}</ProjectGuid>
- <RootNamespace>
- </RootNamespace>
<AssemblyName>SharpDevelop</AssemblyName>
<OutputTarget>Exe</OutputTarget>
<WarningLevel>4</WarningLevel>
@@ -32,6 +30,12 @@
<OutputPath>..\..\..\..\bin\</OutputPath>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.XML" />
+ </ItemGroup>
<ItemGroup>
<Compile Include="Dialogs\SplashScreen.cs">
<SubType>Form</SubType>
@@ -61,11 +65,5 @@
<Name>ICSharpCode.Core</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.XML" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>
\ No newline at end of file
diff --git a/src/Main/StartUp/Project/StartUp.csproj.user b/src/Main/StartUp/Project/StartUp.csproj.user
index 87e9a3ad41..80798801bc 100644
--- a/src/Main/StartUp/Project/StartUp.csproj.user
+++ b/src/Main/StartUp/Project/StartUp.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/SharpDevelop.sln b/src/SharpDevelop.sln
index 6c0ba2d3df..e2ccf7a527 100644
--- a/src/SharpDevelop.sln
+++ b/src/SharpDevelop.sln
@@ -1,5 +1,25 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# 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.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}") = "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}"
+ ProjectSection(SolutionItems) = postProject
+ EndProjectSection
+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}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@@ -30,26 +50,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\Reg
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
- ProjectSection(SolutionItems) = postProject
- EndProjectSection
-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}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
-EndProject
-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.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}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -117,6 +117,12 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
+ {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+ {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+ {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+ {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+ {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+ {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{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}
@@ -127,11 +133,5 @@ Global
{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}
- {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
- {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
- {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
- {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
- {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
- {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
EndGlobalSection
EndGlobal
diff --git a/src/releasebuild.bat b/src/releasebuild.bat
new file mode 100644
index 0000000000..83ba1881f1
--- /dev/null
+++ b/src/releasebuild.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+\windows\microsoft.net\framework\v2.0.41115\msbuild /property:Configuration=Release
+IF %ERRORLEVEL% NEQ 0 PAUSE