Browse Source

Worked on #D

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@22 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mike Krüger 22 years ago
parent
commit
e9c105a4e2
  1. 39
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs
  2. 2
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  3. 5
      src/Main/Base/Project/Src/Gui/Components/LocalizedPropertyGrid/LocalizedObject.cs
  4. 2
      src/Main/Base/Project/Src/Gui/Components/LocalizedPropertyGrid/LocalizedProperty.cs
  5. 3
      src/Main/Base/Project/Src/Gui/Components/LocalizedPropertyGrid/LocalizedPropertyDescriptor.cs
  6. 1
      src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionFolderNode.cs
  7. 2
      src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs
  8. 8
      src/Main/Base/Project/Src/Project/Items/ComReferenceProjectItem.cs
  9. 23
      src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs
  10. 22
      src/Main/Base/Project/Src/Project/Items/ProjectItem.cs
  11. 4
      src/Main/Base/Project/Src/Project/Items/ProjectReferenceProjectItem.cs
  12. 19
      src/Main/Base/Project/Src/Project/Items/ReferenceProjectItem.cs
  13. 6
      src/Main/Base/Project/Src/Project/Solution/AbstractSolutionFolder.cs
  14. 7
      src/Main/Base/Project/Src/Project/Solution/Solution.cs
  15. 7
      src/Main/Base/Project/Src/Project/Solution/SolutionFolder.cs
  16. 70
      src/SharpDevelop.sln

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

