diff --git a/GitVersion.yml b/GitVersion.yml
new file mode 100644
index 0000000..39da81b
--- /dev/null
+++ b/GitVersion.yml
@@ -0,0 +1,8 @@
+assembly-versioning-scheme: Major
+mode: Mainline
+increment: Patch
+next-version: 1.2.0
+branches:
+  master:
+    tag: alpha
+    prevent-increment-of-merged-branch-version: true
diff --git a/ServerHost.sln b/ServerHost.sln
index 5e23f1c..a89b2c2 100644
--- a/ServerHost.sln
+++ b/ServerHost.sln
@@ -19,6 +19,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 1b19800..71846c1 100644
--- a/ServerHost/ServerHost.csproj
+++ b/ServerHost/ServerHost.csproj
@@ -11,7 +11,7 @@
 
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.1.18</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>
@@ -21,7 +21,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' OR '$(OS)' != 'Windows_NT'">
@@ -51,6 +51,12 @@
     <PackageReference Include="log4net" Version="2.0.8" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <PackageReference Include="GitVersionTask" Version="4.0.0">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(Configuration)' == 'Release' ">
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01">
       <PrivateAssets>all</PrivateAssets>