Browse Source

ParserService does not lock parsed files anymore.

Moved common options panel from C# and VB.NET to base.
Fixed bug in property pad by introducing PropertyContainer (combined set of DesignerHost, SelectableObjects and SelectedObject).
The PropertyPad now automatically shows the PropertyContainer of the active ViewContent.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@109 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 21 years ago
parent
commit
e73b222ff3
  1. 3
      data/templates/project/VBNet/Direct3DProject.xpt
  2. 13
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
  3. 24
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
  4. 87
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/DebugOptions.cs
  5. 50
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs
  6. 341
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs
  7. 185
      src/AddIns/BackendBindings/VBNetBinding/Project/Resources/ApplicationSettings.xfrm
  8. 86
      src/AddIns/BackendBindings/VBNetBinding/Project/Resources/BuildEvents.xfrm
  9. 114
      src/AddIns/BackendBindings/VBNetBinding/Project/Resources/DebugOptions.xfrm
  10. 250
      src/AddIns/BackendBindings/VBNetBinding/Project/Resources/Publish.xfrm
  11. 71
      src/AddIns/BackendBindings/VBNetBinding/Project/Resources/ReferencePaths.xfrm
  12. 94
      src/AddIns/BackendBindings/VBNetBinding/Project/Resources/Signing.xfrm
  13. 95
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ApplicationSettings.cs
  14. 55
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildEvents.cs
  15. 27
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/Publish.cs
  16. 26
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ReferencePaths.cs
  17. 83
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/Signing.cs
  18. 48
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/Parser/Parser.cs
  19. 369
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
  20. 13
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
  21. 24
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj
  22. 19
      src/AddIns/DisplayBindings/AssemblyScout/Project/AssemblyScout.addin
  23. 57
      src/AddIns/DisplayBindings/AssemblyScout/Project/AssemblyScout.csproj
  24. 14
      src/AddIns/DisplayBindings/AssemblyScout/Project/AssemblyScout.csproj.user
  25. 75
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
  26. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj.user
  27. 2
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
  28. 2
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj.user
  29. 20
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  30. 116
      src/Main/Base/Project/Resources/GeneralProjectOptions.xfrm
  31. 2
      src/Main/Base/Project/Resources/ProjectOptions/ApplicationSettings.xfrm
  32. 0
      src/Main/Base/Project/Resources/ProjectOptions/BuildEvents.xfrm
  33. 0
      src/Main/Base/Project/Resources/ProjectOptions/DebugOptions.xfrm
  34. 0
      src/Main/Base/Project/Resources/ProjectOptions/Publish.xfrm
  35. 0
      src/Main/Base/Project/Resources/ProjectOptions/ReferencePaths.xfrm
  36. 0
      src/Main/Base/Project/Resources/ProjectOptions/Signing.xfrm
  37. 8
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs
  38. 27
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.cs
  39. 66
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs
  40. 13
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DebugOptions.cs
  41. 128
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
  42. 89
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs
  43. 13
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Publish.cs
  44. 11
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.cs
  45. 13
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.cs
  46. 12
      src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs
  47. 8
      src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs
  48. 90
      src/Main/Base/Project/Src/Gui/Pads/PropertyPad/IDEContainer.cs
  49. 97
      src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyContainer.cs
  50. 130
      src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyPad.cs
  51. 356
      src/Main/Base/Project/Src/Project/AdvancedMSBuildProject.cs
  52. 11
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs
  53. 19
      src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs
  54. 23
      src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs

3
data/templates/project/VBNet/Direct3DProject.xpt

@ -180,8 +180,7 @@ Imports System.Runtime.CompilerServices @@ -180,8 +180,7 @@ Imports System.Runtime.CompilerServices
' numbers with the '*' character (the default):
<assembly: AssemblyVersion("1.0.*")>
</File>
]]></File>
</Files>
</Project>
</Combine>

13
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
<Runtime>
<Import assembly = "CSharpBinding.dll"/>
<Import assembly = "/ICSharpCode.SharpDevelop"/>
</Runtime>
<Path name = "/SharpDevelop/Workbench/Ambiences">
@ -36,25 +37,25 @@ @@ -36,25 +37,25 @@
<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/C#">
<DialogPanel id = "Application"
label = "Application"
class = "CSharpBinding.OptionPanels.ApplicationSettings"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
<DialogPanel id = "ReferencePaths"
label = "Reference Paths"
class = "CSharpBinding.OptionPanels.ReferencePaths"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>
<DialogPanel id = "Signing"
label = "Signing"
class = "CSharpBinding.OptionPanels.Signing"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
<DialogPanel id = "BuildEvents"
label = "Build Events"
class = "CSharpBinding.OptionPanels.BuildEvents"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
<DialogPanel id = "BuildOptions"
label = "Build"
class = "CSharpBinding.OptionPanels.BuildOptions"/>
<DialogPanel id = "DebugOptions"
label = "Debug"
class = "CSharpBinding.OptionPanels.DebugOptions"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
<DialogPanel id = "Publish"
label = "Publish"
class = "CSharpBinding.OptionPanels.Publish"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>
</Path>
<Path name = "/AddIns/DefaultTextEditor/Formatter/C#">

24
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj

@ -34,40 +34,16 @@ @@ -34,40 +34,16 @@
<ItemGroup>
<Compile Include="Configuration\AssemblyInfo.cs" />
<EmbeddedResource Include="Resources\AdvancedBuildOptionsDialog.xfrm" />
<EmbeddedResource Include="Resources\ApplicationSettings.xfrm" />
<EmbeddedResource Include="Resources\BuildEvents.xfrm" />
<EmbeddedResource Include="Resources\BuildOptions.xfrm" />
<EmbeddedResource Include="Resources\DebugOptions.xfrm" />
<EmbeddedResource Include="Resources\Publish.xfrm" />
<EmbeddedResource Include="Resources\ReferencePaths.xfrm" />
<EmbeddedResource Include="Resources\Signing.xfrm" />
<Compile Include="Src\CSharpAmbience.cs" />
<Compile Include="Src\CSharpBindingExecutionManager.cs" />
<Compile Include="Src\CSharpLanguageBinding.cs" />
<Compile Include="Src\FormattingStrategy\CSharpFormattingStrategy.cs" />
<Compile Include="Src\FormattingStrategy\DocumentAccessor.cs" />
<Compile Include="Src\FormattingStrategy\Indentation.cs" />
<Compile Include="Src\OptionPanels\ApplicationSettings.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\BuildEvents.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\BuildOptions.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\DebugOptions.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\Publish.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\ReferencePaths.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\Signing.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Parser\ExpressionFinder.cs" />
<Compile Include="Src\Parser\Parser.cs" />
<Compile Include="Src\Project\CSharpProject.cs" />

87
src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/DebugOptions.cs

@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
using System;
using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace CSharpBinding.OptionPanels
{
public class DebugOptions : AbstractOptionPanel
{
CSharpProject project;
string Config = "Debug";
string Platform = "AnyCPU";
public DebugOptions()
{
}
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.DebugOptions.xfrm"));
ConnectBrowseButton("startExternalProgramBrowseButton", "startExternalProgramTextBox", "${res:SharpDevelop.FileFilter.AllFiles}|*.*");
ConnectBrowseFolder("workingDirectoryBrowseButton", "workingDirectoryTextBox");
this.project = (CSharpProject)((Properties)CustomizationObject).Get("Project");
StartAction startAction = project.GetStartAction(Config, Platform);
Get<RadioButton>("startProject").Checked = startAction == StartAction.Project;
Get<RadioButton>("startProject").CheckedChanged += new EventHandler(UpdateEnabledStates);
Get<RadioButton>("startProject").CheckedChanged += new EventHandler(Save);
Get<RadioButton>("startExternalProgram").Checked = startAction == StartAction.Program;
Get<RadioButton>("startExternalProgram").CheckedChanged += new EventHandler(UpdateEnabledStates);
Get<RadioButton>("startExternalProgram").CheckedChanged += new EventHandler(Save);
Get<RadioButton>("startBrowserInURL").Checked = startAction == StartAction.StartURL;
Get<RadioButton>("startBrowserInURL").CheckedChanged += new EventHandler(UpdateEnabledStates);
Get<RadioButton>("startBrowserInURL").CheckedChanged += new EventHandler(Save);
Get<TextBox>("startExternalProgram").Text = project.GetStartProgram(Config, Platform);
Get<TextBox>("startExternalProgram").TextChanged += new EventHandler(Save);
Get<TextBox>("startBrowserInURL").Text = project.GetStartURL(Config, Platform);
Get<TextBox>("startBrowserInURL").TextChanged += new EventHandler(Save);
Get<TextBox>("commandLineArguments").Text = project.GetStartArguments(Config, Platform);
Get<TextBox>("commandLineArguments").TextChanged += new EventHandler(Save);
Get<TextBox>("workingDirectory").Text = project.GetStartWorkingDirectory(Config, Platform);
Get<TextBox>("workingDirectory").TextChanged += new EventHandler(Save);
UpdateEnabledStates(this, EventArgs.Empty);
}
void Save(object sender, EventArgs e)
{
StorePanelContents();
}
void UpdateEnabledStates(object sender, EventArgs e)
{
Get<TextBox>("startExternalProgram").Enabled = Get<Button>("startExternalProgramBrowse").Enabled = Get<RadioButton>("startExternalProgram").Checked;
Get<TextBox>("startBrowserInURL").Enabled = Get<RadioButton>("startBrowserInURL").Checked;
}
public override bool StorePanelContents()
{
project.SetStartProgram(Config, Platform, Get<TextBox>("startExternalProgram").Text);
project.SetStartURL(Config, Platform, Get<TextBox>("startBrowserInURL").Text);
project.SetStartArguments(Config, Platform, Get<TextBox>("commandLineArguments").Text);
project.SetStartWorkingDirectory(Config, Platform, Get<TextBox>("workingDirectory").Text);
if (Get<RadioButton>("startProject").Checked) {
project.SetStartAction(Config, Platform, StartAction.Project);
} else if (Get<RadioButton>("startExternalProgram").Checked) {
project.SetStartAction(Config, Platform, StartAction.Program);
} else {
project.SetStartAction(Config, Platform, StartAction.StartURL);
}
project.Save();
return true;
}
}
}

50
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs

