GH-1717 - Fix the version numbers for beta versions of GitVersion

Author: arturcic

build.cake

@@ -352,7 +352,8 @@ Task("Pack-Nuget")
 
             var nugetSettings = new NuGetPackSettings
             {
-                Version = parameters.Version.SemVersion,
+                Version = parameters.Version.NugetVersion,
+                NoPackageAnalysis = true,
                 OutputDirectory = parameters.Paths.Directories.NugetRoot,
                 Files = GetFiles(artifactPath + "/**/*.*")
                         .Select(file => new NuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") })

build/artifacts.cake

@@ -6,12 +6,12 @@ public class BuildPackages
 
     public static BuildPackages GetPackages(
         DirectoryPath nugetRooPath,
-        string semVersion,
+        BuildVersion version,
         string[] packageIds,
         string[] chocolateyPackageIds)
     {
-        var toNugetPackage = BuildPackage(nugetRooPath, semVersion);
-        var toChocolateyPackage = BuildPackage(nugetRooPath, semVersion, isChocolateyPackage: true);
+        var toNugetPackage = BuildPackage(nugetRooPath, version.NugetVersion);
+        var toChocolateyPackage = BuildPackage(nugetRooPath, version.SemVersion, isChocolateyPackage: true);
         var nugetPackages = packageIds.Select(toNugetPackage).ToArray();
         var chocolateyPackages = chocolateyPackageIds.Select(toChocolateyPackage).ToArray();
 

build/parameters.cake

@@ -107,7 +107,7 @@ public class BuildParameters
 
         Packages = BuildPackages.GetPackages(
             Paths.Directories.NugetRoot,
-            Version.SemVersion,
+            Version,
             new [] { "GitVersion.CommandLine.DotNetCore", "GitVersion.CommandLine", "GitVersionCore", "GitVersionTask", "GitVersion.Tool" },
             new [] { "GitVersion.Portable" });
 
@@ -139,8 +139,9 @@ public class BuildParameters
         var msBuildSettings = new DotNetCoreMSBuildSettings()
                                 .WithProperty("Version", version.SemVersion)
                                 .WithProperty("AssemblyVersion", version.Version)
-                                .WithProperty("PackageVersion", version.SemVersion)
-                                .WithProperty("FileVersion", version.Version);
+                                .WithProperty("PackageVersion", version.NugetVersion)
+                                .WithProperty("FileVersion", version.Version)
+                                .WithProperty("NoPackageAnalysis", "true");
 
         if(!IsRunningOnWindows)
         {

build/version.cake

@@ -5,27 +5,31 @@ public class BuildVersion
     public string Milestone { get; private set; }
     public string SemVersion { get; private set; }
     public string GemVersion { get; private set; }
+    public string NugetVersion { get; private set; }
     public string VsixVersion { get; private set; }
 
     public static BuildVersion Calculate(ICakeContext context, BuildParameters parameters, GitVersion gitVersion)
     {
         var version = gitVersion.MajorMinorPatch;
         var semVersion = gitVersion.LegacySemVer;
+        var nugetVersion = gitVersion.LegacySemVer;
         var vsixVersion = gitVersion.MajorMinorPatch;
 
         if (!string.IsNullOrWhiteSpace(gitVersion.BuildMetaData)) {
             semVersion += "-" + gitVersion.BuildMetaData;
+            nugetVersion += "." + gitVersion.BuildMetaData;
             vsixVersion += "." + DateTime.UtcNow.ToString("yyMMddHHmm");
         }
 
         return new BuildVersion
         {
-            GitVersion = gitVersion,
-            Milestone  = version,
-            Version    = version,
-            SemVersion = semVersion,
-            GemVersion = semVersion.Replace("-", "."),
-            VsixVersion = vsixVersion,
+            GitVersion   = gitVersion,
+            Milestone    = version,
+            Version      = version,
+            SemVersion   = semVersion,
+            GemVersion   = semVersion.Replace("-", "."),
+            NugetVersion = nugetVersion,
+            VsixVersion  = vsixVersion,
         };
     }
 }