Merge tag '0.7.0' into develop

cake-contrib · May 30, 2019 · 6a6d6e2 · 6a6d6e2
2 parents 2e98cd8 + f111af9
commit 6a6d6e2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/nuspec/nuget/Cake.Issues.MsBuild.nuspec b/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" />

diff --git a/setup.cake b/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");
 

diff --git a/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj b/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj
@@ -43,8 +43,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="Cake.Core" Version="0.33.0" />
     <PackageReference Include="Cake.Testing" Version="0.33.0" />
-    <PackageReference Include="Cake.Issues" Version="0.7.0-beta0002" />
-    <PackageReference Include="Cake.Issues.Testing" Version="0.7.0-beta0002" />
+    <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" />

diff --git a/src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj b/src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="Cake.Core" Version="0.33.0" />
-    <PackageReference Include="Cake.Issues" Version="0.7.0-beta0002" />
+    <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" />

diff --git a/src/Cake.Issues.MsBuild/LogFileFormat/XmlFileLoggerLogFileFormat.cs b/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)
             {

diff --git a/tools/packages.config b/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>