Merge branch 'release/0.8.0'

cake-contrib · Oct 17, 2019 · dcc2d14 · dcc2d14
2 parents f1b274b + 84c5b25
commit dcc2d14
Show file tree

Hide file tree

Showing 23 changed files with 58 additions and 46 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -6,6 +6,10 @@ image: Visual Studio 2017
 #---------------------------------#
 #  Build Script                   #
 #---------------------------------#
+install:
+  # Update to latest NuGet version since we require 5.3.0 for embedded icon
+  - ps: nuget update -self
+
 build_script:
   - ps: .\build.ps1 -Target AppVeyor
 
@@ -27,4 +31,4 @@ branches:
 #  Build Cache                    #
 #---------------------------------#
 cache:
-- tools -> setup.cake
+- tools -> recipe.cake
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,3 @@
+# These owners will be the default owners for everything in the repo and
+# will be requested for review when someone opens a pull request.
+*       @pascalberger @christianbumann @x-jokay @silanosa @georgesgoetz
diff --git a/README.md b/README.md
@@ -2,8 +2,7 @@
 
 This addin for the Cake build automation system allows you to create reports for issues from any code analyzer or linter.
 
-For more information about this addin see the [Cake.Issues website](https://cake-contrib.github.io/Cake.Issues.Website)
-and for general information about the Cake build automation system see the [Cake website](http://cakebuild.net)
+For more information about this addin see the [Cake.Issues website](https://cake-contrib.github.io/Cake.Issues.Website) and for general information about the Cake build automation system see the [Cake website](http://cakebuild.net).
 
 [![License](http://img.shields.io/:license-mit-blue.svg)](https://github.com/cake-contrib/Cake.Issues.Reporting/blob/develop/LICENSE)
 
@@ -19,7 +18,7 @@ and for general information about the Cake build automation system see the [Cake
 | | Develop | Master |
 |:--:|:--:|:--:|
 |AppVeyor Windows|[![Build status](https://ci.appveyor.com/api/projects/status/29xkel1p1e9kd9ss/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-issues-reporting/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/29xkel1p1e9kd9ss/branch/master?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-issues-reporting/branch/master)|
-|Azure DevOps Windows|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting/_apis/build/status/cake-contrib.Cake.Issues.Reporting?branchName=develop&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting/_build/latest?definitionId=14?branchName=develop)|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting/_apis/build/status/cake-contrib.Cake.Issues.Reporting?branchName=master&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting/_build/latest?definitionId=14?branchName=master)|
+|Azure DevOps Windows|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting/_apis/build/status/cake-contrib.Cake.Issues.Reporting?branchName=develop&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting/_build/latest?definitionId=14&branchName=develop)|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting/_apis/build/status/cake-contrib.Cake.Issues.Reporting?branchName=master&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Issues.Reporting/_build/latest?definitionId=14&branchName=master)|
 
 ## Code Coverage
 
@@ -31,10 +30,10 @@ and for general information about the Cake build automation system see the [Cake
 
 ## Chat Room
 
-Come join in the conversation about this addin in our Gitter Chat Room
+Come join in the conversation about this addin in our Gitter Chat Room.
 
 [![Join the chat at https://gitter.im/cake-contrib/Lobby](https://badges.gitter.im/cake-contrib/Lobby.svg)](https://gitter.im/cake-contrib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## Contributing
 
-Contributions are welcome. See [Contribution Guidelines](CONTRIBUTING.md).
+Contributions are welcome. See [Contribution Guidelines](CONTRIBUTING.md).
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -6,6 +6,8 @@ trigger:
 
 pr:
 - develop
+- release/*
+- hotfix/*
 
 jobs:
 - job: Windows

diff --git a/build.ps1 b/build.ps1
@@ -35,7 +35,7 @@ http://cakebuild.net
 
 [CmdletBinding()]
 Param(
-    [string]$Script = "setup.cake",
+    [string]$Script = "recipe.cake",
     [string]$Target = "Default",
     [ValidateSet("Release", "Debug")]
     [string]$Configuration = "Release",
@@ -181,4 +181,4 @@ if (!(Test-Path $CAKE_EXE)) {
 # Start Cake
 Write-Host "Running build script..."
 Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
-exit $LASTEXITCODE
+exit $LASTEXITCODE
diff --git a/build.sh b/build.sh
@@ -11,7 +11,7 @@ NUGET_EXE=$TOOLS_DIR/nuget.exe
 CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe
 
 # Define default arguments.
-SCRIPT="setup.cake"
+SCRIPT="recipe.cake"
 TARGET="Default"
 CONFIGURATION="Release"
 VERBOSITY="verbose"

diff --git a/nuspec/nuget/Cake.Issues.Reporting.nuspec b/nuspec/nuget/Cake.Issues.Reporting.nuspec
@@ -17,14 +17,15 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
     </description>
     <license type="expression">MIT</license>
     <projectUrl>http://cake-contrib.github.io/Cake.Issues.Website/</projectUrl>
-    <iconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics@a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</iconUrl>
+    <icon>icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.Reporting.git"/>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>Cake Script Cake-Issues CodeAnalysis Linting Issues Reporting</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting/releases/tag/0.7.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting/releases/tag/0.8.0</releaseNotes>
   </metadata>
   <files>
+    <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
     <file src="netstandard2.0\Cake.Issues.Reporting.dll" target="lib\netstandard2.0" />
     <file src="netstandard2.0\Cake.Issues.Reporting.pdb" target="lib\netstandard2.0" />
     <file src="netstandard2.0\Cake.Issues.Reporting.xml" target="lib\netstandard2.0" />

diff --git a/nuspec/nuget/icon.png b/nuspec/nuget/icon.png
diff --git a/setup.cake → recipe.cake b/setup.cake → recipe.cake
@@ -3,14 +3,15 @@
 Environment.SetVariableNames();
 
 BuildParameters.SetParameters(
-    context: Context, 
+    context: Context,
     buildSystem: BuildSystem,
     sourceDirectoryPath: "./src",
     title: "Cake.Issues.Reporting",
     repositoryOwner: "cake-contrib",
     repositoryName: "Cake.Issues.Reporting",
     appVeyorAccountName: "cakecontrib",
-    shouldRunCodecov: false);
+    shouldRunCodecov: false,
+    shouldRunGitVersion: true);
 
 BuildParameters.PrintParameters(Context);
 

diff --git a/src/Cake.Issues.Reporting.Tests.ruleset b/src/Cake.Issues.Reporting.Tests.ruleset
@@ -2,7 +2,9 @@
 <RuleSet Name="Ruleset for Cake.Issues.Reporting test cases" Description="Rules valid for Cake.Issues.Reporting test cases" ToolsVersion="14.0">
   <Include Path="Cake.Issues.Reporting.ruleset" Action="Default" />
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <Rule Id="SA0001" Action="None" />
     <Rule Id="SA1118" Action="None" />
+    <Rule Id="SA1600" Action="None" />
     <Rule Id="SA1652" Action="None" />
   </Rules>
 </RuleSet>
diff --git a/src/Cake.Issues.Reporting.Tests/Cake.Issues.Reporting.Tests.csproj b/src/Cake.Issues.Reporting.Tests/Cake.Issues.Reporting.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Copyright>Copyright © BBT Software AG and contributors</Copyright>
     <Description>Tests for the Cake.Issues.Reporting addin</Description>
@@ -14,13 +14,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="Cake.Core" Version="0.33.0" />
-    <PackageReference Include="Cake.Issues" Version="0.7.0" />
-    <PackageReference Include="Cake.Issues.Testing" Version="0.7.0" />
+    <PackageReference Include="Cake.Issues" Version="0.8.0" />
+    <PackageReference Include="Cake.Issues.Testing" Version="0.8.0" />
     <PackageReference Include="Cake.Testing" Version="0.33.0" />
     <PackageReference Include="Shouldly" Version="3.0.2" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
   </ItemGroup>

diff --git a/src/Cake.Issues.Reporting.Tests/CreateIssueReportSettingsTests.cs b/src/Cake.Issues.Reporting.Tests/CreateIssueReportSettingsTests.cs
@@ -1,8 +1,8 @@
 namespace Cake.Issues.Reporting.Tests
 {
-    using Core.IO;
+    using Cake.Core.IO;
+    using Cake.Issues.Testing;
     using Shouldly;
-    using Testing;
     using Xunit;
 
     public sealed class CreateIssueReportSettingsTests

diff --git a/src/Cake.Issues.Reporting.Tests/FakeIssueReportFormat.cs b/src/Cake.Issues.Reporting.Tests/FakeIssueReportFormat.cs
@@ -1,8 +1,8 @@
 namespace Cake.Issues.Reporting.Tests
 {
     using System.Collections.Generic;
-    using Core.Diagnostics;
-    using Core.IO;
+    using Cake.Core.Diagnostics;
+    using Cake.Core.IO;
 
     /// <summary>
     /// Implementation of a <see cref="IssueReportFormat"/> for use in test cases.
@@ -12,7 +12,7 @@ public class FakeIssueReportFormat : IssueReportFormat
         /// <summary>
         /// Initializes a new instance of the <see cref="FakeIssueReportFormat"/> class.
         /// </summary>
-        /// <param name="log">The Cake log instance</param>
+        /// <param name="log">The Cake log instance.</param>
         public FakeIssueReportFormat(ICakeLog log)
             : base(log)
         {

diff --git a/src/Cake.Issues.Reporting.Tests/IssueReportCreatorTests.cs b/src/Cake.Issues.Reporting.Tests/IssueReportCreatorTests.cs
@@ -1,8 +1,8 @@
 namespace Cake.Issues.Reporting.Tests
 {
     using System.Collections.Generic;
+    using Cake.Issues.Testing;
     using Shouldly;
-    using Testing;
     using Xunit;
 
     public sealed class IssueReportCreatorTests
@@ -15,7 +15,7 @@ public void Should_Throw_If_Log_Is_Null()
                 // Given
                 var fixture = new IssueReportFormatFixture
                 {
-                    Log = null
+                    Log = null,
                 };
 
                 // When
@@ -31,7 +31,7 @@ public void Should_Throw_If_Settings_Is_Null()
                 // Given
                 var fixture = new IssueReportFormatFixture
                 {
-                    Settings = null
+                    Settings = null,
                 };
 
                 // When
@@ -103,7 +103,7 @@ public void Should_Initialize_Report_Format()
                             .InFile(@"src\Cake.Issues.Reporting\Foo.cs", 10)
                             .OfRule("Rule")
                             .WithPriority(IssuePriority.Warning)
-                            .Create()
+                            .Create(),
                     };
 
                 // When
@@ -127,7 +127,7 @@ public void Should_Return_Null_If_Initialization_Fails()
                             .InFile(@"src\Cake.Issues.Reporting\Foo.cs", 10)
                             .OfRule("Rule")
                             .WithPriority(IssuePriority.Warning)
-                            .Create()
+                            .Create(),
                     };
 
                 // When
@@ -150,7 +150,7 @@ public void Should_Return_File_Path()
                             .InFile(@"src\Cake.Issues.Reporting\Foo.cs", 10)
                             .OfRule("Rule")
                             .WithPriority(IssuePriority.Warning)
-                            .Create()
+                            .Create(),
                     };
 
                 // When

diff --git a/src/Cake.Issues.Reporting.Tests/IssueReportFormatFixture.cs b/src/Cake.Issues.Reporting.Tests/IssueReportFormatFixture.cs
@@ -1,9 +1,9 @@
 namespace Cake.Issues.Reporting.Tests
 {
     using System.Collections.Generic;
+    using Cake.Core.Diagnostics;
+    using Cake.Core.IO;
     using Cake.Testing;
-    using Core.Diagnostics;
-    using Core.IO;
 
     internal class IssueReportFormatFixture
     {

diff --git a/src/Cake.Issues.Reporting.Tests/IssueReportFormatTests.cs b/src/Cake.Issues.Reporting.Tests/IssueReportFormatTests.cs
@@ -1,9 +1,9 @@
 namespace Cake.Issues.Reporting.Tests
 {
     using System.Collections.Generic;
+    using Cake.Issues.Testing;
     using Cake.Testing;
     using Shouldly;
-    using Testing;
     using Xunit;
 
     public sealed class IssueReportFormatTests

diff --git a/src/Cake.Issues.Reporting.sln b/src/Cake.Issues.Reporting.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Issues.Reporting", "Ca
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{0EB6B524-F05B-4CBB-B5A0-8EEE909565FF}"
 	ProjectSection(SolutionItems) = preProject
-		..\setup.cake = ..\setup.cake
+		..\recipe.cake = ..\recipe.cake
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspec", "nuspec", "{3F62848D-FE36-4BA1-8944-376633747E88}"

diff --git a/src/Cake.Issues.Reporting/Aliases.cs b/src/Cake.Issues.Reporting/Aliases.cs
@@ -1,9 +1,9 @@
 namespace Cake.Issues.Reporting
 {
     using System.Collections.Generic;
-    using Core;
-    using Core.Annotations;
-    using Core.IO;
+    using Cake.Core;
+    using Cake.Core.Annotations;
+    using Cake.Core.IO;
 
     /// <summary>
     /// Contains functionality related to creating issue reports.

diff --git a/src/Cake.Issues.Reporting/Cake.Issues.Reporting.csproj b/src/Cake.Issues.Reporting/Cake.Issues.Reporting.csproj
@@ -22,9 +22,9 @@
 
   <ItemGroup>
     <PackageReference Include="Cake.Core" Version="0.33.0" />
-    <PackageReference Include="Cake.Issues" Version="0.7.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.2" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
+    <PackageReference Include="Cake.Issues" Version="0.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.6" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cake.Issues.Reporting/CreateIssueReportSettings.cs b/src/Cake.Issues.Reporting/CreateIssueReportSettings.cs
@@ -1,6 +1,6 @@
 namespace Cake.Issues.Reporting
 {
-    using Core.IO;
+    using Cake.Core.IO;
 
     /// <summary>
     /// Setting affecting how reports are created.

diff --git a/src/Cake.Issues.Reporting/IIssueReportFormat.cs b/src/Cake.Issues.Reporting/IIssueReportFormat.cs
@@ -1,7 +1,7 @@
 namespace Cake.Issues.Reporting
 {
     using System.Collections.Generic;
-    using Core.IO;
+    using Cake.Core.IO;
 
     /// <summary>
     /// Interface describing a issue report format.

diff --git a/src/Cake.Issues.Reporting/IssueReportCreator.cs b/src/Cake.Issues.Reporting/IssueReportCreator.cs
@@ -1,8 +1,8 @@
 namespace Cake.Issues.Reporting
 {
     using System.Collections.Generic;
-    using Core.Diagnostics;
-    using Core.IO;
+    using Cake.Core.Diagnostics;
+    using Cake.Core.IO;
 
     /// <summary>
     /// Class for creating issue reports.
@@ -40,7 +40,7 @@ public FilePath CreateReport(IEnumerable<IIssueProvider> issueProviders, IIssueR
             reportFormat.NotNull(nameof(reportFormat));
 
             var issuesReader = new IssuesReader(this.log, issueProviders, this.settings);
-            var issues = issuesReader.ReadIssues(IssueCommentFormat.PlainText);
+            var issues = issuesReader.ReadIssues();
 
             return this.CreateReport(issues, reportFormat);
         }

diff --git a/src/Cake.Issues.Reporting/IssueReportFormat.cs b/src/Cake.Issues.Reporting/IssueReportFormat.cs
@@ -1,8 +1,8 @@
 namespace Cake.Issues.Reporting
 {
     using System.Collections.Generic;
-    using Core.Diagnostics;
-    using Core.IO;
+    using Cake.Core.Diagnostics;
+    using Cake.Core.IO;
 
     /// <summary>
     /// Base class for all report format implementations.