Update dependencies + fix stylecop (#816)

SixLabors · Jan 25, 2019 · 2849fd9 · 2849fd9
1 parent b03d41b
commit 2849fd9
Show file tree

Hide file tree

Showing 27 changed files with 167 additions and 86 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,6 @@
 	path = tests/Images/External
 	url = https://github.com/SixLabors/Imagesharp.Tests.Images.git
 	branch = master
+[submodule "standards"]
+	path = standards
+	url = https://github.com/SixLabors/Standards
diff --git a/ImageSharp.sln b/ImageSharp.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
 	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
+		standards\.editorconfig = standards\.editorconfig
 		.travis.yml = .travis.yml
 		appveyor.yml = appveyor.yml
 		.github\ISSUE_TEMPLATE\ask-question.md = .github\ISSUE_TEMPLATE\ask-question.md
@@ -15,12 +15,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
 		.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
 		.github\ISSUE_TEMPLATE\feature-request.md = .github\ISSUE_TEMPLATE\feature-request.md
 		features.md = features.md
-		ImageSharp.ruleset = ImageSharp.ruleset
 		ImageSharp.sln.DotSettings = ImageSharp.sln.DotSettings
 		NuGet.config = NuGet.config
 		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
 		README.md = README.md
 		run-tests.ps1 = run-tests.ps1
+		standards\SixLabors.ruleset = standards\SixLabors.ruleset
+		standards\stylecop.json = standards\stylecop.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"

diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
@@ -1,50 +1,53 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>      
-        <AssemblyTitle>SixLabors.ImageSharp.Drawing</AssemblyTitle>
-        <Authors>SixLabors and contributors</Authors>
-        <Company>Six Labors</Company>
-        <Copyright>Copyright (c) Six Labors and contributors.</Copyright>
-        <Product>SixLabors.ImageSharp</Product>
-        <Description>An extension to ImageSharp that allows the drawing of images, paths, and text.</Description>
-        <NeutralLanguage>en</NeutralLanguage>
+  <PropertyGroup>
+    <AssemblyTitle>SixLabors.ImageSharp.Drawing</AssemblyTitle>
+    <Authors>SixLabors and contributors</Authors>
+    <Company>Six Labors</Company>
+    <Copyright>Copyright (c) Six Labors and contributors.</Copyright>
+    <Product>SixLabors.ImageSharp</Product>
+    <Description>An extension to ImageSharp that allows the drawing of images, paths, and text.</Description>
+    <NeutralLanguage>en</NeutralLanguage>
 
-        <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
-        <VersionPrefix Condition="$(packageversion) == ''">0.0.1</VersionPrefix>
-        <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
-        <LangVersion>7.3</LangVersion>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <AssemblyName>SixLabors.ImageSharp.Drawing</AssemblyName>
-        <PackageId>SixLabors.ImageSharp.Drawing</PackageId>
-        <PackageTags>Image Draw Shape Path Font</PackageTags>
-        <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/imagesharp/sixlabors.imagesharp.128.png</PackageIconUrl>
-        <PackageProjectUrl>https://github.com/SixLabors/ImageSharp</PackageProjectUrl>
-        <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
-        <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/SixLabors/ImageSharp</RepositoryUrl>
-        <DebugType Condition="$(codecov) != ''">full</DebugType>
-        <DebugType Condition="$(codecov) == ''">portable</DebugType>
-        <DebugSymbols>True</DebugSymbols>
-    </PropertyGroup>
-    <ItemGroup>
-        <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\ImageSharp\ImageSharp.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <AdditionalFiles Include="..\..\stylecop.json" />
-        <PackageReference Include="SixLabors.Fonts" Version="1.0.0-dev000119" />
-        <PackageReference Include="SixLabors.Shapes" Version="1.0.0-dev000102" />
-        <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta007">
-            <PrivateAssets>All</PrivateAssets>
-        </PackageReference>
-    </ItemGroup>
-    <PropertyGroup>
-        <CodeAnalysisRuleSet>..\..\ImageSharp.ruleset</CodeAnalysisRuleSet>
-        <RootNamespace>SixLabors.ImageSharp</RootNamespace>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    </PropertyGroup>
+    <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
+    <VersionPrefix Condition="$(packageversion) == ''">0.0.1</VersionPrefix>
+    <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+    <LangVersion>7.3</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>SixLabors.ImageSharp.Drawing</AssemblyName>
+    <PackageId>SixLabors.ImageSharp.Drawing</PackageId>
+    <PackageTags>Image Draw Shape Path Font</PackageTags>
+    <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/imagesharp/sixlabors.imagesharp.128.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/SixLabors/ImageSharp</PackageProjectUrl>
+    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/SixLabors/ImageSharp</RepositoryUrl>
+    <DebugType Condition="$(codecov) != ''">full</DebugType>
+    <DebugType Condition="$(codecov) == ''">portable</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ImageSharp\ImageSharp.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\standards\stylecop.json" />
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0008" />
+    <PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0008" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" PrivateAssets="All" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>..\..\standards\SixLabors.ruleset</CodeAnalysisRuleSet>
+    <RootNamespace>SixLabors.ImageSharp</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
 </Project>
diff --git a/src/ImageSharp/Common/Helpers/SimdUtils.ExtendedIntrinsics.cs b/src/ImageSharp/Common/Helpers/SimdUtils.ExtendedIntrinsics.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

diff --git a/src/ImageSharp/Common/Helpers/TestHelpers.cs b/src/ImageSharp/Common/Helpers/TestHelpers.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.
 
 namespace SixLabors.ImageSharp.Common.Helpers

diff --git a/src/ImageSharp/Common/ParallelUtils/ParallelExecutionSettings.cs b/src/ImageSharp/Common/ParallelUtils/ParallelExecutionSettings.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.Threading.Tasks;

diff --git a/src/ImageSharp/Common/ParallelUtils/ParallelHelper.cs b/src/ImageSharp/Common/ParallelUtils/ParallelHelper.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;

diff --git a/src/ImageSharp/Common/Tuples/Octet.cs b/src/ImageSharp/Common/Tuples/Octet.cs
@@ -1,4 +1,7 @@
-using System.Runtime.CompilerServices;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Tuples

diff --git a/src/ImageSharp/Common/Tuples/Vector4Pair.cs b/src/ImageSharp/Common/Tuples/Vector4Pair.cs
@@ -1,4 +1,7 @@
-using System.Numerics;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

diff --git a/src/ImageSharp/Formats/Bmp/BmpInfoHeaderType.cs b/src/ImageSharp/Formats/Bmp/BmpInfoHeaderType.cs
@@ -1,4 +1,7 @@
-namespace SixLabors.ImageSharp.Formats.Bmp
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Enum value for the different bitmap info header types. The enum value is the number of bytes for the specific bitmap header.

diff --git a/src/ImageSharp/Formats/Bmp/BmpThrowHelper.cs b/src/ImageSharp/Formats/Bmp/BmpThrowHelper.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Formats.Bmp

diff --git a/src/ImageSharp/Formats/Gif/Sections/IGifExtension.cs b/src/ImageSharp/Formats/Gif/Sections/IGifExtension.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 
 namespace SixLabors.ImageSharp.Formats.Gif
 {

diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ScanDecoder.cs
@@ -474,7 +474,8 @@ private void DecodeBlockBaseline(
                         Unsafe.Add(ref blockDataRef, zig) = (short)this.ExtendReceive(s);
                     }
                 }
-            } while (k < 64);
+            }
+            while (k < 64);
         }
 
         private void DecodeBlockProgressiveDC(

diff --git a/src/ImageSharp/Formats/Jpeg/Components/Encoder/YCbCrForwardConverter{TPixel}.cs b/src/ImageSharp/Formats/Jpeg/Components/Encoder/YCbCrForwardConverter{TPixel}.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 using System.Runtime.CompilerServices;
 
 using SixLabors.ImageSharp.Advanced;

diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
@@ -547,7 +547,13 @@ private int WriteBlock(
         private void WriteDefineHuffmanTables(int componentCount)
         {
             // Table identifiers.
-            Span<byte> headers = stackalloc byte[] { 0x00, 0x10, 0x01, 0x11 };
+            Span<byte> headers = stackalloc byte[]
+            {
+                0x00,
+                0x10,
+                0x01,
+                0x11
+            };
 
             int markerlen = 2;
             HuffmanSpec[] specs = HuffmanSpec.TheHuffmanSpecs;
@@ -786,16 +792,37 @@ private void WriteProfiles(ImageMetaData metaData)
         private void WriteStartOfFrame(int width, int height, int componentCount)
         {
             // "default" to 4:2:0
-            Span<byte> subsamples = stackalloc byte[] { 0x22, 0x11, 0x11 };
-            Span<byte> chroma = stackalloc byte[] { 0x00, 0x01, 0x01 };
+            Span<byte> subsamples = stackalloc byte[]
+            {
+                0x22,
+                0x11,
+                0x11
+            };
+
+            Span<byte> chroma = stackalloc byte[]
+            {
+                0x00,
+                0x01,
+                0x01
+            };
 
             switch (this.subsample)
             {
                 case JpegSubsample.Ratio444:
-                    subsamples = stackalloc byte[] { 0x11, 0x11, 0x11 };
+                    subsamples = stackalloc byte[]
+                    {
+                        0x11,
+                        0x11,
+                        0x11
+                    };
                     break;
                 case JpegSubsample.Ratio420:
-                    subsamples = stackalloc byte[] { 0x22, 0x11, 0x11 };
+                    subsamples = stackalloc byte[]
+                    {
+                        0x22,
+                        0x11,
+                        0x11
+                    };
                     break;
             }
 

diff --git a/src/ImageSharp/Formats/Png/Chunks/PhysicalChunkData.cs b/src/ImageSharp/Formats/Png/Chunks/PhysicalChunkData.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 using System.Buffers.Binary;
 using SixLabors.ImageSharp.Common.Helpers;
 using SixLabors.ImageSharp.MetaData;

diff --git a/src/ImageSharp/Formats/Png/Filters/UpFilter.cs b/src/ImageSharp/Formats/Png/Filters/UpFilter.cs
@@ -57,7 +57,8 @@ public static void Encode(Span<byte> scanline, Span<byte> previousScanline, Span
             // Up(x) = Raw(x) - Prior(x)
             resultBaseRef = 2;
 
-            for (int x = 0; x < scanline.Length; /* Note: ++x happens in the body to avoid one add operation */) {
+            for (int x = 0; x < scanline.Length; /* Note: ++x happens in the body to avoid one add operation */)
+            {
                 byte scan = Unsafe.Add(ref scanBaseRef, x);
                 byte above = Unsafe.Add(ref prevBaseRef, x);
                 ++x;

diff --git a/src/ImageSharp/Formats/Png/PngConstants.cs b/src/ImageSharp/Formats/Png/PngConstants.cs
@@ -26,7 +26,8 @@ internal static class PngConstants
         /// </summary>
         public static readonly IEnumerable<string> FileExtensions = new[] { "png" };
 
-        public static readonly byte[] HeaderBytes = {
+        public static readonly byte[] HeaderBytes =
+        {
              0x89, // Set the high bit.
              0x50, // P
              0x4E, // N

diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
@@ -31,35 +31,34 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'net472' ">
     <DefineConstants>$(DefineConstants);SUPPORTS_EXTENDED_INTRINSICS</DefineConstants>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
   </ItemGroup>
-  
+
   <ItemGroup>
+    <AdditionalFiles Include="..\..\standards\stylecop.json" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" PrivateAssets="All" />
+    <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0007" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
-    <PackageReference Include="SixLabors.Core" Version="1.0.0-dev000094" />
-    <AdditionalFiles Include="..\..\stylecop.json" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta007">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
   </ItemGroup>
-
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3'">
     <PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
     <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-  
+
   <PropertyGroup>
-    <CodeAnalysisRuleSet>..\..\ImageSharp.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\standards\SixLabors.ruleset</CodeAnalysisRuleSet>
     <RootNamespace>SixLabors.ImageSharp</RootNamespace>
   </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
+
   <ItemGroup>
     <None Update="Formats\Jpeg\Components\Block8x8F.Generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
@@ -122,6 +121,7 @@
       <Generator>TextTemplatingFileGenerator</Generator>
     </None>
   </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Formats\Jpeg\Components\Block8x8F.Generated.cs">
       <DesignTime>True</DesignTime>
@@ -199,6 +199,7 @@
       <DependentUpon>PorterDuffFunctions.Generated.tt</DependentUpon>
     </Compile>
   </ItemGroup>
+
   <ItemGroup>
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>

diff --git a/src/ImageSharp/Memory/RowInterval.cs b/src/ImageSharp/Memory/RowInterval.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 SixLabors.Primitives;

diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifConstants.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifConstants.cs
@@ -5,14 +5,16 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
 {
     internal static class ExifConstants
     {
-        public static readonly byte[] LittleEndianByteOrderMarker = {
+        public static readonly byte[] LittleEndianByteOrderMarker =
+        {
             (byte)'I',
             (byte)'I',
             0x2A,
             0x00,
         };
 
-        public static readonly byte[] BigEndianByteOrderMarker = {
+        public static readonly byte[] BigEndianByteOrderMarker =
+        {
             (byte)'M',
             (byte)'M',
             0x00,