From 418c86877cf9207223339da740901981fa9ee8fe Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 09:52:50 +0000 Subject: [PATCH 1/4] Bump Cake.Issues from 0.9.0-beta0002 to 0.9.0-beta0004 in /src Bumps [Cake.Issues](https://github.com/cake-contrib/Cake.Issues) from 0.9.0-beta0002 to 0.9.0-beta0004. - [Release notes](https://github.com/cake-contrib/Cake.Issues/releases) - [Changelog](https://github.com/cake-contrib/Cake.Issues/blob/develop/GitReleaseManager.yaml) - [Commits](https://github.com/cake-contrib/Cake.Issues/commits) Signed-off-by: dependabot-preview[bot] --- .../Cake.Issues.Reporting.Generic.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj b/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj index b0ed8bf1..783e62e2 100644 --- a/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj +++ b/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj @@ -27,7 +27,7 @@ - + all From 3d0b02ef6ff5aec70258a4d413c75f0277c9ff8f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 09:52:44 +0000 Subject: [PATCH 2/4] Bump Cake.Issues.Testing from 0.9.0-beta0002 to 0.9.0-beta0004 in /src Bumps [Cake.Issues.Testing](https://github.com/cake-contrib/Cake.Issues) from 0.9.0-beta0002 to 0.9.0-beta0004. - [Release notes](https://github.com/cake-contrib/Cake.Issues/releases) - [Changelog](https://github.com/cake-contrib/Cake.Issues/blob/develop/GitReleaseManager.yaml) - [Commits](https://github.com/cake-contrib/Cake.Issues/commits) Signed-off-by: dependabot-preview[bot] --- .../Cake.Issues.Reporting.Generic.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.Issues.Reporting.Generic.Tests/Cake.Issues.Reporting.Generic.Tests.csproj b/src/Cake.Issues.Reporting.Generic.Tests/Cake.Issues.Reporting.Generic.Tests.csproj index 32c844c6..fe84db99 100644 --- a/src/Cake.Issues.Reporting.Generic.Tests/Cake.Issues.Reporting.Generic.Tests.csproj +++ b/src/Cake.Issues.Reporting.Generic.Tests/Cake.Issues.Reporting.Generic.Tests.csproj @@ -30,7 +30,7 @@ - + all From 86ccbb0c8e717d56f9fa436e8474ff58fb531cdf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 1 Aug 2020 11:09:31 +0000 Subject: [PATCH 3/4] Bump Cake.Issues.Reporting from 0.9.0-beta0001 to 0.9.0-beta0002 in /src Bumps [Cake.Issues.Reporting](https://github.com/cake-contrib/Cake.Issues.Reporting) from 0.9.0-beta0001 to 0.9.0-beta0002. - [Release notes](https://github.com/cake-contrib/Cake.Issues.Reporting/releases) - [Changelog](https://github.com/cake-contrib/Cake.Issues.Reporting/blob/develop/GitReleaseManager.yaml) - [Commits](https://github.com/cake-contrib/Cake.Issues.Reporting/commits) Signed-off-by: dependabot-preview[bot] --- .../Cake.Issues.Reporting.Generic.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj b/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj index 783e62e2..74fec845 100644 --- a/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj +++ b/src/Cake.Issues.Reporting.Generic/Cake.Issues.Reporting.Generic.csproj @@ -28,7 +28,7 @@ - + all 3.0.0 From 4cbf4354665861434dd648ef6c4971f17c6e1ad6 Mon Sep 17 00:00:00 2001 From: Pascal Berger Date: Sat, 1 Aug 2020 13:40:36 +0200 Subject: [PATCH 4/4] Update code for Cake.Issues 0.9.0 Beta 4 --- src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs | 4 ++-- src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs b/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs index 8a8d7ad7..eec33630 100644 --- a/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs +++ b/src/Cake.Issues.Reporting.Generic/IIssueExtensions.cs @@ -141,9 +141,9 @@ public static ExpandoObject GetExpandoObject( fallbackToTextMessageIfMarkdownMessageNotAvailable ? issue.Message(IssueCommentFormat.Markdown) : issue.MessageMarkdown; } - if (fileLinkSettings != null && !string.IsNullOrEmpty(fileLinkSettings.FileLinkPattern)) + if (fileLinkSettings != null) { - result.FileLink = fileLinkSettings.FileLinkPattern.ReplaceIssuePattern(issue); + result.FileLink = fileLinkSettings.GetFileLink(issue); } if (additionalValues != null) diff --git a/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml b/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml index 017e96dc..67495fcb 100644 --- a/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml +++ b/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml @@ -46,7 +46,7 @@ ColumnSortOrder messageSortOrder = ViewBagHelper.ValueOrDefault(ViewBag.MessageSortOder, ColumnSortOrder.Ascending); var groupedColumns = ViewBagHelper.ValueOrDefault(ViewBag.GroupedColumns, new List { ReportColumn.ProviderName }); var sortedColumns = ViewBagHelper.ValueOrDefault(ViewBag.SortedColumns, new List { ReportColumn.PriorityName, ReportColumn.ProjectName, ReportColumn.FileDirectory, ReportColumn.FileName, ReportColumn.Line }); - FileLinkSettings fileLinkSettings = ViewBagHelper.ValueOrDefault(ViewBag.FileLinkSettings, new FileLinkSettings()); + FileLinkSettings fileLinkSettings = ViewBagHelper.ValueOrDefault(ViewBag.FileLinkSettings, null); IdeIntegrationSettings ideIntegrationSettings = ViewBagHelper.ValueOrDefault(ViewBag.IdeIntegrationSettings, null); List additionalColumns = ViewBagHelper.ValueOrDefault(ViewBag.AdditionalColumns, new List()); string jQueryLocation = ViewBagHelper.ValueOrDefault(ViewBag.JQueryLocation, "https://ajax.aspnetcdn.com/ajax/jquery/").Trim(); @@ -417,7 +417,7 @@ @:sortIndex: @sortedColumns.IndexOf(ReportColumn.Line), @:sortOrder: "@lineSortOrder.ToShortString()", } - @if (fileLinkSettings != null && !string.IsNullOrWhiteSpace(fileLinkSettings.FileLinkPattern)) + @if (fileLinkSettings != null) { cellTemplate: function (container, options) {