@ -1,4 +1,5 @@
using System; using System;
using System.ComponentModel;
using System.IO; using System.IO;
using System.Diagnostics; using System.Diagnostics;
using System.Collections; using System.Collections;
@ -45,6 +46,7 @@ namespace CSharpBinding
/// </summary> /// </summary>
public class CSharpProject : MSBuildProject public class CSharpProject : MSBuildProject
{ {
[Browsable(false)]
public int WarningLevel { public int WarningLevel {
get { get {
return BaseConfiguration.Get("WarningLevel", 4); return BaseConfiguration.Get("WarningLevel", 4);
@ -53,6 +55,7 @@ namespace CSharpBinding
BaseConfiguration.Set("WarningLevel", 4, value); BaseConfiguration.Set("WarningLevel", 4, value);
} }
} }
[Browsable(false)]
public string ApplicationIcon { public string ApplicationIcon {
get { get {
return BaseConfiguration["ApplicationIcon"]; return BaseConfiguration["ApplicationIcon"];
@ -63,6 +66,7 @@ namespace CSharpBinding
} }
#region Signing #region Signing
[Browsable(false)]
public bool SignAssembly { public bool SignAssembly {
get { get {
return BaseConfiguration.Get("SignAssembly", false); return BaseConfiguration.Get("SignAssembly", false);
@ -72,6 +76,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public bool DelaySign { public bool DelaySign {
get { get {
return BaseConfiguration.Get("DelaySign", false); return BaseConfiguration.Get("DelaySign", false);
@ -81,6 +86,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public string AssemblyOriginatorKeyFile { public string AssemblyOriginatorKeyFile {
get { get {
return BaseConfiguration["AssemblyOriginatorKeyFile"]; return BaseConfiguration["AssemblyOriginatorKeyFile"];
@ -89,6 +95,8 @@ namespace CSharpBinding
BaseConfiguration.Set("AssemblyOriginatorKeyFile", value); BaseConfiguration.Set("AssemblyOriginatorKeyFile", value);
} }
} }
[Browsable(false)]
public string AssemblyKeyProviderName { public string AssemblyKeyProviderName {
get { get {
return BaseConfiguration["AssemblyKeyProviderName"]; return BaseConfiguration["AssemblyKeyProviderName"];
@ -98,6 +106,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public AssemblyOriginatorKeyMode AssemblyOriginatorKeyMode { public AssemblyOriginatorKeyMode AssemblyOriginatorKeyMode {
get { get {
return BaseConfiguration.Get("AssemblyOriginatorKeyMode", AssemblyOriginatorKeyMode.None); return BaseConfiguration.Get("AssemblyOriginatorKeyMode", AssemblyOriginatorKeyMode.None);
@ -108,6 +117,7 @@ namespace CSharpBinding
} }
#endregion #endregion
[Browsable(false)]
public string StartupObject { public string StartupObject {
get { get {
return BaseConfiguration["StartupObject"]; return BaseConfiguration["StartupObject"];
@ -116,6 +126,8 @@ namespace CSharpBinding
BaseConfiguration.Set("StartupObject", value); BaseConfiguration.Set("StartupObject", value);
} }
} }
[Browsable(false)]
public string Win32Resource { public string Win32Resource {
get { get {
return BaseConfiguration["Win32Resource"]; return BaseConfiguration["Win32Resource"];
@ -125,8 +137,8 @@ namespace CSharpBinding
} }
} }
#region Build events #region Build events
[Browsable(false)]
public RunPostBuildEvent RunPostBuildEvent { public RunPostBuildEvent RunPostBuildEvent {
get { get {
return BaseConfiguration.Get("RunPostBuildEvent", RunPostBuildEvent.OnSuccessfulBuild); return BaseConfiguration.Get("RunPostBuildEvent", RunPostBuildEvent.OnSuccessfulBuild);
@ -136,6 +148,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public string PreBuildEvent { public string PreBuildEvent {
get { get {
return BaseConfiguration["PreBuildEvent"]; return BaseConfiguration["PreBuildEvent"];
@ -145,7 +158,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public string PostBuildEvent { public string PostBuildEvent {
get { get {
return BaseConfiguration["PostBuildEvent"]; return BaseConfiguration["PostBuildEvent"];
@ -156,6 +169,7 @@ namespace CSharpBinding
} }
#endregion #endregion
[Browsable(false)]
public string PublishUrl { public string PublishUrl {
get { get {
return BaseConfiguration["PublishUrl"]; return BaseConfiguration["PublishUrl"];
@ -165,6 +179,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public bool Install { public bool Install {
get { get {
return BaseConfiguration.Get("Install", false); return BaseConfiguration.Get("Install", false);
@ -174,6 +189,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public bool UpdateEnabled { public bool UpdateEnabled {
get { get {
return BaseConfiguration.Get("UpdateEnabled", false); return BaseConfiguration.Get("UpdateEnabled", false);
@ -183,6 +199,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public bool UpdatePeriodically { public bool UpdatePeriodically {
get { get {
return BaseConfiguration.Get("UpdatePeriodically", false); return BaseConfiguration.Get("UpdatePeriodically", false);
@ -192,7 +209,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public bool UpdateRequired { public bool UpdateRequired {
get { get {
return BaseConfiguration.Get("UpdateRequired", false); return BaseConfiguration.Get("UpdateRequired", false);
@ -202,6 +219,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public bool UpdateUrlEnabled { public bool UpdateUrlEnabled {
get { get {
return BaseConfiguration.Get("UpdateUrlEnabled", false); return BaseConfiguration.Get("UpdateUrlEnabled", false);
@ -211,6 +229,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public bool BootstrapperEnabled { public bool BootstrapperEnabled {
get { get {
return BaseConfiguration.Get("BootstrapperEnabled", false); return BaseConfiguration.Get("BootstrapperEnabled", false);
@ -220,7 +239,7 @@ namespace CSharpBinding
} }
} }
[Browsable(false)]
public string InstallFrom { public string InstallFrom {
get { get {
return BaseConfiguration["InstallFrom"]; return BaseConfiguration["InstallFrom"];
@ -229,7 +248,7 @@ namespace CSharpBinding
BaseConfiguration.Set("InstallFrom", value); BaseConfiguration.Set("InstallFrom", value);
} }
} }
[Browsable(false)]
public string FallbackCulture { public string FallbackCulture {
get { get {
return BaseConfiguration["FallbackCulture"]; return BaseConfiguration["FallbackCulture"];
@ -238,7 +257,7 @@ namespace CSharpBinding
BaseConfiguration.Set("FallbackCulture", value); BaseConfiguration.Set("FallbackCulture", value);
} }
} }
[Browsable(false)]
public string UpdateMode { public string UpdateMode {
get { get {
return BaseConfiguration["UpdateMode"]; return BaseConfiguration["UpdateMode"];
@ -247,7 +266,7 @@ namespace CSharpBinding
BaseConfiguration.Set("UpdateMode", value); BaseConfiguration.Set("UpdateMode", value);
} }
} }
[Browsable(false)]
public string UpdateIntervalUnits { public string UpdateIntervalUnits {
get { get {
return BaseConfiguration["UpdateIntervalUnits"]; return BaseConfiguration["UpdateIntervalUnits"];
@ -256,6 +275,8 @@ namespace CSharpBinding
BaseConfiguration.Set("UpdateIntervalUnits", value); BaseConfiguration.Set("UpdateIntervalUnits", value);
} }
} }
[Browsable(false)]
public string ApplicationVersion { public string ApplicationVersion {
get { get {
return BaseConfiguration["ApplicationVersion"]; return BaseConfiguration["ApplicationVersion"];
@ -264,7 +285,7 @@ namespace CSharpBinding
BaseConfiguration.Set("ApplicationVersion", value); BaseConfiguration.Set("ApplicationVersion", value);
} }
} }
[Browsable(false)]
public int UpdateInterval { public int UpdateInterval {
get { get {
return BaseConfiguration.Get("UpdateInterval", 0); return BaseConfiguration.Get("UpdateInterval", 0);
@ -273,7 +294,7 @@ namespace CSharpBinding
BaseConfiguration.Set("UpdateInterval", 0, value); BaseConfiguration.Set("UpdateInterval", 0, value);
} }
} }
[Browsable(false)]
public int ApplicationRevision { public int ApplicationRevision {
get { get {
return BaseConfiguration.Get("ApplicationRevision", 0); return BaseConfiguration.Get("ApplicationRevision", 0);

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

@ -426,7 +426,6 @@
<Compile Include="Src\Gui\XmlForms\Lib\IObjectCreator.cs" /> <Compile Include="Src\Gui\XmlForms\Lib\IObjectCreator.cs" />
<Compile Include="Src\Internal\Erbauer\PadDescriptor.cs" /> <Compile Include="Src\Internal\Erbauer\PadDescriptor.cs" />
<Compile Include="Src\Project\MissingProject.cs" /> <Compile Include="Src\Project\MissingProject.cs" />
<Compile Include="Src\Project\Solution\AbstractProject.cs" />
<Compile Include="Src\Project\UnknownProject.cs" /> <Compile Include="Src\Project\UnknownProject.cs" />
<Compile Include="Src\Gui\Pads\ErrorList\ErrorList.cs" /> <Compile Include="Src\Gui\Pads\ErrorList\ErrorList.cs" />
<Compile Include="Src\Gui\Pads\ErrorList\ErrorListToolbarCommands.cs" /> <Compile Include="Src\Gui\Pads\ErrorList\ErrorListToolbarCommands.cs" />
@ -618,6 +617,7 @@
<Compile Include="Src\TextEditor\CharacterEncodings.cs" /> <Compile Include="Src\TextEditor\CharacterEncodings.cs" />
<Compile Include="Src\TextEditor\XmlFormattingStrategy.cs" /> <Compile Include="Src\TextEditor\XmlFormattingStrategy.cs" />
<Compile Include="Src\Services\Tasks\TaskEventHandler.cs" /> <Compile Include="Src\Services\Tasks\TaskEventHandler.cs" />
<Compile Include="Src\Project\AbstractProject.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj"> <ProjectReference Include="..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj">

5
src/Main/Base/Project/Src/Gui/Components/LocalizedPropertyGrid/LocalizedObject.cs

@ -105,5 +105,10 @@ namespace ICSharpCode.SharpDevelop.Gui
{ {
return this; return this;
} }
public virtual void InformSetValue(LocalizedPropertyDescriptor localizedPropertyDescriptor, object component, object value)
{
}
} }
} }

2
src/Main/Base/Project/Src/Gui/Components/LocalizedPropertyGrid/LocalizedProperty.cs

@ -31,8 +31,6 @@ namespace ICSharpCode.SharpDevelop.Gui
} }
} }
public object DefaultValue { public object DefaultValue {
get { get {
return defaultValue; return defaultValue;

3
src/Main/Base/Project/Src/Gui/Components/LocalizedPropertyGrid/LocalizedPropertyDescriptor.cs

@ -129,6 +129,9 @@ namespace ICSharpCode.SharpDevelop.Gui
} else { } else {
this.basePropertyDescriptor.SetValue(component, value); this.basePropertyDescriptor.SetValue(component, value);
} }
if (component is LocalizedObject) {
((LocalizedObject)component).InformSetValue(this, component, value);
}
} }
} }

1
src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionFolderNode.cs

@ -57,6 +57,7 @@ namespace ICSharpCode.SharpDevelop.Project
ContextmenuAddinTreePath = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SolutionFolderNode"; ContextmenuAddinTreePath = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SolutionFolderNode";
this.solution = solution; this.solution = solution;
this.folder = folder; this.folder = folder;
this.Tag = folder;
Text = folder.Name; Text = folder.Name;
autoClearNodes = false; autoClearNodes = false;
if (!folder.IsEmpty) { if (!folder.IsEmpty) {

2
src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs

@ -131,7 +131,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
FileProjectItem projectFile = new FileProjectItem(project, ItemType.Compile); FileProjectItem projectFile = new FileProjectItem(project, ItemType.Compile);
if (!project.CanCompile(fileName)) { if (!project.CanCompile(fileName)) {
projectFile.BuildAction = ItemType.None; projectFile.BuildAction = FileProjectItem.FileBuildAction.None;
} }
projectFile.Include = FileUtility.GetRelativePath(project.Directory, fileName); projectFile.Include = FileUtility.GetRelativePath(project.Directory, fileName);

8
src/Main/Base/Project/Src/Project/Items/ComReferenceProjectItem.cs

@ -1,4 +1,5 @@
using System; using System;
using System.ComponentModel;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
@ -12,6 +13,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[ReadOnly(true)]
public string Guid { public string Guid {
get { get {
return base.Properties["Guid"]; return base.Properties["Guid"];
@ -21,6 +23,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[ReadOnly(true)]
public int VersionMajor { public int VersionMajor {
get { get {
return base.Properties.Get("VersionMajor", 1); return base.Properties.Get("VersionMajor", 1);
@ -30,6 +33,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[ReadOnly(true)]
public int VersionMinor { public int VersionMinor {
get { get {
return base.Properties.Get("VersionMinor", 0); return base.Properties.Get("VersionMinor", 0);
@ -39,6 +43,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[ReadOnly(true)]
public string Lcid { public string Lcid {
get { get {
return base.Properties["Lcid"]; return base.Properties["Lcid"];
@ -48,6 +53,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[ReadOnly(true)]
public string WrapperTool { public string WrapperTool {
get { get {
return base.Properties["WrapperTool"]; return base.Properties["WrapperTool"];
@ -56,6 +62,8 @@ namespace ICSharpCode.SharpDevelop.Project
base.Properties["WrapperTool"] = value; base.Properties["WrapperTool"] = value;
} }
} }
[ReadOnly(true)]
public bool Isolated { public bool Isolated {
get { get {
return base.Properties.Get("Isolated", false); return base.Properties.Get("Isolated", false);

23
src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs

@ -1,9 +1,11 @@
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.IO; using System.IO;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Project namespace ICSharpCode.SharpDevelop.Project
{ {
/// <summary> /// <summary>
/// Description of CompileProjectItem. /// Description of CompileProjectItem.
/// </summary> /// </summary>
@ -17,15 +19,26 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
public ItemType BuildAction { public enum FileBuildAction {
None = ItemType.None,
Compile = ItemType.Compile,
EmbeddedResource = ItemType.EmbeddedResource,
Content = ItemType.Content,
}
[LocalizedProperty("${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.BuildAction}",
Description ="${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.BuildAction.Description}")]
public FileBuildAction BuildAction {
get { get {
return type; return (FileBuildAction)type;
} }
set { set {
type = value; type = (ItemType)value;
} }
} }
[LocalizedProperty("Copy to output Directory",
Description ="Specifies if the file should be copied to the output directory")]
public bool CopyToOutputDirectory { public bool CopyToOutputDirectory {
get { get {
return base.Properties.Get("CopyToOutputDirectory", false); return base.Properties.Get("CopyToOutputDirectory", false);
@ -35,6 +48,8 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[LocalizedProperty("Custom Tool",
Description ="Specifies the tool that converts the file to the output.")]
public string CustomTool { public string CustomTool {
get { get {
return base.Properties["Generator"]; return base.Properties["Generator"];
@ -44,6 +59,8 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[LocalizedProperty("Custom Tool Namespace",
Description ="Specifies the namespace the custom tool places it's output.")]
public string CustomToolNamespace { public string CustomToolNamespace {
get { get {
return base.Properties["CustomToolNamespace"]; return base.Properties["CustomToolNamespace"];

22
src/Main/Base/Project/Src/Project/Items/ProjectItem.cs

@ -4,6 +4,7 @@ using System.ComponentModel;
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml; using System.Xml;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Project namespace ICSharpCode.SharpDevelop.Project
{ {
@ -28,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Project
BootstrapperFile BootstrapperFile
} }
public abstract class ProjectItem : IDisposable public abstract class ProjectItem : LocalizedObject, IDisposable
{ {
string include; string include;
PropertyGroup properties = new PropertyGroup(); PropertyGroup properties = new PropertyGroup();
@ -39,6 +40,7 @@ namespace ICSharpCode.SharpDevelop.Project
get; get;
} }
[Browsable(false)]
public IProject Project { public IProject Project {
get { get {
return project; return project;
@ -65,6 +67,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public virtual string FileName { public virtual string FileName {
get { get {
return Path.Combine(project.Directory, Include); return Path.Combine(project.Directory, Include);
@ -74,6 +77,13 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public virtual string Tag {
get {
return ItemType.ToString();
}
}
public ProjectItem(IProject project) public ProjectItem(IProject project)
{ {
this.project = project; this.project = project;
@ -102,11 +112,6 @@ namespace ICSharpCode.SharpDevelop.Project
return newItem; return newItem;
} }
public virtual string Tag {
get {
return ItemType.ToString();
}
}
internal void WriteItem(XmlTextWriter writer) internal void WriteItem(XmlTextWriter writer)
{ {
@ -143,5 +148,10 @@ namespace ICSharpCode.SharpDevelop.Project
} }
writer.WriteEndElement(); writer.WriteEndElement();
} }
public override void InformSetValue(LocalizedPropertyDescriptor localizedPropertyDescriptor, object component, object value)
{
Project.Save();
}
} }
} }

4
src/Main/Base/Project/Src/Project/Items/ProjectReferenceProjectItem.cs

@ -1,4 +1,5 @@
using System; using System;
using System.ComponentModel;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using ICSharpCode.Core; using ICSharpCode.Core;
@ -13,6 +14,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public IProject ReferencedProject { public IProject ReferencedProject {
get { get {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
@ -20,6 +22,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[ReadOnly(true)]
public string ProjectGuid { public string ProjectGuid {
get { get {
return Properties["Project"]; return Properties["Project"];
@ -29,6 +32,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[ReadOnly(true)]
public string ProjectName { public string ProjectName {
get { get {
return Properties["Name"]; return Properties["Name"];

19
src/Main/Base/Project/Src/Project/Items/ReferenceProjectItem.cs

@ -1,7 +1,10 @@
using System; using System;
using System.ComponentModel;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Project namespace ICSharpCode.SharpDevelop.Project
{ {
@ -16,6 +19,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public string HintPath { public string HintPath {
get { get {
return Properties["HintPath"]; return Properties["HintPath"];
@ -25,6 +29,9 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[DefaultValue(false)]
[LocalizedProperty("Specific Version",
Description = "Indicates if this reference is bound to a specific version of the assembly.")]
public bool SpecificVersion { public bool SpecificVersion {
get { get {
return Properties.Get("SpecificVersion", true); return Properties.Get("SpecificVersion", true);
@ -34,6 +41,18 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[DefaultValue(false)]
[LocalizedProperty("${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectReference.LocalCopy}",
Description = "${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectReference.LocalCopy.Description}")]
public bool Private {
get {
return Properties.Get("Private", false);
}
set {
Properties.Set("Private", value);
}
}
public override string FileName { public override string FileName {
get { get {
try try

6
src/Main/Base/Project/Src/Project/Solution/AbstractSolutionFolder.cs

@ -1,4 +1,5 @@
using System; using System;
using System.ComponentModel;
namespace ICSharpCode.SharpDevelop.Project namespace ICSharpCode.SharpDevelop.Project
{ {
@ -13,6 +14,7 @@ namespace ICSharpCode.SharpDevelop.Project
string location = null; string location = null;
string name = null; string name = null;
[Browsable(false)]
public string IdGuid { public string IdGuid {
get { get {
return idGuid; return idGuid;
@ -22,6 +24,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public string Location { public string Location {
get { get {
return location; return location;
@ -31,6 +34,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public string Name { public string Name {
get { get {
return name; return name;
@ -40,6 +44,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public ISolutionFolderContainer Parent { public ISolutionFolderContainer Parent {
get { get {
return parent; return parent;
@ -49,6 +54,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public virtual string TypeGuid { public virtual string TypeGuid {
get { get {
return typeGuid; return typeGuid;

7
src/Main/Base/Project/Src/Project/Solution/Solution.cs

@ -1,4 +1,5 @@
using System; using System;
using System.ComponentModel;
using System.CodeDom.Compiler; using System.CodeDom.Compiler;
using System.IO; using System.IO;
using System.Text; using System.Text;
@ -51,6 +52,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
ProjectEnumerator projectEnumerator; ProjectEnumerator projectEnumerator;
[Browsable(false)]
public ProjectEnumerator Projects { public ProjectEnumerator Projects {
get { get {
return projectEnumerator; return projectEnumerator;
@ -86,6 +88,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
SolutionFolderContainerEnumerator solutionFolderContainerEnumerator; SolutionFolderContainerEnumerator solutionFolderContainerEnumerator;
[Browsable(false)]
public SolutionFolderContainerEnumerator SolutionFolderContainers { public SolutionFolderContainerEnumerator SolutionFolderContainers {
get { get {
return solutionFolderContainerEnumerator; return solutionFolderContainerEnumerator;
@ -121,12 +124,14 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
SolutionFolderEnumerator solutionFolderEnumerator; SolutionFolderEnumerator solutionFolderEnumerator;
[Browsable(false)]
public SolutionFolderEnumerator SolutionFolders { public SolutionFolderEnumerator SolutionFolders {
get { get {
return solutionFolderEnumerator; return solutionFolderEnumerator;
} }
} }
[Browsable(false)]
public IProject StartupProject { public IProject StartupProject {
get { get {
if (!HasProjects) { if (!HasProjects) {
@ -142,6 +147,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public bool HasProjects { public bool HasProjects {
get { get {
return Projects.GetEnumerator().MoveNext(); return Projects.GetEnumerator().MoveNext();
@ -160,6 +166,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public bool IsDirty { public bool IsDirty {
get { get {
foreach (IProject project in Projects) { foreach (IProject project in Projects) {

7
src/Main/Base/Project/Src/Project/Solution/SolutionFolder.cs

@ -1,4 +1,6 @@
using System; using System;
using System.ComponentModel;
using System.CodeDom.Compiler; using System.CodeDom.Compiler;
using System.IO; using System.IO;
using System.Text; using System.Text;
@ -14,6 +16,7 @@ namespace ICSharpCode.SharpDevelop.Project
{ {
public const string FolderGuid = "{2150E333-8FDC-42A3-9474-1A3956D46DE8}"; public const string FolderGuid = "{2150E333-8FDC-42A3-9474-1A3956D46DE8}";
[Browsable(false)]
public override string TypeGuid { public override string TypeGuid {
get { get {
return FolderGuid; return FolderGuid;
@ -23,6 +26,7 @@ namespace ICSharpCode.SharpDevelop.Project
} }
} }
[Browsable(false)]
public bool IsEmpty { public bool IsEmpty {
get { get {
return Folders.Count == 0 && SolutionItems.Items.Count == 0; return Folders.Count == 0 && SolutionItems.Items.Count == 0;
@ -44,18 +48,21 @@ namespace ICSharpCode.SharpDevelop.Project
List<ISolutionFolder> folders = new List<ISolutionFolder>(); List<ISolutionFolder> folders = new List<ISolutionFolder>();
List<ProjectSection> sections = new List<ProjectSection>(); List<ProjectSection> sections = new List<ProjectSection>();
[Browsable(false)]
public List<ProjectSection> Sections { public List<ProjectSection> Sections {
get { get {
return sections; return sections;
} }
} }
[Browsable(false)]
public List<ISolutionFolder> Folders { public List<ISolutionFolder> Folders {
get { get {
return folders; return folders;
} }
} }
[Browsable(false)]
public virtual ProjectSection SolutionItems { public virtual ProjectSection SolutionItems {
get { get {
foreach (ProjectSection section in sections) { foreach (ProjectSection section in sections) {

70
src/SharpDevelop.sln

@ -1,5 +1,31 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.0.0.1 # SharpDevelop 2.0.0.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject ProjectSection(SolutionItems) = postProject
EndProjectSection EndProjectSection
@ -34,32 +60,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FE
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -133,6 +133,15 @@ Global
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
@ -145,14 +154,5 @@ Global
{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} {CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

Loading…
Cancel
Save