From aef0901b9370931ae722c947d0ac0be5dbf6b727 Mon Sep 17 00:00:00 2001
From: jthelin <jthelin@microsoft.com>
Date: Sat, 22 Sep 2018 14:32:58 -0700
Subject: [PATCH] GitVersion

- Use GitVersion to stamp version numbers into assemblies.

https://github.com/GitTools/GitVersion

Use GitVersioning variables to set NuGet package version properties.

Use Mainline versioning policy in GitVersion v4.0.0+.

- Bump next version to 1.2.x for easier reference.

`GitVersionTask` package version=`4.0.1-beta1-47`
---
 GitVersion.yml               | 8 +++++---
 ServerHost.sln               | 1 +
 ServerHost/ServerHost.csproj | 8 ++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/GitVersion.yml b/GitVersion.yml
index b2bd9cd..39da81b 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,6 +1,8 @@
 assembly-versioning-scheme: Major
-mode: ContinuousDelivery
-next-version: 1.1.8
+mode: Mainline
+increment: Patch
+next-version: 1.2.0
 branches:
   master:
-    tag: pre
+    tag: alpha
+    prevent-increment-of-merged-branch-version: true
diff --git a/ServerHost.sln b/ServerHost.sln
index 419dc33..dafe00f 100644
--- a/ServerHost.sln
+++ b/ServerHost.sln
@@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{64DBC33D
 		Build.cmd = Build.cmd
 		Build.sh = Build.sh
 		Clean.cmd = Clean.cmd
+		GitVersion.yml = GitVersion.yml
 		nuget-restore.cmd = nuget-restore.cmd
 		Test.cmd = Test.cmd
 		Test.runsettings = Test.runsettings
diff --git a/ServerHost/ServerHost.csproj b/ServerHost/ServerHost.csproj
index bcf459c..0209a97 100644
--- a/ServerHost/ServerHost.csproj
+++ b/ServerHost/ServerHost.csproj
@@ -11,7 +11,7 @@
 
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.1.17</Version>
+    <Version>$(NuGetVersion)</Version>
     <Authors>Jorgen Thelin</Authors>
     <Copyright>Copyright © Jorgen Thelin 2015-2018</Copyright>
     <Description>ServerHost - A .NET Server Hosting utility library, including in-process server host testing.</Description>
@@ -23,7 +23,7 @@
     <PackageTags>DotNet Server Host Testing AppDomain</PackageTags>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/jthelin/ServerHost.git</RepositoryUrl>
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
+    <AssemblyVersion>$(AssemblySemVer)</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TRAVIS)' == 'true'">
@@ -51,6 +51,10 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="GitVersionTask" Version="4.0.1-beta1-47">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(Configuration)' == 'Release' ">