From 9f761808235da10ee2504b7a328403086e77c2df Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 29 Aug 2019 23:37:46 +0200
Subject: [PATCH] [SL.Core] use shared .editorconfig and stylecop.json

---
 .editorconfig                                     |  3 ---
 SixLabors.Core.sln                                |  2 +-
 src/SixLabors.Core/SixLabors.Core.csproj          | 14 +++++++++-----
 stylecop.json                                     | 15 ---------------
 .../SixLabors.Core.Tests.csproj                   |  3 +--
 5 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 .editorconfig
 delete mode 100644 stylecop.json

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index f39b267256..0000000000
--- a/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.cs]
-indent_style = space
-indent_size = 4
diff --git a/SixLabors.Core.sln b/SixLabors.Core.sln
index 040ce0688f..a796a9ebac 100644
--- a/SixLabors.Core.sln
+++ b/SixLabors.Core.sln
@@ -5,7 +5,6 @@ VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
 	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
 		appveyor.yml = appveyor.yml
 		.github\ISSUE_TEMPLATE\ask-question.md = .github\ISSUE_TEMPLATE\ask-question.md
 		.github\ISSUE_TEMPLATE\bug-report.md = .github\ISSUE_TEMPLATE\bug-report.md
@@ -16,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
 		gitversion.yml = gitversion.yml
 		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
 		README.md = README.md
+		shared-infrastructure\.editorconfig = shared-infrastructure\.editorconfig
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"
diff --git a/src/SixLabors.Core/SixLabors.Core.csproj b/src/SixLabors.Core/SixLabors.Core.csproj
index eafe9824ed..2fb64cdf37 100644
--- a/src/SixLabors.Core/SixLabors.Core.csproj
+++ b/src/SixLabors.Core/SixLabors.Core.csproj
@@ -37,15 +37,19 @@
 
     <ItemGroup>
         <Compile Include="..\..\shared-infrastructure\**\*.cs" />
+        <AdditionalFiles Include="..\..\shared-infrastructure\stylecop.json" />
     </ItemGroup>
-    
+    <PropertyGroup>
+        <CodeAnalysisRuleSet>..\..\shared-infrastructure\SixLabors.ruleset</CodeAnalysisRuleSet>
+    </PropertyGroup>
+
     <ItemGroup>
        <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
-        <PrivateAssets>All</PrivateAssets>
-      </PackageReference>
-    
-        <AdditionalFiles Include="..\..\stylecop.json" />
+           <PrivateAssets>All</PrivateAssets>
+       </PackageReference>
     </ItemGroup>
+
+    
  
     <ItemGroup>
        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
diff --git a/stylecop.json b/stylecop.json
deleted file mode 100644
index c67c0db325..0000000000
--- a/stylecop.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
-    "settings":
-    {
-        "orderingRules":
-        {
-            "usingDirectivesPlacement": "outsideNamespace"
-        },
-        "documentationRules":
-        {
-            "xmlHeader": false,
-            "copyrightText": "Copyright (c) Six Labors and contributors.\nLicensed under the Apache License, Version 2.0."
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/SixLabors.Core.Tests/SixLabors.Core.Tests.csproj b/tests/SixLabors.Core.Tests/SixLabors.Core.Tests.csproj
index 55951fb43f..f33dde1c6f 100644
--- a/tests/SixLabors.Core.Tests/SixLabors.Core.Tests.csproj
+++ b/tests/SixLabors.Core.Tests/SixLabors.Core.Tests.csproj
@@ -23,8 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="..\..\stylecop.json" />
-    <Content Include="..\..\stylecop.json" Link="stylecop.json" />
+    <AdditionalFiles Include="..\..\shared-infrastructure\stylecop.json" />
   </ItemGroup>
 
   <ItemGroup>