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

Commit 4c5fb9d

Browse files
siegfriedpammersiegfriedpammer
committed
Merge branch 'reports' of github.com:icsharpcode/SharpDevelop into newNR
Conflicts: SharpDevelop.Tests.sln SharpDevelop.sln
2 parents 98c509f + 6a08d8f commit 4c5fb9d

180 files changed

Lines changed: 6769 additions & 634 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AssemblyName>SourceAnalysis</AssemblyName>
77
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
88
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9-
<ProjectGuid>{3EAA45A9-735C-4AC7-A799-947B93EA449D}</ProjectGuid>
9+
<ProjectGuid>{C16BEA37-FEE8-4792-B860-48F5BFBD39A9}</ProjectGuid>
1010
<OutputPath>..\..\..\..\AddIns\Analysis\SourceAnalysis</OutputPath>
1111
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
1212
<NoStdLib>False</NoStdLib>
@@ -83,7 +83,6 @@
8383
<Compile Include="Src\CheckCurrentProjectCommand.cs" />
8484
</ItemGroup>
8585
<ItemGroup>
86-
<Folder Include="Resources" />
8786
<ProjectReference Include="..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
8887
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
8988
<Name>ICSharpCode.SharpDevelop</Name>

‎src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@
6262
<Compile Include="FSharpProject.cs" />
6363
<Compile Include="FSharpProjectNode.cs" />
6464
<Compile Include="FSharpProjectNodeBuilder.cs" />
65-
<Compile Include="FsOptions.cs" />
65+
<Compile Include="FsOptions.cs">
66+
<SubType>UserControl</SubType>
67+
</Compile>
6668
<Compile Include="ProjectHelpers.cs" />
6769
<Compile Include="Properties\AssemblyInfo.cs" />
6870
<EmbeddedResource Include="Resources\FS-Mode.xshd" />

‎src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.40607</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}</ProjectGuid>
8+
<ProjectGuid>{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}</ProjectGuid>
99
<RootNamespace>ICSharpCode.WixBinding</RootNamespace>
1010
<AssemblyName>WixBinding</AssemblyName>
1111
<OutputTarget>Library</OutputTarget>
@@ -107,7 +107,9 @@
107107
<Compile Include="Src\Commands\AddWixLibraryToProject.cs" />
108108
<Compile Include="Src\WixDocument.cs" />
109109
<Compile Include="Src\WixNamespaceManager.cs" />
110-
<Compile Include="Src\Gui\SetupDialogListView.cs" />
110+
<Compile Include="Src\Gui\SetupDialogListView.cs">
111+
<SubType>Component</SubType>
112+
</Compile>
111113
<Compile Include="Src\Gui\SetupDialogListPad.cs" />
112114
<Compile Include="Src\Commands\OpenDialogCommand.cs" />
113115
<Compile Include="Src\Commands\ViewDialogXmlCommand.cs" />
@@ -127,7 +129,9 @@
127129
<Compile Include="Src\IWixDialogDesigner.cs" />
128130
<Compile Include="Src\WixPropertyParser.cs" />
129131
<Compile Include="Src\Gui\SetupDialogControlsSideTab.cs" />
130-
<Compile Include="Src\Gui\RadioButtonGroupBox.cs" />
132+
<Compile Include="Src\Gui\RadioButtonGroupBox.cs">
133+
<SubType>Component</SubType>
134+
</Compile>
131135
<Compile Include="Src\WixDialogException.cs" />
132136
<Compile Include="Src\WixDocumentLineSegment.cs" />
133137
<Compile Include="Src\IWixPackageFilesView.cs" />
@@ -225,9 +229,6 @@
225229
<Name>ICSharpCode.Core</Name>
226230
<Private>False</Private>
227231
</ProjectReference>
228-
<Folder Include="Configuration" />
229-
<Folder Include="Resources" />
230-
<Folder Include="Src\Commands" />
231232
<ProjectReference Include="..\..\..\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj">
232233
<Project>{0162E499-42D0-409B-AA25-EED21F75336B}</Project>
233234
<Name>AvalonEdit.AddIn</Name>
@@ -245,7 +246,6 @@
245246
<Content Include="SetupDialogControlLibrary.sdcl">
246247
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
247248
</Content>
248-
<Folder Include="Src\PropertyGrid" />
249249
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
250250
<Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
251251
<Name>ICSharpCode.SharpDevelop.Widgets</Name>

