From 87f0ad3b4dc8bd2c923df3e50707b89ed9e88d30 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 25 Jan 2019 12:10:52 +1100
Subject: [PATCH] Update dependencies (#106)

* Update dependencies

* Update description

* Update submodule
---
 .editorconfig                              |  3 -
 .gitmodules                                |  3 +
 SixLabors.Fonts.sln                        |  6 +-
 SixLabors.ruleset                          | 15 ----
 appveyor.yml                               |  1 +
 src/SixLabors.Fonts/SixLabors.Fonts.csproj | 84 +++++++++++-----------
 standards                                  |  1 +
 stylecop.json                              | 16 -----
 8 files changed, 50 insertions(+), 79 deletions(-)
 delete mode 100644 .editorconfig
 create mode 100644 .gitmodules
 delete mode 100644 SixLabors.ruleset
 create mode 160000 standards
 delete mode 100644 stylecop.json

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index f39b26725..000000000
--- a/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.cs]
-indent_style = space
-indent_size = 4
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..c89d0db7e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "standards"]
+	path = standards
+	url = https://github.com/SixLabors/Standards
diff --git a/SixLabors.Fonts.sln b/SixLabors.Fonts.sln
index 3b9c22573..9d3c91bb3 100644
--- a/SixLabors.Fonts.sln
+++ b/SixLabors.Fonts.sln
@@ -4,11 +4,11 @@ VisualStudioVersion = 15.0.26430.15
 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
 		NuGet.config = NuGet.config
 		README.md = README.md
-		SixLabors.ruleset = SixLabors.ruleset
-		stylecop.json = stylecop.json
+		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/SixLabors.ruleset b/SixLabors.ruleset
deleted file mode 100644
index 3e98e21e3..000000000
--- a/SixLabors.ruleset
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Shaper2D" ToolsVersion="14.0">
-  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <Rule Id="SA1413" Action="None" />
-    <Rule Id="SA1200" Action="None" />
-    <Rule Id="SA1633" Action="None" />
-    <Rule Id="SA1600" Action="None" />
-    <Rule Id="SA1201" Action="None" />
-    <Rule Id="SA1202" Action="None" />
-    <Rule Id="SA1204" Action="None" />
-    <Rule Id="SA1602" Action="None" />
-    <Rule Id="SA1615" Action="None" />
-    <Rule Id="SA1642" Action="None" />
-  </Rules>
-</RuleSet>
diff --git a/appveyor.yml b/appveyor.yml
index 950bb7477..5a0c849bb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,7 @@ version: 0.0.{build}
 image: Visual Studio 2017
 
 before_build:
+  - git submodule -q update --init
   - cmd: dotnet --version
 
 build_script:
diff --git a/src/SixLabors.Fonts/SixLabors.Fonts.csproj b/src/SixLabors.Fonts/SixLabors.Fonts.csproj
index 98d6e7674..21b034931 100644
--- a/src/SixLabors.Fonts/SixLabors.Fonts.csproj
+++ b/src/SixLabors.Fonts/SixLabors.Fonts.csproj
@@ -1,50 +1,50 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <Description>A cross-platform library for loading and laying out for processing and measuring; written in C#</Description>
-        <AssemblyTitle>SixLabors.Fonts</AssemblyTitle>
-        <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
-        <VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
-        <Authors>Six Labors and contributors</Authors>
-        <TargetFrameworks>netstandard2.0;netstandard1.3</TargetFrameworks>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <AssemblyName>SixLabors.Fonts</AssemblyName>
-        <PackageId>SixLabors.Fonts</PackageId>
-        <PackageTags>font;truetype;opentype;woff</PackageTags>
-        <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/fonts/sixlabors.fonts.128.png</PackageIconUrl>
-        <PackageProjectUrl>https://github.com/SixLabors/Fonts</PackageProjectUrl>
-        <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
-        <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/SixLabors/Fonts</RepositoryUrl>
-        <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-        <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-        <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
-        <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-        <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-        <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-        <DebugType Condition="$(codecov) != ''">full</DebugType>
-        <LangVersion>7.3</LangVersion>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Description>A cross-platform library for loading and laying out fonts for processing and measuring; written in C#</Description>
+    <AssemblyTitle>SixLabors.Fonts</AssemblyTitle>
+    <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
+    <VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
+    <Authors>Six Labors and contributors</Authors>
+    <TargetFrameworks>netstandard2.0;netstandard1.3</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>SixLabors.Fonts</AssemblyName>
+    <PackageId>SixLabors.Fonts</PackageId>
+    <PackageTags>font;truetype;opentype;woff</PackageTags>
+    <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/fonts/sixlabors.fonts.128.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/SixLabors/Fonts</PackageProjectUrl>
+    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/SixLabors/Fonts</RepositoryUrl>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+    <DebugType Condition="$(codecov) != ''">full</DebugType>
+    <LangVersion>7.3</LangVersion>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <CodeAnalysisRuleSet>..\..\SixLabors.ruleset</CodeAnalysisRuleSet>
-    </PropertyGroup>
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>..\..\standards\SixLabors.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <AdditionalFiles Include="..\..\stylecop.json" />
-    </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\standards\stylecop.json" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004" PrivateAssets="All" />
-        <PackageReference Include="SixLabors.Core" Version="1.0.0-dev000094" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" PrivateAssets="All" />
+    <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0007" />
+  </ItemGroup>
 
 </Project>
diff --git a/standards b/standards
new file mode 160000
index 000000000..dd83f6496
--- /dev/null
+++ b/standards
@@ -0,0 +1 @@
+Subproject commit dd83f649638c6333984a757c01be6ec294e6b63c
diff --git a/stylecop.json b/stylecop.json
deleted file mode 100644
index 485ab604a..000000000
--- a/stylecop.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
-  "settings": {
-    "orderingRules": {
-      "usingDirectivesPlacement": "outsideNamespace",
-      "elementOrder": [
-        "kind"
-      ]
-    },
-    "documentationRules": {
-      "xmlHeader": false,
-      "documentInternalElements": false,
-      "copyrightText": "Copyright (c) Six Labors and contributors.\nLicensed under the Apache License, Version 2.0."
-    }
-  }
-}
\ No newline at end of file