Update build scripts

Author: augustoproiete

.gitignore

@@ -25,5 +25,4 @@ Thumbs.db
 
 #cake
 .cake/
-/build/*
-/tools/*
+/artifact/

build.cake

@@ -1,17 +1,14 @@
-#addin "nuget:?package=Cake.MinVer&version=1.0.0"
-#addin "nuget:?package=Cake.Args&version=1.0.0"
+#addin "nuget:?package=Cake.MinVer&version=1.0.1"
+#addin "nuget:?package=Cake.Args&version=1.0.1"
 
 var target       = ArgumentOrDefault<string>("target") ?? "pack";
 var buildVersion = MinVer(s => s.WithTagPrefix("v").WithDefaultPreReleasePhase("preview"));
 
 Task("clean")
     .Does(() =>
 {
-    CleanDirectory("./build/artifacts");
-    CleanDirectories("./src/**/bin");
-    CleanDirectories("./src/**/obj");
-    CleanDirectories("./test/**/bin");
-    CleanDirectories("./test/**/obj");
+    CleanDirectories("./artifact/**");
+    CleanDirectories("./**/^{bin,obj}");
 });
 
 Task("restore")
@@ -26,28 +23,18 @@ Task("restore")
 
 Task("build")
     .IsDependentOn("restore")
-    .Does(() =>
+    .DoesForEach(new[] { "Debug", "Release" }, (configuration) =>
 {
     DotNetCoreBuild("./Ookii.Dialogs.Wpf.sln", new DotNetCoreBuildSettings
     {
-        Configuration = "Debug",
-        NoRestore = true,
-        NoIncremental = false,
-        ArgumentCustomization = args =>
-            args.AppendQuoted($"-p:Version={buildVersion.Version}")
-                .AppendQuoted($"-p:FileVersion={buildVersion.FileVersion}")
-                .AppendQuoted($"-p:ContinuousIntegrationBuild=true")
-    });
-
-    DotNetCoreBuild("./Ookii.Dialogs.Wpf.sln", new DotNetCoreBuildSettings
-    {
-        Configuration = "Release",
+        Configuration = configuration,
         NoRestore = true,
         NoIncremental = false,
-        ArgumentCustomization = args =>
-            args.AppendQuoted($"-p:Version={buildVersion.Version}")
-                .AppendQuoted($"-p:FileVersion={buildVersion.FileVersion}")
-                .AppendQuoted($"-p:ContinuousIntegrationBuild=true")
+        MSBuildSettings = new DotNetCoreMSBuildSettings()
+            .WithProperty("Version", buildVersion.Version)
+            .WithProperty("AssemblyVersion", buildVersion.AssemblyVersion)
+            .WithProperty("FileVersion", buildVersion.FileVersion)
+            .WithProperty("ContinuousIntegrationBuild", BuildSystem.IsLocalBuild ? "false" : "true")
     });
 });
 
@@ -82,10 +69,10 @@ Task("pack")
         NoBuild = true,
         IncludeSymbols = true,
         IncludeSource = true,
-        OutputDirectory = "./build/artifacts",
-        ArgumentCustomization = args =>
-            args.AppendQuoted($"-p:Version={buildVersion.Version}")
-                .AppendQuoted($"-p:PackageReleaseNotes={releaseNotes}")
+        OutputDirectory = "./artifact/nuget",
+        MSBuildSettings = new DotNetCoreMSBuildSettings()
+            .WithProperty("Version", buildVersion.Version)
+            .WithProperty("PackageReleaseNotes", releaseNotes)
     });
 
     DotNetCorePack("./src/Ookii.Dialogs/Ookii.Dialogs.csproj", new DotNetCorePackSettings
@@ -95,14 +82,14 @@ Task("pack")
         NoBuild = true,
         IncludeSymbols = false,
         IncludeSource = false,
-        OutputDirectory = "./build/artifacts",
-        ArgumentCustomization = args =>
-            args.AppendQuoted($"-p:Version={buildVersion.Version}")
-                .AppendQuoted($"-p:PackageReleaseNotes={releaseNotes}")
+        OutputDirectory = "./artifact/nuget",
+        MSBuildSettings = new DotNetCoreMSBuildSettings()
+            .WithProperty("Version", buildVersion.Version)
+            .WithProperty("PackageReleaseNotes", releaseNotes)
     });
 });
 
-Task("publish")
+Task("push")
     .IsDependentOn("pack")
     .Does(context =>
 {
@@ -126,7 +113,7 @@ Task("publish")
         ApiKey = apiKey,
     };
 
-    foreach (var nugetPackageFile in GetFiles("./build/artifacts/*.nupkg"))
+    foreach (var nugetPackageFile in GetFiles("./artifact/nuget/*.nupkg"))
     {
         DotNetCoreNuGetPush(nugetPackageFile.FullPath, nugetPushSettings);
     }