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

Commit 5bab138

Browse files
pascalbergerpascalberger
committed
Merge branch 'release/0.6.2'
2 parents 1d2a970 + 638eb37 commit 5bab138

15 files changed

+205
-68
lines changed

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ and for general information about the Cake build automation system see the [Cake
1717

1818
## Build Status
1919

20-
|Develop|Master|
21-
|:--:|:--:|
22-
|[![Build status](https://ci.appveyor.com/api/projects/status/1bnglf1kihgqorvy/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-issues-reporting-generic/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/1bnglf1kihgqorvy/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-issues-reporting-generic/branch/master)|
20+
| | Develop | Master |
21+
|:--:|:--:|:--:|
22+
|AppVeyor Windows|[![Build status](https://ci.appveyor.com/api/projects/status/by753fqt03g301iy/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-issues-reporting-generic/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/by753fqt03g301iy/branch/master?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-issues-reporting-generic/branch/master)|
23+
|Azure DevOps Windows|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting.Generic/_apis/build/status/cake-contrib.Cake.Issues.Reporting.Generic?branchName=develop&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting.Generic/_build/latest?definitionId=15?branchName=develop)|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting.Generic/_apis/build/status/cake-contrib.Cake.Issues.Reporting.Generic?branchName=master&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting.Generic/_build/latest?definitionId=15?branchName=master)|
2324

2425
## Code Coverage
2526

‎azure-pipelines.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
trigger:
2+
- develop
3+
- master
4+
- release/*
5+
- hotfix/*
6+
7+
pr:
8+
- develop
9+
10+
jobs:
11+
- job: Windows
12+
pool:
13+
vmImage: 'vs2017-win2016'
14+
steps:
15+
- powershell: ./build.ps1
16+
displayName: 'Cake Build'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
1717
</description>
1818
<licenseUrl>https://github.com/cake-contrib/Cake.Issues.Reporting.Generic/blob/develop/LICENSE</licenseUrl>
1919
<projectUrl>http://cake-contrib.github.io/Cake.Issues.Website</projectUrl>
20-
<iconUrl>https://cdn.rawgit.com/cake-contrib/graphics/a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</iconUrl>
20+
<iconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics@a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</iconUrl>
2121
<requireLicenseAcceptance>false</requireLicenseAcceptance>
2222
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.Reporting.Generic"/>
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.6.1</releaseNotes>
25+
<releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting.Generic/releases/tag/0.6.2</releaseNotes>
2626
</metadata>
2727
<files>
2828
<file src="Cake.Issues.Reporting.Generic.dll" target="lib\net46" />

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

Lines changed: 20 additions & 19 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.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')" />
3+
<Import Project="..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" />
4+
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.1\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>
@@ -52,14 +52,14 @@
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.7.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
56-
<HintPath>..\packages\HtmlAgilityPack.1.8.7\lib\Net45\HtmlAgilityPack.dll</HintPath>
55+
<Reference Include="HtmlAgilityPack, Version=1.11.0.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
56+
<HintPath>..\packages\HtmlAgilityPack.1.11.0\lib\Net45\HtmlAgilityPack.dll</HintPath>
5757
</Reference>
58-
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
58+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
6060
</Reference>
61-
<Reference Include="Shouldly, Version=3.0.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
62-
<HintPath>..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll</HintPath>
61+
<Reference Include="Shouldly, Version=3.0.2.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Shouldly.3.0.2\lib\net451\Shouldly.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System" />
6565
<Reference Include="System.Core" />
@@ -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.2\lib\net35\xunit.abstractions.dll</HintPath>
73+
<HintPath>..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
7474
</Reference>
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>
75+
<Reference Include="xunit.assert, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
76+
<HintPath>..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
7777
</Reference>
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>
78+
<Reference Include="xunit.core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
79+
<HintPath>..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll</HintPath>
8080
</Reference>
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>
81+
<Reference Include="xunit.execution.desktop, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
82+
<HintPath>..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
8383
</Reference>
8484
</ItemGroup>
8585
<ItemGroup>
@@ -112,6 +112,7 @@
112112
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
113113
</ItemGroup>
114114
<ItemGroup>
115+
<None Include="app.config" />
115116
<None Include="packages.config">
116117
<SubType>Designer</SubType>
117118
</None>
@@ -126,9 +127,9 @@
126127
<PropertyGroup>
127128
<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>
128129
</PropertyGroup>
129-
<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'))" />
130-
<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'))" />
131-
<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'))" />
130+
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
131+
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
132+
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
132133
</Target>
133-
<Import Project="..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.0\build\xunit.core.targets')" />
134+
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
134135
</Project>

‎src/Cake.Issues.Reporting.Generic.Tests/DevExtremeThemeExtensionsTests.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ public sealed class TheGetCssFileNameMethod
2424
[InlineData(DevExtremeTheme.MaterialOrangeLight)]
2525
[InlineData(DevExtremeTheme.MaterialPurpleLight)]
2626
[InlineData(DevExtremeTheme.MaterialTealLight)]
27+
[InlineData(DevExtremeTheme.MaterialBlueDark)]
28+
[InlineData(DevExtremeTheme.MaterialLimeDark)]
29+
[InlineData(DevExtremeTheme.MaterialOrangeDark)]
30+
[InlineData(DevExtremeTheme.MaterialPurpleDark)]
31+
[InlineData(DevExtremeTheme.MaterialTealDark)]
2732
public void Should_Return_FileName(DevExtremeTheme theme)
2833
{
2934
// Given

‎src/Cake.Issues.Reporting.Generic.Tests/HtmlDxDataGridTemplateTests.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ public sealed class TheThemeOption
7171
[InlineData(DevExtremeTheme.MaterialOrangeLight)]
7272
[InlineData(DevExtremeTheme.MaterialPurpleLight)]
7373
[InlineData(DevExtremeTheme.MaterialTealLight)]
74+
[InlineData(DevExtremeTheme.MaterialBlueDark)]
75+
[InlineData(DevExtremeTheme.MaterialLimeDark)]
76+
[InlineData(DevExtremeTheme.MaterialOrangeDark)]
77+
[InlineData(DevExtremeTheme.MaterialPurpleDark)]
78+
[InlineData(DevExtremeTheme.MaterialTealDark)]
7479
public void Should_Set_Theme(DevExtremeTheme theme)
7580
{
7681
// Given

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="xunit.assert" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.4.1.0" newVersion="2.4.1.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<package id="Cake.Issues.Reporting" version="0.6.0" targetFramework="net461" />
66
<package id="Cake.Issues.Testing" version="0.6.1" targetFramework="net461" />
77
<package id="Cake.Testing" version="0.28.0" targetFramework="net461" />
8-
<package id="HtmlAgilityPack" version="1.8.7" targetFramework="net461" />
9-
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
10-
<package id="Shouldly" version="3.0.0" targetFramework="net46" />
8+
<package id="HtmlAgilityPack" version="1.11.0" targetFramework="net461" />
9+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
10+
<package id="Shouldly" version="3.0.2" targetFramework="net461" />
1111
<package id="StyleCop.Analyzers" version="1.0.2" 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" />
12+
<package id="xunit" version="2.4.1" targetFramework="net461" />
13+
<package id="xunit.abstractions" version="2.0.3" targetFramework="net461" />
1414
<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" />
15+
<package id="xunit.assert" version="2.4.1" targetFramework="net461" />
16+
<package id="xunit.core" version="2.4.1" targetFramework="net461" />
17+
<package id="xunit.extensibility.core" version="2.4.1" targetFramework="net461" />
18+
<package id="xunit.extensibility.execution" version="2.4.1" targetFramework="net461" />
19+
<package id="xunit.runner.visualstudio" version="2.4.1" targetFramework="net461" developmentDependency="true" />
2020
</packages>

0 commit comments

Comments
 (0)