Merge branch 'master' into feature/1469-dotnet-version-variable

README.md

@@ -24,8 +24,8 @@ works out the [semantic version][semver] of the commit being built.
 |                 **Docker DotnetCore** |   [Dotnetcore][dockerhub-dotnetcore]      |                      -                    |
 |                     **Docker FullFX** |   [FullFX][dockerhub-fullfx]              |                      -                    |
 
-
 ## Compatibility
+
 GitVersion works on Mac, Linux with Mono and Windows.
 
 Tip: If you get `System.TypeInitializationException: The type initializer for
@@ -35,23 +35,26 @@ System.DllNotFoundException: lib/linux/x86_64/libgit2-baa87df.so`
 You likely need to install `libcurl3`. Run `sudo apt-get install libcurl3`
 
 ## Quick Links
- - [Documentation][docs]
- - [Contributing][contribute]
- - [Why GitVersion][why]
- - [Usage][usage]
- - [How it works][how]
- - [FAQ][faq]
- - [Who is using GitVersion][who]
+
+- [Documentation][docs]
+- [Contributing][contribute]
+- [Why GitVersion][why]
+- [Usage][usage]
+- [How it works][how]
+- [FAQ][faq]
+- [Who is using GitVersion][who]
 
 ## GitVersion in action!
+
 ![README][gv-in-action]
 
 You are seeing:
 
- - Pull requests being built as pre-release builds
- - A branch called `release-1.0.0` producing beta v1 packages
+- Pull requests being built as pre-release builds
+- A branch called `release-1.0.0` producing beta v1 packages
 
 ## Icon
+
 <a href="http://thenounproject.com/noun/tree/#icon-No13389"
 target="_blank">Tree</a> designed by <a
 href="http://thenounproject.com/david.chapman" target="_blank">David Chapman</a>

build.cake

@@ -25,8 +25,6 @@
 BuildParameters parameters = BuildParameters.GetParameters(Context);
 bool publishingError = false;
 DotNetCoreMSBuildSettings msBuildSettings = null;
