Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit cd8c6c3

Browse files
Merge branch 'master' of github.com:icsharpcode/SharpDevelop
2 parents 8b59899 + f50ab6b commit cd8c6c3

30 files changed

Lines changed: 210 additions & 143 deletions

data/resources/StringResources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6972,6 +6972,9 @@ The resources files have been renamed/moved accordingly.</value>
69726972
<data name="StartPage.StartMenu.OpenCombineButton" xml:space="preserve">
69736973
<value>Open solution</value>
69746974
</data>
6975+
<data name="StartPage.StartMenu.RemoveRecentProject" xml:space="preserve">
6976+
<value>Remove from recent projects list</value>
6977+
</data>
69756978
<data name="StartPage.StartPageContentName" xml:space="preserve">
69766979
<value>Start Page</value>
69776980
</data>

src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport - Kopie.srd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
<CanGrow>False</CanGrow>
266266
<CanShrink>False</CanShrink>
267267
<RTL>No</RTL>
268-
<Text>= Globals!ReportFolder + Globals!ReportName</Text>
268+
<Text>= Globals!ReportFolder + ' - ' + Globals!ReportName</Text>
269269
<DrawBorder>False</DrawBorder>
270270
<FrameColor>Black</FrameColor>
271271
<ForeColor>ControlText</ForeColor>

src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.srd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
<CanGrow>False</CanGrow>
255255
<CanShrink>False</CanShrink>
256256
<RTL>No</RTL>
257-
<Text>= Globals!ReportFolder + Globals!ReportName</Text>
257+
<Text>= Globals!ReportFolder + ' - ' + Globals!ReportName</Text>
258258
<DrawBorder>False</DrawBorder>
259259
<FrameColor>Black</FrameColor>
260260
<ForeColor>ControlText</ForeColor>

src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
<CanGrow>False</CanGrow>
441441
<CanShrink>False</CanShrink>
442442
<RTL>No</RTL>
443-
<Text>= Globals!ReportFolder + Globals!ReportName</Text>
443+
<Text>= Globals!ReportFolder + ' - ' + Globals!ReportName</Text>
444444
<DrawBorder>False</DrawBorder>
445445
<FrameColor>Black</FrameColor>
446446
<ForeColor>ControlText</ForeColor>

src/AddIns/Analysis/UnitTesting/Pad/UnitTestNode.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ public UnitTestNode(ITest test)
3737
if (test == null)
3838
throw new ArgumentNullException("test");
3939
this.test = test;
40+
if (IsVisible) {
41+
test.DisplayNameChanged += test_NameChanged;
42+
test.ResultChanged += test_ResultChanged;
43+
}
4044
}
4145

4246
protected override void OnIsVisibleChanged()

src/AddIns/Misc/PackageManagement/Project/Src/IPackageExtensions.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
// DEALINGS IN THE SOFTWARE.
1818

1919
using System;
20+
using System.Linq;
2021
using NuGet;
2122

2223
namespace ICSharpCode.PackageManagement
@@ -45,7 +46,8 @@ public static string GetName(this IPackage package)
4546

4647
public static bool IsProjectPackage(this IPackage package)
4748
{
48-
return package.HasProjectContent();
49+
return package.HasProjectContent() ||
50+
package.DependencySets.SelectMany(p => p.Dependencies).Any();
4951
}
5052
}
5153
}

src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.xaml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,26 @@
4747
Grid.Column="1"
4848
Margin="4, 4"
4949
TextTrimming="CharacterEllipsis"
50-
Text="{Binding Path=Message}"/>
50+
Text="{Binding Path=Message}">
51+
<TextBlock.Style>
52+
<Style TargetType="TextBlock">
53+
<Setter Property="ToolTip">
54+
<Setter.Value>
55+
<TextBlock
56+
Text="{Binding Message}"
57+
TextWrapping="WrapWithOverflow"
58+
TextTrimming="CharacterEllipsis"
59+
MaxWidth="400" />
60+
</Setter.Value>
61+
</Setter>
62+
<Style.Triggers>
63+
<DataTrigger Binding="{Binding Message}" Value="{x:Null}">
64+
<Setter Property="ToolTip" Value="{x:Null}" />
65+
</DataTrigger>
66+
</Style.Triggers>
67+
</Style>
68+
</TextBlock.Style>
69+
</TextBlock>
5170
<Button
5271
Grid.Column="2"
5372
Content="{core:Localize Global.CloseButtonText}"
@@ -76,4 +95,4 @@
7695
</TabItem>
7796
</TabControl>
7897
</DockPanel>
79-
</Window>
98+
</Window>

src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,6 @@ protected virtual IQueryable<IPackage> GetAllPackages(string searchCriteria)
275275
return null;
276276
}
277277

278-
protected virtual bool IsProjectPackage (IPackage package)
279-
{
280-
return package.IsProjectPackage();
281-
}
282-
283278
/// <summary>
284279
/// Allows filtering of the packages before paging the results. Call base class method
285280
/// to run default filtering.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)