Merge pull request #1090 from brianpopow/feature/stylecopTests

Use stylecop in Test project

Author: JimBobSquarePants

.editorconfig

@@ -339,6 +339,7 @@ csharp_space_between_square_brackets = false
 #   warn when using var for built-in types,
 #   warn when using var when the type is not apparent, and
 #   warn when not using var when the type is apparent
+#   warn when using simplified "using" declaration
 ###############################################################################
 [*.cs]
 csharp_prefer_braces = true:silent
@@ -367,6 +368,8 @@ csharp_style_throw_expression = true:suggestion
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
 csharp_style_unused_value_assignment_preference = discard_variable:suggestion
 
-csharp_style_var_for_built_in_types = false:warning
-csharp_style_var_elsewhere = false:warning
+csharp_style_var_for_built_in_types = false:silent
 csharp_style_var_when_type_is_apparent = true:warning
+csharp_style_var_elsewhere = false:warning
+
+csharp_prefer_simple_using_statement = false:silent

.gitattributes

@@ -96,22 +96,22 @@
 *.gif               binary
 *.jpg               binary
 *.ktx               binary
+*.otf               binary
 *.pbm               binary
 *.pdf               binary
 *.png               binary
 *.ppt               binary
 *.pptx              binary
 *.pvr               binary
-*.ttf               binary
 *.snk               binary
 *.tga               binary
+*.ttc               binary
 *.ttf               binary
 *.woff              binary
 *.woff2             binary
 *.xls               binary
 *.xlsx              binary
 
-
 ###############################################################################
 # Set explicit file behavior to:
 #   diff as plain text

Directory.Build.props

@@ -103,8 +103,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" IsImplicitlyDefined="true"  />
-    <!--TODO: Enable this once tests Stylecop issues are fixed-->
-    <!--<PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />-->
+    <PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)shared-infrastructure\stylecop.json" />
     <!--NuGet package icon source-->
     <None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp\sixlabors.imagesharp.128.png" Pack="true" PackagePath="\icon.png" />

shared-infrastructure

@@ -27,9 +27,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!--TODO: Delete this once tests Stylecop issues are fixed-->
-    <PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />
-
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKeyToken=null" />
     <InternalsVisibleTo Include="ImageSharp.Benchmarks" />

src/Directory.Build.props

@@ -26,7 +26,7 @@ public static class ParallelHelper
         /// <param name="body">The method body defining the iteration logic on a single <see cref="RowInterval"/>.</param>
         public static void IterateRows(Rectangle rectangle, Configuration configuration, Action<RowInterval> body)
         {
-            ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
+            var parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
 
             IterateRows(rectangle, parallelSettings, body);
         }

src/ImageSharp/Advanced/ParallelUtils/ParallelHelper.cs

