From a573114c0bc68ecfcb09a338bedbcb94423fb79c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Kr=C3=BCger?= <mike@icsharpcode.net>
Date: Tue, 4 Jan 2005 23:13:38 +0000
Subject: [PATCH] addin scout now working again.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@14 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../Project/{Resources => }/AddInScout.addin  |  0
 .../Misc/AddinScout/Project/AddinScout.csproj | 87 ++++++++-----------
 .../AddinScout/Project/AddinScout.csproj.user | 14 ++-
 .../Misc/NUnitPad/Project/NUnitPad.addin      | 54 ++++++++++++
 .../Misc/NUnitPad/Project/NUnitPad.csproj     |  3 -
 .../Project/ICSharpCode.SharpDevelop.csproj   | 12 ++-
 .../ICSharpCode.SharpDevelop.csproj.user      |  2 +-
 src/SharpDevelop.sln                          |  3 +
 8 files changed, 106 insertions(+), 69 deletions(-)
 rename src/AddIns/Misc/AddinScout/Project/{Resources => }/AddInScout.addin (100%)
 create mode 100644 src/AddIns/Misc/NUnitPad/Project/NUnitPad.addin

diff --git a/src/AddIns/Misc/AddinScout/Project/Resources/AddInScout.addin b/src/AddIns/Misc/AddinScout/Project/AddInScout.addin
similarity index 100%
rename from src/AddIns/Misc/AddinScout/Project/Resources/AddInScout.addin
rename to src/AddIns/Misc/AddinScout/Project/AddInScout.addin
diff --git a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
index b1a9013533..e4f92cc1e2 100644
--- a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
+++ b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
@@ -1,35 +1,27 @@
-<Project DefaultTargets="Build" xmlns:Conversion="urn:Conversion" 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.40607</ProductVersion>
+    <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>
-    <ApplicationIcon>
-    </ApplicationIcon>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
-    <StartupObject>
-    </StartupObject>
     <NoStdLib>False</NoStdLib>
     <NoConfig>False</NoConfig>
     <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <OutputType>Library</OutputType>
+    <StartupObject />
+    <ApplicationIcon />
+    <Win32Resource />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
     <Optimize>True</Optimize>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>
-    </DefineConstants>
     <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\AddinScout\</OutputPath>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
@@ -38,53 +30,42 @@
     <Optimize>True</Optimize>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>
-    </DefineConstants>
     <OutputPath>..\..\..\AddIns\Misc\AddinScout\</OutputPath>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
