Skip to content
This repository was archived by the owner on Apr 6, 2024. It is now read-only.

Commit 467ccc0

Browse files
pascalbergerpascalberger
committed
Merge branch 'release/0.4.0'
2 parents e4d1426 + c83f3ad commit 467ccc0

File tree

12 files changed

+351
-339
lines changed

12 files changed

+351
-339
lines changed

‎nuspec/nuget/Cake.Issues.Reporting.Generic.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
2121
<requireLicenseAcceptance>false</requireLicenseAcceptance>
2222
<copyright>Copyright © Pascal Berger</copyright>
2323
<tags>Cake Script Cake-Issues Cake-ReportFormat Issues Reporting Html Markdown</tags>
24-
<releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting.Generic/releases/tag/0.3.4</releaseNotes>
24+
<releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting.Generic/releases/tag/0.4.0</releaseNotes>
2525
</metadata>
2626
<files>
2727
<file src="Cake.Issues.Reporting.Generic.dll" target="lib\net46" />

‎src/Cake.Issues.Reporting.Generic.Tests/Cake.Issues.Reporting.Generic.Tests.csproj

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
3+
<Import Project="..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" />
4+
<Import Project="..\packages\xunit.core.2.4.0\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
55
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
66
<PropertyGroup>
77
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,20 +40,20 @@
4040
<Reference Include="Cake.Core, Version=0.28.0.0, Culture=neutral, processorArchitecture=MSIL">
4141
<HintPath>..\packages\Cake.Core.0.28.0\lib\net46\Cake.Core.dll</HintPath>
4242
</Reference>
43-
<Reference Include="Cake.Issues, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Cake.Issues.0.3.0\lib\netstandard2.0\Cake.Issues.dll</HintPath>
43+
<Reference Include="Cake.Issues, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Cake.Issues.0.4.0\lib\netstandard2.0\Cake.Issues.dll</HintPath>
4545
</Reference>
4646
<Reference Include="Cake.Issues.Reporting, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Cake.Issues.Reporting.0.3.0\lib\net46\Cake.Issues.Reporting.dll</HintPath>
47+
<HintPath>..\packages\Cake.Issues.Reporting.0.4.0\lib\net46\Cake.Issues.Reporting.dll</HintPath>
4848
</Reference>
49-
<Reference Include="Cake.Issues.Testing, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Cake.Issues.Testing.0.3.0\lib\netstandard2.0\Cake.Issues.Testing.dll</HintPath>
49+
<Reference Include="Cake.Issues.Testing, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\packages\Cake.Issues.Testing.0.4.0\lib\netstandard2.0\Cake.Issues.Testing.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Cake.Testing, Version=0.28.0.0, Culture=neutral, processorArchitecture=MSIL">
5353
<HintPath>..\packages\Cake.Testing.0.28.0\lib\net46\Cake.Testing.dll</HintPath>
5454
</Reference>
55-
<Reference Include="HtmlAgilityPack, Version=1.8.4.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
56-
<HintPath>..\packages\HtmlAgilityPack.1.8.4\lib\Net45\HtmlAgilityPack.dll</HintPath>
55+
<Reference Include="HtmlAgilityPack, Version=1.8.5.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
56+
<HintPath>..\packages\HtmlAgilityPack.1.8.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
5757
</Reference>
5858
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5959
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -70,16 +70,16 @@
7070
<Reference Include="System.Net.Http" />
7171
<Reference Include="System.Xml" />
7272
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
73-
<HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
73+
<HintPath>..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll</HintPath>
7474
</Reference>
75-
<Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
76-
<HintPath>..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
75+
<Reference Include="xunit.assert, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
76+
<HintPath>..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll</HintPath>
7777
</Reference>
78-
<Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
79-
<HintPath>..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
78+
<Reference Include="xunit.core, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
79+
<HintPath>..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll</HintPath>
8080
</Reference>
81-
<Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
82-
<HintPath>..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
81+
<Reference Include="xunit.execution.desktop, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
82+
<HintPath>..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll</HintPath>
8383
</Reference>
8484
</ItemGroup>
8585
<ItemGroup>
@@ -109,21 +109,23 @@
109109
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
110110
</ItemGroup>
111111
<ItemGroup>
112-
<None Include="packages.config" />
112+
<None Include="packages.config">
113+
<SubType>Designer</SubType>
114+
</None>
113115
</ItemGroup>
114116
<ItemGroup>
115117
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
116118
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
117-
<Analyzer Include="..\packages\xunit.analyzers.0.9.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
119+
<Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
118120
</ItemGroup>
119121
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
120122
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
121123
<PropertyGroup>
122124
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
123125
</PropertyGroup>
124-
<Error Condition="!Exists('..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
125-
<Error Condition="!Exists('..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
126-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
126+
<Error Condition="!Exists('..\packages\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.0\build\xunit.core.props'))" />
127+
<Error Condition="!Exists('..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" />
128+
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props'))" />
127129
</Target>
128-
<Import Project="..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
130+
<Import Project="..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.0\build\xunit.core.targets')" />
129131
</Project>