@@ -153,7 +153,7 @@ public IccChromaticityTagDataEntry ReadChromaticityTagDataEntry()
             else
             {
                 // The type is not know, so the values need be read
-                var values = new double[channelCount][];
+                double[][] values = new double[channelCount][];
                 for (int i = 0; i < channelCount; i++)
                 {
                     values[i] = new double[] { this.ReadUFix16(), this.ReadUFix16() };
@@ -208,7 +208,7 @@ public IccCurveTagDataEntry ReadCurveTagDataEntry()
                 return new IccCurveTagDataEntry(this.ReadUFix8());
             }
 
-            var cdata = new float[pointCount];
+            float[] cdata = new float[pointCount];
             for (int i = 0; i < pointCount; i++)
             {
                 cdata[i] = this.ReadUInt16() / 65535f;
@@ -264,7 +264,7 @@ public IccLut16TagDataEntry ReadLut16TagDataEntry()
 
             // Input LUT
             var inValues = new IccLut[inChCount];
-            var gridPointCount = new byte[inChCount];
+            byte[] gridPointCount = new byte[inChCount];
             for (int i = 0; i < inChCount; i++)
             {
                 inValues[i] = this.ReadLut16(inTableCount);
@@ -299,7 +299,7 @@ public IccLut8TagDataEntry ReadLut8TagDataEntry()
 
             // Input LUT
             var inValues = new IccLut[inChCount];
-            var gridPointCount = new byte[inChCount];
+            byte[] gridPointCount = new byte[inChCount];
             for (int i = 0; i < inChCount; i++)
             {
                 inValues[i] = this.ReadLut8();
@@ -464,8 +464,8 @@ public IccMultiLocalizedUnicodeTagDataEntry ReadMultiLocalizedUnicodeTagDataEntr
             var text = new IccLocalizedString[recordCount];
 
             var culture = new CultureInfo[recordCount];
-            var length = new uint[recordCount];
-            var offset = new uint[recordCount];
+            uint[] length = new uint[recordCount];
+            uint[] offset = new uint[recordCount];
 
             for (int i = 0; i < recordCount; i++)
             {
@@ -627,7 +627,7 @@ public IccResponseCurveSet16TagDataEntry ReadResponseCurveSet16TagDataEntry()
             ushort channelCount = this.ReadUInt16();
             ushort measurementCount = this.ReadUInt16();
 
-            var offset = new uint[measurementCount];
+            uint[] offset = new uint[measurementCount];
             for (int i = 0; i < measurementCount; i++)
             {
                 offset[i] = this.ReadUInt32();
@@ -651,7 +651,7 @@ public IccResponseCurveSet16TagDataEntry ReadResponseCurveSet16TagDataEntry()
         public IccFix16ArrayTagDataEntry ReadFix16ArrayTagDataEntry(uint size)
         {
             uint count = (size - 8) / 4;
-            var arrayData = new float[count];
+            float[] arrayData = new float[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadFix16() / 256f;
@@ -687,7 +687,7 @@ public IccTextTagDataEntry ReadTextTagDataEntry(uint size)
         public IccUFix16ArrayTagDataEntry ReadUFix16ArrayTagDataEntry(uint size)
         {
             uint count = (size - 8) / 4;
-            var arrayData = new float[count];
+            float[] arrayData = new float[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadUFix16();
@@ -704,7 +704,7 @@ public IccUFix16ArrayTagDataEntry ReadUFix16ArrayTagDataEntry(uint size)
         public IccUInt16ArrayTagDataEntry ReadUInt16ArrayTagDataEntry(uint size)
         {
             uint count = (size - 8) / 2;
-            var arrayData = new ushort[count];
+            ushort[] arrayData = new ushort[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadUInt16();
@@ -721,7 +721,7 @@ public IccUInt16ArrayTagDataEntry ReadUInt16ArrayTagDataEntry(uint size)
         public IccUInt32ArrayTagDataEntry ReadUInt32ArrayTagDataEntry(uint size)
         {
             uint count = (size - 8) / 4;
-            var arrayData = new uint[count];
+            uint[] arrayData = new uint[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadUInt32();
@@ -738,7 +738,7 @@ public IccUInt32ArrayTagDataEntry ReadUInt32ArrayTagDataEntry(uint size)
         public IccUInt64ArrayTagDataEntry ReadUInt64ArrayTagDataEntry(uint size)
         {
             uint count = (size - 8) / 8;
-            var arrayData = new ulong[count];
+            ulong[] arrayData = new ulong[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadUInt64();
@@ -878,14 +878,14 @@ public IccScreeningTagDataEntry ReadScreeningTagDataEntry()
         public IccUcrBgTagDataEntry ReadUcrBgTagDataEntry(uint size)
         {
             uint ucrCount = this.ReadUInt32();
-            var ucrCurve = new ushort[ucrCount];
+            ushort[] ucrCurve = new ushort[ucrCount];
             for (int i = 0; i < ucrCurve.Length; i++)
             {
                 ucrCurve[i] = this.ReadUInt16();
             }
 
             uint bgCount = this.ReadUInt32();
-            var bgCurve = new ushort[bgCount];
+            ushort[] bgCurve = new ushort[bgCount];
             for (int i = 0; i < bgCurve.Length; i++)
             {
                 bgCurve[i] = this.ReadUInt16();

src/ImageSharp/Metadata/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;

src/ImageSharp/Metadata/Profiles/ICC/TagDataEntries/IccLutAToBTagDataEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;

src/ImageSharp/Metadata/Profiles/ICC/TagDataEntries/IccLutBToATagDataEntry.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Numerics;
+using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
 {
@@ -53,4 +54,4 @@ public bool Equals(IccXyzTagDataEntry other)
             return this.Equals((IccTagDataEntry)other);
         }
     }
-}
+}