Browse Source

starting a project with/without debugger works again

pull/18/head
Siegfried Pammer 14 years ago
parent
commit
7c3e361c79
  1. 4
      src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/WebBehavior.cs
  2. 28
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
  3. 2
      src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
  4. 4
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  5. 4
      src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs

4
src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/WebBehavior.cs

@ -61,7 +61,7 @@ namespace ICSharpCode.AspNet.Mvc @@ -61,7 +61,7 @@ namespace ICSharpCode.AspNet.Mvc
// TODO horrible CODE DUPLICATION
public override void Start(bool withDebugging)
{
var processStartInfo = CreateStartInfo();
var processStartInfo = Project.CreateStartInfo();
if (FileUtility.IsUrl(processStartInfo.FileName)) {
if (!CheckWebProjectStartInfo())
return;
@ -140,7 +140,7 @@ namespace ICSharpCode.AspNet.Mvc @@ -140,7 +140,7 @@ namespace ICSharpCode.AspNet.Mvc
void WithoutDebugger()
{
var processStartInfo = CreateStartInfo();
var processStartInfo = Project.CreateStartInfo();
if (FileUtility.IsUrl(processStartInfo.FileName)) {
if (!CheckWebProjectStartInfo())
return;

28
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin

@ -46,15 +46,17 @@ @@ -46,15 +46,17 @@
<Path name="/SharpDevelop/Workbench/LanguageBindings">
<LanguageBinding
id="XAML"
class="ICSharpCode.XamlBinding.XamlLanguageBinding"
extensions=".xaml" />
class="ICSharpCode.XamlBinding.XamlLanguageBinding"
extensions=".xaml" />
</Path>
<Path name="/SharpDevelop/Workbench/ProjectBehaviors">
<Class id="SilverlightBehavior" class="ICSharpCode.XamlBinding.SilverlightBehavior" />
<Condition name="ProjectBehaviorSupported" guid="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
<Class id="SilverlightBehavior" class="ICSharpCode.XamlBinding.SilverlightBehavior" />
</Condition>
<Class id="XamlBehavior" class="ICSharpCode.XamlBinding.XamlBehavior" />
</Path>
<!-- Options panel -->
<Path name="/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
<OptionPanel id = "XamlCompletionPanel"
@ -62,7 +64,7 @@ @@ -62,7 +64,7 @@
label = "${res:AddIns.XamlBinding.Options.Title}"
class = "ICSharpCode.XamlBinding.Options.CodeCompletion" />
</Path>
<Path name="/SharpDevelop/Workbench/MainMenu">
<ComplexCondition>
<And>
@ -71,15 +73,15 @@ @@ -71,15 +73,15 @@
</And>
<MenuItem id="XamlRefactoring" insertafter="Refactor" insertbefore="Project" label="${res:XML.MainMenu.RefactorMenu}" type="Menu">
<MenuItem id="RemoveMargin"
class="ICSharpCode.XamlBinding.PowerToys.Commands.RemoveMarginCommand"
label="${res:AddIns.XamlBinding.Menu.RemoveMargin}" />
<!-- <MenuItem id="RemoveUnnecessaryAttributes"
class="ICSharpCode.XamlBinding.PowerToys.Commands.RemoveMarginCommand"
label="${res:AddIns.XamlBinding.Menu.RemoveMargin}" />
<!-- <MenuItem id="RemoveUnnecessaryAttributes"
class="ICSharpCode.XamlBinding.PowerToys.Commands.RemoveUnnecessaryAttributesCommand"
label="${res:AddIns.XamlBinding.Menu.RemoveUnnecessaryAttributes}" />-->
<MenuItem type="Separator" />
<MenuItem id="ExtractPropertiesAsStyle"
class="ICSharpCode.XamlBinding.PowerToys.Commands.ExtractPropertiesAsStyleCommand"
label="${res:AddIns.XamlBinding.Menu.ExtractPropertiesAsStyle}" />
class="ICSharpCode.XamlBinding.PowerToys.Commands.ExtractPropertiesAsStyleCommand"
label="${res:AddIns.XamlBinding.Menu.ExtractPropertiesAsStyle}" />
<MenuItem id="GroupInto" label="${res:AddIns.XamlBinding.Menu.GroupInto}" type="Menu">
<MenuItem id="GroupIntoBorder" label="Border" type="Menu">
<MenuItem id="GroupIntoBorderWithoutChild"
@ -127,9 +129,9 @@ @@ -127,9 +129,9 @@
class="ICSharpCode.XamlBinding.PowerToys.Commands.GroupIntoWrapPanel" />
</MenuItem>
<MenuItem id="EditGridColumnsAndRows"
class="ICSharpCode.XamlBinding.PowerToys.Commands.EditGridColumnsAndRowsCommand"
label="${res:AddIns.XamlBinding.Menu.EditGridColumnsAndRows}" />
<!-- <MenuItem id="CreateBusinessForm"
class="ICSharpCode.XamlBinding.PowerToys.Commands.EditGridColumnsAndRowsCommand"
label="${res:AddIns.XamlBinding.Menu.EditGridColumnsAndRows}" />
<!-- <MenuItem id="CreateBusinessForm"
class="ICSharpCode.XamlBinding.PowerToys.Commands.CreateBusinessFormFromClassCommand"
label="${res:AddIns.XamlBinding.Menu.CreateBusinessFormFromClass}" />-->
</MenuItem>

2
src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
<ConditionEvaluator name="ProjectItem" class="ICSharpCode.SharpDevelop.Project.ProjectItemConditionEvaluator"/>
<ConditionEvaluator name="IsTextSelected" class="ICSharpCode.SharpDevelop.Editor.AvalonEdit.TextSelectedCondition"/>
<ConditionEvaluator name="ViewInBrowser" class="ICSharpCode.SharpDevelop.ViewInBrowserConditionEvaluator"/>
<ConditionEvaluator name="ProjectBehaviourSupported" class="ICSharpCode.SharpDevelop.Project.ProjectBehaviourSupportedConditionEvaluator"/>
<ConditionEvaluator name="ProjectBehaviorSupported" class="ICSharpCode.SharpDevelop.Project.ProjectBehaviorSupportedConditionEvaluator"/>
<Doozer name="CustomTool" class="ICSharpCode.SharpDevelop.Project.CustomToolDoozer"/>
<Doozer name="CustomProperty" class="ICSharpCode.SharpDevelop.Project.CustomPropertyDoozer"/>

4
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -457,7 +457,9 @@ @@ -457,7 +457,9 @@
<Compile Include="Src\Gui\IWorkbench.cs" />
<Compile Include="Src\Gui\IWorkbenchLayout.cs" />
<Compile Include="Src\Gui\IWorkbenchWindow.cs" />
<Compile Include="Src\Gui\IPadContent.cs" />
<Compile Include="Src\Gui\IPadContent.cs">
<DependentUpon>IProgressMonitor.cs</DependentUpon>
</Compile>
<Compile Include="Src\Gui\AbstractViewContent.cs" />
<Compile Include="Src\Gui\AbstractPadContent.cs" />
<Compile Include="Src\Gui\ContentInterfaces\IClipboardHandler.cs" />

4
src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs

@ -38,7 +38,9 @@ namespace ICSharpCode.SharpDevelop.Project @@ -38,7 +38,9 @@ namespace ICSharpCode.SharpDevelop.Project
{
ProcessStartInfo psi;
try {
psi = CreateStartInfo();
// we have to call CreateStartInfo through IProject, because otherwise the
// project behavior chain would not be processed!
psi = Project.CreateStartInfo();
} catch (ProjectStartException ex) {
MessageService.ShowError(ex.Message);
return;

Loading…
Cancel
Save