improved versioning for build artifacts

Author: arturcic

build/artifacts.cake

@@ -24,13 +24,13 @@ public class BuildPackages
 
     private static Func<string, BuildPackage> BuildPackage(
         DirectoryPath nugetRooPath,
-        string semVersion,
+        string version,
         bool isChocolateyPackage = false)
     {
         return package => new BuildPackage(
             id: package,
             nuspecPath: string.Concat("./nuspec/", package, ".nuspec"),
-            packagePath: nugetRooPath.CombineWithFilePath(string.Concat(package, ".", semVersion, ".nupkg")),
+            packagePath: nugetRooPath.CombineWithFilePath(string.Concat(package, ".", version, ".nupkg")),
             isChocolateyPackage: isChocolateyPackage);
     }
 }

build/paths.cake

@@ -42,7 +42,7 @@ public class BuildPaths
         var vsixVersion = version.DotNetVersion;
         var vsixOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-" + vsixVersion + ".vsix");
 
-        var gemVersion = version.SemVersion.Replace("-", ".pre.");
+        var gemVersion = version.SemVersion.Replace("-", ".");
         var gemOutputFilePath  = buildArtifactDir.CombineWithFilePath("gitversion-" + gemVersion + ".gem");
 
         // Directories

build/utils.cake

@@ -193,9 +193,7 @@ string[] GetDockerTags(GitVersion gitVersion, string platform, string variant, b
         $"{name}:{platform}-{gitVersion.LegacySemVerPadded}"
     };
 
-    if (!string.IsNullOrWhiteSpace(gitVersion.BuildMetaDataPadded)) {
-        tags.Add($"{name}:{platform}-{gitVersion.LegacySemVerPadded}.{gitVersion.BuildMetaDataPadded}");
-    }
+    tags.Add($"{name}:{platform}-{gitVersion.LegacySemVerPadded}-{gitVersion.CommitsSinceVersionSource}");
 
     if (variant == "dotnetcore" && isStableRelease) {
         tags.Add($"{name}:latest");

build/version.cake

@@ -14,7 +14,7 @@ public class BuildVersion
         var semVersion = gitVersion.LegacySemVerPadded;
         var dotnetVersion = version;
 
-        semVersion += "." + gitVersion.CommitsSinceVersionSource;
+        semVersion += "-" + gitVersion.CommitsSinceVersionSource;
         dotnetVersion += "." + gitVersion.CommitsSinceVersionSource;
 
         return new BuildVersion

run.cake

@@ -59,7 +59,7 @@ Setup(context =>
     msBuildSettings = new DotNetCoreMSBuildSettings()
                             .WithProperty("Version", parameters.Version.SemVersion)
                             .WithProperty("AssemblyVersion", parameters.Version.Version)
-                            .WithProperty("PackageVersion", parameters.Version.NuGetVersion)
+                            .WithProperty("PackageVersion", parameters.Version.SemVersion)
                             .WithProperty("FileVersion", parameters.Version.Version);
 
     if(!parameters.IsRunningOnWindows)
@@ -285,7 +285,7 @@ Task("Pack-Gem")
 
     var gemspecFile = new FilePath(workDir + "/gitversion.gemspec");
     // update version number
-    ReplaceTextInFile(gemspecFile, "$version$", parameters.Version.SemVersion);
+    ReplaceTextInFile(gemspecFile, "$version$", parameters.Version.SemVersion.Replace("-", "."));
 
     var toolPath = FindToolInPath(IsRunningOnWindows() ? "gem.cmd" : "gem");
     GemBuild(gemspecFile, new Cake.Gem.Build.GemBuildSettings()
@@ -306,7 +306,7 @@ Task("Pack-Nuget")
         if (FileExists(package.NuspecPath)) {
             var nugetSettings = new NuGetPackSettings
             {
-                Version = parameters.Version.NuGetVersion,
+                Version = parameters.Version.SemVersion,
                 BasePath = parameters.PackagesBuildMap[package.Id],
                 OutputDirectory = parameters.Paths.Directories.NugetRoot,
             };
@@ -342,7 +342,7 @@ Task("Pack-Chocolatey")
 
             ChocolateyPack(package.NuspecPath, new ChocolateyPackSettings {
                 Verbose = true,
-                Version = parameters.Version.NuGetVersion,
+                Version = parameters.Version.SemVersion,
                 OutputDirectory = parameters.Paths.Directories.NugetRoot,
                 Files = GetFiles(artifactPath + "/**/*.*")
                         .Select(file => new ChocolateyNuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") })
@@ -392,6 +392,19 @@ Task("Pack")
     .IsDependentOn("Pack-Nuget")
     .IsDependentOn("Pack-Chocolatey")
     .IsDependentOn("Zip-Files")
+    .Does(() =>
+{
+    Information("The build artifacts: \n");
+    foreach(var artifact in parameters.Artifacts.All)
+    {
+        if (FileExists(artifact.ArtifactPath)) { Information("Artifact: {0}", artifact.ArtifactPath); }
+    }
+
+    foreach(var package in parameters.Packages.All)
+    {
+        if (FileExists(package.PackagePath)) { Information("Artifact: {0}", package.PackagePath); }
+    }
+})
     .ReportError(exception =>
 {
     Error(exception.Dump());