(GH-128) Build against Cake 2.0 (#139)

Author: pascalberger

src/Cake.Issues.Reporting.Sarif.Tests/Cake.Issues.Reporting.Sarif.Tests.csproj

@@ -22,27 +22,17 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Issues">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Cake.Issues.Testing">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Cake.Testing">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Shouldly">
-      <Version>4.0.3</Version>
-    </PackageReference>
+    <PackageReference Include="Cake.Issues" Version="2.0.0-beta0001" />
+    <PackageReference Include="Cake.Issues.Testing" Version="2.0.0-beta0001" />
+    <PackageReference Include="Cake.Testing" Version="2.0.0" />
+    <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.1.118</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="xunit">
-      <Version>2.4.1</Version>
-    </PackageReference>
+    <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio">
       <Version>2.4.3</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

src/Cake.Issues.Reporting.Sarif/Cake.Issues.Reporting.Sarif.csproj

@@ -28,13 +28,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Cake.Issues">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Cake.Issues.Reporting" Version="1.0.0" />
+    <PackageReference Include="Cake.Core" Version="2.0.0" />
+    <PackageReference Include="Cake.Issues" Version="2.0.0-beta0001" />
+    <PackageReference Include="Cake.Issues.Reporting" Version="2.0.0-beta0001" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Cake.Issues.Reporting.Sarif/SarifIssueReportGenerator.cs

@@ -117,7 +117,7 @@ private Result GetResult(IIssue issue)
             var result =
                 new Result
                 {
-                    RuleId = issue.Rule,
+                    RuleId = issue.RuleId,
                     Message =
                         new Message
                         {
@@ -135,20 +135,21 @@ private Result GetResult(IIssue issue)
 
             if (issue.RuleUrl != null)
             {
-                if (!string.IsNullOrEmpty(issue.Rule))
+                if (!string.IsNullOrEmpty(issue.RuleId))
                 {
-                    if (!this.ruleIndices.ContainsKey(issue.Rule))
+                    if (!this.ruleIndices.ContainsKey(issue.RuleId))
                     {
-                        this.ruleIndices.Add(issue.Rule, this.rules.Count);
+                        this.ruleIndices.Add(issue.RuleId, this.rules.Count);
                         this.rules.Add(
                             new ReportingDescriptor
                             {
-                                Id = issue.Rule,
+                                Id = issue.RuleId,
+                                Name = issue.RuleName,
                                 HelpUri = issue.RuleUrl,
                             });
                     }
 
-                    result.RuleIndex = this.ruleIndices[issue.Rule];
+                    result.RuleIndex = this.ruleIndices[issue.RuleId];
                 }
                 else
                 {

tests/.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "1.0.0",
+      "version": "2.0.0",
       "commands": [
         "dotnet-cake"
       ]