@ -80,34 +80,36 @@ namespace CSharpBinding.Parser @@ -80,34 +80,36 @@ namespace CSharpBinding.Parser
public ICompilationUnit Parse(IProjectContent projectContent, string fileName)
{
Properties textEditorProperties = ((Properties)PropertyService.Get("ICSharpCode.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new Properties()));
ICSharpCode.NRefactory.Parser.IParser p = ICSharpCode.NRefactory.Parser.ParserFactory.CreateParser(fileName, Encoding.GetEncoding(textEditorProperties.Get("Encoding", 1252)));
p.Lexer.SpecialCommentTags = lexerTags;
p.Parse();
NRefactoryASTConvertVisitor visitor = new NRefactoryASTConvertVisitor(projectContent);
visitor.Visit(p.CompilationUnit, null);
visitor.Cu.FileName = fileName;
visitor.Cu.ErrorsDuringCompile = p.Errors.count > 0;
RetrieveRegions(visitor.Cu, p.Lexer.SpecialTracker);
AddCommentTags(visitor.Cu, p.Lexer.TagComments);
return visitor.Cu;
using (ICSharpCode.NRefactory.Parser.IParser p = ICSharpCode.NRefactory.Parser.ParserFactory.CreateParser(fileName, Encoding.GetEncoding(textEditorProperties.Get("Encoding", 1252)))) {
p.Lexer.SpecialCommentTags = lexerTags;
p.Parse();
NRefactoryASTConvertVisitor visitor = new NRefactoryASTConvertVisitor(projectContent);
visitor.Visit(p.CompilationUnit, null);
visitor.Cu.FileName = fileName;
visitor.Cu.ErrorsDuringCompile = p.Errors.count > 0;
RetrieveRegions(visitor.Cu, p.Lexer.SpecialTracker);
AddCommentTags(visitor.Cu, p.Lexer.TagComments);
return visitor.Cu;
}
}
public ICompilationUnit Parse(IProjectContent projectContent, string fileName, string fileContent)
{
ICSharpCode.NRefactory.Parser.IParser p = ICSharpCode.NRefactory.Parser.ParserFactory.CreateParser(ICSharpCode.NRefactory.Parser.SupportedLanguages.CSharp, new StringReader(fileContent));
p.Lexer.SpecialCommentTags = lexerTags;
p.Parse();
NRefactoryASTConvertVisitor visitor = new NRefactoryASTConvertVisitor(projectContent);
visitor.Visit(p.CompilationUnit, null);
visitor.Cu.FileName = fileName;
visitor.Cu.ErrorsDuringCompile = p.Errors.count > 0;
visitor.Cu.Tag = p.CompilationUnit;
RetrieveRegions(visitor.Cu, p.Lexer.SpecialTracker);
AddCommentTags(visitor.Cu, p.Lexer.TagComments);
return visitor.Cu;
using (ICSharpCode.NRefactory.Parser.IParser p = ICSharpCode.NRefactory.Parser.ParserFactory.CreateParser(ICSharpCode.NRefactory.Parser.SupportedLanguages.CSharp, new StringReader(fileContent))) {
p.Lexer.SpecialCommentTags = lexerTags;
p.Parse();
NRefactoryASTConvertVisitor visitor = new NRefactoryASTConvertVisitor(projectContent);
visitor.Visit(p.CompilationUnit, null);
visitor.Cu.FileName = fileName;
visitor.Cu.ErrorsDuringCompile = p.Errors.count > 0;
visitor.Cu.Tag = p.CompilationUnit;
RetrieveRegions(visitor.Cu, p.Lexer.SpecialTracker);
AddCommentTags(visitor.Cu, p.Lexer.TagComments);
return visitor.Cu;
}
}
void AddCommentTags(ICompilationUnit cu, ArrayList tagComments)

341
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs

@ -23,28 +23,10 @@ namespace CSharpBinding @@ -23,28 +23,10 @@ namespace CSharpBinding
All
}
public enum AssemblyOriginatorKeyMode {
None,
File,
Provider
}
public enum RunPostBuildEvent {
Always,
OnSuccessfulBuild,
OnOutputUpdated
}
public enum StartAction {
Project,
Program,
StartURL
}
/// <summary>
/// Description of CSharpProject.
/// </summary>
public class CSharpProject : MSBuildProject
public class CSharpProject : AdvancedMSBuildProject
{
[Browsable(false)]
public int WarningLevel {
@ -55,254 +37,6 @@ namespace CSharpBinding @@ -55,254 +37,6 @@ namespace CSharpBinding
BaseConfiguration.Set("WarningLevel", 4, value);
}
}
[Browsable(false)]
public string ApplicationIcon {
get {
return BaseConfiguration["ApplicationIcon"];
}
set {
BaseConfiguration.Set("ApplicationIcon", value);
}
}
#region Signing
[Browsable(false)]
public bool SignAssembly {
get {
return BaseConfiguration.Get("SignAssembly", false);
}
set {
BaseConfiguration.Set("SignAssembly", false, value);
}
}
[Browsable(false)]
public bool DelaySign {
get {
return BaseConfiguration.Get("DelaySign", false);
}
set {
BaseConfiguration.Set("DelaySign", false, value);
}
}
[Browsable(false)]
public string AssemblyOriginatorKeyFile {
get {
return BaseConfiguration["AssemblyOriginatorKeyFile"];
}
set {
BaseConfiguration.Set("AssemblyOriginatorKeyFile", value);
}
}
[Browsable(false)]
public string AssemblyKeyProviderName {
get {
return BaseConfiguration["AssemblyKeyProviderName"];
}
set {
BaseConfiguration.Set("AssemblyKeyProviderName", value);
}
}
[Browsable(false)]
public AssemblyOriginatorKeyMode AssemblyOriginatorKeyMode {
get {
return BaseConfiguration.Get("AssemblyOriginatorKeyMode", AssemblyOriginatorKeyMode.None);
}
set {
BaseConfiguration.Set("AssemblyOriginatorKeyMode", AssemblyOriginatorKeyMode.None, value);
}
}
#endregion
[Browsable(false)]
public string StartupObject {
get {
return BaseConfiguration["StartupObject"];
}
set {
BaseConfiguration.Set("StartupObject", value);
}
}
[Browsable(false)]
public string Win32Resource {
get {
return BaseConfiguration["Win32Resource"];
}
set {
BaseConfiguration.Set("Win32Resource", value);
}
}
#region Build events
[Browsable(false)]
public RunPostBuildEvent RunPostBuildEvent {
get {
return BaseConfiguration.Get("RunPostBuildEvent", RunPostBuildEvent.OnSuccessfulBuild);
}
set {
BaseConfiguration.Set("RunPostBuildEvent", RunPostBuildEvent.OnSuccessfulBuild, value);
}
}
[Browsable(false)]
public string PreBuildEvent {
get {
return BaseConfiguration["PreBuildEvent"];
}
set {
BaseConfiguration.Set("PreBuildEvent", value);
}
}
[Browsable(false)]
public string PostBuildEvent {
get {
return BaseConfiguration["PostBuildEvent"];
}
set {
BaseConfiguration.Set("PostBuildEvent", value);
}
}
#endregion
[Browsable(false)]
public string PublishUrl {
get {
return BaseConfiguration["PublishUrl"];
}
set {
BaseConfiguration.Set("PublishUrl", value);
}
}
[Browsable(false)]
public bool Install {
get {
return BaseConfiguration.Get("Install", false);
}
set {
BaseConfiguration.Set("Install", false, value);
}
}
[Browsable(false)]
public bool UpdateEnabled {
get {
return BaseConfiguration.Get("UpdateEnabled", false);
}
set {
BaseConfiguration.Set("UpdateEnabled", false, value);
}
}
[Browsable(false)]
public bool UpdatePeriodically {
get {
return BaseConfiguration.Get("UpdatePeriodically", false);
}
set {
BaseConfiguration.Set("UpdatePeriodically", false, value);
}
}
[Browsable(false)]
public bool UpdateRequired {
get {
return BaseConfiguration.Get("UpdateRequired", false);
}
set {
BaseConfiguration.Set("UpdateRequired", false, value);
}
}
[Browsable(false)]
public bool UpdateUrlEnabled {
get {
return BaseConfiguration.Get("UpdateUrlEnabled", false);
}
set {
BaseConfiguration.Set("UpdateUrlEnabled", value);
}
}
[Browsable(false)]
public bool BootstrapperEnabled {
get {
return BaseConfiguration.Get("BootstrapperEnabled", false);
}
set {
BaseConfiguration.Set("BootstrapperEnabled", false, value);
}
}
[Browsable(false)]
public string InstallFrom {
get {
return BaseConfiguration["InstallFrom"];
}
set {
BaseConfiguration.Set("InstallFrom", value);
}
}
[Browsable(false)]
public string FallbackCulture {
get {
return BaseConfiguration["FallbackCulture"];
}
set {
BaseConfiguration.Set("FallbackCulture", value);
}
}
[Browsable(false)]
public string UpdateMode {
get {
return BaseConfiguration["UpdateMode"];
}
set {
BaseConfiguration.Set("UpdateMode", value);
}
}
[Browsable(false)]
public string UpdateIntervalUnits {
get {
return BaseConfiguration["UpdateIntervalUnits"];
}
set {
BaseConfiguration.Set("UpdateIntervalUnits", value);
}
}
[Browsable(false)]
public string ApplicationVersion {
get {
return BaseConfiguration["ApplicationVersion"];
}
set {
BaseConfiguration.Set("ApplicationVersion", value);
}
}
[Browsable(false)]
public int UpdateInterval {
get {
return BaseConfiguration.Get("UpdateInterval", 0);
}
set {
BaseConfiguration.Set("UpdateInterval", 0, value);
}
}
[Browsable(false)]
public int ApplicationRevision {
get {
return BaseConfiguration.Get("ApplicationRevision", 0);
}
set {
BaseConfiguration.Set("ApplicationRevision", 0, value);
}
}
public bool GetDebugSymbols(string configurationName, string platform)
{
@ -482,79 +216,6 @@ namespace CSharpBinding @@ -482,79 +216,6 @@ namespace CSharpBinding
GetConfiguration(configurationName, platform).Set("NoStdLib", false, val);
}
#region Debug Options
public string GetStartProgram(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartProgram"];
}
public void SetStartProgram(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartProgram"] = val;
}
public string GetStartURL(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartURL"];
}
public void SetStartURL(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartURL"] = val;
}
public StartAction GetStartAction(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform).Get("StartAction", StartAction.Project);
}
public void SetStartAction(string configurationName, string platform, StartAction val)
{
GetUserConfiguration(configurationName, platform).Set("StartAction", StartAction.Project, val);
}
public string GetStartArguments(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartArguments"];
}
public void SetStartArguments(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartArguments"] = val;
}
public string GetStartWorkingDirectory(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartWorkingDirectory"];
}
public void SetStartWorkingDirectory(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartWorkingDirectory"] = val;
}
public bool GetRemoteDebugEnabled(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform).Get("RemoteDebugEnabled", false);
}
public void SetRemoteDebugEnabled(string configurationName, string platform, bool val)
{
GetUserConfiguration(configurationName, platform).Set("RemoteDebugEnabled", false, val);
}
public string GetRemoteDebugMachine(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["RemoteDebugMachine"];
}
public void SetRemoteDebugMachine(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["RemoteDebugMachine"] = val;
}
#endregion
public CSharpProject(string fileName, string projectName)
{
this.Name = projectName;

185
src/AddIns/BackendBindings/VBNetBinding/Project/Resources/ApplicationSettings.xfrm

@ -1,185 +0,0 @@ @@ -1,185 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.UserControl>
<Name value="XmlUserControl1" />
<DockPadding value="" />
<ClientSize value="{Width=456, Height=364}" />
<Controls>
<System.Windows.Forms.Button>
<Name value="win32ResourceFileBrowseButton" />
<Location value="{X=408,Y=208}" />
<Size value="{Width=40, Height=21}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="14" />
</System.Windows.Forms.Button>
<System.Windows.Forms.ComboBox>
<Name value="win32ResourceFileComboBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="13" />
<Location value="{X=8,Y=208}" />
<Size value="{Width=392, Height=21}" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Label>
<Name value="label9" />
<Text value="Win32 R&amp;esource File:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="12" />
<Size value="{Width=436, Height=16}" />
<Location value="{X=8,Y=192}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.Button>
<Name value="applicationIconBrowseButton" />
<Location value="{X=408,Y=160}" />
<Size value="{Width=40, Height=21}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="11" />
</System.Windows.Forms.Button>
<System.Windows.Forms.GroupBox>
<Name value="groupBox1" />
<TabIndex value="15" />
<Location value="{X=8,Y=236}" />
<Anchor value="Top, Left, Right" />
<Size value="{Width=440, Height=112}" />
<Text value="Project Information" />
<Controls>
<System.Windows.Forms.TextBox>
<Name value="outputNameTextBox" />
<ReadOnly value="True" />
<Anchor value="Top, Left, Right" />
<TabIndex value="5" />
<Location value="{X=112,Y=80}" />
<Size value="{Width=320, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label8" />
<Text value="Output Name:" />
<TextAlign value="MiddleRight" />
<TabIndex value="4" />
<Location value="{X=8,Y=80}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="projectFileTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="3" />
<Location value="{X=112,Y=56}" />
<Size value="{Width=320, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label7" />
<Text value="Project &amp;File:" />
<TextAlign value="MiddleRight" />
<TabIndex value="2" />
<Location value="{X=8,Y=52}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="projectFolderTextBox" />
<ReadOnly value="True" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
<Location value="{X=112,Y=28}" />
<Size value="{Width=320, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label6" />
<Text value="Project Folder:" />
<TextAlign value="MiddleRight" />
<TabIndex value="0" />
<Location value="{X=8,Y=24}" />
</System.Windows.Forms.Label>
</Controls>
</System.Windows.Forms.GroupBox>
<System.Windows.Forms.PictureBox>
<Name value="applicationIconPictureBox" />
<Size value="{Width=48, Height=48}" />
<Location value="{X=8,Y=140}" />
<SizeMode value="StretchImage" />
</System.Windows.Forms.PictureBox>
<System.Windows.Forms.ComboBox>
<Name value="applicationIconComboBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="10" />
<Location value="{X=64,Y=160}" />
<Size value="{Width=336, Height=21}" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Label>
<Name value="label5" />
<Text value="Application i&amp;con:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="9" />
<Size value="{Width=384, Height=16}" />
<Location value="{X=64,Y=144}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.ComboBox>
<Name value="startupObjectComboBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="7" />
<Location value="{X=160,Y=112}" />
<Size value="{Width=288, Height=21}" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Label>
<Name value="label4" />
<Text value="&amp;Startup object:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="6" />
<Size value="{Width=288, Height=16}" />
<Location value="{X=160,Y=96}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.ComboBox>
<Name value="outputTypeComboBox" />
<TabIndex value="5" />
<Location value="{X=8,Y=112}" />
<Size value="{Width=136, Height=21}" />
<DropDownStyle value="DropDownList" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Label>
<Name value="label3" />
<Text value="&amp;Output type:" />
<TextAlign value="BottomLeft" />
<TabIndex value="4" />
<Size value="{Width=136, Height=16}" />
<Location value="{X=8,Y=96}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="rootNamespaceTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="3" />
<Location value="{X=8,Y=68}" />
<Size value="{Width=440, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label2" />
<Text value="&amp;Root namespace:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="2" />
<Size value="{Width=440, Height=16}" />
<Location value="{X=8,Y=52}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="assemblyNameTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
<Location value="{X=8,Y=24}" />
<Size value="{Width=440, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label1" />
<Text value="Assembly &amp;name:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="0" />
<Size value="{Width=440, Height=16}" />
<Location value="{X=8,Y=8}" />
</System.Windows.Forms.Label>
</Controls>
</System.Windows.Forms.UserControl>
</Components>

86
src/AddIns/BackendBindings/VBNetBinding/Project/Resources/BuildEvents.xfrm

@ -1,86 +0,0 @@ @@ -1,86 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.UserControl>
<Name value="XmlUserControl1" />
<DockPadding value="" />
<ClientSize value="{Width=384, Height=256}" />
<Controls>
<System.Windows.Forms.GroupBox>
<Name value="groupBox1" />
<TabIndex value="0" />
<Location value="{X=8,Y=8}" />
<Anchor value="Top, Left, Right" />
<Size value="{Width=364, Height=180}" />
<Text value="Build Events" />
<Controls>
<System.Windows.Forms.ComboBox>
<Name value="runPostBuildEventComboBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="8" />
<Location value="{X=8,Y=153}" />
<Size value="{Width=184, Height=21}" />
<DropDownStyle value="DropDownList" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Label>
<Name value="label3" />
<Text value="&amp;Run the post-build event:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="7" />
<Size value="{Width=352, Height=23}" />
<Location value="{X=8,Y=130}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="postBuildEventTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="5" />
<Location value="{X=8,Y=96}" />
<Size value="{Width=304, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label2" />
<Text value="P&amp;ost-build event command line:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="4" />
<Size value="{Width=344, Height=23}" />
<Location value="{X=8,Y=75}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.Button>
<Name value="postBuildEventBrowseButton" />
<Location value="{X=316,Y=98}" />
<Size value="{Width=40, Height=23}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="6" />
</System.Windows.Forms.Button>
<System.Windows.Forms.TextBox>
<Name value="preBuildEventTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="2" />
<Location value="{X=8,Y=49}" />
<Size value="{Width=304, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label1" />
<Text value="P&amp;re-build event command line:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
<Size value="{Width=344, Height=23}" />
<Location value="{X=8,Y=25}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.Button>
<Name value="preBuildEventBrowseButton" />
<Location value="{X=316,Y=50}" />
<Size value="{Width=40, Height=21}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="3" />
</System.Windows.Forms.Button>
</Controls>
</System.Windows.Forms.GroupBox>
</Controls>
</System.Windows.Forms.UserControl>
</Components>

114
src/AddIns/BackendBindings/VBNetBinding/Project/Resources/DebugOptions.xfrm

@ -1,114 +0,0 @@ @@ -1,114 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.UserControl>
<Name value="XmlUserControl1" />
<DockPadding value="" />
<ClientSize value="{Width=480, Height=312}" />
<Controls>
<System.Windows.Forms.GroupBox>
<Name value="groupBox1" />
<TabIndex value="0" />
<Location value="{X=8,Y=8}" />
<Anchor value="Top, Left, Right" />
<Size value="{Width=464, Height=100}" />
<Text value="Start Action" />
<Controls>
<System.Windows.Forms.TextBox>
<Name value="startBrowserInURLTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="8" />
<Location value="{X=156,Y=68}" />
<Size value="{Width=300, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Button>
<Name value="startExternalProgramBrowseButton" />
<Location value="{X=416,Y=44}" />
<Size value="{Width=40, Height=21}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="7" />
</System.Windows.Forms.Button>
<System.Windows.Forms.TextBox>
<Name value="startExternalProgramTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="3" />
<Location value="{X=156,Y=44}" />
<Size value="{Width=252, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.RadioButton>
<Name value="startBrowserInURLRadioButton" />
<Location value="{X=4,Y=68}" />
<Size value="{Width=152, Height=20}" />
<Text value="Start browser in &amp;URL:" />
<TabIndex value="2" />
</System.Windows.Forms.RadioButton>
<System.Windows.Forms.RadioButton>
<Name value="startExternalProgramRadioButton" />
<Location value="{X=4,Y=44}" />
<Size value="{Width=152, Height=20}" />
<Text value="Start e&amp;xternal program:" />
<TabIndex value="1" />
</System.Windows.Forms.RadioButton>
<System.Windows.Forms.RadioButton>
<Name value="startProjectRadioButton" />
<Location value="{X=4,Y=20}" />
<Size value="{Width=152, Height=20}" />
<Text value="&amp;Start project" />
<TabIndex value="0" />
</System.Windows.Forms.RadioButton>
</Controls>
</System.Windows.Forms.GroupBox>
<System.Windows.Forms.GroupBox>
<Name value="groupBox2" />
<TabIndex value="9" />
<Location value="{X=8,Y=120}" />
<Anchor value="Top, Left, Right" />
<Size value="{Width=464, Height=80}" />
<Text value="Start Options" />
<Controls>
<System.Windows.Forms.Label>
<Name value="label2" />
<Text value="&amp;Working directory:" />
<TextAlign value="MiddleRight" />
<TabIndex value="12" />
<Size value="{Width=148, Height=20}" />
<Location value="{X=4,Y=48}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.Label>
<Name value="label1" />
<Text value="Co&amp;mmand line arguments:" />
<TextAlign value="MiddleRight" />
<TabIndex value="11" />
<Size value="{Width=148, Height=20}" />
<Location value="{X=8,Y=20}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="commandLineArgumentsTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="10" />
<Location value="{X=156,Y=20}" />
<Size value="{Width=300, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Button>
<Name value="workingDirectoryBrowseButton" />
<Location value="{X=416,Y=52}" />
<Size value="{Width=40, Height=21}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="7" />
</System.Windows.Forms.Button>
<System.Windows.Forms.TextBox>
<Name value="workingDirectoryTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="3" />
<Location value="{X=156,Y=52}" />
<Size value="{Width=252, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
</Controls>
</System.Windows.Forms.GroupBox>
</Controls>
</System.Windows.Forms.UserControl>
</Components>

250
src/AddIns/BackendBindings/VBNetBinding/Project/Resources/Publish.xfrm

@ -1,250 +0,0 @@ @@ -1,250 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.UserControl>
<Name value="XmlUserControl1" />
<DockPadding value="" />
<ClientSize value="{Width=592, Height=480}" />
<Controls>
<System.Windows.Forms.Button>
<Name value="button5" />
<Location value="{X=472,Y=440}" />
<Size value="{Width=112, Height=23}" />
<Text value="Publish &amp;Now" />
<Anchor value="Top, Right" />
<TabIndex value="5" />
</System.Windows.Forms.Button>
<System.Windows.Forms.Button>
<Name value="button3" />
<Location value="{X=352,Y=440}" />
<Size value="{Width=112, Height=23}" />
<Text value="Publish &amp;Wizard..." />
<Anchor value="Top, Right" />
<TabIndex value="3" />
</System.Windows.Forms.Button>
<System.Windows.Forms.GroupBox>
<Name value="groupBox2" />
<TabIndex value="1" />
<Location value="{X=8,Y=192}" />
<Anchor value="Top, Left, Right" />
<Size value="{Width=576, Height=152}" />
<Text value="Install Mode and Settings" />
<Controls>
<System.Windows.Forms.Button>
<Name value="button8" />
<Location value="{X=456,Y=121}" />
<Size value="{Width=112, Height=23}" />
<Text value="O&amp;ptions..." />
<Anchor value="Top, Right" />
<TabIndex value="7" />
</System.Windows.Forms.Button>
<System.Windows.Forms.Button>
<Name value="button7" />
<Location value="{X=456,Y=89}" />
<Size value="{Width=112, Height=23}" />
<Text value="&amp;Updates..." />
<Anchor value="Top, Right" />
<TabIndex value="6" />
</System.Windows.Forms.Button>
<System.Windows.Forms.Button>
<Name value="button6" />
<Location value="{X=456,Y=57}" />
<Size value="{Width=112, Height=23}" />
<Text value="Pr&amp;erequisites..." />
<Anchor value="Top, Right" />
<TabIndex value="5" />
</System.Windows.Forms.Button>
<System.Windows.Forms.Button>
<Name value="button4" />
<Location value="{X=456,Y=25}" />
<Size value="{Width=112, Height=23}" />
<Text value="Application &amp;Files..." />
<Anchor value="Top, Right" />
<TabIndex value="4" />
</System.Windows.Forms.Button>
<System.Windows.Forms.CheckBox>
<Name value="checkBox1" />
<Location value="{X=8,Y=121}" />
<Size value="{Width=440, Height=24}" />
<Text value="For &amp;CD installations, automatically start Setup when CD is inserted" />
<Anchor value="Top, Left, Right" />
<TabIndex value="2" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.RadioButton>
<Name value="radioButton2" />
<Location value="{X=8,Y=49}" />
<Size value="{Width=440, Height=24}" />
<Text value="The application is avaiable offline as well (launchable from Start &amp;menu)" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
</System.Windows.Forms.RadioButton>
<System.Windows.Forms.RadioButton>
<Name value="radioButton1" />
<Location value="{X=8,Y=25}" />
<Size value="{Width=440, Height=24}" />
<Text value="The application is avaiable &amp;online only" />
<Anchor value="Top, Left, Right" />
<TabIndex value="0" />
</System.Windows.Forms.RadioButton>
</Controls>
</System.Windows.Forms.GroupBox>
<System.Windows.Forms.GroupBox>
<Name value="groupBox1" />
<TabIndex value="0" />
<Location value="{X=8,Y=8}" />
<Anchor value="Top, Left, Right" />
<Size value="{Width=576, Height=176}" />
<Text value="Publish Location" />
<Controls>
<System.Windows.Forms.Label>
<Name value="label2" />
<Text value="Documentation and &amp;support URL:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="18" />
<Size value="{Width=560, Height=16}" />
<Location value="{X=8,Y=122}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.ComboBox>
<Name value="comboBox2" />
<Anchor value="Top, Left, Right" />
<TabIndex value="19" />
<Location value="{X=8,Y=138}" />
<Size value="{Width=512, Height=21}" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Button>
<Name value="button2" />
<Location value="{X=528,Y=138}" />
<Size value="{Width=40, Height=21}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="20" />
</System.Windows.Forms.Button>
<System.Windows.Forms.Label>
<Name value="label1" />
<Text value="&amp;Installation URL (if different than above):" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="15" />
<Size value="{Width=528, Height=16}" />
<Location value="{X=40,Y=74}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.ComboBox>
<Name value="comboBox1" />
<Anchor value="Top, Left, Right" />
<TabIndex value="16" />
<Location value="{X=40,Y=90}" />
<Size value="{Width=480, Height=21}" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Button>
<Name value="button1" />
<Location value="{X=528,Y=90}" />
<Size value="{Width=40, Height=21}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="17" />
</System.Windows.Forms.Button>
<System.Windows.Forms.Label>
<Name value="label5" />
<Text value="Pu&amp;blishing Location (web site, ftp server, or file path)" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="12" />
<Size value="{Width=560, Height=16}" />
<Location value="{X=8,Y=26}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.ComboBox>
<Name value="applicationIconComboBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="13" />
<Location value="{X=8,Y=42}" />
<Size value="{Width=512, Height=21}" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Button>
<Name value="applicationIconBrowseButton" />
<Location value="{X=528,Y=42}" />
<Size value="{Width=40, Height=21}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="14" />
</System.Windows.Forms.Button>
</Controls>
</System.Windows.Forms.GroupBox>
<System.Windows.Forms.GroupBox>
<Name value="groupBox3" />
<TabIndex value="2" />
<Location value="{X=8,Y=352}" />
<Size value="{Width=328, Height=112}" />
<Text value="Publish Version" />
<Controls>
<System.Windows.Forms.CheckBox>
<Name value="checkBox2" />
<Location value="{X=8,Y=82}" />
<Size value="{Width=312, Height=24}" />
<Text value="&amp;Automatically increment revision with each release" />
<Anchor value="Top, Left, Right" />
<TabIndex value="8" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.Label>
<Name value="label7" />
<Text value="Revision:" />
<TextAlign value="BottomCenter" />
<TabIndex value="7" />
<Size value="{Width=56, Height=23}" />
<Location value="{X=200,Y=24}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="textBox4" />
<TabIndex value="6" />
<Location value="{X=200,Y=48}" />
<Size value="{Width=56, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label6" />
<Text value="Build:" />
<TextAlign value="BottomCenter" />
<TabIndex value="5" />
<Size value="{Width=56, Height=23}" />
<Location value="{X=136,Y=24}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="textBox3" />
<TabIndex value="4" />
<Location value="{X=136,Y=48}" />
<Size value="{Width=56, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label4" />
<Text value="Minor:" />
<TextAlign value="BottomCenter" />
<TabIndex value="3" />
<Size value="{Width=56, Height=23}" />
<Location value="{X=72,Y=24}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="textBox2" />
<TabIndex value="2" />
<Location value="{X=72,Y=48}" />
<Size value="{Width=56, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label3" />
<Text value="Major:" />
<TextAlign value="BottomCenter" />
<TabIndex value="1" />
<Size value="{Width=56, Height=23}" />
<Location value="{X=8,Y=24}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="textBox1" />
<TabIndex value="0" />
<Location value="{X=8,Y=48}" />
<Size value="{Width=56, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
</Controls>
</System.Windows.Forms.GroupBox>
</Controls>
</System.Windows.Forms.UserControl>
</Components>

71
src/AddIns/BackendBindings/VBNetBinding/Project/Resources/ReferencePaths.xfrm

@ -1,71 +0,0 @@ @@ -1,71 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.UserControl>
<Name value="XmlUserControl1" />
<DockPadding value="" />
<ClientSize value="{Width=360, Height=256}" />
<Controls>
<System.Windows.Forms.Button>
<Name value="removeButton" />
<Location value="{X=8,Y=216}" />
<Size value="{Width=88, Height=23}" />
<Text value="&amp;Remove" />
<TabIndex value="7" />
</System.Windows.Forms.Button>
<System.Windows.Forms.ListView>
<Name value="referencePathListView" />
<Anchor value="Top, Left, Right" />
<TabIndex value="6" />
<Location value="{X=8,Y=120}" />
<Size value="{Width=336, Height=88}" />
</System.Windows.Forms.ListView>
<System.Windows.Forms.Label>
<Name value="label2" />
<Text value="Reference &amp;Path:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="5" />
<Size value="{Width=336, Height=23}" />
<Location value="{X=8,Y=96}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.Button>
<Name value="updateButton" />
<Location value="{X=112,Y=64}" />
<Size value="{Width=80, Height=23}" />
<Text value="&amp;Update" />
<TabIndex value="4" />
</System.Windows.Forms.Button>
<System.Windows.Forms.Button>
<Name value="addFolderButton" />
<Location value="{X=8,Y=64}" />
<Size value="{Width=96, Height=23}" />
<Text value="&amp;Add Folder" />
<TabIndex value="3" />
</System.Windows.Forms.Button>
<System.Windows.Forms.TextBox>
<Name value="folderTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
<Location value="{X=8,Y=32}" />
<Size value="{Width=296, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label1" />
<Text value="&amp;Folder:" />
<TextAlign value="BottomLeft" />
<Anchor value="Top, Left, Right" />
<TabIndex value="0" />
<Size value="{Width=344, Height=23}" />
<Location value="{X=8,Y=8}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.Button>
<Name value="folderBrowseButton" />
<Location value="{X=312,Y=32}" />
<Size value="{Width=40, Height=23}" />
<Text value="..." />
<Anchor value="Top, Right" />
<TabIndex value="2" />
</System.Windows.Forms.Button>
</Controls>
</System.Windows.Forms.UserControl>
</Components>

94
src/AddIns/BackendBindings/VBNetBinding/Project/Resources/Signing.xfrm

@ -1,94 +0,0 @@ @@ -1,94 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.UserControl>
<Name value="XmlUserControl1" />
<DockPadding value="" />
<ClientSize value="{Width=392, Height=312}" />
<Controls>
<System.Windows.Forms.GroupBox>
<Name value="signingGroupBox" />
<TabIndex value="1" />
<Location value="{X=8,Y=28}" />
<Anchor value="Top, Left, Right" />
<Size value="{Width=368, Height=196}" />
<Text value="Key Selection" />
<Controls>
<System.Windows.Forms.CheckBox>
<Name value="delaySignOnlyCheckBox" />
<Location value="{X=4,Y=169}" />
<Size value="{Width=356, Height=24}" />
<Text value="Dela&amp;y Sign only" />
<Anchor value="Top, Left, Right" />
<TabIndex value="8" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.ComboBox>
<Name value="containerComboBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="7" />
<Location value="{X=108,Y=133}" />
<Size value="{Width=252, Height=21}" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Label>
<Name value="label2" />
<Text value="&amp;Container:" />
<TextAlign value="MiddleRight" />
<TabIndex value="6" />
<Location value="{X=8,Y=128}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.ComboBox>
<Name value="providerNameComboBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="5" />
<Location value="{X=108,Y=105}" />
<Size value="{Width=252, Height=21}" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Label>
<Name value="label1" />
<Text value="Provider &amp;name:" />
<TextAlign value="MiddleRight" />
<TabIndex value="4" />
<Location value="{X=8,Y=100}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.RadioButton>
<Name value="useKeyProviderRadioButton" />
<Location value="{X=4,Y=77}" />
<Size value="{Width=356, Height=24}" />
<Text value="Use this key &amp;provider:" />
<Anchor value="Top, Left, Right" />
<TabIndex value="3" />
</System.Windows.Forms.RadioButton>
<System.Windows.Forms.ComboBox>
<Name value="keyFileComboBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
<Location value="{X=20,Y=49}" />
<Size value="{Width=184, Height=21}" />
</System.Windows.Forms.ComboBox>
<System.Windows.Forms.Button>
<Name value="changePasswordButton" />
<Location value="{X=212,Y=49}" />
<Size value="{Width=148, Height=21}" />
<Text value="Change Pass&amp;word..." />
<Anchor value="Top, Right" />
<TabIndex value="2" />
</System.Windows.Forms.Button>
<System.Windows.Forms.RadioButton>
<Name value="useKeyFileRadioButton" />
<Location value="{X=4,Y=25}" />
<Size value="{Width=356, Height=24}" />
<Text value="Use a key &amp;file:" />
<Anchor value="Top, Left, Right" />
<TabIndex value="0" />
</System.Windows.Forms.RadioButton>
</Controls>
</System.Windows.Forms.GroupBox>
<System.Windows.Forms.CheckBox>
<Name value="signAssemblyCheckBox" />
<Location value="{X=8,Y=4}" />
<Size value="{Width=376, Height=24}" />
<Text value="Sign the &amp;assembly" />
<Anchor value="Top, Left, Right" />
<TabIndex value="0" />
</System.Windows.Forms.CheckBox>
</Controls>
</System.Windows.Forms.UserControl>
</Components>

95
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ApplicationSettings.cs

@ -1,95 +0,0 @@ @@ -1,95 +0,0 @@
using System;
using System.Drawing;
using System.IO;
using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
namespace VBNetBinding.OptionPanels
{
public class ApplicationSettings : AbstractOptionPanel
{
VBNetProject project;
public ApplicationSettings()
{
}
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ApplicationSettings.xfrm"));
this.project = (VBNetProject)((Properties)CustomizationObject).Get("Project");
ConnectBrowseButton("applicationIconBrowseButton", "applicationIconComboBox", "${res:SharpDevelop.FileFilter.Icons}|*.ico|${res:SharpDevelop.FileFilter.AllFiles}|*.*");
// TODO: Suitable file filter.
ConnectBrowseButton("win32ResourceFileBrowseButton", "win32ResourceFileComboBox");
Get<TextBox>("assemblyName").Text = project.AssemblyName;
Get<TextBox>("assemblyName").TextChanged += new EventHandler(RefreshOutputNameTextBox);
Get<TextBox>("assemblyName").TextChanged += new EventHandler(Save);
Get<TextBox>("rootNamespace").Text = project.RootNamespace;
Get<TextBox>("rootNamespace").TextChanged += new EventHandler(Save);
Get<ComboBox>("outputType").Items.Add(StringParser.Parse("${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Exe}"));
Get<ComboBox>("outputType").Items.Add(StringParser.Parse("${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.WinExe}"));
Get<ComboBox>("outputType").Items.Add(StringParser.Parse("${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Library}"));
Get<ComboBox>("outputType").Items.Add(StringParser.Parse("${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Module}"));
Get<ComboBox>("outputType").SelectedIndex = (int)project.OutputType;
Get<ComboBox>("outputType").SelectedIndexChanged += new EventHandler(RefreshOutputNameTextBox);
Get<ComboBox>("outputType").SelectedIndexChanged += new EventHandler(Save);
Get<ComboBox>("startupObject").Text = project.StartupObject;
Get<ComboBox>("startupObject").SelectedIndexChanged += new EventHandler(Save);
Get<ComboBox>("applicationIcon").Text = project.ApplicationIcon;
Get<ComboBox>("applicationIcon").TextChanged += new EventHandler(ApplicationIconComboBoxTextChanged);
Get<ComboBox>("applicationIcon").TextChanged += new EventHandler(Save);
Get<ComboBox>("win32ResourceFile").Text = project.Win32Resource;
Get<ComboBox>("win32ResourceFile").TextChanged += new EventHandler(Save);
Get<TextBox>("projectFolder").Text = project.Directory;
Get<TextBox>("projectFile").Text = Path.GetFileName(project.FileName);
Get<TextBox>("projectFile").TextChanged += new EventHandler(Save);
RefreshOutputNameTextBox(null, EventArgs.Empty);
}
void Save(object sender, EventArgs e)
{
StorePanelContents();
}
public override bool StorePanelContents()
{
project.AssemblyName = Get<TextBox>("assemblyName").Text;
project.RootNamespace = Get<TextBox>("rootNamespace").Text;
project.OutputType = (OutputType)Get<ComboBox>("outputType").SelectedIndex;
project.StartupObject = Get<ComboBox>("startupObject").Text;
project.ApplicationIcon = Get<ComboBox>("applicationIcon").Text;
project.Win32Resource = Get<ComboBox>("win32ResourceFile").Text;
project.Name = Path.GetFileNameWithoutExtension(Get<TextBox>("projectFile").Text);
project.Save();
return true;
}
void RefreshOutputNameTextBox(object sender, EventArgs e)
{
Get<TextBox>("outputName").Text = Get<TextBox>("assemblyName").Text + MSBuildProject.GetExtension((OutputType)Get<ComboBox>("outputType").SelectedIndex);
}
void ApplicationIconComboBoxTextChanged(object sender, EventArgs e)
{
string applicationIcon = Get<ComboBox>("applicationIcon").Text;
if (File.Exists(applicationIcon)) {
Get<PictureBox>("applicationIcon").Image = Image.FromFile(applicationIcon);
}
}
}
}

