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

Commit 0e29bd6

Browse files
author
Dragan
committed
merge upstream/master
2 parents 7e1ebec + 58fddcc commit 0e29bd6

363 files changed

Lines changed: 17457 additions & 10609 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.

‎SharpDevelop.Tests.sln‎

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2012
44
# SharpDevelop 5.0
5+
VisualStudioVersion = 12.0.20827.3
6+
MinimumVisualStudioVersion = 10.0.40219.1
57
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
68
EndProject
79
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}"
@@ -138,15 +140,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager2.Tests", "src\
138140
EndProject
139141
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{FEDD3FD9-0480-43CC-913C-4E0876DDA852}"
140142
EndProject
141-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}"
143+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting", "src\AddIns\Misc\Reporting\ICSharpCode.Reporting\ICSharpCode.Reporting.csproj", "{40CA84D4-ACFC-4646-9CDD-B87262D34093}"
142144
EndProject
143-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}"
145+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting.Test", "src\AddIns\Misc\Reporting\ICSharpCode.Reporting\Test\ICSharpCode.Reporting.Test\ICSharpCode.Reporting.Test.csproj", "{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}"
144146
EndProject
145-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}"
146-
EndProject
147-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\Test\ICSharpCode.Reports.Core.Test\ICSharpCode.Reports.Core.Test.csproj", "{E16B73CA-3603-47EE-915E-6F8B2A07304B}"
148-
EndProject
149-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
147+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting.Addin", "src\AddIns\Misc\Reporting\ICSharpCode.Reporting.Addin\ICSharpCode.Reporting.Addin.csproj", "{0502FCF7-72F4-4587-936B-D0238CD0E072}"
150148
EndProject
151149
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
152150
EndProject
@@ -470,26 +468,18 @@ Global
470468
{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
471469
{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
472470
{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5}.Release|Any CPU.Build.0 = Release|Any CPU
473-
{35D002D7-C78B-44FB-92AA-104BEB431678}.Debug|Any CPU.ActiveCfg = Debug|x86
474-
{35D002D7-C78B-44FB-92AA-104BEB431678}.Debug|Any CPU.Build.0 = Debug|x86
475-
{35D002D7-C78B-44FB-92AA-104BEB431678}.Release|Any CPU.ActiveCfg = Release|x86
476-
{35D002D7-C78B-44FB-92AA-104BEB431678}.Release|Any CPU.Build.0 = Release|x86
477-
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
478-
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
479-
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
480-
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Release|Any CPU.Build.0 = Release|Any CPU
481-
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.ActiveCfg = Debug|x86
482-
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.Build.0 = Debug|x86
483-
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.ActiveCfg = Release|x86
484-
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.Build.0 = Release|x86
485-
{E16B73CA-3603-47EE-915E-6F8B2A07304B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
486-
{E16B73CA-3603-47EE-915E-6F8B2A07304B}.Debug|Any CPU.Build.0 = Debug|Any CPU
487-
{E16B73CA-3603-47EE-915E-6F8B2A07304B}.Release|Any CPU.ActiveCfg = Release|Any CPU
488-
{E16B73CA-3603-47EE-915E-6F8B2A07304B}.Release|Any CPU.Build.0 = Release|Any CPU
489-
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
490-
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.Build.0 = Debug|Any CPU
491-
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.ActiveCfg = Release|Any CPU
492-
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.Build.0 = Release|Any CPU
471+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
472+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.Build.0 = Debug|Any CPU
473+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.ActiveCfg = Release|Any CPU
474+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.Build.0 = Release|Any CPU
475+
{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
476+
{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
477+
{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
478+
{97CA9CE5-B966-48DF-BB59-F00FFC534B1F}.Release|Any CPU.Build.0 = Release|Any CPU
479+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
480+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU
481+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU
482+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.Build.0 = Release|Any CPU
493483
{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
494484
{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.Build.0 = Debug|Any CPU
495485
{0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -712,11 +702,9 @@ Global
712702
{60480C2F-F228-4D86-B98F-AF75A7DCEC34} = {1F88F080-AD7C-4B03-9895-20C26282429D}
713703
{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5} = {1F88F080-AD7C-4B03-9895-20C26282429D}
714704
{FEDD3FD9-0480-43CC-913C-4E0876DDA852} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
715-
{35D002D7-C78B-44FB-92AA-104BEB431678} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
716-
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
717-
{4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
718-
{E16B73CA-3603-47EE-915E-6F8B2A07304B} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
719-
{D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
705+
{40CA84D4-ACFC-4646-9CDD-B87262D34093} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
706+
{97CA9CE5-B966-48DF-BB59-F00FFC534B1F} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
707+
{0502FCF7-72F4-4587-936B-D0238CD0E072} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
720708
{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
721709
{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
722710
{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}

‎SharpDevelop.sln‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2012
44
# SharpDevelop 5.0
5+
VisualStudioVersion = 12.0.20827.3
6+
MinimumVisualStudioVersion = 10.0.40219.1
57
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
68
EndProject
79
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}"
@@ -111,11 +113,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager2", "src\AddIns
111113
EndProject
112114
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}"
113115
EndProject
114-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}"
116+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting", "src\AddIns\Misc\Reporting\ICSharpCode.Reporting\ICSharpCode.Reporting.csproj", "{40CA84D4-ACFC-4646-9CDD-B87262D34093}"
115117
EndProject
116-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}"
117-
EndProject
118-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
118+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reporting.Addin", "src\AddIns\Misc\Reporting\ICSharpCode.Reporting.Addin\ICSharpCode.Reporting.Addin.csproj", "{0502FCF7-72F4-4587-936B-D0238CD0E072}"
119119
EndProject
120120
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
121121
EndProject
@@ -369,18 +369,14 @@ Global
369369
{60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Debug|Any CPU.Build.0 = Debug|Any CPU
370370
{60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Release|Any CPU.ActiveCfg = Release|Any CPU
371371
{60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Release|Any CPU.Build.0 = Release|Any CPU
372-
{35D002D7-C78B-44FB-92AA-104BEB431678}.Debug|Any CPU.ActiveCfg = Debug|x86
373-
{35D002D7-C78B-44FB-92AA-104BEB431678}.Debug|Any CPU.Build.0 = Debug|x86
374-
{35D002D7-C78B-44FB-92AA-104BEB431678}.Release|Any CPU.ActiveCfg = Release|x86
375-
{35D002D7-C78B-44FB-92AA-104BEB431678}.Release|Any CPU.Build.0 = Release|x86
376-
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.ActiveCfg = Debug|x86
377-
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.Build.0 = Debug|x86
378-
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.ActiveCfg = Release|x86
379-
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.Build.0 = Release|x86
380-
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
381-
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.Build.0 = Debug|Any CPU
382-
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.ActiveCfg = Release|Any CPU
383-
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.Build.0 = Release|Any CPU
372+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
373+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.Build.0 = Debug|Any CPU
374+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.ActiveCfg = Release|Any CPU
375+
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.Build.0 = Release|Any CPU
376+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
377+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU
378+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU
379+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.Build.0 = Release|Any CPU
384380
{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
385381
{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.Build.0 = Debug|Any CPU
386382
{0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -560,9 +556,8 @@ Global
560556
{E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {87D549AF-8FCD-4E84-9C33-3DB6E42FEF6D}
561557
{60480C2F-F228-4D86-B98F-AF75A7DCEC34} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
562558
{4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
563-
{35D002D7-C78B-44FB-92AA-104BEB431678} = {4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}
564-
{4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}
565-
{D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}
559+
{40CA84D4-ACFC-4646-9CDD-B87262D34093} = {4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}
560+
{0502FCF7-72F4-4587-936B-D0238CD0E072} = {4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}
566561
{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
567562
{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
568563
{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}

‎doc/Dependencies.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<li>
1616
<a href="http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B&amp;displaylang=en">Microsoft Windows SDK for Windows 7 and .NET Framework 4</a> (strongly recommended!)
1717
</li>
18+
<li>
19+
<a href="http://www.microsoft.com/en-us/download/details.aspx?id=40760">Microsoft Build Tools 2013</a> for opening Visual Studio 2013 solutions
20+
</li>
1821
<li>
1922
<a href="http://www.microsoft.com/downloads/en/details.aspx?FamilyID=effc5bc4-c3df-4172-ad1c-bc62935861c5">Microsoft F#</a> for F# support
2023
</li>
@@ -41,7 +44,7 @@
4144

4245
<table>
4346
<tr>
44-
<th style="width:250px">Target platform</th>
47+
<th>Target platform</th>
4548
<th>Reference Assemblies</th>
4649
<tr>
4750
<tr>
@@ -57,7 +60,7 @@
5760
<td><a href="http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B&amp;displaylang=en">Microsoft Windows SDK for Windows 7 and .NET Framework 4</a></td>
5861
</tr>
5962
<tr>
60-
<td>.NET Framework 3.5 SP1 and below</td>
63+
<td style="padding-right: 8px;">.NET Framework 3.5 SP1 and below</td>
6164
<td>Included with .NET framework</td>
6265
</tr>
6366
</table>

‎src/AddIns/Analysis/CodeQuality/CodeQuality.addin‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<Manifest>
88
<Identity name = "ICSharpCode.CodeQuality"/>
9-
<Dependency addin="ICSharpCode.Reports.Addin" requirePreload="true" />
9+
<Dependency addin="ICSharpCode.Reporting.Addin" requirePreload="true"></Dependency>
1010
</Manifest>
1111

1212
<Runtime>

‎src/AddIns/Analysis/CodeQuality/CodeQuality.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
<EmbeddedResource Include="Reporting\Overviewreport.srd">
112112
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
113113
</EmbeddedResource>
114+
<EmbeddedResource Include="Reporting\DependencyReport - Kopie.srd" />
114115
</ItemGroup>
115116
<ItemGroup>
116117
<Folder Include="Engine\Dom" />
@@ -172,10 +173,9 @@
172173
<Name>ICSharpCode.SharpDevelop.Widgets</Name>
173174
<Private>False</Private>
174175
</ProjectReference>
175-
<ProjectReference Include="..\..\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj">
176-
<Project>{7C3579BC-2A64-4108-82B5-3D07ADA079E7}</Project>
177-
<Name>ICSharpCode.Reports.Core</Name>
178-
<Private>False</Private>
176+
<ProjectReference Include="..\..\Misc\Reporting\ICSharpCode.Reporting\ICSharpCode.Reporting.csproj">
177+
<Project>{40CA84D4-ACFC-4646-9CDD-B87262D34093}</Project>
178+
<Name>ICSharpCode.Reporting</Name>
179179
</ProjectReference>
180180
</ItemGroup>
181181
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />

‎src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:gui="clr-namespace:ICSharpCode.CodeQuality.Gui"
66
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
7-
xmlns:rep="clr-namespace:ICSharpCode.Reports.Core.WpfReportViewer;assembly=ICSharpCode.Reports.Core">
8-
7+
xmlns:reporting="clr-namespace:ICSharpCode.Reporting.WpfReportViewer;assembly=ICSharpCode.Reporting">
8+
99
<DockPanel>
1010
<ToolBar DockPanel.Dock="Top">
1111
<Button Click="AddAssemblyClick">Add Assembly</Button>
@@ -40,8 +40,7 @@
4040
x:Name="reportTab"
4141
Visibility="Hidden">
4242
<Grid>
43-
<rep:WpfReportViewer
44-
x:Name="viewer" />
43+
<reporting:WpfReportViewer x:Name="viewer" />
4544
</Grid>
4645
</TabItem>
4746
</TabControl>

‎src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,13 @@
1919
using System;
2020
using System.Collections.Generic;
2121
using System.Collections.ObjectModel;
22-
using System.Text;
2322
using System.Windows;
2423
using System.Windows.Controls;
25-
using System.Windows.Data;
26-
using System.Windows.Documents;
27-
using System.Windows.Input;
28-
using System.Windows.Media;
2924

25+
using ICSharpCode.Reporting.WpfReportViewer;
3026
using ICSharpCode.CodeQuality.Engine;
3127
using ICSharpCode.CodeQuality.Engine.Dom;
3228
using ICSharpCode.CodeQuality.Reporting;
33-
using ICSharpCode.Reports.Core.WpfReportViewer;
3429
using ICSharpCode.SharpDevelop.Gui;
3530
using ICSharpCode.SharpDevelop.Project;
3631
using Microsoft.Win32;
@@ -125,6 +120,7 @@ void DependecyReport_Click(object sender, RoutedEventArgs e)
125120
var previewViewModel = new PreviewViewModel(dependencyReport.ReportSettings,reportCreator.Pages);
126121
viewer.SetBinding(previewViewModel);
127122
ActivateReportTab();
123+
128124
}
129125

130126
void ActivateReportTab()

‎src/AddIns/Analysis/CodeQuality/Reporting/BaseReport.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818

1919
using System;
2020
using System.Collections.Generic;
21-
using System.IO;
22-
using System.Reflection;
21+
using ICSharpCode.Reporting.Items;
2322

24-
using ICSharpCode.Reports.Core;
2523

2624
namespace ICSharpCode.CodeQuality.Reporting
2725
{

0 commit comments

Comments
 (0)