‎src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@
7171
<Compile Include="NavigateToDecompiledEntityService.cs" />
7272
<Compile Include="Properties\AssemblyInfo.cs" />
7373
<Compile Include="LaunchILSpy\ILSpyController.cs" />
74-
<Compile Include="LaunchILSpy\SetILSpyPathDialog.cs" />
74+
<Compile Include="LaunchILSpy\SetILSpyPathDialog.cs">
75+
<SubType>Form</SubType>
76+
</Compile>
7577
<Compile Include="LaunchILSpy\SetILSpyPathDialog.Designer.cs">
7678
<DependentUpon>SetILSpyPathDialog.cs</DependentUpon>
7779
</Compile>
@@ -129,8 +131,5 @@
129131
<Private>False</Private>
130132
</ProjectReference>
131133
</ItemGroup>
132-
<ItemGroup>
133-
<Folder Include="LaunchILSpy" />
134-
<Folder Include="ViewContent" />
135-
</ItemGroup>
134+
<ItemGroup />
136135
</Project>

‎src/AddIns/DisplayBindings/IconEditor/IconEditor.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@
5252
<Compile Include="IconPanel.Designer.cs">
5353
<DependentUpon>IconPanel.cs</DependentUpon>
5454
</Compile>
55-
<Compile Include="IconPanel.cs" />
55+
<Compile Include="IconPanel.cs">
56+
<SubType>UserControl</SubType>
57+
</Compile>
5658
<Compile Include="PickFormatDialog.cs" />
5759
<Compile Include="PickFormatDialog.Designer.cs">
5860
<DependentUpon>PickFormatDialog.cs</DependentUpon>
@@ -61,7 +63,9 @@
6163
<Compile Include="EditorPanel.Designer.cs">
6264
<DependentUpon>EditorPanel.cs</DependentUpon>
6365
</Compile>
64-
<Compile Include="EditorPanel.cs" />
66+
<Compile Include="EditorPanel.cs">
67+
<SubType>UserControl</SubType>
68+
</Compile>
6569
<None Include="IconEditor.addin">
6670
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6771
</None>

‎src/AddIns/Misc/AddInManager/Project/AddInManager.csproj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,19 @@
5353
</None>
5454
<Compile Include="Configuration\AssemblyInfo.cs" />
5555
<Compile Include="Src\Commands.cs" />
56-
<Compile Include="Src\ManagerForm.cs" />
56+
<Compile Include="Src\ManagerForm.cs">
57+
<SubType>Form</SubType>
58+
</Compile>
5759
<EmbeddedResource Include="Src\ManagerForm.resx">
5860
<DependentUpon>ManagerForm.cs</DependentUpon>
5961
</EmbeddedResource>
60-
<Compile Include="Src\AddInControl.cs" />
62+
<Compile Include="Src\AddInControl.cs">
63+
<SubType>Component</SubType>
64+
</Compile>
6165
<Compile Include="Src\InstallableAddIn.cs" />
62-
<Compile Include="Src\AboutForm.cs" />
66+
<Compile Include="Src\AboutForm.cs">
67+
<SubType>Form</SubType>
68+
</Compile>
6369
<EmbeddedResource Include="Src\AboutForm.resx">
6470
<DependentUpon>AboutForm.cs</DependentUpon>
6571
</EmbeddedResource>

‎src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@
7979
<Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
8080
<Link>Configuration\GlobalAssemblyInfo.cs</Link>
8181
</Compile>
82-
<Compile Include="Src\RegisterFiletypesPanel.cs" />
82+
<Compile Include="Src\RegisterFiletypesPanel.cs">
83+
<SubType>UserControl</SubType>
84+
</Compile>
8385
<Compile Include="Src\RegisterFiletypesPanel.Designer.cs">
8486
<DependentUpon>RegisterFiletypesPanel.cs</DependentUpon>
8587
</Compile>
@@ -95,7 +97,6 @@
9597
<Name>ICSharpCode.Core</Name>
9698
<Private>False</Private>
9799
</ProjectReference>
98-
<Folder Include="filetypes" />
99100
<Content Include="filetypes\addin.ico">
100101
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
101102
</Content>

‎src/AddIns/Misc/ICSharpCode.Reporting.Tests/Factory/ReportingFactoryFixture.cs‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* Created by SharpDevelop.
3+
* User: Peter Forstmeier
4+
* Date: 19.03.2013
5+
* Time: 19:14
6+
*
7+
* To change this template use Tools | Options | Coding | Edit Standard Headers.
8+
*/
9+
using System;
10+
using System.IO;
11+
using System.Reflection;
12+
13+
using NUnit.Framework;
14+
15+
namespace ICSharpCode.Reporting.Tests.Factory
16+
{
17+
[TestFixture]
18+
public class ReportingFactoryFixture
19+
{
20+
private const string nS = "ICSharpCode.Reporting.Tests.TestReports.";
21+
private const string reportName = "PlainModel.srd";
22+
private Stream stream;
23+
24+
[Test]
25+
public void CreateFormSheetBuilder()
26+
{
27+
var r = new ReportingFactory();
28+
var x = r.CreatePageBuilder(stream);
29+
Assert.That(x,Is.Null);
30+
}
31+
32+
[SetUp]
33+
public void LoadFromStream()
34+
{
35+
System.Reflection.Assembly asm = Assembly.GetExecutingAssembly();
36+
stream = asm.GetManifestResourceStream(nS + reportName);
37+
}
38+
}
39+
}

