Merge branch 'master' into develop

cake-contrib · Aug 24, 2018 · 74b2165 · 74b2165
2 parents f0e66ac + 227cf2d
commit 74b2165
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/nuspec/nuget/Cake.Issues.EsLint.nuspec b/nuspec/nuget/Cake.Issues.EsLint.nuspec
@@ -24,7 +24,7 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.ESLint"/>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>Cake Script Cake-Issues Cake-IssueProvider CodeAnalysis JavaScript Linting ESLint</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.ESLint/releases/tag/0.5.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.ESLint/releases/tag/0.6.0</releaseNotes>
   </metadata>
   <files>
     <file src="netstandard2.0\Cake.Issues.EsLint.dll" target="lib\netstandard2.0" />

diff --git a/src/Cake.Issues.EsLint.Tests/Cake.Issues.EsLint.Tests.csproj b/src/Cake.Issues.EsLint.Tests/Cake.Issues.EsLint.Tests.csproj
@@ -29,8 +29,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
     <PackageReference Include="Cake.Core" Version="0.28.0" />
     <PackageReference Include="Cake.Testing" Version="0.28.0" />
-    <PackageReference Include="Cake.Issues" Version="0.5.0" />
-    <PackageReference Include="Cake.Issues.Testing" Version="0.5.0" />
+    <PackageReference Include="Cake.Issues" Version="0.6.0" />
+    <PackageReference Include="Cake.Issues.Testing" Version="0.6.0" />
     <PackageReference Include="Shouldly" Version="3.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
     <PackageReference Include="xunit" Version="2.4.0" />

diff --git a/src/Cake.Issues.EsLint.sln b/src/Cake.Issues.EsLint.sln
@@ -3,9 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Issues.EsLint", "Cake.Issues.EsLint\Cake.Issues.EsLint.csproj", "{EAC1D76A-A763-4EA8-8B9D-7B2F71B7EA8B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Issues.EsLint", "Cake.Issues.EsLint\Cake.Issues.EsLint.csproj", "{EAC1D76A-A763-4EA8-8B9D-7B2F71B7EA8B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Issues.EsLint.Tests", "Cake.Issues.EsLint.Tests\Cake.Issues.EsLint.Tests.csproj", "{4A657D7C-B66B-49C8-B1E2-544EFF8525F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Issues.EsLint.Tests", "Cake.Issues.EsLint.Tests\Cake.Issues.EsLint.Tests.csproj", "{4A657D7C-B66B-49C8-B1E2-544EFF8525F6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{86A53287-4147-4449-BC52-B3BD17B1C22B}"
+	ProjectSection(SolutionItems) = preProject
+		..\setup.cake = ..\setup.cake
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspec", "nuspec", "{3D3B8EEA-DBFC-4492-8CAD-BEDF32BA0828}"
+	ProjectSection(SolutionItems) = preProject
+		..\nuspec\nuget\Cake.Issues.EsLint.nuspec = ..\nuspec\nuget\Cake.Issues.EsLint.nuspec
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,6 +35,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{3D3B8EEA-DBFC-4492-8CAD-BEDF32BA0828} = {86A53287-4147-4449-BC52-B3BD17B1C22B}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D075C1C8-0C5E-4B2A-99E3-5AAD32EA5142}
 	EndGlobalSection

diff --git a/src/Cake.Issues.EsLint/Cake.Issues.EsLint.csproj b/src/Cake.Issues.EsLint/Cake.Issues.EsLint.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="Cake.Core" Version="0.28.0" />
-    <PackageReference Include="Cake.Issues" Version="0.5.0" />
+    <PackageReference Include="Cake.Issues" Version="0.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
     <PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />

diff --git a/src/Cake.Issues.EsLint/LogFileFormat/JsonLogFileFormat.cs b/src/Cake.Issues.EsLint/LogFileFormat/JsonLogFileFormat.cs
@@ -23,6 +23,7 @@ public JsonLogFileFormat(ICakeLog log)
         /// <inheritdoc />
         public override IEnumerable<IIssue> ReadIssues(
             EsLintIssuesProvider issueProvider,
+            IssueCommentFormat format,
             RepositorySettings repositorySettings,
             EsLintIssuesSettings esLintsettings)
         {