55
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildEvents.cs

@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
using System;
using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace VBNetBinding.OptionPanels
{
public class BuildEvents : AbstractOptionPanel
{
VBNetProject project;
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.BuildEvents.xfrm"));
ConnectBrowseButton("preBuildEventBrowseButton",
"preBuildEventTextBox",
"${res:SharpDevelop.FileFilter.AllFiles}|*.*");
ConnectBrowseButton("postBuildEventBrowseButton",
"postBuildEventTextBox",
"${res:SharpDevelop.FileFilter.AllFiles}|*.*");
this.project = (VBNetProject)((Properties)CustomizationObject).Get("Project");
Get<TextBox>("preBuildEvent").Text = project.PreBuildEvent;
Get<TextBox>("preBuildEvent").TextChanged += new EventHandler(Save);
Get<TextBox>("postBuildEvent").Text = project.PostBuildEvent;
Get<TextBox>("postBuildEvent").TextChanged += new EventHandler(Save);
Get<ComboBox>("runPostBuildEvent").Items.Add("Always");
Get<ComboBox>("runPostBuildEvent").Items.Add("On successful build");
Get<ComboBox>("runPostBuildEvent").Items.Add("When the build updates the project output");
Get<ComboBox>("runPostBuildEvent").SelectedIndex = (int)project.RunPostBuildEvent;
Get<ComboBox>("runPostBuildEvent").SelectedIndexChanged += new EventHandler(Save);
}
void Save(object sender, EventArgs e)
{
StorePanelContents();
}
public override bool StorePanelContents()
{
project.PreBuildEvent = Get<TextBox>("preBuildEvent").Text;
project.PostBuildEvent = Get<TextBox>("postBuildEvent").Text;
project.RunPostBuildEvent = (RunPostBuildEvent)Get<ComboBox>("runPostBuildEvent").SelectedIndex;
project.Save();
return true;
}
}
}

