Merge branch 'release/0.2.0'

cake-contrib · Mar 24, 2017 · 8d12cdf · 8d12cdf
2 parents 74a25e4 + 2f56884
commit 8d12cdf
Show file tree

Hide file tree

Showing 15 changed files with 336 additions and 36 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -22,5 +22,5 @@ branches:
 #  Build Cache                    #
 #---------------------------------#
 cache:
-- Source\packages -> Source\**\packages.config
+- src\packages -> src\**\packages.config
 - tools -> setup.cake
diff --git a/nuspec/nuget/Cake.Prca.Issues.InspectCode.nuspec b/nuspec/nuget/Cake.Prca.Issues.InspectCode.nuspec
@@ -7,15 +7,16 @@
     <authors>BBT Software AG</authors>
     <owners>bbtsoftware, pascalberger, cake-contrib</owners>
     <summary>JetBrains Inspect Code support for the Pull Request Code Analysis Addin for Cake Build Automation System</summary>
-    <description>The Inspect Code support for the Pull Request Code Analysis Addin for Cake allows you to write any issues logged by JetBrains Inspect Code to a pull request.</description>
+    <description>The Inspect Code support for the Pull Request Code Analysis Addin for Cake allows you to write any issues logged by JetBrains Inspect Code as comments to a pull request.</description>
     <licenseUrl>https://github.com/cake-contrib/Cake.Prca.Issues.InspectCode/blob/develop/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/cake-contrib/Cake.Prca.Issues.InspectCode</projectUrl>
+    <projectUrl>http://cake-contrib.github.io/Cake.Prca.Website</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/cake-build/graphics/aba74fb4cb5fe9454381af2cc70c870088229d5c/png/cake-medium.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright © 2017 BBT Software AG, Root/Zermatt, Switzerland</copyright>
     <tags>Cake Script PullRequest CodeAnalysis Cake-Prca-IssueProvider Linting InspectCode</tags>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Prca.Issues.InspectCode/releases/tag/0.2.0</releaseNotes>
     <dependencies>
-      <dependency id="Cake.Prca" version="[0.1,0.2)" />
+      <dependency id="Cake.Prca" version="[0.2,0.3)" />
     </dependencies>
   </metadata>
   <files>

