use updateBuildNumber configuration, updated tests

Author: arturcic

src/GitVersionCore.Tests/BuildAgents/BuildServerBaseTests.cs

@@ -50,6 +50,10 @@ public void BuildNumberIsFullSemVer()
             buildServer.WriteIntegration(writes.Add, variables);
 
             writes[1].ShouldBe("1.2.3-beta.1+5");
+
+            writes = new List<string>();
+            buildServer.WriteIntegration(writes.Add, variables, false);
+            writes.ShouldBeEmpty();
         }
 
         private class BuildAgent : BuildAgentBase

src/GitVersionCore.Tests/BuildAgents/GitHubActionsTests.cs

@@ -148,6 +148,23 @@ public void ShouldWriteIntegration()
                 .ShouldBe(string.Join(Environment.NewLine, expected));
         }
 
+        [Test]
+        public void ShouldNotWriteIntegration()
+        {
+            // Arrange
+            var vars = new TestableVersionVariables("1.0.0");
+
+            var list = new List<string>();
+
+            // Assert
+            environment.GetEnvironmentVariable("GitVersion_Major").ShouldBeNullOrWhiteSpace();
+
+            // Act
+            buildServer.WriteIntegration(s => { list.Add(s); }, vars, false);
+
+            list.ShouldBeEmpty();
+        }
+
         [Test]
         public void GetEmptyGenerateSetVersionMessage()
         {

src/GitVersionCore.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -123,4 +123,4 @@ ignore:
   sha: []
 commit-date-format: yyyy-MM-dd
 merge-message-formats: {}
-update-build-number: false
+update-build-number: true

src/GitVersionCore/BuildAgents/CodeBuild.cs

@@ -40,7 +40,7 @@ public override string GetCurrentBranch(bool usingDynamicRepos)
             return Environment.GetEnvironmentVariable(EnvironmentVariableName);
         }
 
-        public override void WriteIntegration(Action<string> writer, VersionVariables variables)
+        public override void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true)
         {
             base.WriteIntegration(writer, variables);
             writer($"Outputting variables to '{file}' ... ");

src/GitVersionCore/BuildAgents/GitLabCi.cs

@@ -43,7 +43,7 @@ public override string GetCurrentBranch(bool usingDynamicRepos)
 
         public override bool PreventFetch() => true;
 
-        public override void WriteIntegration(Action<string> writer, VersionVariables variables)
+        public override void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true)
         {
             base.WriteIntegration(writer, variables);
             writer($"Outputting variables to '{file}' ... ");

src/GitVersionCore/BuildAgents/Jenkins.cs

@@ -58,7 +58,7 @@ public override bool ShouldCleanUpRemotes()
             return IsPipelineAsCode();
         }
 
-        public override void WriteIntegration(Action<string> writer, VersionVariables variables)
+        public override void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true)
         {
             base.WriteIntegration(writer, variables);
             writer($"Outputting variables to '{file}' ... ");

src/GitVersionCore/Common/IBuildAgent.cs

@@ -6,7 +6,7 @@ namespace GitVersion
     public interface IBuildAgent
     {
         bool CanApplyToCurrentContext();
-        void WriteIntegration(Action<string> writer, VersionVariables variables);
+        void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true);
         string GetCurrentBranch(bool usingDynamicRepos);
         bool PreventFetch();
         bool ShouldCleanUpRemotes();

src/GitVersionCore/Configuration/ConfigExtensions.cs

@@ -36,7 +36,7 @@ public static void Reset(this Config config)
             config.BuildMetaDataPadding ??= 4;
             config.CommitsSinceVersionSourcePadding ??= 4;
             config.CommitDateFormat ??= "yyyy-MM-dd";
-            config.UpdateBuildNumber ??= false;
+            config.UpdateBuildNumber ??= true;
 
             var configBranches = config.Branches.ToList();
 
@@ -264,7 +264,7 @@ public static EffectiveConfiguration CalculateEffectiveConfiguration(this Config
             var patchMessage = configuration.PatchVersionBumpMessage;
             var noBumpMessage = configuration.NoBumpMessage;
             var commitDateFormat = configuration.CommitDateFormat;
-            var updateBuildNumber = configuration.UpdateBuildNumber ?? false;
+            var updateBuildNumber = configuration.UpdateBuildNumber ?? true;
 
             var commitMessageVersionBump = currentBranchConfig.CommitMessageIncrementing ?? configuration.CommitMessageIncrementing.Value;
 

src/GitVersionCore/Core/BuildAgentBase.cs

@@ -28,9 +28,9 @@ protected BuildAgentBase(IEnvironment environment, ILog log)
         public virtual bool PreventFetch() => true;
         public virtual bool ShouldCleanUpRemotes() => false;
 
-        public virtual void WriteIntegration(Action<string> writer, VersionVariables variables)
+        public virtual void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true)
         {
-            if (writer == null)
+            if (writer == null || !updateBuildNumber)
             {
                 return;
             }

src/GitVersionCore/VersionConverters/OutputGenerator/OutputGenerator.cs

@@ -15,13 +15,15 @@ public class OutputGenerator : IOutputGenerator
         private readonly IConsole console;
         private readonly IFileSystem fileSystem;
         private readonly IOptions<GitVersionOptions> options;
+        private readonly Lazy<GitVersionContext> versionContext;
         private readonly ICurrentBuildAgent buildAgent;
 
-        public OutputGenerator(ICurrentBuildAgent buildAgent, IConsole console, IFileSystem fileSystem, IOptions<GitVersionOptions> options)
+        public OutputGenerator(ICurrentBuildAgent buildAgent, IConsole console, IFileSystem fileSystem, IOptions<GitVersionOptions> options, Lazy<GitVersionContext> versionContext)
         {
             this.console = console ?? throw new ArgumentNullException(nameof(console));
             this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
             this.options = options ?? throw new ArgumentNullException(nameof(options));
+            this.versionContext = versionContext;
             this.buildAgent = buildAgent;
         }
 
@@ -30,7 +32,7 @@ public void Execute(VersionVariables variables, OutputContext context)
             var gitVersionOptions = options.Value;
             if (gitVersionOptions.Output.Contains(OutputType.BuildServer))
             {
-                buildAgent?.WriteIntegration(console.WriteLine, variables);
+                buildAgent?.WriteIntegration(console.WriteLine, variables, versionContext.Value.Configuration.UpdateBuildNumber);
             }
             if (gitVersionOptions.Output.Contains(OutputType.File))
             {