27
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/Publish.cs

@ -1,27 +0,0 @@ @@ -1,27 +0,0 @@
using System;
using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace VBNetBinding.OptionPanels
{
public class Publish : AbstractOptionPanel
{
VBNetProject project;
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Publish.xfrm"));
this.project = (VBNetProject)((Properties)CustomizationObject).Get("Project");
}
public override bool StorePanelContents()
{
// TODO
return true;
}
}
}

26
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ReferencePaths.cs

@ -1,26 +0,0 @@ @@ -1,26 +0,0 @@
using System;
using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace VBNetBinding.OptionPanels
{
public class ReferencePaths : AbstractOptionPanel
{
VBNetProject project;
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ReferencePaths.xfrm"));
this.project = (VBNetProject)((Properties)CustomizationObject).Get("Project");
}
public override bool StorePanelContents()
{
// TODO
return true;
}
}
}

83
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/Signing.cs

@ -1,83 +0,0 @@ @@ -1,83 +0,0 @@
using System;
using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace VBNetBinding.OptionPanels
{
public class Signing : AbstractOptionPanel
{
VBNetProject project;
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Signing.xfrm"));
this.project = (VBNetProject)((Properties)CustomizationObject).Get("Project");
Get<CheckBox>("signAssembly").Checked = project.SignAssembly;
Get<CheckBox>("signAssembly").CheckedChanged += new EventHandler(UpdateEnabledStates);
Get<CheckBox>("signAssembly").CheckedChanged += new EventHandler(Save);
Get<RadioButton>("useKeyFile").Checked = project.AssemblyOriginatorKeyMode == AssemblyOriginatorKeyMode.File;
Get<RadioButton>("useKeyFile").CheckedChanged += new EventHandler(UpdateEnabledStates);
Get<RadioButton>("useKeyFile").CheckedChanged += new EventHandler(Save);
Get<RadioButton>("useKeyProvider").Checked = project.AssemblyOriginatorKeyMode == AssemblyOriginatorKeyMode.Provider;
Get<RadioButton>("useKeyProvider").CheckedChanged += new EventHandler(UpdateEnabledStates);
Get<RadioButton>("useKeyProvider").CheckedChanged += new EventHandler(Save);
Get<ComboBox>("keyFile").Text = project.AssemblyOriginatorKeyFile;
Get<ComboBox>("keyFile").TextChanged += new EventHandler(Save);
Get<ComboBox>("providerName").Text = project.AssemblyKeyProviderName;
Get<ComboBox>("providerName").Items.Add("TODO: GetKeyProviders()");
Get<ComboBox>("providerName").TextChanged += new EventHandler(Save);
Get<ComboBox>("container").Text = "TODO";
Get<ComboBox>("container").TextChanged += new EventHandler(Save);
Get<CheckBox>("delaySignOnly").Checked = project.DelaySign;
Get<CheckBox>("delaySignOnly").CheckedChanged += new EventHandler(Save);
UpdateEnabledStates(this, EventArgs.Empty);
}
void Save(object sender, EventArgs e)
{
StorePanelContents();
}
void UpdateEnabledStates(object sender, EventArgs e)
{
Get<Button>("changePassword").Enabled = false;
Get<ComboBox>("providerName").Enabled = Get<ComboBox>("container").Enabled = Get<RadioButton>("useKeyProvider").Checked;
Get<ComboBox>("keyFile").Enabled = Get<RadioButton>("useKeyFile").Checked;
Get<GroupBox>("signing").Enabled = Get<CheckBox>("signAssembly").Checked;
}
public override bool StorePanelContents()
{
project.SignAssembly = Get<CheckBox>("signAssembly").Checked;
project.DelaySign = Get<CheckBox>("delaySignOnly").Checked;
project.AssemblyOriginatorKeyFile = Get<ComboBox>("keyFile").Text;
project.AssemblyKeyProviderName = Get<ComboBox>("providerName").Text;
// TODO : Container ????
if (Get<RadioButton>("useKeyFile").Checked) {
project.AssemblyOriginatorKeyMode = AssemblyOriginatorKeyMode.File;
} else if (Get<RadioButton>("useKeyProvider").Checked) {
project.AssemblyOriginatorKeyMode = AssemblyOriginatorKeyMode.Provider;
}
project.Save();
return true;
}
}
}

48
src/AddIns/BackendBindings/VBNetBinding/Project/Src/Parser/Parser.cs