‎src/Cake.Issues.Reporting.Generic.Tests/packages.config

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Cake.Core" version="0.28.0" targetFramework="net461" />
4-
<package id="Cake.Issues" version="0.3.0" targetFramework="net461" />
5-
<package id="Cake.Issues.Reporting" version="0.3.0" targetFramework="net461" />
6-
<package id="Cake.Issues.Testing" version="0.3.0" targetFramework="net461" />
4+
<package id="Cake.Issues" version="0.4.0" targetFramework="net461" />
5+
<package id="Cake.Issues.Reporting" version="0.4.0" targetFramework="net461" />
6+
<package id="Cake.Issues.Testing" version="0.4.0" targetFramework="net461" />
77
<package id="Cake.Testing" version="0.28.0" targetFramework="net461" />
8-
<package id="HtmlAgilityPack" version="1.8.4" targetFramework="net461" />
8+
<package id="HtmlAgilityPack" version="1.8.5" targetFramework="net461" />
99
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
1010
<package id="Shouldly" version="3.0.0" targetFramework="net46" />
1111
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net46" developmentDependency="true" />
12-
<package id="xunit" version="2.3.1" targetFramework="net46" />
13-
<package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
14-
<package id="xunit.analyzers" version="0.9.0" targetFramework="net461" />
15-
<package id="xunit.assert" version="2.3.1" targetFramework="net46" />
16-
<package id="xunit.core" version="2.3.1" targetFramework="net46" />
17-
<package id="xunit.extensibility.core" version="2.3.1" targetFramework="net46" />
18-
<package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net46" />
19-
<package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net46" developmentDependency="true" />
12+
<package id="xunit" version="2.4.0" targetFramework="net461" />
13+
<package id="xunit.abstractions" version="2.0.2" targetFramework="net461" />
14+
<package id="xunit.analyzers" version="0.10.0" targetFramework="net461" />
15+
<package id="xunit.assert" version="2.4.0" targetFramework="net461" />
16+
<package id="xunit.core" version="2.4.0" targetFramework="net461" />
17+
<package id="xunit.extensibility.core" version="2.4.0" targetFramework="net461" />
18+
<package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net461" />
19+
<package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net461" developmentDependency="true" />
2020
</packages>

‎src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
<Reference Include="Cake.Core, Version=0.28.0.0, Culture=neutral, processorArchitecture=MSIL">
4545
<HintPath>..\packages\Cake.Core.0.28.0\lib\net46\Cake.Core.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Cake.Issues, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Cake.Issues.0.3.0\lib\netstandard2.0\Cake.Issues.dll</HintPath>
47+
<Reference Include="Cake.Issues, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Cake.Issues.0.4.0\lib\netstandard2.0\Cake.Issues.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Cake.Issues.Reporting, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Cake.Issues.Reporting.0.3.0\lib\net46\Cake.Issues.Reporting.dll</HintPath>
51+
<HintPath>..\packages\Cake.Issues.Reporting.0.4.0\lib\net46\Cake.Issues.Reporting.dll</HintPath>
5252
</Reference>
5353
<Reference Include="RazorEngine, Version=3.10.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
5454
<HintPath>..\packages\RazorEngine.3.10.0\lib\net45\RazorEngine.dll</HintPath>

