Merge pull request #81 from brianfeucht/stylecop-argument-out-of-range

(GH-80) MSBuild log generated by StyleCop throws ArgumentOutOfRangeException
cake-contrib · Mar 18, 2019 · 39a0bc8 · 39a0bc8
2 parents 1e088ed + 1253904
commit 39a0bc8
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 1 deletion.
diff --git a/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj b/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj
@@ -22,6 +22,7 @@
     <None Remove="Testfiles\IssueWithOnlyFileName.xml" />
     <None Remove="Testfiles\IssueWithoutCode.xml" />
     <None Remove="Testfiles\IssueWithoutFile.xml" />
+    <None Remove="Testfiles\XmlFileLoggerLogFileFormat\IssueWithAbsoluteFileNameAndWithoutTask.xml" />
     <None Remove="Testfiles\XmlFileLoggerLogFileFormat\IssueWithoutMessage.xml" />
     <None Remove="Testfiles\XmlFileLoggerLogFileFormat\LogWithControlChars.xml" />
   </ItemGroup>
@@ -54,4 +55,8 @@
     <ProjectReference Include="..\Cake.Issues.MsBuild\Cake.Issues.MsBuild.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="Testfiles\XmlFileLoggerLogFileFormat\IssueWithAbsoluteFileNameAndWithoutTask.xml" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Cake.Issues.MsBuild.Tests/LogFileFormat/XmlFileLoggerLogFileFormatTests.cs b/src/Cake.Issues.MsBuild.Tests/LogFileFormat/XmlFileLoggerLogFileFormatTests.cs
@@ -1,5 +1,6 @@
 namespace Cake.Issues.MsBuild.Tests.LogFileFormat
 {
+    using System.IO;
     using System.Linq;
     using Cake.Core.Diagnostics;
     using Cake.Core.IO;
@@ -364,7 +365,6 @@ public void Should_Ignore_Issue_Without_Message()
                 issues.Count.ShouldBe(0);
             }
 
-
             [Fact]
             public void Should_Filter_Control_Chars_From_Log_Content()
             {
@@ -378,6 +378,40 @@ public void Should_Filter_Control_Chars_From_Log_Content()
                 issues.Count.ShouldBe(0);
             }
 
+            [Fact]
+            public void Should_Read_Issue_With_Absolute_FileName_And_Without_Task()
+            {
+                var fixture = new MsBuildIssuesProviderFixture<XmlFileLoggerLogFileFormat>("IssueWithAbsoluteFileNameAndWithoutTask.xml");
+
+                var repoRootCreated = !Directory.Exists(fixture.RepositorySettings.RepositoryRoot.FullPath);
+                Directory.CreateDirectory(fixture.RepositorySettings.RepositoryRoot.FullPath);
+                try
+                {
+                    var oldWorkingDirectory = Directory.GetCurrentDirectory();
+                    try
+                    {
+                        Directory.SetCurrentDirectory(fixture.RepositorySettings.RepositoryRoot.FullPath);
+
+                        // When
+                        var issues = fixture.ReadIssues().ToList();
+
+                        // Then
+                        issues.Count.ShouldBe(1);
+                    }
+                    finally
+                    {
+                        Directory.SetCurrentDirectory(oldWorkingDirectory);
+                    }
+                }
+                finally
+                {
+                    if (repoRootCreated)
+                    {
+                        Directory.Delete(fixture.RepositorySettings.RepositoryRoot.FullPath);
+                    }
+                }
+            }
+
             private static void CheckIssue(
                 IIssue issue,
                 string projectFileRelativePath,

diff --git a/...ld.Tests/Testfiles/XmlFileLoggerLogFileFormat/IssueWithAbsoluteFileNameAndWithoutTask.xml b/...ld.Tests/Testfiles/XmlFileLoggerLogFileFormat/IssueWithAbsoluteFileNameAndWithoutTask.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<build started="3/11/2019 22:29:45">
+  <warning code="SA1633" file="File.cs" line="1" column="1" started="3/11/2019 22:29:59"><![CDATA[The file header is missing or not located at the top of the file.]]></warning>
+</build>
diff --git a/src/Cake.Issues.MsBuild/LogFileFormat/XmlFileLoggerLogFileFormat.cs b/src/Cake.Issues.MsBuild/LogFileFormat/XmlFileLoggerLogFileFormat.cs
@@ -222,6 +222,10 @@ private static bool TryGetRule(XElement warning, out string rule)
                     var compileTaskDirectory = System.IO.Path.GetDirectoryName(parentFileAttr.Value);
                     fileName = System.IO.Path.Combine(compileTaskDirectory, fileName);
                 }
+                else
+                {
+                    fileName = System.IO.Path.Combine(repositorySettings.RepositoryRoot.FullPath, fileName);
+                }
             }
 
             // Validate file path and make relative to repository root.