(build) re-enable dogfooding

Author: arturcic

build.cake

@@ -24,7 +24,6 @@
 // Install .NET Core Global tools.
 #tool "dotnet:?package=Codecov.Tool&version=1.7.2"
 #tool "dotnet:?package=GitReleaseManager.Tool&version=0.9.0"
-#tool "dotnet:?package=GitVersion.Tool&version=5.1.2"
 
 // Load other scripts.
 #load "./build/utils/parameters.cake"

build/pack.cake

@@ -20,6 +20,7 @@ Task("Build")
     .Does<BuildParameters>((parameters) =>
 {
     Build(parameters);
+    PublishGitVersionToArtifacts(parameters);
 
     RunGitVersionOnCI(parameters);
 });
@@ -66,24 +67,7 @@ Task("Pack-Prepare")
         DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", settings);
     }
 
-    var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion30, parameters.FullFxVersion472 };
-
-    // publish Framework-dependent deployment
-    foreach(var framework in frameworks)
-    {
-        var settings = new DotNetCorePublishSettings
-        {
-            Framework = framework,
-            NoRestore = false,
-            Configuration = parameters.Configuration,
-            OutputDirectory = parameters.Paths.Directories.ArtifactsBin.Combine(framework),
-            MSBuildSettings = parameters.MSBuildSettings,
-        };
-
-        DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", settings);
-    }
-
-    frameworks = new[] { parameters.CoreFxVersion21, parameters.FullFxVersion472 };
+    var frameworks = new[] { parameters.CoreFxVersion21, parameters.FullFxVersion472 };
 
     // MsBuild Task
     foreach(var framework in frameworks)

build/utils/utils.cake

@@ -110,7 +110,10 @@ GitVersion GetVersion(BuildParameters parameters)
     GitVersion gitVersion = null;
     if (gitversionFile == null)
     {
+        Build(parameters);
+
         var settings = new GitVersionSettings { OutputType = GitVersionOutput.Json };
+        SetGitVersionTool(settings, parameters, "src/GitVersionExe/**");
 
         gitVersion = GitVersion(settings);
         SerializeJsonToPrettyFile(gitversionFilePath, gitVersion);
@@ -134,11 +137,42 @@ void RunGitVersionOnCI(BuildParameters parameters)
             LogFilePath = "console",
             OutputType = GitVersionOutput.BuildServer
         };
+        SetGitVersionTool(settings, parameters, "artifacts/**/bin");
 
         GitVersion(settings);
     }
 }
 
+GitVersionSettings SetGitVersionTool(GitVersionSettings settings, BuildParameters parameters, string toolPath)
+{
+    var gitversionTool = GetFiles($"{toolPath}/{parameters.CoreFxVersion30}/GitVersion.dll").FirstOrDefault();
+
+    settings.ToolPath = Context.FindToolInPath(IsRunningOnUnix() ? "dotnet" : "dotnet.exe");
+    settings.ArgumentCustomization = args => gitversionTool + " " + args.Render();
+
+    return settings;
+}
+
+void PublishGitVersionToArtifacts(BuildParameters parameters)
+{
+    var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion30, parameters.FullFxVersion472 };
+
+    // publish Framework-dependent deployment
+    foreach(var framework in frameworks)
+    {
+        var settings = new DotNetCorePublishSettings
+        {
+            Framework = framework,
+            NoRestore = false,
+            Configuration = parameters.Configuration,
+            OutputDirectory = parameters.Paths.Directories.ArtifactsBin.Combine(framework),
+            MSBuildSettings = parameters.MSBuildSettings,
+        };
+
+        DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", settings);
+    }
+}
+
 void Build(BuildParameters parameters)
 {
     var sln = "./src/GitVersion.sln";