From 917567267b050987bbf482794e82816eef2141ff Mon Sep 17 00:00:00 2001
From: Scott Williams <tocsoft@gmail.com>
Date: Sat, 16 Sep 2017 11:00:24 +0100
Subject: [PATCH 1/2] update to prevent stylecop.json being included in package

---
 src/SixLabors.Fonts/SixLabors.Fonts.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/SixLabors.Fonts/SixLabors.Fonts.csproj b/src/SixLabors.Fonts/SixLabors.Fonts.csproj
index 51bad4214..bf2911054 100644
--- a/src/SixLabors.Fonts/SixLabors.Fonts.csproj
+++ b/src/SixLabors.Fonts/SixLabors.Fonts.csproj
@@ -39,7 +39,6 @@
 
   <ItemGroup>
     <AdditionalFiles Include="..\..\stylecop.json" />
-    <Content Include="..\..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
   
   <ItemGroup>
@@ -47,7 +46,7 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
-    <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0002" />
+    <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0003" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

From 1981f362d0bf049e966fbf57167c6962b8bf47e3 Mon Sep 17 00:00:00 2001
From: Scott Williams <tocsoft@gmail.com>
Date: Sat, 16 Sep 2017 11:03:31 +0100
Subject: [PATCH 2/2] update build settings

---
 appveyor.yml   |  2 +-
 gitversion.yml | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6057c74f1..45b3460df 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ install:
   
 before_build:
   - cmd: dotnet --version
-  - ps: gitversion /l console /output buildserver
+  - ps: c:\ProgramData\chocolatey\lib\gitversion.portable\tools\gitversion.exe /l console /output buildserver
 
 build_script:
   - cmd: build.cmd
diff --git a/gitversion.yml b/gitversion.yml
index e07c90f0d..9fae0d8c2 100644
--- a/gitversion.yml
+++ b/gitversion.yml
@@ -9,5 +9,23 @@ branches:
     increment: Minor
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true
+  pull-request:
+    regex: (pull|pull\-requests|pr)[/-]
+    mode: ContinuousDelivery
+    tag: PullRequest
+    increment: Inherit
+    prevent-increment-of-merged-branch-version: false
+    tag-number-pattern: '[/-](?<number>\d+)[-/]'
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: false
+  otherbranches:
+    regex: '.*'
+    mode: ContinuousDeployment
+    tag: ci
+    increment: Patch
+    prevent-increment-of-merged-branch-version: false
+    track-merge-target: true
+    is-release-branch: false
 ignore:
   sha: []
\ No newline at end of file