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

Commit 335e6ca

Browse files
committed
Merge branch 'release/0.8.1'
2 parents c7c80b7 + ce9c469 commit 335e6ca

File tree

8 files changed

+13
-9
lines changed

8 files changed

+13
-9
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#---------------------------------#
22
# Build Image #
33
#---------------------------------#
4-
image: Visual Studio 2017
4+
image: Visual Studio 2019
55

66
#---------------------------------#
77
# Build Script #

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pr:
1212
jobs:
1313
- job: Windows
1414
pool:
15-
vmImage: 'vs2017-win2016'
15+
vmImage: 'windows-2019'
1616
steps:
1717
- powershell: ./build.ps1
1818
displayName: 'Cake Build'

docs/examples/custom-template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ See [pinning addin versions](https://cakebuild.net/docs/tutorials/pinning-cake-v
2121
#tool "nuget:?package=MSBuild.Extension.Pack"
2222
#addin "Cake.Issues"
2323
#addin "Cake.Issues.MsBuild"
24-
#addin "Cake.Reporting"
25-
#addin "Cake.Reporting.Generic"
24+
#addin "Cake.Issues.Reporting"
25+
#addin "Cake.Issues.Reporting.Generic"
2626

2727
Task("Create-IssueReport").Does(() =>
2828
{

docs/examples/default-template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ See [pinning addin versions](https://cakebuild.net/docs/tutorials/pinning-cake-v
1616
#tool "nuget:?package=MSBuild.Extension.Pack"
1717
#addin "Cake.Issues"
1818
#addin "Cake.Issues.MsBuild"
19-
#addin "Cake.Reporting"
20-
#addin "Cake.Reporting.Generic"
19+
#addin "Cake.Issues.Reporting"
20+
#addin "Cake.Issues.Reporting.Generic"
2121

2222
Task("Create-IssueReport").Does(() =>
2323
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
2222
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.Reporting.Generic.git"/>
2323
<copyright>Copyright © Pascal Berger</copyright>
2424
<tags>Cake Script Cake-Issues Cake-ReportFormat Issues Reporting Html Markdown</tags>
25-
<releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting.Generic/releases/tag/0.8.0</releaseNotes>
25+
<releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting.Generic/releases/tag/0.8.1</releaseNotes>
2626
</metadata>
2727
<files>
2828
<file src="..\..\..\..\nuspec\nuget\icon.png" target="" />

recipe.cake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ BuildParameters.PrintParameters(Context);
1818

1919
ToolSettings.SetToolSettings(
2020
context: Context,
21+
buildMSBuildToolVersion: MSBuildToolVersion.VS2019,
2122
dupFinderExcludePattern: new string[] { BuildParameters.RootDirectoryPath + "/src/Cake.Issues.Reporting.Generic.Tests/*.cs" },
2223
testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Cake.Issues]* -[Cake.Issues.Testing]* -[Cake.Issues.Reporting]* -[Shouldly]* -[Newtonsoft.Json]* -[HtmlAgilityPack]*",
2324
testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ public enum HtmlDxDataGridOption
298298
/// <summary>
299299
/// Version of the DevExtreme libraries which should be used.
300300
/// If setting this the matching <see cref="JQueryVersion"/> needs to also be set.
301-
/// Default value is <c>19.1.5</c>.
301+
/// Default value is <c>19.2.3</c>.
302302
/// </summary>
303303
DevExtremeVersion,
304304

src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
string jQueryVersion = ViewBagHelper.ValueOrDefault(ViewBag.JQueryVersion, "3.1.0");
5252
string JSZipLocation = ViewBagHelper.ValueOrDefault(ViewBag.JSZipLocation, "https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.5/");
5353
string devExtremeLocation = ViewBagHelper.ValueOrDefault(ViewBag.DevExtremeLocation, "https://cdn3.devexpress.com/jslib/");
54-
string devExtremeVersion = ViewBagHelper.ValueOrDefault(ViewBag.DevExtremeVersion, "19.1.5");
54+
string devExtremeVersion = ViewBagHelper.ValueOrDefault(ViewBag.DevExtremeVersion, "19.2.3");
5555
}
5656

5757
@{
@@ -188,6 +188,9 @@
188188
headerFilter: {
189189
visible: @enableFiltering.ToString().ToLowerInvariant()
190190
},
191+
sorting: {
192+
mode: "multiple"
193+
},
191194
"export": {
192195
enabled: @enableExporting.ToString().ToLowerInvariant(),
193196
fileName: "@exportFileName",

0 commit comments

Comments
 (0)