Make the effective configuration tag not nullable. Default value for tag will be present only on fallback branch configuration settings.

HHobeck · HHobeck · commit 6bd49cd1e2da · 2022-10-11T08:27:58.000+02:00
diff --git a/src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs b/src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs
@@ -106,8 +106,7 @@ public static void WriteVersionVariables(this RepositoryFixtureBase fixture, str
 
     public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver, Config? configuration = null, IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)
     {
-        configuration ??= new Config();
-        configuration = new ConfigurationBuilder().Add(configuration).Build();
+        configuration ??= new ConfigurationBuilder().Build();
         Console.WriteLine("---------");
 
         try
diff --git a/src/GitVersion.Core.Tests/Helpers/TestConfigurationBuilder.cs b/src/GitVersion.Core.Tests/Helpers/TestConfigurationBuilder.cs
@@ -8,7 +8,7 @@ public sealed class TestConfigurationBuilder
 {
     public static TestConfigurationBuilder New => new();
 
-    private string? nextVerson;
+    private string? nextVersion;
     private VersioningMode? versioningMode;
     private readonly Dictionary<string, VersioningMode?> versioningModeDictionary = new();
     private bool withoutAnyTrackMergeTargets;
@@ -28,7 +28,7 @@ private TestConfigurationBuilder()
 
     public TestConfigurationBuilder WithNextVersion(string? value)
     {
-        nextVerson = value;
+        nextVersion = value;
         return this;
     }
 
@@ -109,7 +109,7 @@ public Config Build()
     {
         Config configuration = new()
         {
-            NextVersion = nextVerson,
+            NextVersion = nextVersion,
             VersioningMode = versioningMode
         };
 
diff --git a/src/GitVersion.Core/Configuration/ConfigExtensions.cs b/src/GitVersion.Core/Configuration/ConfigExtensions.cs
@@ -86,7 +86,7 @@ public static BranchConfig GetFallbackBranchConfiguration(this Config configurat
 
     public static string GetBranchSpecificTag(this EffectiveConfiguration configuration, ILog log, string? branchFriendlyName, string? branchNameOverride)
     {
-        var tagToUse = configuration.Tag ?? "{BranchName}";
+        var tagToUse = configuration.Tag;
         if (tagToUse == "useBranchName")
         {
             tagToUse = "{BranchName}";
diff --git a/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
@@ -10,11 +10,11 @@ public class ConfigurationBuilder
 
     private readonly List<Config> overrides = new();
 
-    public ConfigurationBuilder Add(Config config)
+    public ConfigurationBuilder Add(Config configuration)
     {
-        if (config == null) throw new ArgumentNullException(nameof(config));
+        if (configuration == null) throw new ArgumentNullException(nameof(configuration));
 
-        this.overrides.Add(config);
+        this.overrides.Add(configuration);
         return this;
     }
 
@@ -312,10 +312,10 @@ private static Config CreateDefaultConfiguration()
 
         return config;
 
-        void AddBranchConfig(string name, BranchConfig overrides)
+        void AddBranchConfig(string name, BranchConfig branchConfiguration)
         {
-            var emptyBranchConfiguration = new BranchConfig() { Name = name };
-            config.Branches[name] = emptyBranchConfiguration.Apply(overrides);
+            branchConfiguration.Name = name;
+            config.Branches[name] = branchConfiguration;
         }
     }
 }
diff --git a/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs b/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs
@@ -41,7 +41,7 @@ public EffectiveConfiguration(Config configuration, BranchConfig currentBranchCo
         AssemblyFileVersioningFormat = configuration.AssemblyFileVersioningFormat;
         VersioningMode = currentBranchConfig.VersioningMode.Value;
         TagPrefix = configuration.TagPrefix;
-        Tag = currentBranchConfig.Tag ?? @"{BranchName}";
+        Tag = currentBranchConfig.Tag ?? string.Empty;
         NextVersion = configuration.NextVersion;
         Increment = currentBranchConfig.Increment.Value;
         BranchPrefixToTrim = currentBranchConfig.Regex;
@@ -72,7 +72,7 @@ protected EffectiveConfiguration(AssemblyVersioningScheme assemblyVersioningSche
         string? assemblyFileVersioningFormat,
         VersioningMode versioningMode,
         string? tagPrefix,
-        string? tag,
+        string tag,
         string? nextVersion,
         IncrementStrategy increment,
         string? branchPrefixToTrim,
@@ -144,7 +144,7 @@ protected EffectiveConfiguration(AssemblyVersioningScheme assemblyVersioningSche
     /// <summary>
     ///     Tag to use when calculating SemVer
     /// </summary>
-    public string? Tag { get; }
+    public string Tag { get; }
 
     public string? NextVersion { get; }
 
diff --git a/src/GitVersion.Core/PublicAPI.Shipped.txt b/src/GitVersion.Core/PublicAPI.Shipped.txt
@@ -191,7 +191,7 @@ GitVersion.Configuration.ConfigProvider.Provide(string? workingDirectory, GitVer
 GitVersion.Configuration.ConfigSerializer
 GitVersion.Configuration.ConfigSerializer.ConfigSerializer() -> void
 GitVersion.Configuration.ConfigurationBuilder
-GitVersion.Configuration.ConfigurationBuilder.Add(GitVersion.Model.Configuration.Config! config) -> GitVersion.Configuration.ConfigurationBuilder!
+GitVersion.Configuration.ConfigurationBuilder.Add(GitVersion.Model.Configuration.Config! configuration) -> GitVersion.Configuration.ConfigurationBuilder!
 GitVersion.Configuration.ConfigurationBuilder.Build() -> GitVersion.Model.Configuration.Config!
 GitVersion.Configuration.ConfigurationBuilder.ConfigurationBuilder() -> void
 GitVersion.Configuration.ConfigurationException
@@ -668,7 +668,7 @@ GitVersion.Model.Configuration.EffectiveConfiguration.BranchPrefixToTrim.get ->
 GitVersion.Model.Configuration.EffectiveConfiguration.CommitDateFormat.get -> string?
 GitVersion.Model.Configuration.EffectiveConfiguration.CommitMessageIncrementing.get -> GitVersion.VersionCalculation.CommitMessageIncrementMode
 GitVersion.Model.Configuration.EffectiveConfiguration.ContinuousDeploymentFallbackTag.get -> string?
-GitVersion.Model.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Extensions.AssemblyVersioningScheme assemblyVersioningScheme, GitVersion.Extensions.AssemblyFileVersioningScheme assemblyFileVersioningScheme, string? assemblyInformationalFormat, string? assemblyVersioningFormat, string? assemblyFileVersioningFormat, GitVersion.VersionCalculation.VersioningMode versioningMode, string? tagPrefix, string? tag, string? nextVersion, GitVersion.IncrementStrategy increment, string? branchPrefixToTrim, bool preventIncrementOfMergedBranchVersion, string? tagNumberPattern, string? continuousDeploymentFallbackTag, bool trackMergeTarget, string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, GitVersion.VersionCalculation.CommitMessageIncrementMode commitMessageIncrementing, System.Collections.Generic.IEnumerable<GitVersion.VersionCalculation.IVersionFilter!>! versionFilters, bool tracksReleaseBranches, bool isReleaseBranch, bool isMainline, string? commitDateFormat, bool updateBuildNumber, GitVersion.SemanticVersionFormat semanticVersionFormat, int preReleaseWeight, int tagPreReleaseWeight) -> void
+GitVersion.Model.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Extensions.AssemblyVersioningScheme assemblyVersioningScheme, GitVersion.Extensions.AssemblyFileVersioningScheme assemblyFileVersioningScheme, string? assemblyInformationalFormat, string? assemblyVersioningFormat, string? assemblyFileVersioningFormat, GitVersion.VersionCalculation.VersioningMode versioningMode, string? tagPrefix, string! tag, string? nextVersion, GitVersion.IncrementStrategy increment, string? branchPrefixToTrim, bool preventIncrementOfMergedBranchVersion, string? tagNumberPattern, string? continuousDeploymentFallbackTag, bool trackMergeTarget, string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, GitVersion.VersionCalculation.CommitMessageIncrementMode commitMessageIncrementing, System.Collections.Generic.IEnumerable<GitVersion.VersionCalculation.IVersionFilter!>! versionFilters, bool tracksReleaseBranches, bool isReleaseBranch, bool isMainline, string? commitDateFormat, bool updateBuildNumber, GitVersion.SemanticVersionFormat semanticVersionFormat, int preReleaseWeight, int tagPreReleaseWeight) -> void
 GitVersion.Model.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Model.Configuration.Config! configuration, GitVersion.Model.Configuration.BranchConfig! currentBranchConfig) -> void
 GitVersion.Model.Configuration.EffectiveConfiguration.Increment.get -> GitVersion.IncrementStrategy
 GitVersion.Model.Configuration.EffectiveConfiguration.IsMainline.get -> bool
@@ -682,7 +682,7 @@ GitVersion.Model.Configuration.EffectiveConfiguration.PreReleaseWeight.get -> in
 GitVersion.Model.Configuration.EffectiveConfiguration.PreventIncrementOfMergedBranchVersion.get -> bool
 GitVersion.Model.Configuration.EffectiveConfiguration.SemanticVersionFormat.get -> GitVersion.SemanticVersionFormat
 GitVersion.Model.Configuration.EffectiveConfiguration.SemanticVersionFormat.set -> void
-GitVersion.Model.Configuration.EffectiveConfiguration.Tag.get -> string?
+GitVersion.Model.Configuration.EffectiveConfiguration.Tag.get -> string!
 GitVersion.Model.Configuration.EffectiveConfiguration.TagNumberPattern.get -> string?
 GitVersion.Model.Configuration.EffectiveConfiguration.TagPrefix.get -> string?
 GitVersion.Model.Configuration.EffectiveConfiguration.TagPreReleaseWeight.get -> int
diff --git a/src/GitVersion.Core/VersionCalculation/EffectiveBranchConfigurationFinder.cs b/src/GitVersion.Core/VersionCalculation/EffectiveBranchConfigurationFinder.cs
@@ -36,8 +36,6 @@ private IEnumerable<EffectiveBranchConfiguration> GetEffectiveConfigurationsRecu
             branchConfiguration = childBranchConfiguration.Inherit(branchConfiguration);
         }
 
-        var fallbackBranchConfiguration = configuration.GetFallbackBranchConfiguration();
-
         var sourceBranches = Array.Empty<IBranch>();
         if (branchConfiguration.Increment == IncrementStrategy.Inherit)
         {
@@ -48,6 +46,7 @@ private IEnumerable<EffectiveBranchConfiguration> GetEffectiveConfigurationsRecu
             {
                 // Because the actual branch is marked with the inherit increment strategy we need to either skip the iteration or go further
                 // while inheriting from the fallback branch configuration. This behavior is configurable via the increment settings of the configuration.
+                var fallbackBranchConfiguration = configuration.GetFallbackBranchConfiguration();
                 var skipTraversingOfOrphanedBranches = fallbackBranchConfiguration.Increment == null
                     || fallbackBranchConfiguration.Increment == IncrementStrategy.Inherit;
                 this.log.Info(
@@ -70,6 +69,7 @@ in GetEffectiveConfigurationsRecursive(sourceBranch, configuration, branchConfig
         }
         else
         {
+            var fallbackBranchConfiguration = configuration.GetFallbackBranchConfiguration();
             branchConfiguration = branchConfiguration.Inherit(fallbackBranchConfiguration);
             yield return new(branch, new EffectiveConfiguration(configuration, branchConfiguration));
         }

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,7 @@ public static void WriteVersionVariables(this RepositoryFixtureBase fixture, str`
`106`	`106`
`107`	`107`	`public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver, Config? configuration = null, IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)`
`108`	`108`	`{`
`109`		`- configuration ??= new Config();`
`110`		`- configuration = new ConfigurationBuilder().Add(configuration).Build();`
	`109`	`+ configuration ??= new ConfigurationBuilder().Build();`
`111`	`110`	`Console.WriteLine("---------");`
`112`	`111`
`113`	`112`	`try`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public sealed class TestConfigurationBuilder`
`8`	`8`	`{`
`9`	`9`	`public static TestConfigurationBuilder New => new();`
`10`	`10`
`11`		`- private string? nextVerson;`
	`11`	`+ private string? nextVersion;`
`12`	`12`	`private VersioningMode? versioningMode;`
`13`	`13`	`private readonly Dictionary<string, VersioningMode?> versioningModeDictionary = new();`
`14`	`14`	`private bool withoutAnyTrackMergeTargets;`
`@@ -28,7 +28,7 @@ private TestConfigurationBuilder()`
`28`	`28`
`29`	`29`	`public TestConfigurationBuilder WithNextVersion(string? value)`
`30`	`30`	`{`
`31`		`- nextVerson = value;`
	`31`	`+ nextVersion = value;`
`32`	`32`	`return this;`
`33`	`33`	`}`
`34`	`34`
`@@ -109,7 +109,7 @@ public Config Build()`
`109`	`109`	`{`
`110`	`110`	`Config configuration = new()`
`111`	`111`	`{`
`112`		`- NextVersion = nextVerson,`
	`112`	`+ NextVersion = nextVersion,`
`113`	`113`	`VersioningMode = versioningMode`
`114`	`114`	`};`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public static BranchConfig GetFallbackBranchConfiguration(this Config configurat`
`86`	`86`
`87`	`87`	`public static string GetBranchSpecificTag(this EffectiveConfiguration configuration, ILog log, string? branchFriendlyName, string? branchNameOverride)`
`88`	`88`	`{`
`89`		`- var tagToUse = configuration.Tag ?? "{BranchName}";`
	`89`	`+ var tagToUse = configuration.Tag;`
`90`	`90`	`if (tagToUse == "useBranchName")`
`91`	`91`	`{`
`92`	`92`	`tagToUse = "{BranchName}";`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ public class ConfigurationBuilder`
`10`	`10`
`11`	`11`	`private readonly List<Config> overrides = new();`
`12`	`12`
`13`		`- public ConfigurationBuilder Add(Config config)`
	`13`	`+ public ConfigurationBuilder Add(Config configuration)`
`14`	`14`	`{`
`15`		`- if (config == null) throw new ArgumentNullException(nameof(config));`
	`15`	`+ if (configuration == null) throw new ArgumentNullException(nameof(configuration));`
`16`	`16`
`17`		`- this.overrides.Add(config);`
	`17`	`+ this.overrides.Add(configuration);`
`18`	`18`	`return this;`
`19`	`19`	`}`
`20`	`20`
`@@ -312,10 +312,10 @@ private static Config CreateDefaultConfiguration()`
`312`	`312`
`313`	`313`	`return config;`
`314`	`314`
`315`		`- void AddBranchConfig(string name, BranchConfig overrides)`
	`315`	`+ void AddBranchConfig(string name, BranchConfig branchConfiguration)`
`316`	`316`	`{`
`317`		`- var emptyBranchConfiguration = new BranchConfig() { Name = name };`
`318`		`- config.Branches[name] = emptyBranchConfiguration.Apply(overrides);`
	`317`	`+ branchConfiguration.Name = name;`
	`318`	`+ config.Branches[name] = branchConfiguration;`
`319`	`319`	`}`
`320`	`320`	`}`
`321`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ private IEnumerable<EffectiveBranchConfiguration> GetEffectiveConfigurationsRecu`
`36`	`36`	`branchConfiguration = childBranchConfiguration.Inherit(branchConfiguration);`
`37`	`37`	`}`
`38`	`38`
`39`		`- var fallbackBranchConfiguration = configuration.GetFallbackBranchConfiguration();`
`40`		`-`
`41`	`39`	`var sourceBranches = Array.Empty<IBranch>();`
`42`	`40`	`if (branchConfiguration.Increment == IncrementStrategy.Inherit)`
`43`	`41`	`{`
`@@ -48,6 +46,7 @@ private IEnumerable<EffectiveBranchConfiguration> GetEffectiveConfigurationsRecu`
`48`	`46`	`{`
`49`	`47`	`// Because the actual branch is marked with the inherit increment strategy we need to either skip the iteration or go further`
`50`	`48`	`// while inheriting from the fallback branch configuration. This behavior is configurable via the increment settings of the configuration.`
	`49`	`+ var fallbackBranchConfiguration = configuration.GetFallbackBranchConfiguration();`
`51`	`50`	`var skipTraversingOfOrphanedBranches = fallbackBranchConfiguration.Increment == null`
`52`	`51`	`\|\| fallbackBranchConfiguration.Increment == IncrementStrategy.Inherit;`
`53`	`52`	`this.log.Info(`
`@@ -70,6 +69,7 @@ in GetEffectiveConfigurationsRecursive(sourceBranch, configuration, branchConfig`
`70`	`69`	`}`
`71`	`70`	`else`
`72`	`71`	`{`
	`72`	`+ var fallbackBranchConfiguration = configuration.GetFallbackBranchConfiguration();`
`73`	`73`	`branchConfiguration = branchConfiguration.Inherit(fallbackBranchConfiguration);`
`74`	`74`	`yield return new(branch, new EffectiveConfiguration(configuration, branchConfiguration));`
`75`	`75`	`}`