Merge branch 'master' into master

Author: Sergey Chanaev

README.md

@@ -88,9 +88,9 @@ from The Noun Project.
 [dockerhub]:                       https://hub.docker.com/r/gittools/gitversion/
 [dockerhub-badge]:                 https://img.shields.io/docker/pulls/gittools/gitversion.svg?logo=docker
 [az-pipeline-task]:                https://marketplace.visualstudio.com/items?itemName=gittools.gittools
-[az-pipeline-task-badge]:          https://img.shields.io/badge/marketplace-gittools.gittools-blue?logo=visual-studio
-[gh-actions]:                      https://github.com/marketplace/actions/use-actions
-[gh-actions-badge]:                https://img.shields.io/badge/marketplace-use--actions-blue?logo=github
+[az-pipeline-task-badge]:          https://img.shields.io/badge/marketplace-gittools.gittools-blue?logo=azure-pipelines
+[gh-actions]:                      https://github.com/marketplace/actions/gittools
+[gh-actions-badge]:                https://img.shields.io/badge/marketplace-gittools-blue?logo=github
 [contribute]:                      https://github.com/GitTools/GitVersion/blob/master/CONTRIBUTING.md
 [why]:                             https://gitversion.net/docs/why
 [usage]:                           https://gitversion.net/docs/usage/usage

build.ps1

@@ -197,7 +197,9 @@ $Arguments = @{
     nuget_useinprocessclient=$true;
     docker_distro=$DockerDistro;
     docker_dotnetversion=$DockerDotnetVersion;
-}.GetEnumerator() | ForEach-Object { "--{0}=`"{1}`"" -f $_.key, $_.value };
+}.GetEnumerator() | ForEach-Object { 
+    if ($_.value -ne "") { "--{0}=`"{1}`"" -f $_.key, $_.value }
+};
 
 # Start Cake
 Write-Host "Running build script..."

docs/input/docs/build-server-support/build-server/bamboo.md

@@ -19,7 +19,7 @@ a Windows build host using Powershell. The build only needs one of the two.
 
 ```bash
 ~/.dotnet/tools/dotnet-gitversion > gitversion.txt
-sed -i '1d;26d;s/  //;s/"//g;s/,//;s/:/=/' gitversion.txt
+sed -i '1d;$ d;s/  //;s/"//g;s/,//;s/:/=/' gitversion.txt
 ```
 
 ### Task: Script

src/Directory.Build.props

@@ -19,8 +19,8 @@
 
     </PropertyGroup>
     <PropertyGroup>
-        <PackageVersion_LibGit2Sharp>0.27.0-preview-0034</PackageVersion_LibGit2Sharp>
-        <PackageVersion_LibGit2Sharp_NativeBinaries>2.0.298</PackageVersion_LibGit2Sharp_NativeBinaries>
+        <PackageVersion_LibGit2Sharp>0.27.0-preview-0096</PackageVersion_LibGit2Sharp>
+        <PackageVersion_LibGit2Sharp_NativeBinaries>2.0.312</PackageVersion_LibGit2Sharp_NativeBinaries>
 
         <PackageVersion_JetBrainsAnnotations>2020.1.0</PackageVersion_JetBrainsAnnotations>
         <PackageVersion_YamlDotNet>8.1.2</PackageVersion_YamlDotNet>
@@ -35,7 +35,7 @@
         <PackageVersion_GitToolsTesting>1.2.0</PackageVersion_GitToolsTesting>
         <PackageVersion_NUnit3TestAdapter>3.17.0</PackageVersion_NUnit3TestAdapter>
         <PackageVersion_NunitXmlTestLogger>2.1.80</PackageVersion_NunitXmlTestLogger>
-        <PackageVersion_Shouldly>4.0.0</PackageVersion_Shouldly>
+        <PackageVersion_Shouldly>4.0.1</PackageVersion_Shouldly>
 
     </PropertyGroup>
 

src/GitVersionCore.Tests/BuildAgents/BuildServerBaseTests.cs

@@ -53,7 +53,7 @@ public void BuildNumberIsFullSemVer()
 
             writes = new List<string>();
             buildServer.WriteIntegration(writes.Add, variables, false);
-            writes.ShouldBeEmpty();
+            writes.ShouldNotContain(x => x.StartsWith("Executing GenerateSetVersionMessage for "));
         }
 
         private class BuildAgent : BuildAgentBase

src/GitVersionCore.Tests/BuildAgents/GitHubActionsTests.cs

@@ -180,7 +180,7 @@ public void ShouldNotWriteIntegration()
             // Act
             buildServer.WriteIntegration(s => { list.Add(s); }, vars, false);
 
-            list.ShouldBeEmpty();
+            list.ShouldNotContain(x => x.StartsWith("Executing GenerateSetVersionMessage for "));
         }
 
         [Test]

src/GitVersionCore/Core/BuildAgentBase.cs

@@ -30,13 +30,16 @@ protected BuildAgentBase(IEnvironment environment, ILog log)
 
         public virtual void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true)
         {
-            if (writer == null || !updateBuildNumber)
+            if (writer == null)
             {
                 return;
             }
 
-            writer($"Executing GenerateSetVersionMessage for '{GetType().Name}'.");
-            writer(GenerateSetVersionMessage(variables));
+            if (updateBuildNumber)
+            {
+                writer($"Executing GenerateSetVersionMessage for '{GetType().Name}'.");
+                writer(GenerateSetVersionMessage(variables));
+            }
             writer($"Executing GenerateBuildLogOutput for '{GetType().Name}'.");
             foreach (var buildParameter in GenerateBuildLogOutput(variables))
             {