From ba8b88b6c0e7326d14ca23c17f3ab6dc11bb0db4 Mon Sep 17 00:00:00 2001
From: Pascal Berger <pascal.berger@gmail.com>
Date: Sun, 3 Jun 2018 21:23:07 +0200
Subject: [PATCH] Update to Cake.Issues 0.3.0-beta.4

---
 .../Cake.Issues.MsBuild.Tests.csproj          |  4 +--
 .../Cake.Issues.MsBuild.csproj                |  2 +-
 .../XmlFileLoggerFormat.cs                    | 33 +++----------------
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj b/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj
index 046cd35..3b23e41 100644
--- a/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj
+++ b/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj
@@ -34,8 +34,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="Cake.Core" Version="0.28.0" />
     <PackageReference Include="Cake.Testing" Version="0.28.0" />
-    <PackageReference Include="Cake.Issues" Version="0.3.0-beta0002" />
-    <PackageReference Include="Cake.Issues.Testing" Version="0.3.0-beta0002" />
+    <PackageReference Include="Cake.Issues" Version="0.3.0-beta0004" />
+    <PackageReference Include="Cake.Issues.Testing" Version="0.3.0-beta0004" />
     <PackageReference Include="Shouldly" Version="3.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
     <PackageReference Include="xunit" Version="2.3.1" />
diff --git a/src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj b/src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj
index bba2087..b4f5c24 100644
--- a/src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj
+++ b/src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="Cake.Core" Version="0.28.0" />
-    <PackageReference Include="Cake.Issues" Version="0.3.0-beta0002" />
+    <PackageReference Include="Cake.Issues" Version="0.3.0-beta0004" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
   </ItemGroup>
diff --git a/src/Cake.Issues.MsBuild/XmlFileLoggerFormat.cs b/src/Cake.Issues.MsBuild/XmlFileLoggerFormat.cs
index 33b76df..b323797 100644
--- a/src/Cake.Issues.MsBuild/XmlFileLoggerFormat.cs
+++ b/src/Cake.Issues.MsBuild/XmlFileLoggerFormat.cs
@@ -64,36 +64,13 @@ public XmlFileLoggerFormat(ICakeLog log)
                 }
 
                 // Build issue.
-                var issueBuilder =
+                result.Add(
                     IssueBuilder
                         .NewIssue(warning.Value, issueProvider)
-                        .WithPriority(IssuePriority.Warning);
-
-                if (!string.IsNullOrWhiteSpace(fileName))
-                {
-                    if (line.HasValue)
-                    {
-                        issueBuilder = issueBuilder.InFile(fileName, line.Value);
-                    }
-                    else
-                    {
-                        issueBuilder = issueBuilder.InFile(fileName);
-                    }
-                }
-
-                if (!string.IsNullOrWhiteSpace(rule))
-                {
-                    if (ruleUrl != null)
-                    {
-                        issueBuilder = issueBuilder.OfRule(rule, ruleUrl);
-                    }
-                    else
-                    {
-                        issueBuilder = issueBuilder.OfRule(rule);
-                    }
-                }
-
-                result.Add(issueBuilder.Create());
+                        .WithPriority(IssuePriority.Warning)
+                        .InFile(fileName, line)
+                        .OfRule(rule, ruleUrl)
+                        .Create());
             }
 
             return result;