diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs
index 523458ea1e..204ae111c3 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs
@@ -8,7 +8,7 @@ using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.Editor;
-namespace Debugger.AddIn.Pads.ParallelPad
+namespace ICSharpCode.SharpDevelop.Bookmarks
{
public class SelectedFrameBookmark : SDMarkerBookmark
{
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs
index b3fbf47370..f5463752d3 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs
@@ -20,7 +20,6 @@ using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui;
-using Services.Debugger.Tooltips;
namespace Debugger.AddIn.Tooltips
{
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs
index 5b0e713564..0ae3b19e08 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs
@@ -17,7 +17,6 @@ using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Services;
-using Services.Debugger.Tooltips;
namespace Debugger.AddIn.Tooltips
{
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinningBinding.cs b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinningBinding.cs
index fb5e0d5e47..9811669d03 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinningBinding.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinningBinding.cs
@@ -9,7 +9,6 @@ using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.SharpDevelop.Editor;
-using Services.Debugger.Tooltips;
namespace Debugger.AddIn.Tooltips
{
diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs
index 1a6a83cde1..f038f48cee 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs
+++ b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs
@@ -150,7 +150,7 @@ namespace SearchAndReplace
return;
}
}
- BookmarkManager.AddMark(new SDBookmark(result.FileName, textArea.Document.OffsetToPosition(result.Offset)));
+ BookmarkManager.AddMark(new Bookmark(result.FileName, textArea.Document.OffsetToPosition(result.Offset)));
}
}
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index bcd7576a30..b4bbface61 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1978,17 +1978,16 @@
icon = "Bookmarks.GotoNext"
tooltip = "${res:MainWindow.Windows.BookmarkPad.GotoNext.ToolTip}"
class = "ICSharpCode.SharpDevelop.Bookmarks.NextBookmarkPadCommand"/>
-
+
-
GetBookmarks(IBookmarkMargin bookmarkMargin)
+ protected static List GetBookmarks(IBookmarkMargin bookmarkMargin)
{
- return (from b in bookmarkMargin.Bookmarks.OfType()
+ return (from b in bookmarkMargin.Bookmarks.OfType()
where b.CanToggle
orderby b.LineNumber
select b).ToList();
@@ -40,12 +40,12 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
{
protected override void Run(ITextEditor editor, IBookmarkMargin bookmarkMargin)
{
- BookmarkManager.ToggleBookmark(editor, editor.Caret.Line,
+ BookmarkManager.ToggleBookmark(editor, editor.Caret.Line,
b => b.CanToggle && b.GetType() == typeof(SDBookmark),
- location => new SDBookmark(editor.FileName, location));
+ location => new Bookmark(editor.FileName, location));
}
}
- public class PrevBookmark : BookmarkMenuCommand
+ public class PrevBookmark : BookmarkMenuCommand
{
protected override void Run(ITextEditor editor, IBookmarkMargin bookmarkMargin)
{
@@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
{
protected override void Run(ITextEditor editor, IBookmarkMargin bookmarkMargin)
{
- var bookmarks = (from b in bookmarkMargin.Bookmarks.OfType()
+ var bookmarks = (from b in bookmarkMargin.Bookmarks.OfType()
where b.CanToggle
select b).ToList();
foreach (SDBookmark b in bookmarks)
diff --git a/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs b/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs
index 71cd7a1b78..d4047b6e4a 100644
--- a/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs
+++ b/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs
@@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
{
instance = this;
myPanel.Children.Add(CreateToolBar());
- listView.HideColumns(3, 0);
+ listView.HideColumns(2, 0);
}
}
@@ -96,9 +96,9 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
}
}
- public ListViewPadItemModel PrevItem {
+ public ListViewPadItemModel PreviousItem {
get {
- return this.listView.PrevItem;
+ return this.listView.PreviousItem;
}
}
diff --git a/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs b/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs
index 229395f037..03da5cdaae 100644
--- a/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs
+++ b/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs
@@ -56,7 +56,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
var bookmarkBase = (BookmarkPadBase)Owner;
var nextItem = bookmarkBase.NextItem;
- base.Run(nextItem);
+ Run(nextItem);
}
}
@@ -65,9 +65,9 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
public override void Run()
{
var bookmarkBase = (BookmarkPadBase)Owner;
- var prevItem = bookmarkBase.PrevItem;
+ var prevItem = bookmarkBase.PreviousItem;
- base.Run(prevItem);
+ Run(prevItem);
}
}
#endregion Goto Commands
diff --git a/src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml b/src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml
index b80d7d1c71..dbc714cc73 100644
--- a/src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml
+++ b/src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml
@@ -10,9 +10,11 @@
IsChecked="{Binding Path=IsChecked, Mode=TwoWay}" />
-
+ x:Key="InformationTemplate">
+
+
+
+
-
+ CellTemplate="{StaticResource InformationTemplate}" />
[TypeConverter(typeof(BookmarkConverter))]
- public class SDBookmark : BookmarkBase
+ public abstract class SDBookmark : BookmarkBase
{
public SDBookmark(FileName fileName, Location location) : base(location)
{
@@ -91,4 +91,14 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
BookmarkManager.RemoveMark(this);
}
}
+
+ ///
+ /// Bookmark class.
+ ///
+ public sealed class Bookmark : SDBookmark
+ {
+ public Bookmark(FileName fileName, Location location) : base(fileName, location)
+ {
+ }
+ }
}
diff --git a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/IPinDebuggerControl.cs b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/IPinDebuggerControl.cs
index b3e531820c..835aaa0e25 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/IPinDebuggerControl.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/IPinDebuggerControl.cs
@@ -5,9 +5,9 @@ using System;
using System.Collections.Generic;
using System.Windows;
-using ICSharpCode.SharpDevelop.Debugging;
+using ICSharpCode.SharpDevelop.Bookmarks;
-namespace Services.Debugger.Tooltips
+namespace ICSharpCode.SharpDevelop.Debugging
{
public interface IPinDebuggerControl
{
diff --git a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinBookmark.cs b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinBookmark.cs
index cf758a382b..7a422636a0 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinBookmark.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinBookmark.cs
@@ -13,7 +13,7 @@ using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.Debugging;
-namespace Services.Debugger.Tooltips
+namespace ICSharpCode.SharpDevelop.Bookmarks
{
public class PinBookmark : SDBookmark
{
diff --git a/src/Tools/NUnit/lib/nunit-console-runner.dll b/src/Tools/NUnit/lib/nunit-console-runner.dll
index a18299ede1..1709ce7bd2 100644
Binary files a/src/Tools/NUnit/lib/nunit-console-runner.dll and b/src/Tools/NUnit/lib/nunit-console-runner.dll differ
diff --git a/src/Tools/NUnit/lib/nunit-gui-runner.dll b/src/Tools/NUnit/lib/nunit-gui-runner.dll
index ec364fa979..35efa737c3 100644
Binary files a/src/Tools/NUnit/lib/nunit-gui-runner.dll and b/src/Tools/NUnit/lib/nunit-gui-runner.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.core.dll b/src/Tools/NUnit/lib/nunit.core.dll
index 5e9fcc037e..a1dd69866d 100644
Binary files a/src/Tools/NUnit/lib/nunit.core.dll and b/src/Tools/NUnit/lib/nunit.core.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.core.interfaces.dll b/src/Tools/NUnit/lib/nunit.core.interfaces.dll
index 3152dd2f08..0ac8788205 100644
Binary files a/src/Tools/NUnit/lib/nunit.core.interfaces.dll and b/src/Tools/NUnit/lib/nunit.core.interfaces.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.fixtures.dll b/src/Tools/NUnit/lib/nunit.fixtures.dll
index 0b19937293..8fd1932d75 100644
Binary files a/src/Tools/NUnit/lib/nunit.fixtures.dll and b/src/Tools/NUnit/lib/nunit.fixtures.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.uiexception.dll b/src/Tools/NUnit/lib/nunit.uiexception.dll
index 66b4b95491..610c1700ed 100644
Binary files a/src/Tools/NUnit/lib/nunit.uiexception.dll and b/src/Tools/NUnit/lib/nunit.uiexception.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.uikit.dll b/src/Tools/NUnit/lib/nunit.uikit.dll
index adc5ead69d..9087db2d16 100644
Binary files a/src/Tools/NUnit/lib/nunit.uikit.dll and b/src/Tools/NUnit/lib/nunit.uikit.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.util.dll b/src/Tools/NUnit/lib/nunit.util.dll
index b31beef419..0b315c2106 100644
Binary files a/src/Tools/NUnit/lib/nunit.util.dll and b/src/Tools/NUnit/lib/nunit.util.dll differ
diff --git a/src/Tools/NUnit/nunit-console-dotnet2-x86.exe b/src/Tools/NUnit/nunit-console-dotnet2-x86.exe
index e35a94d46a..def5f1889a 100755
Binary files a/src/Tools/NUnit/nunit-console-dotnet2-x86.exe and b/src/Tools/NUnit/nunit-console-dotnet2-x86.exe differ
diff --git a/src/Tools/NUnit/nunit-console-dotnet2.exe b/src/Tools/NUnit/nunit-console-dotnet2.exe
index 26b92210de..67ba103ffb 100755
Binary files a/src/Tools/NUnit/nunit-console-dotnet2.exe and b/src/Tools/NUnit/nunit-console-dotnet2.exe differ
diff --git a/src/Tools/NUnit/nunit-console-x86.exe b/src/Tools/NUnit/nunit-console-x86.exe
index e35a94d46a..def5f1889a 100644
Binary files a/src/Tools/NUnit/nunit-console-x86.exe and b/src/Tools/NUnit/nunit-console-x86.exe differ
diff --git a/src/Tools/NUnit/nunit-console.exe b/src/Tools/NUnit/nunit-console.exe
index 26b92210de..67ba103ffb 100644
Binary files a/src/Tools/NUnit/nunit-console.exe and b/src/Tools/NUnit/nunit-console.exe differ
diff --git a/src/Tools/NUnit/nunit-console/AssemblyInfo.cs b/src/Tools/NUnit/nunit-console/AssemblyInfo.cs
index f163c5be29..4b88389d14 100644
--- a/src/Tools/NUnit/nunit-console/AssemblyInfo.cs
+++ b/src/Tools/NUnit/nunit-console/AssemblyInfo.cs
@@ -36,5 +36,5 @@ using System.Reflection;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.5.9")]
-[assembly: AssemblyInformationalVersion("2.5.9")]
+[assembly: AssemblyVersion("2.5.10")]
+[assembly: AssemblyInformationalVersion("2.5.10")]
diff --git a/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs b/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs
index d0019b1dcf..bb2330fb56 100644
--- a/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs
+++ b/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs
@@ -93,7 +93,7 @@ namespace NUnit.ConsoleRunner
if ( options.run != null && options.run != string.Empty )
{
Console.WriteLine( "Selected test(s): " + options.run );
- testFilter = new SimpleNameFilter( options.run );
+ testFilter = new SimpleNameFilter( TestNameParser.Parse(options.run) );
}
if ( options.include != null && options.include != string.Empty )
@@ -163,7 +163,7 @@ namespace NUnit.ConsoleRunner
else
{
WriteSummaryReport(summary);
- if (summary.ErrorsAndFailures > 0)
+ if (summary.ErrorsAndFailures > 0 || result.IsError || result.IsFailure)
WriteErrorsAndFailuresReport(result);
if (summary.TestsNotRun > 0)
WriteNotRunReport(result);
@@ -297,8 +297,9 @@ namespace NUnit.ConsoleRunner
{
if (result.HasResults)
{
- if ( (result.IsFailure || result.IsError) && result.FailureSite == FailureSite.SetUp)
- WriteSingleResult(result);
+ if (result.IsFailure || result.IsError)
+ if (result.FailureSite == FailureSite.SetUp || result.FailureSite == FailureSite.TearDown)
+ WriteSingleResult(result);
foreach (TestResult childResult in result.Results)
WriteErrorsAndFailures(childResult);
diff --git a/src/Tools/NUnit/nunit.framework.dll b/src/Tools/NUnit/nunit.framework.dll
index 875e098420..6856e51ef0 100755
Binary files a/src/Tools/NUnit/nunit.framework.dll and b/src/Tools/NUnit/nunit.framework.dll differ