diff --git a/src/Cake.Prca.Issues.InspectCode.Tests.ruleset b/src/Cake.Prca.Issues.InspectCode.Tests.ruleset
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Ruleset for Cake.Prca.Issues.InspectCode test cases" Description="Rules valid for Cake.Prca.Issues.InspectCode test cases" ToolsVersion="14.0">
+  <Include Path="Cake.Prca.Issues.InspectCode.ruleset" Action="Default" />
+  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <Rule Id="SA1118" Action="None" />
+    <Rule Id="SA1652" Action="None" />
+  </Rules>
+</RuleSet>
diff --git a/src/Cake.Prca.Issues.InspectCode.Tests/Cake.Prca.Issues.InspectCode.Tests.csproj b/src/Cake.Prca.Issues.InspectCode.Tests/Cake.Prca.Issues.InspectCode.Tests.csproj
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>..\Cake.Prca.Issues.InspectCode.Tests.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,14 +32,15 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>..\Cake.Prca.Issues.InspectCode.Tests.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Cake.Core, Version=0.18.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Cake.Core.0.18.0\lib\net45\Cake.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Cake.Prca, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Prca.0.1.0-unstable0011\lib\net45\Cake.Prca.dll</HintPath>
+      <HintPath>..\packages\Cake.Prca.0.2.0\lib\net45\Cake.Prca.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Cake.Testing, Version=0.18.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -98,6 +100,11 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/src/Cake.Prca.Issues.InspectCode.Tests/InspectCodeProviderFixture.cs b/src/Cake.Prca.Issues.InspectCode.Tests/InspectCodeProviderFixture.cs
@@ -7,17 +7,16 @@
 
     public class InspectCodeProviderFixture
     {
-
         public InspectCodeProviderFixture(string fileResourceName)
         {
             this.Log = new FakeLog();
-            Log.Verbosity = Verbosity.Normal;
+            this.Log.Verbosity = Verbosity.Normal;
 
             using (var stream = this.GetType().Assembly.GetManifestResourceStream("Cake.Prca.Issues.InspectCode.Tests.Testfiles." + fileResourceName))
             {
                 using (var sr = new StreamReader(stream))
                 {
-                    this.Settings = 
+                    this.Settings =
                         InspectCodeSettings.FromContent(
                             sr.ReadToEnd(),
                             new Core.IO.DirectoryPath(@"c:\Source\Cake.Prca"));

diff --git a/src/Cake.Prca.Issues.InspectCode.Tests/InspectCodeProviderTests.cs b/src/Cake.Prca.Issues.InspectCode.Tests/InspectCodeProviderTests.cs
@@ -1,8 +1,8 @@
 namespace Cake.Prca.Issues.InspectCode.Tests
 {
+    using System.Linq;
     using Core.IO;
     using Shouldly;
-    using System.Linq;
     using Testing;
     using Xunit;
 
@@ -14,9 +14,9 @@ public sealed class TheInspectCodeProviderCtor
             public void Should_Throw_If_Log_Is_Null()
             {
                 // Given / When
-                var result = Record.Exception(() => 
+                var result = Record.Exception(() =>
                     new InspectCodeProvider(
-                        null, 
+                        null,
                         InspectCodeSettings.FromContent(@"foo", @"c:\src")));
 
                 // Then
@@ -72,7 +72,6 @@ public void Should_Read_Issue_Correct()
                 issue.Priority.ShouldBe(priority);
                 issue.Message.ShouldBe(message);
             }
-
         }
     }
 }
diff --git a/src/Cake.Prca.Issues.InspectCode.Tests/InspectCodeSettingsTests.cs b/src/Cake.Prca.Issues.InspectCode.Tests/InspectCodeSettingsTests.cs
@@ -14,7 +14,7 @@ public sealed class TheInspectCodeSettings
             public void Should_Throw_If_LogFilePath_Is_Null()
             {
                 // Given / When
-                var result = Record.Exception(() => 
+                var result = Record.Exception(() =>
                     InspectCodeSettings.FromFilePath(
                         null,
                         new DirectoryPath(@"C:\")));
@@ -91,7 +91,7 @@ public void Should_Throw_If_RepositoryRoot_For_LogFileContent_Is_Null()
             [Fact]
             public void Should_Set_Property_Values_Passed_To_Constructor()
             {
-                // Given 
+                // Given
                 const string logFileContent = "foo";
                 var repoRoot = new DirectoryPath(@"C:\");
 
@@ -126,7 +126,7 @@ public void Should_Read_File_From_Disk()
                     }
 
                     // When
-                    var settings = 
+                    var settings =
                         InspectCodeSettings.FromFilePath(
                             new FilePath(fileName),
                             new DirectoryPath(@"C:\"));

diff --git a/src/Cake.Prca.Issues.InspectCode.Tests/Properties/AssemblyInfo.cs b/src/Cake.Prca.Issues.InspectCode.Tests/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Cake.Prca.Issues.InspectCode.Tests")]
@@ -14,8 +14,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,11 +25,11 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

diff --git a/src/Cake.Prca.Issues.InspectCode.Tests/packages.config b/src/Cake.Prca.Issues.InspectCode.Tests/packages.config
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Cake.Core" version="0.18.0" targetFramework="net452" />
-  <package id="Cake.Prca" version="0.1.0-unstable0011" targetFramework="net452" />
+  <package id="Cake.Prca" version="0.2.0" targetFramework="net452" />
   <package id="Cake.Testing" version="0.18.0" targetFramework="net452" />
   <package id="Shouldly" version="2.8.2" targetFramework="net452" />
+  <package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
   <package id="xunit" version="2.2.0" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
   <package id="xunit.assert" version="2.2.0" targetFramework="net452" />