-
-string dotnetVersion = "net40";
 GitVersion gitVersion = null;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -36,7 +34,7 @@ GitVersion gitVersion = null;
 Setup(context =>
 {
     Build(parameters.Configuration, null);
-    gitVersion = GetVersion(dotnetVersion);
+    gitVersion = GetVersion(parameters);
     parameters.Initialize(context, gitVersion);
 
     // Increase verbosity?
@@ -76,6 +74,12 @@ Teardown(context =>
 {
     Information("Starting Teardown...");
 
+    Information("Repository info : IsMainRepo {0}, IsMainBranch {1}, IsTagged: {2}, IsPullRequest: {3}",
+        parameters.IsMainRepo,
+        parameters.IsMainBranch,
+        parameters.IsTagged,
+        parameters.IsPullRequest);
+
     if(context.Successful)
     {
         // if(parameters.ShouldPublish)
@@ -113,7 +117,7 @@ Teardown(context =>
 Task("Clean")
     .Does(() =>
 {
-    Information("Cleaning direcories..");
+    Information("Cleaning directories..");
 
     CleanDirectories("./src/**/bin/" + parameters.Configuration);
     CleanDirectories("./src/**/obj");
@@ -200,7 +204,7 @@ Task("Copy-Files")
     // .NET Core
     DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", new DotNetCorePublishSettings
     {
-        Framework = "netcoreapp2.0",
+        Framework = parameters.NetCoreVersion,
         NoRestore = true,
         Configuration = parameters.Configuration,
         OutputDirectory = netCoreDir,
@@ -209,12 +213,12 @@ Task("Copy-Files")
 
     // Copy license & Copy GitVersion.XML (since publish does not do this anymore)
     CopyFileToDirectory("./LICENSE", netCoreDir);
-    CopyFileToDirectory("./src/GitVersionExe/bin/" + parameters.Configuration + "/netcoreapp2.0/GitVersion.xml", netCoreDir);
+    CopyFileToDirectory($"./src/GitVersionExe/bin/{parameters.Configuration}/{parameters.NetCoreVersion}/GitVersion.xml", netCoreDir);
 
     // .NET 4.0
     DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", new DotNetCorePublishSettings
     {
-        Framework = dotnetVersion,
+        Framework = parameters.FullFxVersion,
         NoBuild = true,
         NoRestore = true,
         Configuration = parameters.Configuration,
@@ -227,9 +231,9 @@ Task("Copy-Files")
     var cmdlineDir = parameters.Paths.Directories.ArtifactsBinFullFxCmdline.Combine("tools");
 
     // Portable
-    PublishILRepackedGitVersionExe(true, parameters.Paths.Directories.ArtifactsBinFullFx, ilMergDir, portableDir, parameters.Configuration, dotnetVersion);
+    PublishILRepackedGitVersionExe(true, parameters.Paths.Directories.ArtifactsBinFullFx, ilMergDir, portableDir, parameters.Configuration, parameters.FullFxVersion);
     // Commandline
-    PublishILRepackedGitVersionExe(false, parameters.Paths.Directories.ArtifactsBinFullFx, ilMergDir, cmdlineDir, parameters.Configuration, dotnetVersion);
+    PublishILRepackedGitVersionExe(false, parameters.Paths.Directories.ArtifactsBinFullFx, ilMergDir, cmdlineDir, parameters.Configuration, parameters.FullFxVersion);
 
     // Vsix
     var tfsPath = new DirectoryPath("./src/GitVersionTfsTask/GitVersionTask");

build/parameters.cake

@@ -8,13 +8,16 @@ public class BuildParameters
     public string Target { get; private set; }
     public string Configuration { get; private set; }
 
+    public string NetCoreVersion { get; private set; } = "netcoreapp2.0";
+    public string FullFxVersion { get; private set; } = "net40";
+
     public bool EnabledUnitTests { get; private set; }
+    public bool EnabledSetVersion { get; private set; }
     public bool EnabledPublishGem { get; private set; }
     public bool EnabledPublishTfs { get; private set; }
     public bool EnabledPublishNuget { get; private set; }
     public bool EnabledPublishChocolatey { get; private set; }
     public bool EnabledPublishDocker { get; private set; }
-    public bool EnabledPullRequestPublish { get; private set; }
 
     public bool IsRunningOnUnix { get; private set; }
     public bool IsRunningOnWindows { get; private set; }
@@ -58,6 +61,7 @@ public class BuildParameters
             Configuration = context.Argument("configuration", "Release"),
 
             EnabledUnitTests          = IsEnabled(context, "ENABLED_UNIT_TESTS"),
+            EnabledSetVersion         = IsEnabled(context, "ENABLED_SET_VERSION"),
             EnabledPublishGem         = IsEnabled(context, "ENABLED_PUBLISH_GEM"),
             EnabledPublishTfs         = IsEnabled(context, "ENABLED_PUBLISH_TFS"),
             EnabledPublishNuget       = IsEnabled(context, "ENABLED_PUBLISH_NUGET"),

build/utils.cake

@@ -47,9 +47,9 @@ void SetRubyGemPushApiKey(string apiKey)
     CopyFileToDirectory(credentialFile, gemHomeDir);
 }
 
-GitVersion GetVersion(string dotnetVersion)
+GitVersion GetVersion(BuildParameters parameters)
 {
-    var dllFile = GetFiles("**/netcoreapp2.0/GitVersion.dll").FirstOrDefault();
+    var dllFile = GetFiles($"**/{parameters.NetCoreVersion}/GitVersion.dll").FirstOrDefault();
     var settings = new GitVersionSettings
     {
         OutputType = GitVersionOutput.Json,
@@ -59,12 +59,14 @@ GitVersion GetVersion(string dotnetVersion)
 
     var gitVersion = GitVersion(settings);
 
-    settings.UpdateAssemblyInfo = true;
-    settings.LogFilePath = "console";
-    settings.OutputType = GitVersionOutput.BuildServer;
-
-    GitVersion(settings);
+    if (parameters.EnabledSetVersion)
+    {
+        settings.UpdateAssemblyInfo = true;
+        settings.LogFilePath = "console";
+        settings.OutputType = GitVersionOutput.BuildServer;
 
+        GitVersion(settings);
+    }
     return gitVersion;
 }
 
@@ -173,6 +175,7 @@ string[] GetDockerTags(string platform, string variant, BuildParameters paramete
     var name = $"gittools/gitversion-{variant}";
 
     var tags = new List<string> {
+        $"{name}:{platform}",
         $"{name}:{platform}-{parameters.Version.Version}"
     };
 

build/version.cake

@@ -7,10 +7,10 @@ public class BuildVersion
     public static BuildVersion Calculate(ICakeContext context, BuildParameters parameters, GitVersion gitVersion)
     {
         var version = gitVersion.MajorMinorPatch;
-        var semVersion = gitVersion.LegacySemVerPadded;
+        var semVersion = gitVersion.LegacySemVer;
 
-        if (!string.IsNullOrWhiteSpace(gitVersion.BuildMetaDataPadded)) {
-            semVersion += "-" + gitVersion.BuildMetaDataPadded;
+        if (!string.IsNullOrWhiteSpace(gitVersion.BuildMetaData)) {
+            semVersion += "-" + gitVersion.BuildMetaData;
         }
 
         return new BuildVersion

src/GitVersionTfsTask/GitVersion.ts

@@ -1,7 +1,6 @@
 import tl = require('vsts-task-lib/task');
 import { IExecOptions, ToolRunner } from 'vsts-task-lib/toolrunner';
 import path = require('path');
-import q = require('q');
 import os = require('os');
 
 var updateAssemblyInfo = tl.getBoolInput('updateAssemblyInfo');