(build) use DotNetCoreBuild extension instead of MSBuild

Author: arturcic

build/pack.cake

@@ -20,7 +20,7 @@ Task("Build")
     .Does<BuildParameters>((parameters) =>
 {
     // build .Net code
-    Build(parameters.Configuration);
+    Build(parameters);
 
     var workDir = "./src/GitVersionVsixTask";
     // build typescript code

build/utils/parameters.cake

@@ -102,6 +102,8 @@ public class BuildParameters
             IsMainRepo    = IsOnMainRepo(context),
             IsMainBranch  = IsOnMainBranch(context),
             IsTagged      = IsBuildTagged(context),
+
+            MSBuildSettings = GetMsBuildSettings(context)
         };
     }
 
@@ -136,20 +138,13 @@ public class BuildParameters
         };
 
         Credentials = BuildCredentials.GetCredentials(context);
-
-        MSBuildSettings = GetMsBuildSettings(context, Version);
+        SetMSBuildSettingsVersion(MSBuildSettings, Version);
     }
 
-    private DotNetCoreMSBuildSettings GetMsBuildSettings(ICakeContext context, BuildVersion version)
+    private static DotNetCoreMSBuildSettings GetMsBuildSettings(ICakeContext context)
     {
-        var msBuildSettings = new DotNetCoreMSBuildSettings()
-                                .WithProperty("Version", version.SemVersion)
-                                .WithProperty("AssemblyVersion", version.Version)
-                                .WithProperty("PackageVersion", version.NugetVersion)
-                                .WithProperty("FileVersion", version.Version)
-                                .WithProperty("NoPackageAnalysis", "true");
-
-        if(!IsRunningOnWindows)
+        var msBuildSettings = new DotNetCoreMSBuildSettings();
+        if(!context.IsRunningOnWindows())
         {
             var frameworkPathOverride = context.Environment.Runtime.IsCoreClr
                                         ?   new []{
@@ -165,11 +160,21 @@ public class BuildParameters
             // Use FrameworkPathOverride when not running on Windows.
             context.Information("Build will use FrameworkPathOverride={0} since not building on Windows.", frameworkPathOverride);
             msBuildSettings.WithProperty("FrameworkPathOverride", frameworkPathOverride);
+            msBuildSettings.WithProperty("POSIX", "true");
         }
 
         return msBuildSettings;
     }
 
+    private void SetMSBuildSettingsVersion(DotNetCoreMSBuildSettings msBuildSettings, BuildVersion version)
+    {
+        msBuildSettings.WithProperty("Version", version.SemVersion);
+        msBuildSettings.WithProperty("AssemblyVersion", version.Version);
+        msBuildSettings.WithProperty("PackageVersion", version.NugetVersion);
+        msBuildSettings.WithProperty("FileVersion", version.Version);
+        msBuildSettings.WithProperty("NoPackageAnalysis", "true");
+    }
+
     private static bool IsOnMainRepo(ICakeContext context)
     {
         var buildSystem = context.BuildSystem();

build/utils/utils.cake

@@ -41,7 +41,7 @@ GitVersion GetVersion(BuildParameters parameters)
     if (dllFile == null)
     {
         Warning("Dogfood GitVersion to get information");
-        Build(parameters.Configuration);
+        Build(parameters);
         dllFilePath = $"./src/GitVersionExe/bin/{parameters.Configuration}/{parameters.CoreFxVersion}/GitVersion.dll";
         dllFile = GetFiles(dllFilePath).FirstOrDefault();
     }
@@ -66,15 +66,23 @@ GitVersion GetVersion(BuildParameters parameters)
     return gitVersion;
 }
 
-void Build(string configuration)
+void Build(BuildParameters parameters)
 {
-    DotNetCoreRestore("./src/GitVersion.sln");
-    MSBuild("./src/GitVersion.sln", settings =>
+    var sln = "./src/GitVersion.sln";
+    DotNetCoreRestore(sln, new DotNetCoreRestoreSettings
     {
-        settings.SetConfiguration(configuration)
-            .SetVerbosity(Verbosity.Minimal)
-            .WithTarget("Build")
-            .WithProperty("POSIX", IsRunningOnUnix().ToString());
+        Verbosity = DotNetCoreVerbosity.Minimal,
+        Sources = new [] { "https://api.nuget.org/v3/index.json" },
+        MSBuildSettings = parameters.MSBuildSettings
+    });
+
+    var slnPath = MakeAbsolute(new DirectoryPath(sln));
+    DotNetCoreBuild(slnPath.FullPath, new DotNetCoreBuildSettings
+    {
+        Verbosity = DotNetCoreVerbosity.Minimal,
+        Configuration = parameters.Configuration,
+        NoRestore = true,
+        MSBuildSettings = parameters.MSBuildSettings
     });
 }