Rename ConfigNext to ConfigNextVersion and ensure that the array of version strategy is flat.

Author: HHobeck

BREAKING_CHANGES.md

@@ -39,7 +39,7 @@
     *   ContinuousDelivery (previously ContinuousDeployment)
     *   ContinuousDeployment (new)
 *   At the configuration root level, a new array called `strategies` has been introduced, which can consist of on or more following values:
-    *   ConfigNext
+    *   ConfigNextVersion
     *   MergeMessage
     *   TaggedCommit
     *   TrackReleaseBranches

docs/input/docs/reference/configuration.md

@@ -54,10 +54,14 @@ merge-message-formats: {}
 update-build-number: true
 semantic-version-format: Strict
 strategies:
-- ConfigNext, MergeMessage, TaggedCommit, TrackReleaseBranches, VersionInBranchName
+- ConfigNextVersion
+- MergeMessage
+- TaggedCommit
+- TrackReleaseBranches
+- VersionInBranchName
 branches:
   develop:
-    mode: ContinuousDeployment
+    mode: ContinuousDelivery
     label: alpha
     increment: Minor
     prevent-increment-of-merged-branch-version: false
@@ -70,6 +74,7 @@ branches:
     is-main-branch: false
     pre-release-weight: 0
   main:
+    mode: ContinuousDeployment
     label: ''
     increment: Patch
     prevent-increment-of-merged-branch-version: true
@@ -100,10 +105,10 @@ branches:
     is-main-branch: false
     pre-release-weight: 30000
   feature:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: '{BranchName}'
     increment: Inherit
-    regex: ^features?[/-]
+    regex: ^features?[/-](?<BranchName>.+)
     source-branches:
     - develop
     - main
@@ -129,7 +134,7 @@ branches:
     is-source-branch-for: []
     pre-release-weight: 30000
   hotfix:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: beta
     increment: Inherit
     regex: ^hotfix(es)?[/-]
@@ -155,10 +160,10 @@ branches:
     is-main-branch: true
     pre-release-weight: 55000
   unknown:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: '{BranchName}'
     increment: Inherit
-    regex: .*
+    regex: (?<BranchName>.+)
     source-branches:
     - main
     - develop
@@ -170,7 +175,7 @@ branches:
     is-source-branch-for: []
 ignore:
   sha: []
-mode: ContinuousDelivery
+mode: ManualDeployment
 label: '{BranchName}'
 increment: Inherit
 prevent-increment-of-merged-branch-version: false
@@ -183,6 +188,7 @@ is-source-branch-for: []
 tracks-release-branches: false
 is-release-branch: false
 is-main-branch: false
