Merge branch 'release/0.7.0'

nuspec/nuget/Cake.Issues.MsBuild.nuspec

@@ -17,14 +17,14 @@ There are also additional addins for generating reports or posting issues to pul
 
 See the Project Site for an overview of the whole ecosystem of addins for working with issues in Cake scripts.
     </description>
-    <licenseUrl>https://github.com/cake-contrib/Cake.Issues.MsBuild/blob/develop/LICENSE</licenseUrl>
+    <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>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.MsBuild"/>
+    <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.MsBuild.git"/>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>Cake Script Cake-Issues Cake-IssueProvider CodeAnalysis Linting MsBuild</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.MsBuild/releases/tag/0.6.3</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.MsBuild/releases/tag/0.7.0</releaseNotes>
   </metadata>
   <files>
     <file src="netstandard2.0\Cake.Issues.MsBuild.dll" target="lib\netstandard2.0" />

setup.cake

@@ -1,4 +1,4 @@
-#load nuget:https://www.myget.org/F/cake-contrib/api/v2?package=Cake.Recipe&prerelease
+#load nuget:?package=Cake.Recipe&version=1.0.0
 
 Environment.SetVariableNames();
 
@@ -17,7 +17,7 @@ BuildParameters.PrintParameters(Context);
 ToolSettings.SetToolSettings(
     context: Context,
     dupFinderExcludePattern: new string[] { BuildParameters.RootDirectoryPath + "/src/Cake.Issues.MsBuild.Tests/**/*.cs", BuildParameters.RootDirectoryPath + "/src/Cake.Issues.MsBuild*/**/*.AssemblyInfo.cs"  },
-    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Cake.Issues]* -[Cake.Issues.Testing]*",
+    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Cake.Issues]* -[Cake.Issues.Testing]* -[Shouldly]* -[Microsoft.Build*]* -[StructuredLogger]*",
     testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
     testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 

src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj

@@ -41,10 +41,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="Cake.Core" Version="0.28.0" />
-    <PackageReference Include="Cake.Testing" Version="0.28.0" />
-    <PackageReference Include="Cake.Issues" Version="0.6.0" />
-    <PackageReference Include="Cake.Issues.Testing" Version="0.6.0" />
+    <PackageReference Include="Cake.Core" Version="0.33.0" />
+    <PackageReference Include="Cake.Testing" Version="0.33.0" />
+    <PackageReference Include="Cake.Issues" Version="0.7.0" />
+    <PackageReference Include="Cake.Issues.Testing" Version="0.7.0" />
     <PackageReference Include="Shouldly" Version="3.0.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta009" />
     <PackageReference Include="xunit" Version="2.4.1" />

src/Cake.Issues.MsBuild.Tests/MsBuildIssuesSettingsTests.cs

@@ -44,7 +44,7 @@ public void Should_Throw_If_Format_For_LogFilePath_Is_Null()
             }
 
             [Fact]
-            public void Should_Throw_If_LogContent_Is_Null()
+            public void Should_Throw_If_LogFileContent_Is_Null()
             {
                 // Given
                 byte[] logFileContent = null;
@@ -58,39 +58,39 @@ public void Should_Throw_If_LogContent_Is_Null()
             }
 
             [Fact]
-            public void Should_Throw_If_LogContent_Is_Empty()
+            public void Should_Throw_If_Format_For_LogFileContent_Is_Null()
             {
                 // Given
-                byte[] logFileContent = Array.Empty<byte>();
-                var format = new XmlFileLoggerLogFileFormat(new FakeLog());
+                var logFileContent = "foo".ToByteArray();
+                BaseMsBuildLogFileFormat format = null;
 
                 // When
-                var result = Record.Exception(() => new MsBuildIssuesSettings(logFileContent, format));
+                var result = Record.Exception(() =>
+                    new MsBuildIssuesSettings(logFileContent, format));
 
                 // Then
-                result.IsArgumentException("logFileContent");
+                result.IsArgumentNullException("format");
             }
 
             [Fact]
-            public void Should_Throw_If_Format_For_LogFileContent_Is_Null()
+            public void Should_Set_LogFileContent()
             {
                 // Given
-                var logFileContent = "foo".ToByteArray();
-                BaseMsBuildLogFileFormat format = null;
+                var logFileContent = "Foo".ToByteArray();
+                var format = new XmlFileLoggerLogFileFormat(new FakeLog());
 
                 // When
-                var result = Record.Exception(() =>
-                    new MsBuildIssuesSettings(logFileContent, format));
+                var settings = new MsBuildIssuesSettings(logFileContent, format);
 
                 // Then
-                result.IsArgumentNullException("format");
+                settings.LogFileContent.ShouldBe(logFileContent);
             }
 
             [Fact]
-            public void Should_Set_LogContent()
+            public void Should_Set_LogFileContent_If_Empty()
             {
                 // Given
-                var logFileContent = "Foo".ToByteArray();
+                byte[] logFileContent = Array.Empty<byte>();
                 var format = new XmlFileLoggerLogFileFormat(new FakeLog());
 
                 // When
@@ -101,7 +101,7 @@ public void Should_Set_LogContent()
             }
 
             [Fact]
-            public void Should_Set_LogContent_From_LogFilePath()
+            public void Should_Set_LogFileContent_From_LogFilePath()
             {
                 // Given
                 var format = new XmlFileLoggerLogFileFormat(new FakeLog());

src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj

@@ -25,10 +25,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.28.0" />
-    <PackageReference Include="Cake.Issues" Version="0.6.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3" />
-    <PackageReference Include="MSBuild.StructuredLogger" Version="2.0.68" />
+    <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="MSBuild.StructuredLogger" Version="2.0.88" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta009" />
   </ItemGroup>
 

src/Cake.Issues.MsBuild/LogFileFormat/XmlFileLoggerLogFileFormat.cs

@@ -136,8 +136,6 @@ private static bool TryGetLine(XElement warning, out int? line)
         /// <returns>True if the rule code could be parsed.</returns>
         private static bool TryGetRule(XElement warning, out string rule)
         {
-            rule = string.Empty;
-
             var codeAttr = warning.Attribute("code");
             if (codeAttr == null)
             {

tools/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-	<package id="Cake" version="0.32.0" />
+	<package id="Cake" version="0.32.1" />
 </packages>