From 3fcdca1a0f5f6bccc81561871b080769b51078bb Mon Sep 17 00:00:00 2001
From: Chris Wood <chris@flipbit.co.uk>
Date: Tue, 21 May 2019 04:53:25 +0100
Subject: [PATCH 1/4] Add versioning script to appveyor.yml

---
 appveyor.yml | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a435de4..80661fe 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,14 +10,35 @@ image: Visual Studio 2017
 dotnet_csproj:
   patch: true
   file: '**\*.csproj'
-  version: '{version}'
-  package_version: '{version}'
-  assembly_version: '{version}'
-  file_version: '{version}'
-  informational_version: '{version}'
+  version: '{assembly_version}'
+  package_version: '{package_version}'
+  assembly_version: '{assembly_version}'
+  file_version: '{assembly_version}'
+  informational_version: '{package_version}'
+environment:  
+  # Set library version 
+  major: 2
+  minor: 1 
+  patch: 2 
 init:
   # Good practise, because Windows line endings are different from Unix/Linux ones
   - cmd: git config --global core.autocrlf true
+  # Build version strings
+  - ps: |
+      $build = "$Env:APPVEYOR_BUILD_NUMBER"
+      $assembly_version = "$Env:major.$Env:minor.$Env:patch.0"
+
+      If ($Env:APPVEYOR_REPO_TAG -eq "true")
+      {
+          $package_version = "$($assembly_version)"
+      }
+      Else
+      {
+          $package_version = "$($assembly_version)-beta.$($build)"
+      }
+
+      Set-AppveyorBuildVariable -Name "assembly_version" -Value $assembly_version
+      Set-AppveyorBuildVariable -Name "package_version" -Value $package_version
 install:
   # Install repo specific stuff here
 before_build:

From c0e6dcd02d06e7cf9aaff68ff1c8f976f8c7518c Mon Sep 17 00:00:00 2001
From: Chris Wood <chris@flipbit.co.uk>
Date: Tue, 21 May 2019 04:57:08 +0100
Subject: [PATCH 2/4] Print verion numbers

---
 appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 80661fe..ef5d4c8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,6 +39,9 @@ init:
 
       Set-AppveyorBuildVariable -Name "assembly_version" -Value $assembly_version
       Set-AppveyorBuildVariable -Name "package_version" -Value $package_version
+
+      Write-Host "Using Assembly Version: $($assembly_version)"
+      Write-Host "Using Package Version: $($package_version)"
 install:
   # Install repo specific stuff here
 before_build:

From 5bbe5358edba11b369ebc9d6ea9cc661fea8b958 Mon Sep 17 00:00:00 2001
From: Chris Wood <chris@flipbit.co.uk>
Date: Tue, 21 May 2019 05:02:09 +0100
Subject: [PATCH 3/4] Escape appveyor package stage

---
 appveyor.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ef5d4c8..3e4604a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,11 +10,11 @@ image: Visual Studio 2017
 dotnet_csproj:
   patch: true
   file: '**\*.csproj'
-  version: '{assembly_version}'
-  package_version: '{package_version}'
-  assembly_version: '{assembly_version}'
-  file_version: '{assembly_version}'
-  informational_version: '{package_version}'
+  version: '$(assembly_version)'
+  package_version: '$(package_version)'
+  assembly_version: '$(assembly_version)'
+  file_version: '$(assembly_version)'
+  informational_version: '$(package_version)'
 environment:  
   # Set library version 
   major: 2

From e4317e6370314573227773993f15b7e92a72cc43 Mon Sep 17 00:00:00 2001
From: Chris Wood <chris@flipbit.co.uk>
Date: Tue, 21 May 2019 05:12:31 +0100
Subject: [PATCH 4/4] Add project PackageVersion element

---
 Tokenizer/Tokenizer.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Tokenizer/Tokenizer.csproj b/Tokenizer/Tokenizer.csproj
index c7ddc1d..e7d1d6d 100644
--- a/Tokenizer/Tokenizer.csproj
+++ b/Tokenizer/Tokenizer.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-   <Version>2.1.0.0</Version>
+   <Version>2.1.0.1</Version>
+   <PackageVersion>2.1.0.1-beta</PackageVersion>
    <Authors>Chris Wood</Authors>
    <Company>flipbit.co.uk</Company>
    <PackageProjectUrl>http://github.com/flipbit/tokenizer</PackageProjectUrl>