From 027ffeb17fd57bd92e716960521eec800285ce1c Mon Sep 17 00:00:00 2001
From: Scott Williams <tocsoft@gmail.com>
Date: Sat, 16 Sep 2017 10:15:58 +0100
Subject: [PATCH 1/3] prevent stylecop.json form being included in package

---
 src/SixLabors.Core/SixLabors.Core.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SixLabors.Core/SixLabors.Core.csproj b/src/SixLabors.Core/SixLabors.Core.csproj
index a5a1745..e38298f 100644
--- a/src/SixLabors.Core/SixLabors.Core.csproj
+++ b/src/SixLabors.Core/SixLabors.Core.csproj
@@ -36,7 +36,6 @@
 
   <ItemGroup>
     <AdditionalFiles Include="..\..\stylecop.json" />
-    <Content Include="..\..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
 
   <ItemGroup>

From f759408e57aa419e13d76b32305c567509301170 Mon Sep 17 00:00:00 2001
From: Scott Williams <tocsoft@gmail.com>
Date: Sat, 16 Sep 2017 10:19:58 +0100
Subject: [PATCH 2/3] fix gitversion rules to match IS

---
 gitversion.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gitversion.yml b/gitversion.yml
index e07c90f..9fae0d8 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

From ce05dea53f19f4e96c815c3d458de6c2d60b9943 Mon Sep 17 00:00:00 2001
From: Scott Williams <tocsoft@gmail.com>
Date: Sat, 16 Sep 2017 10:23:00 +0100
Subject: [PATCH 3/3] fix appveyor.yml to user correct version of gitversion

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5a74728..8938394 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,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