‎src/AddIns/Misc/ICSharpCode.Reporting.Tests/Model/LoadPlainModelFixture.cs‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/*
2+
* Created by SharpDevelop.
3+
* User: Peter Forstmeier
4+
* Date: 19.03.2013
5+
* Time: 19:58
6+
*
7+
* To change this template use Tools | Options | Coding | Edit Standard Headers.
8+
*/
9+
using System;
10+
using System.IO;
11+
using System.Reflection;
12+
13+
using ICSharpCode.Reporting.Globals;
14+
using NUnit.Framework;
15+
16+
namespace ICSharpCode.Reporting.Tests.Model
17+
{
18+
[TestFixture]
19+
public class LoadPlainModelFixture
20+
{
21+
private const string nS = "ICSharpCode.Reporting.Tests.TestReports.";
22+
private const string reportName = "PlainModel.srd";
23+
private Stream stream;
24+
25+
[Test]
26+
public void CanLoadFromResource()
27+
{
28+
Assert.IsNotNull(stream);
29+
}
30+
31+
32+
[Test]
33+
public void LoadPlainModel()
34+
{
35+
var rf = new ReportingFactory();
36+
var model = rf.LoadReportModel(stream);
37+
Assert.IsNotNull(model);
38+
}
39+
40+
41+
[Test]
42+
public void ReportSettingsFromPlainModel()
43+
{
44+
var rf = new ReportingFactory();
45+
var model = rf.LoadReportModel(stream);
46+
Assert.That(model.ReportSettings,Is.Not.Null);
47+
}
48+
49+
50+
[Test]
51+
public void ReportSettingsReportName()
52+
{
53+
var rf = new ReportingFactory();
54+
var model = rf.LoadReportModel(stream);
55+
Assert.That(model.ReportSettings.ReportName,Is.EqualTo(Globals.GlobalValues.DefaultReportName));
56+
}
57+
58+
59+
[Test]
60+
public void ReportSettingsDataModelFormSheet()
61+
{
62+
var rf = new ReportingFactory();
63+
var model = rf.LoadReportModel(stream);
64+
Assert.That(model.ReportSettings.DataModel,Is.EqualTo(GlobalEnums.PushPullModel.FormSheet));
65+
}
66+
67+
[Test]
68+
public void ReportSettingsPageSize()
69+
{
70+
var rf = new ReportingFactory();
71+
var model = rf.LoadReportModel(stream);
72+
Assert.That(model.ReportSettings.PageSize,Is.EqualTo(Globals.GlobalValues.DefaultPageSize));
73+
}
74+
75+
76+
77+
[SetUp]
78+
public void LoadFromStream()
79+
{
80+
System.Reflection.Assembly asm = Assembly.GetExecutingAssembly();
81+
stream = asm.GetManifestResourceStream(nS + reportName);
82+
}
83+
84+
85+
}
86+
}

‎src/AddIns/Misc/ICSharpCode.Reporting.Tests/Model/ReportModelFixture.cs‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
* Created by SharpDevelop.
3+
* User: Peter Forstmeier
4+
* Date: 19.03.2013
5+
* Time: 19:02
6+
*
7+
* To change this template use Tools | Options | Coding | Edit Standard Headers.
8+
*/
9+
using System;
10+
using ICSharpCode.Reporting.Items;
11+
using NUnit.Framework;
12+
13+
namespace ICSharpCode.Reporting.Tests.Model
14+
{
15+
[TestFixture]
16+
public class ReportModelFixture
17+
{
18+
private ReportModel model;
19+
20+
[Test]
21+
public void CanCreateReportModel()
22+
{
23+
Assert.That(model,Is.Not.Null);
24+
}
25+
26+
27+
[Test]
28+
public void ModelInitializeReportSettings()
29+
{
30+
Assert.That(model.ReportSettings,Is.Not.Null);
31+
}
32+
33+
34+
[Test]
35+
public void ModelReturnsPlainReportName()
36+
{
37+
Assert.That(model.ReportSettings.ReportName,Is.EqualTo(Globals.GlobalValues.DefaultReportName));
38+
}
39+
40+
41+
[SetUp]
42+
public void CreateModel()
43+
{
44+
model = ReportModel.Create();
45+
}
46+
47+
}
48+
}

0 commit comments

Comments
 (0)