Merge pull request #3749 from BinToss/fix-schemas

fix(GitVersion.Core, GitVersion.Schema): improve implementation of Types and JSON keywords in GitVersion.Configuration.json

Author: arturcic

build.ps1

@@ -43,13 +43,30 @@ $Arguments = @{
     exclusive=$Exclusive;
     nuget_useinprocessclient=$true;
 }.GetEnumerator() | ForEach-Object {
-    if ($_.value -ne "") { "--{0}=`"{1}`"" -f $_.key, $_.value }
+    if ($($_.Key -ceq "dryrun") -or ($_.Key -ceq "exclusive")) {
+        if ($_.Value -eq $true) {
+            # switches must not be assigned true or false, but must be passed to indicate true.
+            "--{0}" -f $_.Key
+        }
+    }
+    else {
+        if ($_.Value -cne "") {
+            if ($_.Value -as [string] -contains " ") {
+                $_.Value = "$($_.Value)" # if it contains spaces, enclose it.
+            }
+            "--{0}={1}" -f $_.Key, $_.Value
+        }
+    }
 };
 
+$Arguments | Join-String -Separator " " | Write-Verbose
+
 # Start Cake
 Write-Host "Running build stage $Stage..."
 
-& dotnet run --project build/$Stage/$Stage.csproj -- $Arguments $ScriptArgs
+$cmdline = "& dotnet run --project build/$Stage/$Stage.csproj -- $Arguments $ScriptArgs"
+Write-Verbose $cmdline
+Invoke-Command -ScriptBlock ([scriptblock]::Create($cmdline))
 
 if ($env:APPVEYOR) {
     $host.SetShouldExit($LASTEXITCODE)

build/common/Lifetime/BuildLifetimeBase.cs

@@ -30,12 +30,11 @@ public override void Setup(T context, ISetupContext info)
             context.Information("Running BuildPrepare...");
             return;
         }
-        var gitVersionTool = context.GetGitVersionDotnetToolLocation();
         var gitVersionSettings = new GitVersionSettings
         {
             OutputTypes = new() { GitVersionOutput.Json, GitVersionOutput.BuildServer },
             ToolPath = context.Tools.Resolve(new[] { "dotnet.exe", "dotnet" }),
-            ArgumentCustomization = args => args.Prepend(gitVersionTool!.FullPath)
+            ArgumentCustomization = args => args.Prepend(context.GetGitVersionDotnetToolLocation()?.FullPath ?? throw new FileNotFoundException("Failed to locate the Release build of gitversion.dll in ./tools/gitversion. Try running \"./build.ps1 -Stage build -Target BuildPrepare\""))
         };
 
         var gitVersion = context.GitVersion(gitVersionSettings);