‎src/Cake.Issues.Reporting.Generic/FileLinkSettings.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public string GetFileLink(IIssue issue)
8787
.Replace("{ProviderName}", issue.ProviderName)
8888
.Replace("{Priority}", issue.Priority?.ToString())
8989
.Replace("{PriorityName}", issue.PriorityName)
90-
.Replace("{Project}", issue.Project)
90+
.Replace("{ProjectPath}", issue.ProjectFileRelativePath?.FullPath.ToString())
91+
.Replace("{PojectName}", issue.ProjectName)
9192
.Replace("{FilePath}", issue.AffectedFileRelativePath?.FullPath.ToString())
9293
.Replace("{Path}", issue.FilePath())
9394
.Replace("{File}", issue.FileName())

‎src/Cake.Issues.Reporting.Generic/HtmlDxDataGridOption.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,18 @@ public enum HtmlDxDataGridOption
7676
PriorityNameSortOrder,
7777

7878
/// <summary>
79-
/// Flag if the <see cref="ReportColumn.Project"/> column should be visible or not.
79+
/// Flag if the <see cref="ReportColumn.ProjectName"/> column should be visible or not.
8080
/// Either <c>true</c> or <c>false</c>.
8181
/// Default value is <c>true</c>.
8282
/// </summary>
83-
ProjectVisible,
83+
ProjectNameVisible,
8484

8585
/// <summary>
86-
/// Sort order of the <see cref="ReportColumn.Project"/> column if it is part of <see cref="SortedColumns"/>.
86+
/// Sort order of the <see cref="ReportColumn.ProjectName"/> column if it is part of <see cref="SortedColumns"/>.
8787
/// See <see cref="ColumnSortOrder"/> for possible values.
8888
/// Default value is <see cref="ColumnSortOrder.Ascending"/>.
8989
/// </summary>
90-
ProjectSortOrder,
90+
ProjectNameSortOrder,
9191

9292
/// <summary>
9393
/// Flag if the <see cref="ReportColumn.Path"/> column should be visible or not.
@@ -168,7 +168,7 @@ public enum HtmlDxDataGridOption
168168

169169
/// <summary>
170170
/// List of <see cref="ReportColumn"/> which should be sorted.
171-
/// Default value is <see cref="ReportColumn.PriorityName"/>, <see cref="ReportColumn.Project"/>,
171+
/// Default value is <see cref="ReportColumn.PriorityName"/>, <see cref="ReportColumn.ProjectName"/>,
172172
/// <see cref="ReportColumn.Path"/>, <see cref="ReportColumn.File"/>, <see cref="ReportColumn.Line"/>.
173173
/// </summary>
174174
SortedColumns,

‎src/Cake.Issues.Reporting.Generic/ReportColumn.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,14 @@ public enum ReportColumn
2626
PriorityName,
2727

2828
/// <summary>
29-
/// Column for the <see cref="IIssue.Project"/> field.
29+
/// Column for the <see cref="IIssue.ProjectFileRelativePath"/> field.
3030
/// </summary>
31-
Project,
31+
ProjectPath,
32+
33+
/// <summary>
34+
/// Column for the <see cref="IIssue.ProjectName"/> field.
35+
/// </summary>
36+
ProjectName,
3237

3338
/// <summary>
3439
/// Column for the <see cref="IIssue.AffectedFileRelativePath"/> field.

‎src/Cake.Issues.Reporting.Generic/Templates/DataTable.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
{
7878
<tr>
7979
<td>@issue.PriorityName</td>
80-
<td>@issue.Project</td>
80+
<td>@issue.ProjectName</td>
8181
<td>@issue.FilePath()</td>
8282
<td>@issue.FileName()</td>
8383
<td>@issue.Line</td>

‎src/Cake.Issues.Reporting.Generic/Templates/Diagnostic.cshtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<table>
1212
<thead>
1313
<tr>
14-
<th scope="col">Project</th>
14+
<th scope="col">ProjectFileRelativePath</th>
15+
<th scope="col">ProjectName</th>
1516
<th scope="col">AffectedFileRelativePath</th>
1617
<th scope="col">Line</th>
1718
<th scope="col">Message</th>
@@ -27,7 +28,8 @@
2728
@foreach (var issue in Model)
2829
{
2930
<tr>
30-
<td>@issue.Project</td>
31+
<td>@issue.ProjectFileRelativePath</td>
32+
<td>@issue.ProjectName</td>
3133
<td>@issue.AffectedFileRelativePath</td>
3234
<td>@issue.Line</td>
3335
<td>@issue.Message</td>

0 commit comments

Comments
 (0)