@ -19,7 +19,7 @@ namespace VBNetBinding.Parser @@ -19,7 +19,7 @@ namespace VBNetBinding.Parser
{
public class TParser : IParser
{
///<summary>IParser Interface</summary>
///<summary>IParser Interface</summary>
string[] lexerTags;
public string[] LexerTags
@ -93,34 +93,36 @@ namespace VBNetBinding.Parser @@ -93,34 +93,36 @@ namespace VBNetBinding.Parser
public ICompilationUnit Parse(IProjectContent projectContent, string fileName)
{
Properties textEditorProperties = ((Properties)PropertyService.Get("ICSharpCode.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new Properties()));
ICSharpCode.NRefactory.Parser.IParser p = ICSharpCode.NRefactory.Parser.ParserFactory.CreateParser(fileName, Encoding.GetEncoding(textEditorProperties.Get("Encoding", 1252)));
p.Lexer.SpecialCommentTags = lexerTags;
p.Parse();
using (ICSharpCode.NRefactory.Parser.IParser p = ICSharpCode.NRefactory.Parser.ParserFactory.CreateParser(fileName, Encoding.GetEncoding(textEditorProperties.Get("Encoding", 1252)))) {
p.Lexer.SpecialCommentTags = lexerTags;
p.Parse();
NRefactoryASTConvertVisitor visitor = new NRefactoryASTConvertVisitor(projectContent);
visitor.Visit(p.CompilationUnit, null);
visitor.Cu.FileName = fileName;
visitor.Cu.ErrorsDuringCompile = p.Errors.count > 0;
RetrieveRegions(visitor.Cu, p.Lexer.SpecialTracker);
AddCommentTags(visitor.Cu, p.Lexer.TagComments);
return visitor.Cu;
NRefactoryASTConvertVisitor visitor = new NRefactoryASTConvertVisitor(projectContent);
visitor.Visit(p.CompilationUnit, null);
visitor.Cu.FileName = fileName;
visitor.Cu.ErrorsDuringCompile = p.Errors.count > 0;
RetrieveRegions(visitor.Cu, p.Lexer.SpecialTracker);
AddCommentTags(visitor.Cu, p.Lexer.TagComments);
return visitor.Cu;
}
}
public ICompilationUnit Parse(IProjectContent projectContent, string fileName, string fileContent)
{
ICSharpCode.NRefactory.Parser.IParser p = ICSharpCode.NRefactory.Parser.ParserFactory.CreateParser(ICSharpCode.NRefactory.Parser.SupportedLanguages.CSharp, new StringReader(fileContent));
p.Lexer.SpecialCommentTags = lexerTags;
p.Parse();
NRefactoryASTConvertVisitor visitor = new NRefactoryASTConvertVisitor(projectContent);
visitor.Visit(p.CompilationUnit, null);
visitor.Cu.FileName = fileName;
visitor.Cu.ErrorsDuringCompile = p.Errors.count > 0;
visitor.Cu.Tag = p.CompilationUnit;
using (ICSharpCode.NRefactory.Parser.IParser p = ICSharpCode.NRefactory.Parser.ParserFactory.CreateParser(ICSharpCode.NRefactory.Parser.SupportedLanguages.CSharp, new StringReader(fileContent))) {
p.Lexer.SpecialCommentTags = lexerTags;
p.Parse();
RetrieveRegions(visitor.Cu, p.Lexer.SpecialTracker);
AddCommentTags(visitor.Cu, p.Lexer.TagComments);
return visitor.Cu;
NRefactoryASTConvertVisitor visitor = new NRefactoryASTConvertVisitor(projectContent);
visitor.Visit(p.CompilationUnit, null);
visitor.Cu.FileName = fileName;
visitor.Cu.ErrorsDuringCompile = p.Errors.count > 0;
visitor.Cu.Tag = p.CompilationUnit;
RetrieveRegions(visitor.Cu, p.Lexer.SpecialTracker);
AddCommentTags(visitor.Cu, p.Lexer.TagComments);
return visitor.Cu;
}
}
void AddCommentTags(ICompilationUnit cu, ArrayList tagComments)

369
src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs

@ -17,38 +17,16 @@ using ICSharpCode.Core; @@ -17,38 +17,16 @@ using ICSharpCode.Core;
namespace VBNetBinding
{
public enum WarningsAsErrors
{
public enum WarningsAsErrors {
None,
Specific,
All
}
public enum AssemblyOriginatorKeyMode
{
None,
File,
Provider
}
public enum RunPostBuildEvent
{
Always,
OnSuccessfulBuild,
OnOutputUpdated
}
public enum StartAction
{
Project,
Program,
StartURL
}
/// <summary>
/// Description of CSharpProject.
/// </summary>
public class VBNetProject : MSBuildProject
public class VBNetProject : AdvancedMSBuildProject
{
[Browsable(false)]
public int WarningLevel
@ -60,276 +38,6 @@ namespace VBNetBinding @@ -60,276 +38,6 @@ namespace VBNetBinding
BaseConfiguration.Set("WarningLevel", 4, value);
}
}
[Browsable(false)]
public string ApplicationIcon
{
get {
return BaseConfiguration["ApplicationIcon"];
}
set {
BaseConfiguration.Set("ApplicationIcon", value);
}
}
#region Signing
[Browsable(false)]
public bool SignAssembly {
get {
return BaseConfiguration.Get("SignAssembly", false);
}
set {
BaseConfiguration.Set("SignAssembly", false, value);
}
}
[Browsable(false)]
public bool DelaySign {
get {
return BaseConfiguration.Get("DelaySign", false);
}
set {
BaseConfiguration.Set("DelaySign", false, value);
}
}
[Browsable(false)]
public string AssemblyOriginatorKeyFile {
get {
return BaseConfiguration["AssemblyOriginatorKeyFile"];
}
set {
BaseConfiguration.Set("AssemblyOriginatorKeyFile", value);
}
}
[Browsable(false)]
public string AssemblyKeyProviderName {
get {
return BaseConfiguration["AssemblyKeyProviderName"];
}
set {
BaseConfiguration.Set("AssemblyKeyProviderName", value);
}
}
[Browsable(false)]
public AssemblyOriginatorKeyMode AssemblyOriginatorKeyMode {
get {
return BaseConfiguration.Get("AssemblyOriginatorKeyMode", AssemblyOriginatorKeyMode.None);
}
set {
BaseConfiguration.Set("AssemblyOriginatorKeyMode", AssemblyOriginatorKeyMode.None, value);
}
}
#endregion
[Browsable(false)]
public string StartupObject
{
get {
return BaseConfiguration["StartupObject"];
}
set {
BaseConfiguration.Set("StartupObject", value);
}
}
[Browsable(false)]
public string Win32Resource
{
get {
return BaseConfiguration["Win32Resource"];
}
set {
BaseConfiguration.Set("Win32Resource", value);
}
}
#region Build events
[Browsable(false)]
public RunPostBuildEvent RunPostBuildEvent {
get {
return BaseConfiguration.Get("RunPostBuildEvent", RunPostBuildEvent.OnSuccessfulBuild);
}
set {
BaseConfiguration.Set("RunPostBuildEvent", RunPostBuildEvent.OnSuccessfulBuild, value);
}
}
[Browsable(false)]
public string PreBuildEvent {
get {
return BaseConfiguration["PreBuildEvent"];
}
set {
BaseConfiguration.Set("PreBuildEvent", value);
}
}
[Browsable(false)]
public string PostBuildEvent {
get {
return BaseConfiguration["PostBuildEvent"];
}
set {
BaseConfiguration.Set("PostBuildEvent", value);
}
}
#endregion
[Browsable(false)]
public string PublishUrl
{
get {
return BaseConfiguration["PublishUrl"];
}
set {
BaseConfiguration.Set("PublishUrl", value);
}
}
[Browsable(false)]
public bool Install
{
get {
return BaseConfiguration.Get("Install", false);
}
set {
BaseConfiguration.Set("Install", false, value);
}
}
[Browsable(false)]
public bool UpdateEnabled
{
get {
return BaseConfiguration.Get("UpdateEnabled", false);
}
set {
BaseConfiguration.Set("UpdateEnabled", false, value);
}
}
[Browsable(false)]
public bool UpdatePeriodically
{
get {
return BaseConfiguration.Get("UpdatePeriodically", false);
}
set {
BaseConfiguration.Set("UpdatePeriodically", false, value);
}
}
[Browsable(false)]
public bool UpdateRequired
{
get {
return BaseConfiguration.Get("UpdateRequired", false);
}
set {
BaseConfiguration.Set("UpdateRequired", false, value);
}
}
[Browsable(false)]
public bool UpdateUrlEnabled
{
get {
return BaseConfiguration.Get("UpdateUrlEnabled", false);
}
set {
BaseConfiguration.Set("UpdateUrlEnabled", value);
}
}
[Browsable(false)]
public bool BootstrapperEnabled
{
get {
return BaseConfiguration.Get("BootstrapperEnabled", false);
}
set {
BaseConfiguration.Set("BootstrapperEnabled", false, value);
}
}
[Browsable(false)]
public string InstallFrom
{
get {
return BaseConfiguration["InstallFrom"];
}
set {
BaseConfiguration.Set("InstallFrom", value);
}
}
[Browsable(false)]
public string FallbackCulture
{
get {
return BaseConfiguration["FallbackCulture"];
}
set {
BaseConfiguration.Set("FallbackCulture", value);
}
}
[Browsable(false)]
public string UpdateMode
{
get {
return BaseConfiguration["UpdateMode"];
}
set {
BaseConfiguration.Set("UpdateMode", value);
}
}
[Browsable(false)]
public string UpdateIntervalUnits
{
get {
return BaseConfiguration["UpdateIntervalUnits"];
}
set {
BaseConfiguration.Set("UpdateIntervalUnits", value);
}
}
[Browsable(false)]
public string ApplicationVersion
{
get {
return BaseConfiguration["ApplicationVersion"];
}
set {
BaseConfiguration.Set("ApplicationVersion", value);
}
}
[Browsable(false)]
public int UpdateInterval
{
get {
return BaseConfiguration.Get("UpdateInterval", 0);
}
set {
BaseConfiguration.Set("UpdateInterval", 0, value);
}
}
[Browsable(false)]
public int ApplicationRevision
{
get {
return BaseConfiguration.Get("ApplicationRevision", 0);
}
set {
BaseConfiguration.Set("ApplicationRevision", 0, value);
}
}
public bool GetDebugSymbols(string configurationName, string platform)
{
@ -509,79 +217,6 @@ namespace VBNetBinding @@ -509,79 +217,6 @@ namespace VBNetBinding
GetConfiguration(configurationName, platform).Set("NoStdLib", false, val);
}
#region Debug Options
public string GetStartProgram(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartProgram"];
}
public void SetStartProgram(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartProgram"] = val;
}
public string GetStartURL(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartURL"];
}
public void SetStartURL(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartURL"] = val;
}
public StartAction GetStartAction(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform).Get("StartAction", StartAction.Project);
}
public void SetStartAction(string configurationName, string platform, StartAction val)
{
GetUserConfiguration(configurationName, platform).Set("StartAction", StartAction.Project, val);
}
public string GetStartArguments(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartArguments"];
}
public void SetStartArguments(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartArguments"] = val;
}
public string GetStartWorkingDirectory(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartWorkingDirectory"];
}
public void SetStartWorkingDirectory(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartWorkingDirectory"] = val;
}
public bool GetRemoteDebugEnabled(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform).Get("RemoteDebugEnabled", false);
}
public void SetRemoteDebugEnabled(string configurationName, string platform, bool val)
{
GetUserConfiguration(configurationName, platform).Set("RemoteDebugEnabled", false, val);
}
public string GetRemoteDebugMachine(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["RemoteDebugMachine"];
}
public void SetRemoteDebugMachine(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["RemoteDebugMachine"] = val;
}
#endregion
public VBNetProject(string fileName, string projectName)
{
this.Name = projectName;

13
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
<Runtime>
<Import assembly = "VBNetBinding.dll"/>
<Import assembly = "/ICSharpCode.SharpDevelop"/>
</Runtime>
<Path name = "/SharpDevelop/Workbench/Ambiences">
@ -31,25 +32,25 @@ @@ -31,25 +32,25 @@
<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/VBNet">
<DialogPanel id = "Application"
label = "Application"
class = "VBNetBinding.OptionPanels.ApplicationSettings"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ApplicationSettings"/>
<DialogPanel id = "ReferencePaths"
label = "Reference Paths"
class = "VBNetBinding.OptionPanels.ReferencePaths"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>
<DialogPanel id = "Signing"
label = "Signing"
class = "VBNetBinding.OptionPanels.Signing"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
<DialogPanel id = "BuildEvents"
label = "Build Events"
class = "VBNetBinding.OptionPanels.BuildEvents"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
<DialogPanel id = "BuildOptions"
label = "Build"
class = "VBNetBinding.OptionPanels.BuildOptions"/>
<DialogPanel id = "DebugOptions"
label = "Debug"
class = "VBNetBinding.OptionPanels.DebugOptions"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
<DialogPanel id = "Publish"
label = "Publish"
class = "VBNetBinding.OptionPanels.Publish"/>
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Publish"/>
</Path>
<Path name = "/AddIns/DefaultTextEditor/Formatter/VBNet">

24
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj

@ -37,40 +37,16 @@ @@ -37,40 +37,16 @@
<ItemGroup>
<Compile Include="Configuration\AssemblyInfo.cs" />
<EmbeddedResource Include="Resources\AdvancedBuildOptionsDialog.xfrm" />
<EmbeddedResource Include="Resources\ApplicationSettings.xfrm" />
<EmbeddedResource Include="Resources\BuildEvents.xfrm" />
<EmbeddedResource Include="Resources\BuildOptions.xfrm" />
<EmbeddedResource Include="Resources\DebugOptions.xfrm" />
<EmbeddedResource Include="Resources\Publish.xfrm" />
<EmbeddedResource Include="Resources\ReferencePaths.xfrm" />
<EmbeddedResource Include="Resources\Signing.xfrm" />
<Compile Include="Src\VBNetAmbience.cs" />
<Compile Include="Src\VBNetBindingExecutionManager.cs" />
<Compile Include="Src\VBNetLanguageBinding.cs" />
<Compile Include="Src\FormattingStrategy\VBNetFormattingStrategy.cs" />
<Compile Include="Src\FormattingStrategy\DocumentAccessor.cs" />
<Compile Include="Src\FormattingStrategy\Indentation.cs" />
<Compile Include="Src\OptionPanels\ApplicationSettings.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\BuildEvents.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\BuildOptions.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\OptionPanels\DebugOptions.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\Publish.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\ReferencePaths.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionPanels\Signing.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Parser\ExpressionFinder.cs" />
<Compile Include="Src\Parser\Parser.cs" />
<Compile Include="Src\Project\VBNetProject.cs" />

19
src/AddIns/DisplayBindings/AssemblyScout/Project/AssemblyScout.addin

@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
<AddIn name = "Assembly Scout"
author = "Mike Krueger"
copyright = "GPL"
url = "http://www.icsharpcode.net"
description = "SharpDevelop Assembly Scout"
version = "1.0.0">
<Runtime>
<Import assembly="AssemblyScout.dll"/>
</Runtime>
<Path name = "/SharpDevelop/Workbench/MainMenu/View">
<MenuItem id = "ShowAssemblyScout"
insertafter = "ViewItemsSeparator"
insertbefore = "FullScreen"
label = "Assembly Scout"
class = "ICSharpCode.SharpDevelop.AddIns.AssemblyScout.AssemblyScoutCommand"/>
</Extension>
</AddIn>

57
src/AddIns/DisplayBindings/AssemblyScout/Project/AssemblyScout.csproj

@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
<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.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{DDD402CD-1D04-4E3F-B563-A4CACC500188}</ProjectGuid>
<AssemblyName>AssemblyScout</AssemblyName>
<OutputTarget>Library</OutputTarget>
<WarningLevel>4</WarningLevel>
<NoStdLib>False</NoStdLib>
<NoConfig>False</NoConfig>
<RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
<OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<Optimize>False</Optimize>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\AssemblyScout\</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>False</DebugSymbols>
<Optimize>True</Optimize>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\AssemblyScout\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
<None Include="AssemblyScout.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<Folder Include="Configuration" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>

14
src/AddIns/DisplayBindings/AssemblyScout/Project/AssemblyScout.csproj.user

@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
<StartAction>Program</StartAction>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
<PropertyGroup>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ShowAllFiles</ProjectView>
<ProjectTrust>0</ProjectTrust>
</PropertyGroup>
</Project>

75
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs

@ -44,7 +44,7 @@ using Microsoft.VisualBasic; @@ -44,7 +44,7 @@ using Microsoft.VisualBasic;
namespace ICSharpCode.FormDesigner
{
public class FormDesignerViewContent : AbstractViewContent, ISecondaryViewContent, IClipboardHandler, IUndoHandler
public class FormDesignerViewContent : AbstractViewContent, ISecondaryViewContent, IClipboardHandler, IUndoHandler, IHasPropertyContainer
{
protected bool failedDesignerInitialize;
@ -151,12 +151,17 @@ namespace ICSharpCode.FormDesigner @@ -151,12 +151,17 @@ namespace ICSharpCode.FormDesigner
designSurface.Flush();
ICSharpCode.SharpDevelop.Gui.PropertyPad.SetDesignerHost(Host);
generator.Attach(this);
}
PropertyContainer propertyContainer = new PropertyContainer();
public PropertyContainer PropertyContainer {
get {
return propertyContainer;
}
}
public override void Load(string fileName)
{
}
@ -219,17 +224,33 @@ namespace ICSharpCode.FormDesigner @@ -219,17 +224,33 @@ namespace ICSharpCode.FormDesigner
public override void Selected()
{
IsFormDesignerVisible = true;
foreach(AxSideTab tab in ToolboxProvider.SideTabs) {
if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) {
SharpDevelopSideBar.SideBar.Tabs.Add(tab);
}
}
SharpDevelopSideBar.SideBar.Refresh();
propertyContainer.Host = Host;
UpdateSelectableObjects();
Reload();
}
public override void Deselected()
{
propertyContainer.Clear();
IsFormDesignerVisible = false;
foreach(AxSideTab tab in ToolboxProvider.SideTabs) {
if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) {
return;
}
SharpDevelopSideBar.SideBar.Tabs.Remove(tab);
}
SharpDevelopSideBar.SideBar.Refresh();
if (!failedDesignerInitialize) {
MergeFormChanges();
textAreaControlProvider.TextEditorControl.Refresh();
// base.DeSelectMe(this, EventArgs.Empty);
}
// DeselectAllComponents();
}
@ -249,54 +270,16 @@ namespace ICSharpCode.FormDesigner @@ -249,54 +270,16 @@ namespace ICSharpCode.FormDesigner
MergeFormChanges();
}
// AbstractViewContent members
protected override void OnWorkbenchWindowChanged(EventArgs e)
{
base.OnWorkbenchWindowChanged(e);
if (WorkbenchWindow != null) {
WorkbenchWindow.WindowSelected += new EventHandler(SelectMe);
WorkbenchWindow.WindowDeselected += new EventHandler(DeSelectMe);
}
}
protected void UpdateSelectableObjects()
{
PropertyPad.SetSelectableObjects(Host.Container.Components);
propertyContainer.SelectableObjects = Host.Container.Components;
ISelectionService selectionService = (ISelectionService)Host.GetService(typeof(ISelectionService));
if (selectionService != null) {
ICSharpCode.SharpDevelop.Gui.PropertyPad.SetDesignableObject(selectionService.PrimarySelection);
propertyContainer.SelectedObject = selectionService.PrimarySelection;
}
}
public bool IsFormDesignerVisible = false;
protected virtual void SelectMe(object sender, EventArgs e)
{
// TODO:
// loader.TextContent = Document.TextContent;
IsFormDesignerVisible = true;
foreach(AxSideTab tab in ToolboxProvider.SideTabs) {
if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) {
SharpDevelopSideBar.SideBar.Tabs.Add(tab);
}
}
SharpDevelopSideBar.SideBar.Refresh();
ICSharpCode.SharpDevelop.Gui.PropertyPad.SetDesignerHost(Host);
UpdateSelectableObjects();
}
protected virtual void DeSelectMe(object sender, EventArgs e)
{
IsFormDesignerVisible = false;
ICSharpCode.SharpDevelop.Gui.PropertyPad.SetDesignableObject(null);
ICSharpCode.SharpDevelop.Gui.PropertyPad.SetSelectableObjects(null);
foreach(AxSideTab tab in ToolboxProvider.SideTabs) {
if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) {
return;
}
SharpDevelopSideBar.SideBar.Tabs.Remove(tab);
}
SharpDevelopSideBar.SideBar.Refresh();
ICSharpCode.SharpDevelop.Gui.PropertyPad.RemoveHost(Host);
}
#region IUndoHandler impelementation
public bool EnableUndo {

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj.user

@ -1,4 +1,4 @@ @@ -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>
<ProjectView>ShowAllFiles</ProjectView>

2
src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj

@ -1,4 +1,4 @@ @@ -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>

2
src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj.user

@ -1,4 +1,4 @@ @@ -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>
<ProjectView>ShowAllFiles</ProjectView>

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

@ -236,9 +236,6 @@ @@ -236,9 +236,6 @@
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\CompileFileProjectOptions.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\DeployFileOptions.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\GeneralProjectOptions.cs" />
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\AddWebReferenceDialog.cs" />
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\AssemblyReferencePanel.cs">
<SubType>Component</SubType>
@ -496,7 +493,6 @@ @@ -496,7 +493,6 @@
<EmbeddedResource Include="Resources\ExternalToolOptions.xfrm" />
<EmbeddedResource Include="Resources\FontSelectionPanel.xfrm" />
<EmbeddedResource Include="Resources\NewFileWithNameDialog.xfrm" />
<EmbeddedResource Include="Resources\GeneralProjectOptions.xfrm" />
<EmbeddedResource Include="Resources\InputBox.xfrm" />
<EmbeddedResource Include="Resources\LoadSaveOptionPanel.xfrm" />
<EmbeddedResource Include="Resources\NewFileDialog.xfrm" />
@ -639,6 +635,21 @@ @@ -639,6 +635,21 @@
<Compile Include="Src\Project\MSBuildEngine.cs" />
<Compile Include="Src\TextEditor\Gui\Editor\CodeCompletionBinding.cs" />
<Compile Include="Src\Gui\Pads\DefinitionViewPad.cs" />
<Compile Include="Src\Project\AdvancedMSBuildProject.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ApplicationSettings.cs" />
<EmbeddedResource Include="Resources\ProjectOptions\ApplicationSettings.xfrm" />
<Compile Include="Src\Gui\Pads\PropertyPad\IDEContainer.cs" />
<Compile Include="Src\Gui\Pads\PropertyPad\PropertyContainer.cs" />
<EmbeddedResource Include="Resources\ProjectOptions\Publish.xfrm" />
<EmbeddedResource Include="Resources\ProjectOptions\ReferencePaths.xfrm" />
<EmbeddedResource Include="Resources\ProjectOptions\Signing.xfrm" />
<EmbeddedResource Include="Resources\ProjectOptions\BuildEvents.xfrm" />
<EmbeddedResource Include="Resources\ProjectOptions\DebugOptions.xfrm" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\Signing.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ReferencePaths.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\Publish.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\DebugOptions.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildEvents.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj">
@ -657,6 +668,7 @@ @@ -657,6 +668,7 @@
<Project>{35cef10f-2d4c-45f2-9dd1-161e0fec583c}</Project>
<Name>ICSharpCode.Core</Name>
</ProjectReference>
<Folder Include="Resources\ProjectOptions" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>

116
src/Main/Base/Project/Resources/GeneralProjectOptions.xfrm

@ -1,116 +0,0 @@ @@ -1,116 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.UserControl>
<Name value="CreatedObject0" />
<DockPadding value="" />
<ClientSize value="{Width=400, Height=344}" />
<Controls>
<System.Windows.Forms.TextBox>
<Name value="ProjectNamespaceTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="3" />
<Location value="{X=156,Y=32}" />
<Size value="{Width=236, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="label" />
<Text value="${res:Dialog.Options.PrjOptions.General.ProjectNamespaceLabel}" />
<TextAlign value="MiddleRight" />
<TabIndex value="2" />
<Size value="{Width=144, Height=16}" />
<Location value="{X=8,Y=32}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.RichTextBox>
<Name value="ProjectDescriptionTextBox" />
<Anchor value="Top, Bottom, Left, Right" />
<Size value="{Width=384, Height=88}" />
<Location value="{X=8,Y=80}" />
<Text value="" />
<TabIndex value="5" />
</System.Windows.Forms.RichTextBox>
<System.Windows.Forms.Label>
<Name value="CreatedObject1" />
<Text value="${res:Dialog.Options.PrjOptions.General.ProjectNameLabel}" />
<TextAlign value="MiddleRight" />
<TabIndex value="0" />
<Size value="{Width=144, Height=16}" />
<Location value="{X=8,Y=12}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="ProjectNameTextBox" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
<Location value="{X=156,Y=8}" />
<Size value="{Width=236, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Label>
<Name value="CreatedObject4" />
<Text value="${res:Dialog.Options.PrjOptions.General.ProjectDescriptionLabel}" />
<TextAlign value="BottomLeft" />
<TabIndex value="4" />
<Size value="{Width=376, Height=16}" />
<Location value="{X=8,Y=60}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.Label>
<Name value="CreatedObject7" />
<Text value="${res:Dialog.Options.PrjOptions.General.ProjectDocumentationLabel}" />
<TextAlign value="BottomLeft" />
<Anchor value="Bottom, Left, Right" />
<TabIndex value="7" />
<Size value="{Width=384, Height=16}" />
<Location value="{X=8,Y=264}" />
</System.Windows.Forms.Label>
<System.Windows.Forms.TextBox>
<Name value="ProjectDocumentationLocationTextBox" />
<Anchor value="Bottom, Left, Right" />
<TabIndex value="8" />
<Location value="{X=8,Y=280}" />
<Size value="{Width=344, Height=21}" />
<Text value="" />
</System.Windows.Forms.TextBox>
<System.Windows.Forms.Button>
<Name value="BrowseButton" />
<Location value="{X=360,Y=280}" />
<Size value="{Width=32, Height=21}" />
<Text value="..." />
<Anchor value="Bottom, Right" />
<TabIndex value="9" />
</System.Windows.Forms.Button>
<System.Windows.Forms.GroupBox>
<Name value="CreatedObject12" />
<TabIndex value="6" />
<Location value="{X=8,Y=176}" />
<Anchor value="Bottom, Left, Right" />
<Size value="{Width=384, Height=80}" />
<Text value="${res:Dialog.Options.PrjOptions.General.AutoFindFilesGroupBox}" />
<Controls>
<System.Windows.Forms.CheckBox>
<Name value="NewFilesOnLoadCheckBox" />
<Location value="{X=10,Y=21}" />
<Size value="{Width=368, Height=24}" />
<Text value="${res:Dialog.Options.PrjOptions.General.SearchNewFileOnLoadCheckBox}" />
<Anchor value="Top, Left, Right" />
<TabIndex value="0" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="AutoInsertNewFilesCheckBox" />
<Location value="{X=24,Y=45}" />
<Size value="{Width=352, Height=32}" />
<Text value="${res:Dialog.Options.PrjOptions.General.AutoIncludeFilesCheckBox}" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
</System.Windows.Forms.CheckBox>
</Controls>
</System.Windows.Forms.GroupBox>
<System.Windows.Forms.CheckBox>
<Name value="EnableViewStateCheckBox" />
<Location value="{X=8,Y=312}" />
<Size value="{Width=388, Height=24}" />
<Text value="${res:Dialog.Options.PrjOptions.General.ViewStateCheckBox}" />
<Anchor value="Bottom, Left, Right" />
<TabIndex value="10" />
</System.Windows.Forms.CheckBox>
</Controls>
</System.Windows.Forms.UserControl>
</Components>

2
src/AddIns/BackendBindings/CSharpBinding/Project/Resources/ApplicationSettings.xfrm → src/Main/Base/Project/Resources/ProjectOptions/ApplicationSettings.xfrm

@ -182,4 +182,4 @@ @@ -182,4 +182,4 @@
</System.Windows.Forms.Label>
</Controls>
</System.Windows.Forms.UserControl>
</Components>
</Components>

0
src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildEvents.xfrm → src/Main/Base/Project/Resources/ProjectOptions/BuildEvents.xfrm

0
src/AddIns/BackendBindings/CSharpBinding/Project/Resources/DebugOptions.xfrm → src/Main/Base/Project/Resources/ProjectOptions/DebugOptions.xfrm

0
src/AddIns/BackendBindings/CSharpBinding/Project/Resources/Publish.xfrm → src/Main/Base/Project/Resources/ProjectOptions/Publish.xfrm

0
src/AddIns/BackendBindings/CSharpBinding/Project/Resources/ReferencePaths.xfrm → src/Main/Base/Project/Resources/ProjectOptions/ReferencePaths.xfrm

0
src/AddIns/BackendBindings/CSharpBinding/Project/Resources/Signing.xfrm → src/Main/Base/Project/Resources/ProjectOptions/Signing.xfrm

8
src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/ApplicationSettings.cs → src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs

@ -8,11 +8,11 @@ using ICSharpCode.Core; @@ -8,11 +8,11 @@ using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
namespace CSharpBinding.OptionPanels
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
public class ApplicationSettings : AbstractOptionPanel
{
CSharpProject project;
AdvancedMSBuildProject project;
public ApplicationSettings()
{
@ -20,8 +20,8 @@ namespace CSharpBinding.OptionPanels @@ -20,8 +20,8 @@ namespace CSharpBinding.OptionPanels
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ApplicationSettings.xfrm"));
this.project = (CSharpProject)((Properties)CustomizationObject).Get("Project");
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectOptions.ApplicationSettings.xfrm"));
this.project = (AdvancedMSBuildProject)((Properties)CustomizationObject).Get("Project");
ConnectBrowseButton("applicationIconBrowseButton", "applicationIconComboBox", "${res:SharpDevelop.FileFilter.Icons}|*.ico|${res:SharpDevelop.FileFilter.AllFiles}|*.*");

27
src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildEvents.cs → src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.cs

@ -4,26 +4,27 @@ using System.Windows.Forms; @@ -4,26 +4,27 @@ using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace CSharpBinding.OptionPanels
using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
public class BuildEvents : AbstractOptionPanel
{
CSharpProject project;
AdvancedMSBuildProject project;
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.BuildEvents.xfrm"));
ConnectBrowseButton("preBuildEventBrowseButton",
"preBuildEventTextBox",
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectOptions.BuildEvents.xfrm"));
ConnectBrowseButton("preBuildEventBrowseButton",
"preBuildEventTextBox",
"${res:SharpDevelop.FileFilter.AllFiles}|*.*");
ConnectBrowseButton("postBuildEventBrowseButton",
"postBuildEventTextBox",
ConnectBrowseButton("postBuildEventBrowseButton",
"postBuildEventTextBox",
"${res:SharpDevelop.FileFilter.AllFiles}|*.*");
this.project = (CSharpProject)((Properties)CustomizationObject).Get("Project");
this.project = (AdvancedMSBuildProject)((Properties)CustomizationObject).Get("Project");
Get<TextBox>("preBuildEvent").Text = project.PreBuildEvent;
Get<TextBox>("preBuildEvent").Text = project.PreBuildEvent;
Get<TextBox>("preBuildEvent").TextChanged += new EventHandler(Save);
Get<TextBox>("postBuildEvent").Text = project.PostBuildEvent;
@ -38,15 +39,15 @@ namespace CSharpBinding.OptionPanels @@ -38,15 +39,15 @@ namespace CSharpBinding.OptionPanels
}
void Save(object sender, EventArgs e)
void Save(object sender, EventArgs e)
{
StorePanelContents();
}
public override bool StorePanelContents()
{
project.PreBuildEvent = Get<TextBox>("preBuildEvent").Text;
project.PostBuildEvent = Get<TextBox>("postBuildEvent").Text;
project.PreBuildEvent = Get<TextBox>("preBuildEvent").Text;
project.PostBuildEvent = Get<TextBox>("postBuildEvent").Text;
project.RunPostBuildEvent = (RunPostBuildEvent)Get<ComboBox>("runPostBuildEvent").SelectedIndex;
project.Save();
return true;

66
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs

@ -1,66 +0,0 @@ @@ -1,66 +0,0 @@
//// <file>
//// <copyright see="prj:///doc/copyright.txt"/>
//// <license see="prj:///doc/license.txt"/>
//// <owner name="Mike Krger" email="mike@icsharpcode.net"/>
//// <version value="$version"/>
//// </file>
//
//using System;
//using System.IO;
//using System.Drawing;
//using System.Collections;
//using System.ComponentModel;
//using System.Windows.Forms;
//
//using ICSharpCode.Core;
//
//using ICSharpCode.SharpDevelop.Project;
//using ICSharpCode.Core;
//using ICSharpCode.Core;
//
//namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
//{
// /// <summary>
// /// Summary description for Form1.
// /// </summary>
// public class CompileFileProjectOptions : AbstractOptionPanel
// {
// IProject project;
//
// public override void LoadPanelContents()
// {
// SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.CompileFileProjectOptions.xfrm"));
//
// this.project = (IProject)((Properties)CustomizationObject).Get("Project");
//
// foreach (ProjectFile info in project.ProjectFiles) {
// if (info.BuildAction == BuildAction.Nothing || info.BuildAction == BuildAction.Compile) {
// ((CheckedListBox)ControlDictionary["IncludeFilesCheckedListBox"]).Items.Add(FileUtility.GetRelativePath(project.BaseDirectory, info.Name).Substring(2), info.BuildAction == BuildAction.Compile ? CheckState.Checked : CheckState.Unchecked);
// }
// }
// }
//
// public override bool StorePanelContents()
// {
//
// for (int i = 0; i < ((CheckedListBox)ControlDictionary["IncludeFilesCheckedListBox"]).Items.Count; ++i) {
// string name = FileUtility.RelativeToAbsolutePath(project.BaseDirectory, "." + Path.DirectorySeparatorChar + ((CheckedListBox)ControlDictionary["IncludeFilesCheckedListBox"]).Items[i].ToString());
//
// int j = 0;
// while (j < project.ProjectFiles.Count && Path.GetFullPath(project.ProjectFiles[j].Name).ToLower() != Path.GetFullPath(name).ToLower()) {
// ++j;
// }
//
// if (j < project.ProjectFiles.Count) {
// project.ProjectFiles[j].BuildAction = ((CheckedListBox)ControlDictionary["IncludeFilesCheckedListBox"]).GetItemChecked(i) ? BuildAction.Compile : BuildAction.Nothing;
// } else {
// //// if file not found - we have to remove it from compiled ones for future
// MessageService.ShowError("File " + name + " not found in " + project.Name+ Environment.NewLine + "File will be ignored");
// project.ProjectFiles[i].BuildAction = BuildAction.Nothing;
// }
// }
//
// return true;
// }
// }
//}

13
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/DebugOptions.cs → src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DebugOptions.cs

@ -4,12 +4,13 @@ using System.Windows.Forms; @@ -4,12 +4,13 @@ using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace VBNetBinding.OptionPanels
using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
public class DebugOptions : AbstractOptionPanel
{
VBNetProject project;
AdvancedMSBuildProject project;
string Config = "Debug";
string Platform = "AnyCPU";
@ -20,10 +21,10 @@ namespace VBNetBinding.OptionPanels @@ -20,10 +21,10 @@ namespace VBNetBinding.OptionPanels
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.DebugOptions.xfrm"));
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectOptions.DebugOptions.xfrm"));
ConnectBrowseButton("startExternalProgramBrowseButton", "startExternalProgramTextBox", "${res:SharpDevelop.FileFilter.AllFiles}|*.*");
ConnectBrowseFolder("workingDirectoryBrowseButton", "workingDirectoryTextBox");
this.project = (VBNetProject)((Properties)CustomizationObject).Get("Project");
this.project = (AdvancedMSBuildProject)((Properties)CustomizationObject).Get("Project");
StartAction startAction = project.GetStartAction(Config, Platform);
@ -54,7 +55,7 @@ namespace VBNetBinding.OptionPanels @@ -54,7 +55,7 @@ namespace VBNetBinding.OptionPanels
UpdateEnabledStates(this, EventArgs.Empty);
}
void Save(object sender, EventArgs e)
void Save(object sender, EventArgs e)
{
StorePanelContents();
}

128
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs

@ -1,128 +0,0 @@ @@ -1,128 +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.IO;
//using System.Drawing;
//using System.Collections;
//using System.ComponentModel;
//using System.Windows.Forms;
//
//using ICSharpCode.SharpDevelop.Project;
//using ICSharpCode.Core;
//
//using ICSharpCode.Core;
//using ICSharpCode.Core;
//
//namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
//{
// /// <summary>
// /// Summary description for Form3.
// /// </summary>
// public class DeployFileProjectOptions : AbstractOptionPanel
// {
// IProject project;
//
// static
//
// public override void LoadPanelContents()
// {
// SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.DeployFileOptions.xfrm"));
//
// ((RadioButton)ControlDictionary["projectFileRadioButton"]).CheckedChanged += new EventHandler(RadioButtonCheckedChange);
// ((RadioButton)ControlDictionary["compiledAssemblyRadioButton"]).CheckedChanged += new EventHandler(RadioButtonCheckedChange);
// ((RadioButton)ControlDictionary["scriptFileRadioButton"]).CheckedChanged += new EventHandler(RadioButtonCheckedChange);
//
// (ControlDictionary["selectScriptFileButton"]).Click += new EventHandler(SelectScriptFileEvent);
// (ControlDictionary["selectTargetButton"]).Click += new EventHandler(SelectTargetFolderEvent);
//
// this.project = (IProject)((Properties)CustomizationObject).Get("Project");
//
// foreach (ProjectFile info in project.ProjectFiles) {
// if (info.BuildAction != BuildAction.Exclude) {
// string name = FileUtility.GetRelativePath(project.BaseDirectory, info.Name);
// ((CheckedListBox)ControlDictionary["projectFilesCheckedListBox"]).Items.Add(name, project.DeployInformation.IsFileExcluded(info.Name) ? CheckState.Unchecked : CheckState.Checked);
// }
// }
//
// ControlDictionary["deployTargetTextBox"].Text = project.DeployInformation.DeployTarget;
// ControlDictionary["deployScriptTextBox"].Text = project.DeployInformation.DeployScript;
//
// ((RadioButton)ControlDictionary["projectFileRadioButton"]).Checked = project.DeployInformation.DeploymentStrategy == DeploymentStrategy.File;
// ((RadioButton)ControlDictionary["compiledAssemblyRadioButton"]).Checked = project.DeployInformation.DeploymentStrategy == DeploymentStrategy.Assembly;
// ((RadioButton)ControlDictionary["scriptFileRadioButton"]).Checked = project.DeployInformation.DeploymentStrategy == DeploymentStrategy.Script;
//
// RadioButtonCheckedChange(null, null);
// }
//
// public override bool StorePanelContents()
// {
// if (ControlDictionary["deployTargetTextBox"].Text.Length > 0) {
// if (!FileUtility.IsValidFileName(ControlDictionary["deployTargetTextBox"].Text)) {
// MessageService.ShowError("Invalid deploy target specified");
// return false;
// }
// }
//
// if (ControlDictionary["deployScriptTextBox"].Text.Length > 0) {
// if (!FileUtility.IsValidFileName(ControlDictionary["deployScriptTextBox"].Text)) {
// MessageService.ShowError("Invalid deploy script specified");
// return false;
// }
// if (!File.Exists(ControlDictionary["deployScriptTextBox"].Text)) {
// MessageService.ShowError("Deploy script doesn't exists");
// return false;
// }
// }
//
// project.DeployInformation.DeployTarget = ControlDictionary["deployTargetTextBox"].Text;
// project.DeployInformation.DeployScript = ControlDictionary["deployScriptTextBox"].Text;
//
// if (((RadioButton)ControlDictionary["projectFileRadioButton"]).Checked) {
// project.DeployInformation.DeploymentStrategy = DeploymentStrategy.File;
// } else if (((RadioButton)ControlDictionary["compiledAssemblyRadioButton"]).Checked) {
// project.DeployInformation.DeploymentStrategy = DeploymentStrategy.Assembly;
// } else {
// project.DeployInformation.DeploymentStrategy = DeploymentStrategy.Script;
// }
//
// project.DeployInformation.ClearExcludedFiles();
// for (int i = 0; i < ((CheckedListBox)ControlDictionary["projectFilesCheckedListBox"]).Items.Count; ++i) {
// if (!((CheckedListBox)ControlDictionary["projectFilesCheckedListBox"]).GetItemChecked(i)) {
// project.DeployInformation.AddExcludedFile(FileUtility.RelativeToAbsolutePath(project.BaseDirectory, ((CheckedListBox)ControlDictionary["projectFilesCheckedListBox"]).Items[i].ToString()));
// }
// }
// return true;
// }
//
// void SelectScriptFileEvent(object sender, EventArgs e)
// {
// using (OpenFileDialog fdiag = new OpenFileDialog()) {
// fdiag.CheckFileExists = true;
// fdiag.Filter = StringParser.Parse("${res:SharpDevelop.FileFilter.ExecutableFiles}|*.exe;*.com;*.pif;*.bat;*.cmd|${res:SharpDevelop.FileFilter.AllFiles}|*.*");
//
// if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
// ControlDictionary["deployScriptTextBox"].Text = fdiag.FileName;
// }
// }
// }
//
// void SelectTargetFolderEvent(object sender, EventArgs e)
// {
// FolderDialog fdiag = new FolderDialog();
// if (fdiag.DisplayDialog("${res:Dialog.Options.PrjOptions.DeployFile.FolderDialogDescription}") == DialogResult.OK) {
// ControlDictionary["deployTargetTextBox"].Text = fdiag.Path;
// }
// }
//
// void RadioButtonCheckedChange(object sender, EventArgs e)
// {
// ControlDictionary["deployTargetTextBox"].Enabled = ControlDictionary["selectTargetButton"].Enabled = ((RadioButton)ControlDictionary["projectFileRadioButton"]).Checked || ((RadioButton)ControlDictionary["compiledAssemblyRadioButton"]).Checked;
// ControlDictionary["deployScriptTextBox"].Enabled = ControlDictionary["selectScriptFileButton"].Enabled = ((RadioButton)ControlDictionary["scriptFileRadioButton"]).Checked;
// }
// }
//}

89
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs

@ -1,89 +0,0 @@ @@ -1,89 +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.IO;
//using System.Drawing;
//using System.Collections;
//using System.ComponentModel;
//using System.Windows.Forms;
//
//using ICSharpCode.SharpDevelop.Project;
//using ICSharpCode.Core;
//using ICSharpCode.Core;
//using ICSharpCode.Core;
//
//namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
//{
// public class GeneralProjectOptions : AbstractOptionPanel
// {
// IProject project;
// static
//
// public override void LoadPanelContents()
// {
// SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.GeneralProjectOptions.xfrm"));
//
// ((CheckBox)ControlDictionary["NewFilesOnLoadCheckBox"]).CheckedChanged += new EventHandler(AutoLoadCheckBoxCheckedChangeEvent);
// (ControlDictionary["BrowseButton"]).Click += new EventHandler(BrowseFileEvent);
//
// this.project = (IProject)((Properties)CustomizationObject).Get("Project");
//
// ControlDictionary["ProjectNameTextBox"].Text = project.Name;
// ControlDictionary["ProjectNamespaceTextBox"].Text = project.StandardNamespace;
// ControlDictionary["ProjectDescriptionTextBox"].Text = project.Description;
//
// ((CheckBox)ControlDictionary["EnableViewStateCheckBox"]).Checked = project.EnableViewState;
//
// switch (project.NewFileSearch) {
// case NewFileSearch.None:
// ((CheckBox)ControlDictionary["NewFilesOnLoadCheckBox"]).Checked = ((CheckBox)ControlDictionary["AutoInsertNewFilesCheckBox"]).Checked = false;
// break;
// case NewFileSearch.OnLoad:
// ((CheckBox)ControlDictionary["NewFilesOnLoadCheckBox"]).Checked = true;
// ((CheckBox)ControlDictionary["AutoInsertNewFilesCheckBox"]).Checked = false;
// break;
// default:
// ((CheckBox)ControlDictionary["NewFilesOnLoadCheckBox"]).Checked = ((CheckBox)ControlDictionary["AutoInsertNewFilesCheckBox"]).Checked = true;
// break;
// }
// AutoLoadCheckBoxCheckedChangeEvent(null, null);
// }
//
// public override bool StorePanelContents()
// {
// project.Name = ControlDictionary["ProjectNameTextBox"].Text;
// project.StandardNamespace = ControlDictionary["ProjectNamespaceTextBox"].Text;
// project.Description = ControlDictionary["ProjectDescriptionTextBox"].Text;
//
// project.EnableViewState = ((CheckBox)ControlDictionary["EnableViewStateCheckBox"]).Checked;
//
// if (((CheckBox)ControlDictionary["NewFilesOnLoadCheckBox"]).Checked) {
// project.NewFileSearch = ((CheckBox)ControlDictionary["AutoInsertNewFilesCheckBox"]).Checked ? NewFileSearch.OnLoadAutoInsert : NewFileSearch.OnLoad;
// } else {
// project.NewFileSearch = NewFileSearch.None;
// }
// return true;
// }
//
// void AutoLoadCheckBoxCheckedChangeEvent(object sender, EventArgs e)
// {
// ((CheckBox)ControlDictionary["AutoInsertNewFilesCheckBox"]).Enabled = ((CheckBox)ControlDictionary["NewFilesOnLoadCheckBox"]).Checked;
// }
//
// void BrowseFileEvent(object sender, EventArgs e)
// {
// using (OpenFileDialog fdiag = new OpenFileDialog()) {
// fdiag.CheckFileExists = true;
//
// if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
// ControlDictionary["ProjectDocumentationLocationTextBox"].Text = fdiag.FileName;
// }
// }
// }
// }
//}

13
src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/Publish.cs → src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Publish.cs

@ -4,20 +4,21 @@ using System.Windows.Forms; @@ -4,20 +4,21 @@ using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace CSharpBinding.OptionPanels
using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
public class Publish : AbstractOptionPanel
{
CSharpProject project;
AdvancedMSBuildProject project;
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Publish.xfrm"));
this.project = (CSharpProject)((Properties)CustomizationObject).Get("Project");
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectOptions.Publish.xfrm"));
this.project = (AdvancedMSBuildProject)((Properties)CustomizationObject).Get("Project");
}
public override bool StorePanelContents()
{
// TODO

11
src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/ReferencePaths.cs → src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.cs

@ -4,17 +4,18 @@ using System.Windows.Forms; @@ -4,17 +4,18 @@ using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace CSharpBinding.OptionPanels
using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
public class ReferencePaths : AbstractOptionPanel
{
CSharpProject project;
AdvancedMSBuildProject project;
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ReferencePaths.xfrm"));
this.project = (CSharpProject)((Properties)CustomizationObject).Get("Project");
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectOptions.ReferencePaths.xfrm"));
this.project = (AdvancedMSBuildProject)((Properties)CustomizationObject).Get("Project");
}
public override bool StorePanelContents()

13
src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/Signing.cs → src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Signing.cs

@ -4,17 +4,18 @@ using System.Windows.Forms; @@ -4,17 +4,18 @@ using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Internal.ExternalTool;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace CSharpBinding.OptionPanels
using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
public class Signing : AbstractOptionPanel
{
CSharpProject project;
AdvancedMSBuildProject project;
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.Signing.xfrm"));
this.project = (CSharpProject)((Properties)CustomizationObject).Get("Project");
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectOptions.Signing.xfrm"));
this.project = (AdvancedMSBuildProject)((Properties)CustomizationObject).Get("Project");
Get<CheckBox>("signAssembly").Checked = project.SignAssembly;
Get<CheckBox>("signAssembly").CheckedChanged += new EventHandler(UpdateEnabledStates);
@ -46,7 +47,7 @@ namespace CSharpBinding.OptionPanels @@ -46,7 +47,7 @@ namespace CSharpBinding.OptionPanels
}
void Save(object sender, EventArgs e)
void Save(object sender, EventArgs e)
{
StorePanelContents();
}

12
src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs

@ -13,7 +13,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -13,7 +13,7 @@ namespace ICSharpCode.SharpDevelop.Project
/// <summary>
/// Description of ProjectBrowserControl.
/// </summary>
public class ProjectBrowserControl : System.Windows.Forms.UserControl
public class ProjectBrowserControl : System.Windows.Forms.UserControl, IHasPropertyContainer
{
ExtTreeView treeView;
static Dictionary<Image, int> projectBrowserImageIndex = new Dictionary<Image, int>();
@ -153,7 +153,15 @@ namespace ICSharpCode.SharpDevelop.Project @@ -153,7 +153,15 @@ namespace ICSharpCode.SharpDevelop.Project
return;
}
ProjectService.CurrentProject = node.Project;
ICSharpCode.SharpDevelop.Gui.PropertyPad.SetDesignableObject(node.Tag);
propertyContainer.SelectedObject = node.Tag;
}
PropertyContainer propertyContainer = new PropertyContainer();
public PropertyContainer PropertyContainer {
get {
return propertyContainer;
}
}
#region Windows Forms Designer generated code

8
src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs

@ -8,7 +8,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -8,7 +8,7 @@ namespace ICSharpCode.SharpDevelop.Project
/// <summary>
/// Description of ProjectBrowserPad.
/// </summary>
public class ProjectBrowserPad : AbstractPadContent, IClipboardHandler
public class ProjectBrowserPad : AbstractPadContent, IClipboardHandler, IHasPropertyContainer
{
static ProjectBrowserPad instance;
public static ProjectBrowserPad Instance {
@ -36,6 +36,12 @@ namespace ICSharpCode.SharpDevelop.Project @@ -36,6 +36,12 @@ namespace ICSharpCode.SharpDevelop.Project
}
}
public PropertyContainer PropertyContainer {
get {
return projectBrowserPanel.ProjectBrowserControl.PropertyContainer;
}
}
public ProjectBrowserPad()
{
instance = this;

90
src/Main/Base/Project/Src/Gui/Pads/PropertyPad/IDEContainer.cs

@ -0,0 +1,90 @@ @@ -0,0 +1,90 @@
// <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.Collections;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
using System.Drawing.Design;
using System.Windows.Forms;
using System.Windows.Forms.Design;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.Core;
namespace ICSharpCode.SharpDevelop.Gui
{
class IDEContainer : Container
{
class IDESite : ISite
{
private string name = "";
private IComponent component;
private IDEContainer container;
public IDESite(IComponent sitedComponent, IDEContainer site, string aName)
{
component = sitedComponent;
container = site;
name = aName;
}
public IComponent Component{
get{ return component;}
}
public IContainer Container{
get{return container;}
}
public bool DesignMode{
get{return false;}
}
public string Name {
get{ return name;}
set{name=value;}
}
public object GetService(Type serviceType)
{
return container.GetService(serviceType);
}
}
public IDEContainer (IServiceProvider sp)
{
serviceProvider = sp;
}
protected override object GetService(Type serviceType)
{
object service = base.GetService(serviceType);
if (service == null) {
service = serviceProvider.GetService(serviceType);
}
return service;
}
public ISite CreateSite(IComponent component)
{
return CreateSite(component, "UNKNOWN_SITE");
}
protected override ISite CreateSite(IComponent component,string name)
{
ISite site = base.CreateSite(component,name);
if (site == null) {
}
return new IDESite(component,this,name);
}
private IServiceProvider serviceProvider;
}
}

97
src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyContainer.cs

@ -0,0 +1,97 @@ @@ -0,0 +1,97 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
// <version value="$version"/>
// </file>
using System;
using System.Collections;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
using System.Drawing.Design;
using System.Windows.Forms;
using System.Windows.Forms.Design;
namespace ICSharpCode.SharpDevelop.Gui
{
public interface IHasPropertyContainer
{
PropertyContainer PropertyContainer { get; }
}
/// <summary>
/// A PropertyContainer is a little helper class that combines the settings a ViewContent
/// can set on the PropertyGrid.
/// Every pad or view content can have a property container associated with it by implementing
/// IHasPropertyContainer.
/// The PropertyPad follows the focus and displays the properties for the last pad that
/// has specified a PropertyContainer.
/// Changing properties on the container automatically updates the pad if the property container
/// is currently displayed there.
/// </summary>
public sealed class PropertyContainer
{
object selectedObject;
object[] selectedObjects;
public object SelectedObject {
get {
return selectedObject;
}
set {
selectedObject = value;
selectedObjects = null;
PropertyPad.UpdateSelectedObjectIfActive(this);
}
}
public object[] SelectedObjects {
get {
return selectedObjects;
}
set {
selectedObject = null;
selectedObjects = value;
PropertyPad.UpdateSelectedObjectIfActive(this);
}
}
ICollection selectableObjects;
public ICollection SelectableObjects {
get {
return selectableObjects;
}
set {
selectableObjects = value;
PropertyPad.UpdateSelectableIfActive(this);
}
}
IDesignerHost host;
public IDesignerHost Host {
get {
return host;
}
set {
host = value;
PropertyPad.UpdateHostIfActive(this);
}
}
/// <summary>
/// Clears all properties on this container.
/// When a ViewContent is closed, it should call Clear on it's property container to
/// remove it from the property pad.
/// </summary>
public void Clear()
{
Host = null;
SelectableObjects = null;
SelectedObject = null;
}
}
}

130
src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyPad.cs

@ -21,83 +21,57 @@ using ICSharpCode.Core; @@ -21,83 +21,57 @@ using ICSharpCode.Core;
namespace ICSharpCode.SharpDevelop.Gui
{
class IDEContainer : Container
public class PropertyPad : AbstractPadContent, IHelpProvider
{
class IDESite : ISite
{
private string name = "";
private IComponent component;
private IDEContainer container;
public IDESite(IComponent sitedComponent, IDEContainer site, string aName)
{
component = sitedComponent;
container = site;
name = aName;
}
public IComponent Component{
get{ return component;}
}
public IContainer Container{
get{return container;}
}
public bool DesignMode{
get{return false;}
}
public string Name {
get{ return name;}
set{name=value;}
}
public object GetService(Type serviceType)
{
return container.GetService(serviceType);
static PropertyPad instance;
public static PropertyPad Instance {
get {
return instance;
}
}
public IDEContainer (IServiceProvider sp)
{
serviceProvider = sp;
}
protected override object GetService(Type serviceType)
static PropertyContainer activeContainer;
static void SetActiveContainer(PropertyContainer pc)
{
object service = base.GetService(serviceType);
if (service == null) {
service = serviceProvider.GetService(serviceType);
}
return service;
if (activeContainer == pc)
return;
if (pc == null)
return;
activeContainer = pc;
UpdateSelectedObjectIfActive(pc);
UpdateHostIfActive(pc);
UpdateSelectableIfActive(pc);
}
public ISite CreateSite(IComponent component)
internal static void UpdateSelectedObjectIfActive(PropertyContainer container)
{
return CreateSite(component, "UNKNOWN_SITE");
if (activeContainer != container) return;
if (container.SelectedObjects != null)
SetDesignableObjects(container.SelectedObjects);
else
SetDesignableObject(container.SelectedObject);
}
protected override ISite CreateSite(IComponent component,string name)
internal static void UpdateHostIfActive(PropertyContainer container)
{
ISite site = base.CreateSite(component,name);
if (site == null) {
}
return new IDESite(component,this,name);
if (activeContainer != container)
return;
if (host == container.Host)
return;
if (host != null)
RemoveHost(host);
if (container.Host != null)
SetDesignerHost(container.Host);
}
private IServiceProvider serviceProvider;
}
public class PropertyPad : AbstractPadContent, IHelpProvider
{
static PropertyPad instance;
public static PropertyPad Instance {
get {
return instance;
}
internal static void UpdateSelectableIfActive(PropertyContainer container)
{
if (activeContainer != container)
return;
SetSelectableObjects(container.SelectableObjects);
}
static Panel panel = null;
static ComboBox comboBox = null;
@ -130,8 +104,16 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -130,8 +104,16 @@ namespace ICSharpCode.SharpDevelop.Gui
comboBox.DropDownStyle = ComboBoxStyle.DropDownList;
comboBox.DrawMode = DrawMode.OwnerDrawFixed;
comboBox.Sorted = true;
}
WorkbenchSingleton.Workbench.ActiveWorkbenchWindowChanged += WorkbenchWindowChanged;
}
static void WorkbenchWindowChanged(object sender, EventArgs e)
{
IHasPropertyContainer c = WorkbenchSingleton.Workbench.ActiveContent as IHasPropertyContainer;
if (c == null) return;
SetActiveContainer(c.PropertyContainer);
}
public PropertyPad()
{
@ -264,7 +246,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -264,7 +246,7 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
public static void SetDesignableObject(object obj)
static void SetDesignableObject(object obj)
{
if (grid != null) {
grid.SelectedObject = obj;
@ -272,7 +254,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -272,7 +254,7 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
public static void SetDesignableObjects(object[] obj)
static void SetDesignableObjects(object[] obj)
{
if (grid != null) {
grid.SelectedObjects = obj;
@ -280,11 +262,10 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -280,11 +262,10 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
public static void RemoveHost(IDesignerHost host)
static void RemoveHost(IDesignerHost host)
{
PropertyPad.host = null;
grid.Site = null;
SetDesignableObject(null);
ISelectionService selectionService = (ISelectionService)host.GetService(typeof(ISelectionService));
if (selectionService != null) {
@ -302,7 +283,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -302,7 +283,7 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
public static void SetDesignerHost(IDesignerHost host)
static void SetDesignerHost(IDesignerHost host)
{
PropertyPad.host = host;
if (host != null) {
@ -325,11 +306,10 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -325,11 +306,10 @@ namespace ICSharpCode.SharpDevelop.Gui
}
} else {
grid.Site = null;
}
}
public static void SetSelectableObjects(ICollection coll)
static void SetSelectableObjects(ICollection coll)
{
inUpdate = true;
try {
@ -380,11 +360,11 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -380,11 +360,11 @@ namespace ICSharpCode.SharpDevelop.Gui
shouldUpdateSelectableObjects = true;
}
public static void SelectionChangingHandler(object sender, EventArgs args)
static void SelectionChangingHandler(object sender, EventArgs args)
{
}
public static void SelectionChangedHandler(object sender, EventArgs args)
static void SelectionChangedHandler(object sender, EventArgs args)
{
ISelectionService selectionService = sender as ISelectionService;
if (selectionService != null) {

356
src/Main/Base/Project/Src/Project/AdvancedMSBuildProject.cs

@ -0,0 +1,356 @@ @@ -0,0 +1,356 @@
using System;
using System.ComponentModel;
namespace ICSharpCode.SharpDevelop.Project
{
public enum AssemblyOriginatorKeyMode {
None,
File,
Provider
}
public enum RunPostBuildEvent {
Always,
OnSuccessfulBuild,
OnOutputUpdated
}
public enum StartAction {
Project,
Program,
StartURL
}
/// <summary>
/// Common base of C# and VB.NET projects.
/// Any AdvancedMSBuildProject can use the common option panels.
/// </summary>
public class AdvancedMSBuildProject : MSBuildProject
{
#region Application
[Browsable(false)]
public string ApplicationIcon {
get {
return BaseConfiguration["ApplicationIcon"];
}
set {
BaseConfiguration.Set("ApplicationIcon", value);
}
}
[Browsable(false)]
public string StartupObject {
get {
return BaseConfiguration["StartupObject"];
}
set {
BaseConfiguration.Set("StartupObject", value);
}
}
[Browsable(false)]
public string Win32Resource {
get {
return BaseConfiguration["Win32Resource"];
}
set {
BaseConfiguration.Set("Win32Resource", value);
}
}
#endregion
#region Signing
[Browsable(false)]
public bool SignAssembly {
get {
return BaseConfiguration.Get("SignAssembly", false);
}
set {
BaseConfiguration.Set("SignAssembly", false, value);
}
}
[Browsable(false)]
public bool DelaySign {
get {
return BaseConfiguration.Get("DelaySign", false);
}
set {
BaseConfiguration.Set("DelaySign", false, value);
}
}
[Browsable(false)]
public string AssemblyOriginatorKeyFile {
get {
return BaseConfiguration["AssemblyOriginatorKeyFile"];
}
set {
BaseConfiguration.Set("AssemblyOriginatorKeyFile", value);
}
}
[Browsable(false)]
public string AssemblyKeyProviderName {
get {
return BaseConfiguration["AssemblyKeyProviderName"];
}
set {
BaseConfiguration.Set("AssemblyKeyProviderName", value);
}
}
[Browsable(false)]
public AssemblyOriginatorKeyMode AssemblyOriginatorKeyMode {
get {
return BaseConfiguration.Get("AssemblyOriginatorKeyMode", AssemblyOriginatorKeyMode.None);
}
set {
BaseConfiguration.Set("AssemblyOriginatorKeyMode", AssemblyOriginatorKeyMode.None, value);
}
}
#endregion
#region Build events
[Browsable(false)]
public RunPostBuildEvent RunPostBuildEvent {
get {
return BaseConfiguration.Get("RunPostBuildEvent", RunPostBuildEvent.OnSuccessfulBuild);
}
set {
BaseConfiguration.Set("RunPostBuildEvent", RunPostBuildEvent.OnSuccessfulBuild, value);
}
}
[Browsable(false)]
public string PreBuildEvent {
get {
return BaseConfiguration["PreBuildEvent"];
}
set {
BaseConfiguration.Set("PreBuildEvent", value);
}
}
[Browsable(false)]
public string PostBuildEvent {
get {
return BaseConfiguration["PostBuildEvent"];
}
set {
BaseConfiguration.Set("PostBuildEvent", value);
}
}
#endregion
#region Publishing
[Browsable(false)]
public string PublishUrl {
get {
return BaseConfiguration["PublishUrl"];
}
set {
BaseConfiguration.Set("PublishUrl", value);
}
}
[Browsable(false)]
public bool Install {
get {
return BaseConfiguration.Get("Install", false);
}
set {
BaseConfiguration.Set("Install", false, value);
}
}
[Browsable(false)]
public bool UpdateEnabled {
get {
return BaseConfiguration.Get("UpdateEnabled", false);
}
set {
BaseConfiguration.Set("UpdateEnabled", false, value);
}
}
[Browsable(false)]
public bool UpdatePeriodically {
get {
return BaseConfiguration.Get("UpdatePeriodically", false);
}
set {
BaseConfiguration.Set("UpdatePeriodically", false, value);
}
}
[Browsable(false)]
public bool UpdateRequired {
get {
return BaseConfiguration.Get("UpdateRequired", false);
}
set {
BaseConfiguration.Set("UpdateRequired", false, value);
}
}
[Browsable(false)]
public bool UpdateUrlEnabled {
get {
return BaseConfiguration.Get("UpdateUrlEnabled", false);
}
set {
BaseConfiguration.Set("UpdateUrlEnabled", value);
}
}
[Browsable(false)]
public bool BootstrapperEnabled {
get {
return BaseConfiguration.Get("BootstrapperEnabled", false);
}
set {
BaseConfiguration.Set("BootstrapperEnabled", false, value);
}
}
[Browsable(false)]
public string InstallFrom {
get {
return BaseConfiguration["InstallFrom"];
}
set {
BaseConfiguration.Set("InstallFrom", value);
}
}
[Browsable(false)]
public string FallbackCulture {
get {
return BaseConfiguration["FallbackCulture"];
}
set {
BaseConfiguration.Set("FallbackCulture", value);
}
}
[Browsable(false)]
public string UpdateMode {
get {
return BaseConfiguration["UpdateMode"];
}
set {
BaseConfiguration.Set("UpdateMode", value);
}
}
[Browsable(false)]
public string UpdateIntervalUnits {
get {
return BaseConfiguration["UpdateIntervalUnits"];
}
set {
BaseConfiguration.Set("UpdateIntervalUnits", value);
}
}
[Browsable(false)]
public string ApplicationVersion {
get {
return BaseConfiguration["ApplicationVersion"];
}
set {
BaseConfiguration.Set("ApplicationVersion", value);
}
}
[Browsable(false)]
public int UpdateInterval {
get {
return BaseConfiguration.Get("UpdateInterval", 0);
}
set {
BaseConfiguration.Set("UpdateInterval", 0, value);
}
}
[Browsable(false)]
public int ApplicationRevision {
get {
return BaseConfiguration.Get("ApplicationRevision", 0);
}
set {
BaseConfiguration.Set("ApplicationRevision", 0, value);
}
}
#endregion
#region Debug Options
public string GetStartProgram(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartProgram"];
}
public void SetStartProgram(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartProgram"] = val;
}
public string GetStartURL(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartURL"];
}
public void SetStartURL(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartURL"] = val;
}
public StartAction GetStartAction(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform).Get("StartAction", StartAction.Project);
}
public void SetStartAction(string configurationName, string platform, StartAction val)
{
GetUserConfiguration(configurationName, platform).Set("StartAction", StartAction.Project, val);
}
public string GetStartArguments(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartArguments"];
}
public void SetStartArguments(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartArguments"] = val;
}
public string GetStartWorkingDirectory(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["StartWorkingDirectory"];
}
public void SetStartWorkingDirectory(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["StartWorkingDirectory"] = val;
}
public bool GetRemoteDebugEnabled(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform).Get("RemoteDebugEnabled", false);
}
public void SetRemoteDebugEnabled(string configurationName, string platform, bool val)
{
GetUserConfiguration(configurationName, platform).Set("RemoteDebugEnabled", false, val);
}
public string GetRemoteDebugMachine(string configurationName, string platform)
{
return GetUserConfiguration(configurationName, platform)["RemoteDebugMachine"];
}
public void SetRemoteDebugMachine(string configurationName, string platform, string val)
{
GetUserConfiguration(configurationName, platform)["RemoteDebugMachine"] = val;
}
#endregion
}
}

11
src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs

@ -122,17 +122,10 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor @@ -122,17 +122,10 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
public string Text {
get {
if (textAreaControl.IsDisposed) return null;
if (textAreaControl.InvokeRequired)
return (string)textAreaControl.Invoke(new GetTextDelegate(GetText));
else
return GetText();
return (string)WorkbenchSingleton.SafeThreadCall(this, "GetText", null);
}
set {
if (textAreaControl.InvokeRequired)
textAreaControl.Invoke(new SetTextDelegate(SetText));
else
SetText(value);
WorkbenchSingleton.SafeThreadCall(this, "SetText", value);
}
}

19
src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs

@ -18,7 +18,7 @@ namespace ICSharpCode.Core @@ -18,7 +18,7 @@ namespace ICSharpCode.Core
public object CreateObject(string className)
{
foreach (Runtime runtime in runtimes) {
object o = runtime.CreateInstance(Path.GetDirectoryName(addInFileName), className);
object o = runtime.CreateInstance(className);
if (o != null) {
return o;
}
@ -54,7 +54,7 @@ namespace ICSharpCode.Core @@ -54,7 +54,7 @@ namespace ICSharpCode.Core
{
}
static void SetupAddIn(XmlTextReader reader, AddIn addIn)
static void SetupAddIn(XmlTextReader reader, AddIn addIn, string hintPath)
{
while (reader.Read()) {
if (reader.NodeType == XmlNodeType.Element && reader.IsStartElement()) {
@ -68,7 +68,7 @@ namespace ICSharpCode.Core @@ -68,7 +68,7 @@ namespace ICSharpCode.Core
if (reader.NodeType == XmlNodeType.Element && reader.IsStartElement()) {
switch (reader.LocalName) {
case "Import":
addIn.runtimes.Add(Runtime.Read(addIn, reader));
addIn.runtimes.Add(Runtime.Read(addIn, reader, hintPath));
break;
default:
throw new AddInLoadException("Unknown node in runtime section :" + reader.LocalName);
@ -84,9 +84,9 @@ namespace ICSharpCode.Core @@ -84,9 +84,9 @@ namespace ICSharpCode.Core
if (!reader.IsEmptyElement) {
throw new AddInLoadException("Include nodes must be empty!");
}
string fileName = reader.GetAttribute(0);
string fileName = Path.Combine(hintPath, reader.GetAttribute(0));
using (XmlTextReader includeReader = new XmlTextReader(fileName)) {
SetupAddIn(includeReader, addIn);
SetupAddIn(includeReader, addIn, Path.GetDirectoryName(fileName));
}
break;
case "Path":
@ -115,6 +115,11 @@ namespace ICSharpCode.Core @@ -115,6 +115,11 @@ namespace ICSharpCode.Core
}
public static AddIn Load(TextReader textReader)
{
return Load(textReader, ".");
}
public static AddIn Load(TextReader textReader, string hintPath)
{
AddIn addIn = new AddIn();
using (XmlTextReader reader = new XmlTextReader(textReader)) {
@ -123,7 +128,7 @@ namespace ICSharpCode.Core @@ -123,7 +128,7 @@ namespace ICSharpCode.Core
switch (reader.LocalName) {
case "AddIn":
addIn.properties = Properties.ReadFromAttributes(reader);
SetupAddIn(reader, addIn);
SetupAddIn(reader, addIn, hintPath);
break;
default:
throw new AddInLoadException("Unknown add-in file.");
@ -138,7 +143,7 @@ namespace ICSharpCode.Core @@ -138,7 +143,7 @@ namespace ICSharpCode.Core
{
try {
using (TextReader textReader = File.OpenText(fileName)) {
AddIn addIn = Load(textReader);
AddIn addIn = Load(textReader, Path.GetDirectoryName(fileName));
addIn.addInFileName = fileName;
return addIn;
}

23
src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs

@ -8,11 +8,18 @@ namespace ICSharpCode.Core @@ -8,11 +8,18 @@ namespace ICSharpCode.Core
{
public class Runtime
{
string hintPath;
string assembly;
Assembly loadedAssembly = null;
List<Properties> definedErbauer = new List<Properties>(1);
List<Properties> definedConditions = new List<Properties>(1);
public Runtime(string assembly, string hintPath)
{
this.assembly = assembly;
this.hintPath = hintPath;
}
public string Assembly {
get {
return assembly;
@ -22,7 +29,11 @@ namespace ICSharpCode.Core @@ -22,7 +29,11 @@ namespace ICSharpCode.Core
public Assembly LoadedAssembly {
get {
if (loadedAssembly == null) {
loadedAssembly = System.Reflection.Assembly.LoadFrom(assembly);
if (assembly[0] == '/') {
loadedAssembly = System.Reflection.Assembly.Load(assembly.Substring(1));
} else {
loadedAssembly = System.Reflection.Assembly.LoadFrom(Path.Combine(hintPath, assembly));
}
}
return loadedAssembly;
}
@ -40,21 +51,17 @@ namespace ICSharpCode.Core @@ -40,21 +51,17 @@ namespace ICSharpCode.Core
}
}
public object CreateInstance(string hintPath, string instance)
public object CreateInstance(string instance)
{
if (loadedAssembly == null) {
loadedAssembly = System.Reflection.Assembly.LoadFrom(Path.Combine(hintPath, assembly));
}
return LoadedAssembly.CreateInstance(instance);
}
internal static Runtime Read(AddIn addIn, XmlTextReader reader)
internal static Runtime Read(AddIn addIn, XmlTextReader reader, string hintPath)
{
Runtime runtime = new Runtime();
if (reader.AttributeCount != 1) {
throw new AddInLoadException("Import node requires ONE attribute.");
}
runtime.assembly = reader.GetAttribute(0);
Runtime runtime = new Runtime(reader.GetAttribute(0), hintPath);
if (!reader.IsEmptyElement) {
while (reader.Read()) {
switch (reader.NodeType) {

Loading…
Cancel
Save