+
 ```
 
 The details of the available options are as follows:
@@ -690,7 +696,7 @@ Example of invalid `Strict`, but valid `Loose`
 ### strategies
 
 Specifies which version strategy implementation (one ore more) will be used to determine the next version. Following values are supported and can be combined:
-*   ConfigNext
+*   ConfigNextVersion
 *   MergeMessage
 *   TaggedCommit
 *   TrackReleaseBranches

src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -12,9 +12,14 @@ merge-message-formats: {}
 update-build-number: true
 semantic-version-format: Strict
 strategies:
-- ConfigNext, MergeMessage, TaggedCommit, TrackReleaseBranches, VersionInBranchName
+- ConfigNextVersion
+- MergeMessage
+- TaggedCommit
+- TrackReleaseBranches
+- VersionInBranchName
 branches:
   develop:
+    mode: ContinuousDelivery
     label: alpha
     increment: Minor
     prevent-increment-of-merged-branch-version: false
@@ -27,6 +32,7 @@ branches:
     is-main-branch: false
     pre-release-weight: 0
   main:
+    mode: ContinuousDelivery
     label: ''
     increment: Patch
     prevent-increment-of-merged-branch-version: true
@@ -41,7 +47,6 @@ branches:
     is-main-branch: true
     pre-release-weight: 55000
   release:
-    mode: ManualDeployment
     label: beta
     increment: None
     prevent-increment-of-merged-branch-version: true
@@ -100,6 +105,7 @@ branches:
     is-release-branch: true
     pre-release-weight: 30000
   support:
+    mode: ContinuousDelivery
     label: ''
     increment: Patch
     prevent-increment-of-merged-branch-version: true
@@ -128,7 +134,7 @@ branches:
     is-source-branch-for: []
 ignore:
   sha: []
-mode: ContinuousDelivery
+mode: ManualDeployment
 label: '{BranchName}'
 increment: Inherit
 prevent-increment-of-merged-branch-version: false

src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs

@@ -60,13 +60,13 @@ public void OverwritesDefaultsWithProvidedConfig()
     public void CombineVersionStrategyConfigNextAndTaggedCommit()
     {
         // Arrange
-        SetupConfigFileContent("strategies: [ConfigNext, TaggedCommit]");
+        SetupConfigFileContent("strategies: [ConfigNextVersion, TaggedCommit]");
 
         // Act
         var configuration = this.configurationProvider.ProvideForDirectory(this.repoPath);
 
         // Assert
-        configuration.VersionStrategy.ShouldBe(VersionStrategies.ConfigNext | VersionStrategies.TaggedCommit);
+        configuration.VersionStrategy.ShouldBe(VersionStrategies.ConfigNextVersion | VersionStrategies.TaggedCommit);
     }
 
     [Test]

src/GitVersion.Configuration.Tests/Configuration/Init/InitScenarios.CanSetNextVersion.approved.txt

@@ -2,8 +2,7 @@ next-version: 2.0.0
 merge-message-formats: {}
 update-build-number: true
 semantic-version-format: Strict
-strategies:
-- None
+strategies: []
 branches: {}
 ignore:
   sha: []

src/GitVersion.Configuration/ConfigurationBuilderBase.cs

@@ -201,8 +201,19 @@ public virtual TConfigurationBuilder WithSemanticVersionFormat(SemanticVersionFo
     }
 
     public virtual TConfigurationBuilder WithVersionStrategies(params VersionStrategies[] values)
+        => WithVersionStrategies((IEnumerable<VersionStrategies>)values);
+
+    public virtual TConfigurationBuilder WithVersionStrategies(IEnumerable<VersionStrategies> values)
     {
-        this.versionStrategies = values;
+        HashSet<VersionStrategies> versionStrategies = new();
+        foreach (var versionStrategy in values)
+        {
+            versionStrategies.AddRange(
+                Enum.GetValues<VersionStrategies>().Where(
+                    element => element != VersionStrategies.None && versionStrategy.HasFlag(element))
+            );
+        }
+        this.versionStrategies = versionStrategies.ToArray();
         return (TConfigurationBuilder)this;
     }
 

src/GitVersion.Configuration/GitVersionConfiguration.cs

@@ -124,15 +124,14 @@ public string? NextVersion
     [JsonPropertyDefault(DefaultSemanticVersionFormat)]
     public SemanticVersionFormat SemanticVersionFormat { get; internal set; }
 
-    [JsonPropertyName("strategies")]
-    [JsonPropertyDescription($"Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfigNext', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'TrunkBased'.")]
-    public VersionStrategies[] VersionStrategies { get; internal set; } = [];
-
     [JsonIgnore]
-
     VersionStrategies IGitVersionConfiguration.VersionStrategy => VersionStrategies.Length == 0
         ? VersionCalculation.VersionStrategies.None : VersionStrategies.Aggregate((one, another) => one | another);
 
+    [JsonPropertyName("strategies")]
+    [JsonPropertyDescription($"Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfigNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'TrunkBased'.")]
+    public VersionStrategies[] VersionStrategies { get; internal set; } = [];
+
     [JsonIgnore]
     IReadOnlyDictionary<string, IBranchConfiguration> IGitVersionConfiguration.Branches
         => Branches.ToDictionary(element => element.Key, element => (IBranchConfiguration)element.Value);

src/GitVersion.Core/Configuration/ConfigurationConstants.cs

@@ -15,7 +15,7 @@ internal static class ConfigurationConstants
     public const AssemblyFileVersioningScheme DefaultAssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch;
     public const SemanticVersionFormat DefaultSemanticVersionFormat = SemanticVersionFormat.Strict;
     public static readonly VersionStrategies[] DefaultVersionStrategies = [
-        VersionStrategies.ConfigNext,
+        VersionStrategies.ConfigNextVersion,
         VersionStrategies.MergeMessage,
         VersionStrategies.TaggedCommit,
         VersionStrategies.TrackReleaseBranches,

src/GitVersion.Core/PublicAPI.Unshipped.txt

@@ -724,7 +724,7 @@ GitVersion.VersionCalculation.VersionCalculationModule
 GitVersion.VersionCalculation.VersionCalculationModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
 GitVersion.VersionCalculation.VersionCalculationModule.VersionCalculationModule() -> void
 GitVersion.VersionCalculation.VersionStrategies
-GitVersion.VersionCalculation.VersionStrategies.ConfigNext = 1 -> GitVersion.VersionCalculation.VersionStrategies
+GitVersion.VersionCalculation.VersionStrategies.ConfigNextVersion = 1 -> GitVersion.VersionCalculation.VersionStrategies
 GitVersion.VersionCalculation.VersionStrategies.MergeMessage = 2 -> GitVersion.VersionCalculation.VersionStrategies
 GitVersion.VersionCalculation.VersionStrategies.None = 0 -> GitVersion.VersionCalculation.VersionStrategies
 GitVersion.VersionCalculation.VersionStrategies.TaggedCommit = 4 -> GitVersion.VersionCalculation.VersionStrategies

src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/ConfigNextVersionVersionStrategy.cs

@@ -12,7 +12,7 @@ internal class ConfigNextVersionVersionStrategy(Lazy<GitVersionContext> versionC
 {
     public override IEnumerable<BaseVersion> GetBaseVersions(EffectiveBranchConfiguration configuration)
     {
-        if (!Context.Configuration.VersionStrategy.HasFlag(VersionStrategies.ConfigNext))
+        if (!Context.Configuration.VersionStrategy.HasFlag(VersionStrategies.ConfigNextVersion))
             yield break;
 
         var contextConfiguration = Context.Configuration;