-    </Reference>
-    <Reference Include="System.Data">
-    </Reference>
-    <Reference Include="System.Drawing">
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-    </Reference>
-    <Reference Include="System.Xml">
-    </Reference>
-    <Reference Include="SharpDevelop.Base.dll">
-      <HintPath>..\..\..\..\..\bin\SharpDevelop.Base.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="ICSharpCode.Core.dll">
-      <HintPath>..\..\..\..\..\bin\ICSharpCode.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AddInScoutCommand.cs">
-    </Compile>
-    <Compile Include="AssemblyInfo.cs">
-    </Compile>
-    <Compile Include="AddInScoutViewContent.cs">
-    </Compile>
-    <Compile Include="Gui\AddinTreeView.cs">
-    </Compile>
-    <Compile Include="Gui\TreeTreeView.cs">
-    </Compile>
-    <Compile Include="Gui\AddInDetailsPanel.cs">
-    </Compile>
-    <Compile Include="Gui\CodonListPanel.cs">
-    </Compile>
+    <Compile Include="Src\Gui\AddInDetailsPanel.cs" />
+    <Compile Include="Src\Gui\AddinTreeView.cs" />
+    <Compile Include="Src\Gui\CodonListPanel.cs" />
+    <Compile Include="Src\Gui\TreeTreeView.cs" />
+    <Compile Include="Src\AddInScoutCommand.cs" />
+    <Compile Include="Src\AddInScoutViewContent.cs" />
+    <Compile Include="Src\AssemblyInfo.cs" />
+    <None Include="AddInScout.addin">
+      <CopyToOutputDirectory>True</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Gui\">
-    </Folder>
+    <ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
+      <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
+      <Name>ICSharpCode.Core</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
+      <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
+      <Name>ICSharpCode.SharpDevelop</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Gui\" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets">
-  </Import>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user
index e956ed7735..8bc3f21f76 100644
--- a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user
+++ b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj.user
@@ -1,13 +1,11 @@
-<Project DefaultTargets="Build" xmlns:Conversion="urn:Conversion" 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>
-    <StartArguments>
-    </StartArguments>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <StartProgram>
-    </StartProgram>
-    <StartArguments>
-    </StartArguments>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
+    <LastOpenVersion>8.0.41115</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.addin b/src/AddIns/Misc/NUnitPad/Project/NUnitPad.addin
new file mode 100644
index 0000000000..ddc33f4505
--- /dev/null
+++ b/src/AddIns/Misc/NUnitPad/Project/NUnitPad.addin
@@ -0,0 +1,54 @@
+<AddIn
+	name        = "NUnit-Addin"
+	author      = "Mike Krueger"
+	copyright   = "GPL"
+	url         = "http://www.icsharpcode.net"
+	description = "Integrated NUnit test runner for #Develop"
+	version     = "1.0.0"
+>
+	<Runtime>
+		<Import assembly="NUnitPad.dll"/>
+	</Runtime>
+	
+	<Path name = "/SharpDevelop/Workbench/Pads">
+		<Pad id       = "NUnitPad"
+		     category = "Tools"
+		     title    = "${res:ICSharpCode.NUnitPad.NUnitPadContent.PadName}"
+		     icon     = "PadIcons.UnitTest"
+		     shortcut = "Control|Alt|N"
+		     class    = "ICSharpCode.NUnitPad.NUnitPadContent"/>
+	</Path>
+	
+	<Path name = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ProjectNode">
+		<MenuItem id = "RunTests"
+		          insertafter ="AddSeparator"
+		          insertbefore ="Separator2"
+		          label = "${res:ProjectComponent.ContextMenu.RunTests}"
+		          class = "ICSharpCode.NUnitPad.RunTestsInProject"/>
+	</Path>
+	
+	<Path name = "/SharpDevelop/Workbench/MainMenu/Project">
+		<Condition name = "ProjectActive" activeproject="*" action="Disable">
+			<MenuItem id = "RunTests"
+			          insertbefore ="Deploy"
+			          label = "${res:XML.MainMenu.ProjectMenu.RunTests}" 
+			          description = "${res:XML.MainMenu.ProjectMenu.RunTests.Description}"
+			          class = "ICSharpCode.NUnitPad.RunTestsInProject"/>
+		</Condition>
+	</Path>
+	
+	
+	<Path name = "/NUnitPad/TestTreeView/ContextMenu">
+		<Condition name = "Ownerstate" ownerstate="TestItemSelected">
+			<MenuItem id = "Run"
+			          label = "${res:NUnitPad.NUnitPadContent.RunTestsContextMenuLabel}"
+			          class = "ICSharpCode.NUnitPad.RunTestsCommand"/>
+		</Condition>
+		<Condition name = "Ownerstate" ownerstate="SourceCodeItemSelected">
+			<MenuItem id = "GotoDefinition"
+			          label = "${res:NUnitPad.NUnitPadContent.GotoDefinitionContextMenuLabel}"
+			          class = "ICSharpCode.NUnitPad.GotoDefinitionCommand"/>
+		</Condition>
+	</Path>
+
+</AddIn>
diff --git a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj b/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj
index ab343323ba..1f3600d9c6 100644
--- a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj
+++ b/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj
@@ -13,9 +13,6 @@
     <NoConfig>False</NoConfig>
     <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
     <OutputType>Library</OutputType>
-    <StartupObject />
-    <ApplicationIcon />
-    <Win32Resource />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 31e0486bce..553d758de1 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>
@@ -182,7 +182,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" />
@@ -198,9 +198,11 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\TipOfTheDay.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Src\Gui\Dialogs\TreeViewOptions.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Dialogs\TreeViewOptions.cs" />
     <Compile Include="Src\Gui\Dialogs\ViewGPLDialog.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -258,7 +260,9 @@
     <Compile Include="Src\Gui\Dialogs\Wizard\WizardDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Pads\FileScout.cs" />
+    <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" />
     <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 a424bd7b03..746ae1f782 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/SharpDevelop.sln b/src/SharpDevelop.sln
index 47de66bfc2..c65e35a0d0 100644
--- a/src/SharpDevelop.sln
+++ b/src/SharpDevelop.sln
@@ -8,6 +8,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4b8f0f98-8be1-402b-aa8b-c8d548577b38}"
+EndProject
 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}") = "RegExpTk", "AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
@@ -139,6 +141,7 @@ Global
 		{8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{4b8f0f98-8be1-402b-aa8b-c8d548577b38} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
 		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}