Update GitVersion.Tool to v6 (#717)

* Update GitVersion.Tool to v6
* Update configuration
* Fix calculating version information

+semver:patch

Author: hazzik

GitVersion.yml

@@ -1,2 +1,2 @@
 assembly-versioning-scheme: MajorMinor
-mode: ContinuousDeployment
+mode: ContinuousDelivery

build.cake

@@ -1,6 +1,6 @@
 #addin "nuget:?package=Cake.FileHelpers&version=7.0.0"
 #tool "dotnet:?package=GitReleaseManager.Tool&version=0.18.0"
-#tool "dotnet:?package=GitVersion.Tool&version=5.12.0"
+#tool "dotnet:?package=GitVersion.Tool&version=6.0.4"
 
 #load "./build/parameters.cake"
 
@@ -108,21 +108,21 @@ Task("Copy-Files")
         PublishProjects(
             SrcProjects, "net461",
             parameters.Paths.Directories.ArtifactsBinFullFx.FullPath, 
-            parameters.Version.DotNetAsterix, 
+            parameters.Version.VersionSuffix, 
             parameters.Configuration, 
             msBuildSettings
         );
         PublishProjects(
             SrcProjects, "netstandard2.0",
             parameters.Paths.Directories.ArtifactsBinNetStandard20.FullPath, 
-            parameters.Version.DotNetAsterix, 
+            parameters.Version.VersionSuffix, 
             parameters.Configuration, 
             msBuildSettings
         );
         PublishProjects(
             SrcProjects, "netcoreapp2.0",
             parameters.Paths.Directories.ArtifactsBinNetCoreApp2.FullPath, 
-            parameters.Version.DotNetAsterix, 
+            parameters.Version.VersionSuffix, 
             parameters.Configuration, 
             msBuildSettings
         );

build/version.cake

@@ -2,7 +2,7 @@ public class BuildVersion
 {
     public string Version { get; private set; }
     public string SemVersion { get; private set; }
-    public string DotNetAsterix { get; private set; }
+    public string VersionSuffix { get; private set; }
     public string Milestone { get; private set; }
     public string AppVersion { get; private set; }
     public string AssemblyVersion { get; private set; }
@@ -20,6 +20,7 @@ public class BuildVersion
         string assemblyVersion = null;
         string informationalVersion = null;
         string milestone = null;
+        string preReleaseTag = null;
 
         context.Information("Calculating Semantic Version");
         if (!parameters.IsLocalBuild || parameters.IsPublishBuild || parameters.IsReleaseBuild)
@@ -30,7 +31,8 @@ public class BuildVersion
             });
 
             version = context.EnvironmentVariable("GitVersion_MajorMinorPatch");
-            semVersion = context.EnvironmentVariable("GitVersion_LegacySemVerPadded");
+            semVersion = context.EnvironmentVariable("GitVersion_SemVer");
+            preReleaseTag = context.EnvironmentVariable("GitVersion_PreReleaseTag");
             assemblyVersion = context.EnvironmentVariable("GitVersion_AssemblySemVer");
             informationalVersion = context.EnvironmentVariable("GitVersion_InformationalVersion");
             milestone = string.Concat("v", version);
@@ -42,7 +44,8 @@ public class BuildVersion
         });
 
         version = assertedVersions.MajorMinorPatch;
-        semVersion = assertedVersions.LegacySemVerPadded;
+        semVersion = assertedVersions.SemVer;
+        preReleaseTag = assertedVersions.PreReleaseTag;
         assemblyVersion = assertedVersions.AssemblySemVer;
         informationalVersion = assertedVersions.InformationalVersion;
         milestone = string.Concat("v", version);
@@ -55,7 +58,7 @@ public class BuildVersion
         {
             Version = version,
             SemVersion = semVersion,
-            DotNetAsterix = semVersion.Substring(version.Length).TrimStart('-'),
+            VersionSuffix = preReleaseTag,
             Milestone = milestone,
             AppVersion = appVersion,
             AssemblyVersion = assemblyVersion,