This file was generated by the tool 'BuildAddinDocumentation'. -It is based on SharpDevelop 2.1.0.2133.
+It is based on SharpDevelop 3.0.0.3062.This file was generated by the tool 'BuildAddinDocumentation'. -It is based on SharpDevelop 2.1.0.2133.
+It is based on SharpDevelop 3.0.0.3062.
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "ResourceEditor"
+ title = "Resource editor"
class = "ResourceEditor.ResourceEditorDisplayBinding"
insertbefore = "Text"
- fileNamePattern = "\.res(x|ources)$"
- languagePattern = "^ResourceFiles$"/>
+ fileNamePattern = "\.res(x|ources)$"/>
</Path>
Example: Secondary display binding: Form designer
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "FormsDesigner"
+ title = "Windows Forms Designer"
type = "Secondary"
class = "ICSharpCode.FormsDesigner.FormsDesignerSecondaryDisplayBinding"
fileNamePattern = "\.(cs|vb)$" />
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index e4c4d72465..ad5b6049be 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -21,7 +21,7 @@
4096
false
False
- 0809
+ 0809 1591
4
..\..\..\..\bin\
v3.5
diff --git a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeNode.cs b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeNode.cs
index 1a14891769..e01dd8e8f0 100644
--- a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeNode.cs
@@ -393,6 +393,7 @@ namespace ICSharpCode.SharpDevelop.Gui
///
/// Gets the drag & drop effect, when a DataObject is dragged over this node.
///
+ ///
///
/// The default effect DragDropEffects.Copy and DragDropEffects.Move, depending on the
/// key the user presses while performing d&d.
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/AsynchronousWaitDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/AsynchronousWaitDialog.cs
index 98626ade71..50d80cdaf9 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/AsynchronousWaitDialog.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/AsynchronousWaitDialog.cs
@@ -183,6 +183,7 @@ namespace ICSharpCode.SharpDevelop.Gui
///
/// Name of the task. Use null to display "please wait..." message
/// Total amount of work in work units. Use 0 for unknown amount of work.
+ /// Specifies whether the task can be cancelled.
public void BeginTask(string name, int totalWork, bool allowCancel)
{
if (name == null)
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ExtractInterfaceDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ExtractInterfaceDialog.cs
index d993276ce8..bfee3263b0 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/ExtractInterfaceDialog.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/ExtractInterfaceDialog.cs
@@ -20,7 +20,7 @@ namespace ICSharpCode.SharpDevelop.Gui
///
/// Asks the user about Extract Interface refactoring options.
///
- /// ();
this.hasSetFilenameExplicitly = false;
- /// recursively passes the Text attribute of each Control on this form through our StringParser
+ // recursively passes the Text attribute of each Control on this form through our StringParser
ParseTextFor(this);
}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/WebReference.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/WebReference.cs
index 0e73ebb3a7..ca25f24ee9 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/WebReference.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/WebReference.cs
@@ -93,6 +93,7 @@ namespace ICSharpCode.SharpDevelop.Gui
/// Gets all the file items that belong to the named web reference in
/// the specified project.
///
+ /// The specified project.
/// The name of the web reference to look for. This is
/// not the full path of the web reference, just the last folder's name.
///
diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/FileLineReference.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/FileLineReference.cs
index ac04f126c1..72f297743f 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/FileLineReference.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/FileLineReference.cs
@@ -68,7 +68,7 @@ namespace ICSharpCode.SharpDevelop.Gui
///
/// Creates a new instance of the
- /// The filename that the reference refers to.
+ /// The filename that the reference refers to.
/// The line number.
/// The line column.
public FileLineReference(string fileName, int line, int column)
@@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Gui
///
/// Creates a new instance of the
- /// The filename that the reference refers to.
+ /// The filename that the reference refers to.
/// The line number.
public FileLineReference(string fileName, int line) : this(fileName, line, 0)
{
diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/OutputTextLineParser.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/OutputTextLineParser.cs
index b9d1f5ffe7..d12aa14d22 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/OutputTextLineParser.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/OutputTextLineParser.cs
@@ -25,8 +25,8 @@ namespace ICSharpCode.SharpDevelop.Gui
///
/// Extracts source code file reference from the c# compiler output.
///
- /// The text line to parse.
- /// A A
public static FileLineReference GetCSharpCompilerFileLineReference(string lineText)
{
@@ -52,8 +52,8 @@ namespace ICSharpCode.SharpDevelop.Gui
///
/// Extracts source code file reference.
///
- /// The text line to parse.
- /// A A
public static FileLineReference GetFileLineReference(string lineText)
{
@@ -74,9 +74,9 @@ namespace ICSharpCode.SharpDevelop.Gui
///
/// Extracts source code file reference from NUnit output. (stacktrace format)
///
- /// The text line to parse.
+ /// The text line to parse.
/// The A A
public static FileLineReference GetNUnitOutputFileLineReference(string lineText, bool multiline)
{
@@ -104,8 +104,8 @@ namespace ICSharpCode.SharpDevelop.Gui
///
/// Extracts source code file reference from the c++ or VB.Net compiler output.
///
- /// The text line to parse.
- /// A A
public static FileLineReference GetCppCompilerFileLineReference(string lineText)
{
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs
index a6c1b4201d..db81c62d72 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/DirectoryNode.cs
@@ -268,6 +268,7 @@ namespace ICSharpCode.SharpDevelop.Project
/// Determines if the specified
/// Gets the name of the file in the virtual project file system.
/// This is normally the same as Include, except for linked files, where it is
/// the value of Properties["Link"].
///
+ [Browsable(false)]
public string VirtualName {
get {
if (HasMetadata("Link"))
diff --git a/src/Main/Base/Project/Src/Project/Solution/Solution.cs b/src/Main/Base/Project/Src/Project/Solution/Solution.cs
index dd07599efc..08c4b45f50 100644
--- a/src/Main/Base/Project/Src/Project/Solution/Solution.cs
+++ b/src/Main/Base/Project/Src/Project/Solution/Solution.cs
@@ -31,7 +31,7 @@ namespace ICSharpCode.SharpDevelop.Project
public const int SolutionVersionVS05 = 9;
public const int SolutionVersionVS08 = 10;
- /// contains , (IProject/ISolutionFolder) pairs.
+ /// contains <GUID, (IProject/ISolutionFolder)> pairs.
Dictionary guidDictionary = new Dictionary();
string fileName = String.Empty;
diff --git a/src/Main/Base/Project/Src/Services/NavigationService/NavigationService.cs b/src/Main/Base/Project/Src/Services/NavigationService/NavigationService.cs
index e65eb5bc93..3d0a3df5a0 100644
--- a/src/Main/Base/Project/Src/Services/NavigationService/NavigationService.cs
+++ b/src/Main/Base/Project/Src/Services/NavigationService/NavigationService.cs
@@ -27,12 +27,12 @@ namespace ICSharpCode.SharpDevelop
/// implementation. This scheme supports the basic function of logging a
/// filename and returning to that file's default view.
/// The default text editor provides a slightly more sophisticated
- /// scheme,
+ /// scheme,
/// TextEditorNavigationPoint , that logs filename and line number.
/// To implement your own navigation scheme, implement
/// BuildNavigationPoint
+ /// BuildNavigationPoint
/// method.
///
/// History logic based in part on Orlando Curioso's Code Project article:
@@ -194,7 +194,7 @@ namespace ICSharpCode.SharpDevelop
/// Refactoring this out of Log() allows the NavigationService
/// to call this and ensure it will work regardless of the
/// requested state of loggingSuspended, as in
- ///
@@ -232,7 +232,7 @@ namespace ICSharpCode.SharpDevelop
}
///
- /// Gets a INavigationPoints that
/// are currently in the collection.
///
public static ICollection Points
@@ -327,7 +327,7 @@ namespace ICSharpCode.SharpDevelop
///
/// Navigates the view (i.e. the workbench) to whatever
- ///
/// Factoring this out of code that manipulates
@@ -372,7 +372,6 @@ namespace ICSharpCode.SharpDevelop
///
/// Prepares the NavigationService to load a new solution.
///
- /// The fileName of the solution as a
/// Prepares the NavigationService for working with a newly loaded solution
///
- ///
static void LoadSolutionProjectsThreadEnded(object sender, EventArgs e)
{
ResumeLogging();
@@ -405,6 +403,7 @@ namespace ICSharpCode.SharpDevelop
/// Respond to changes in filenames by updating points in the history
/// to reflect the change.
///
+ ///
///
- /// Responds to the
static void ProjectService_SolutionClosed(object sender, EventArgs e)
{
diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/IncrementalSearch.cs b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/IncrementalSearch.cs
index e9ded7b814..3b59a2840c 100644
--- a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/IncrementalSearch.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/IncrementalSearch.cs
@@ -57,6 +57,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
///
/// Creates an incremental search for the specified text editor.
///
+ /// The text editor to search in.
/// Indicates whether the search goes
/// forward from the cursor or backwards.
public IncrementalSearch(TextEditorControl textEditor, bool forwards)
diff --git a/src/Main/Base/Project/Src/Util/OutputReader.cs b/src/Main/Base/Project/Src/Util/OutputReader.cs
index 40a67956c2..e874fb15df 100644
--- a/src/Main/Base/Project/Src/Util/OutputReader.cs
+++ b/src/Main/Base/Project/Src/Util/OutputReader.cs
@@ -6,6 +6,7 @@
//
using System;
+using System.Diagnostics;
using System.IO;
using System.Text;
using System.Threading;
diff --git a/src/Tools/BuildAddinDocumentation/MainClass.cs b/src/Tools/BuildAddinDocumentation/MainClass.cs
index 351f2e5535..733654e498 100644
--- a/src/Tools/BuildAddinDocumentation/MainClass.cs
+++ b/src/Tools/BuildAddinDocumentation/MainClass.cs
@@ -316,7 +316,7 @@ namespace BuildAddinDocumentation
static bool ReadXmlDocu(string projectFolder, List doozers, List conditions)
{
- XmlDocument doc = GetXmlDocu(projectFolder);
+ XmlDocument doc = GetXmlDocu(Path.GetFullPath(projectFolder));
if (doc == null) return false;
foreach (XmlNode node in doc.DocumentElement["members"]) {
XmlElement member = node as XmlElement;
@@ -338,8 +338,9 @@ namespace BuildAddinDocumentation
if (File.Exists(docFile))
File.Delete(docFile);
string args = "\"/p:DocumentationFile=" + docFile + "\" \"/p:NoWarn=1591 1573 1574 1572 419\"";
- string msbuild = Path.Combine(Path.GetDirectoryName(typeof(object).Assembly.Location), "msbuild.exe");
+ string msbuild = Path.Combine(Path.GetDirectoryName(typeof(object).Assembly.Location), "..\\v3.5\\msbuild.exe");
ProcessStartInfo info = new ProcessStartInfo(msbuild, args);
+ Debug.WriteLine(projectFolder + ">" + msbuild + " " + args);
info.WorkingDirectory = projectFolder;
Process p = Process.Start(info);
if (!p.WaitForExit(60000)) {