Rename is-mainline to is-main-branch

Author: HHobeck

schemas/6.0/GitVersion.configuration.json

@@ -69,8 +69,8 @@
     },
     "increment": {
       "$ref": "#/$defs/incrementStrategy"
-    },
-    "is-mainline": {
+    },f
+    "is-main-branch": {
       "$ref": "#/$defs/nullableOfBoolean"
     },
     "is-release-branch": {
@@ -191,7 +191,7 @@
         "increment": {
           "$ref": "#/$defs/incrementStrategy"
         },
-        "is-mainline": {
+        "is-main-branch": {
           "$ref": "#/$defs/nullableOfBoolean"
         },
         "is-release-branch": {
@@ -352,4 +352,4 @@
       }
     }
   }
-}
+}

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

@@ -22,7 +22,7 @@ branches:
     is-source-branch-for: []
     tracks-release-branches: true
     is-release-branch: false
-    is-mainline: false
+    is-main-branch: false
     pre-release-weight: 0
   main:
     label: ''
@@ -36,7 +36,7 @@ branches:
     is-source-branch-for: []
     tracks-release-branches: false
     is-release-branch: false
-    is-mainline: true
+    is-main-branch: true
     pre-release-weight: 55000
   release:
     mode: ManualDeployment
@@ -53,7 +53,7 @@ branches:
     is-source-branch-for: []
     tracks-release-branches: false
     is-release-branch: true
-    is-mainline: false
+    is-main-branch: false
     pre-release-weight: 30000
   feature:
     mode: ManualDeployment
@@ -108,7 +108,7 @@ branches:
     is-source-branch-for: []
     tracks-release-branches: false
     is-release-branch: false
-    is-mainline: true
+    is-main-branch: true
     pre-release-weight: 55000
   unknown:
     mode: ManualDeployment
@@ -138,4 +138,4 @@ source-branches: []
 is-source-branch-for: []
 tracks-release-branches: false
 is-release-branch: false
-is-mainline: false
+is-main-branch: false

src/GitVersion.Configuration/BranchConfiguration.cs

@@ -70,9 +70,9 @@ internal record BranchConfiguration : IBranchConfiguration
     [JsonPropertyDescription("Indicates this branch configuration represents a release branch in GitFlow.")]
     public bool? IsReleaseBranch { get; internal set; }
 
-    [JsonPropertyName("is-mainline")]
+    [JsonPropertyName("is-main-branch")]
     [JsonPropertyDescription("When using Mainline mode, this indicates that this branch is a mainline. By default main and support/* are mainlines.")]
-    public bool? IsMainline { get; internal set; }
+    public bool? IsMainBranch { get; internal set; }
 
     [JsonPropertyName("pre-release-weight")]
     [JsonPropertyDescription("Provides a way to translate the PreReleaseLabel to a number.")]
@@ -96,7 +96,7 @@ public virtual IBranchConfiguration Inherit(IBranchConfiguration configuration)
             RegularExpression = RegularExpression ?? configuration.RegularExpression,
             TracksReleaseBranches = TracksReleaseBranches ?? configuration.TracksReleaseBranches,
             IsReleaseBranch = IsReleaseBranch ?? configuration.IsReleaseBranch,
-            IsMainline = IsMainline ?? configuration.IsMainline,
+            IsMainBranch = IsMainBranch ?? configuration.IsMainBranch,
             PreReleaseWeight = PreReleaseWeight ?? configuration.PreReleaseWeight
         };
     }

src/GitVersion.Configuration/BranchConfigurationBuilder.cs

@@ -19,7 +19,7 @@ internal class BranchConfigurationBuilder
     private HashSet<string> isSourceBranchFor = [];
     private bool? tracksReleaseBranches;
     private bool? isReleaseBranch;
-    private bool? isMainline;
+    private bool? isMainBranch;
     private int? preReleaseWeight;
 
     private BranchConfigurationBuilder()
@@ -116,9 +116,9 @@ public virtual BranchConfigurationBuilder WithIsReleaseBranch(bool? value)
         return this;
     }
 
-    public virtual BranchConfigurationBuilder WithIsMainline(bool? value)
+    public virtual BranchConfigurationBuilder WithIsMainBranch(bool? value)
     {
-        this.isMainline = value;
+        this.isMainBranch = value;
         return this;
     }
 
@@ -141,7 +141,7 @@ public virtual BranchConfigurationBuilder WithConfiguration(IBranchConfiguration
         WithRegularExpression(value.RegularExpression);
         WithTracksReleaseBranches(value.TracksReleaseBranches);
         WithIsReleaseBranch(value.IsReleaseBranch);
-        WithIsMainline(value.IsMainline);
+        WithIsMainBranch(value.IsMainBranch);
         WithPreReleaseWeight(value.PreReleaseWeight);
         WithSourceBranches(value.SourceBranches);
         WithIsSourceBranchFor(value.IsSourceBranchFor);
@@ -158,7 +158,7 @@ public virtual BranchConfigurationBuilder WithConfiguration(IBranchConfiguration
         TrackMergeTarget = trackMergeTarget,
         TrackMergeMessage = trackMergeMessage,
         CommitMessageIncrementing = commitMessageIncrementing,
-        IsMainline = isMainline,
+        IsMainBranch = isMainBranch,
         IsReleaseBranch = isReleaseBranch,
         LabelNumberPattern = labelNumberPattern,
         PreventIncrementOfMergedBranchVersion = preventIncrementOfMergedBranchVersion,

src/GitVersion.Configuration/ConfigurationBuilderBase.cs

@@ -38,7 +38,7 @@ internal abstract class ConfigurationBuilderBase<TConfigurationBuilder> : IConfi
     private string? regularExpression;
     private bool? tracksReleaseBranches;
     private bool? isReleaseBranch;
-    private bool? isMainline;
+    private bool? isMainBranch;
     private int? preReleaseWeight;
 
     protected readonly BranchMetaData MainBranch = new()
@@ -290,9 +290,9 @@ public virtual TConfigurationBuilder WithIsReleaseBranch(bool? value)
         return (TConfigurationBuilder)this;
     }
 
-    public virtual TConfigurationBuilder WithIsMainline(bool? value)
+    public virtual TConfigurationBuilder WithIsMainBranch(bool? value)
     {
-        this.isMainline = value;
+        this.isMainBranch = value;
         return (TConfigurationBuilder)this;
     }
 
@@ -337,7 +337,7 @@ public virtual TConfigurationBuilder WithConfiguration(IGitVersionConfiguration
         WithRegularExpression(value.RegularExpression);
         WithTracksReleaseBranches(value.TracksReleaseBranches);
         WithIsReleaseBranch(value.IsReleaseBranch);
-        WithIsMainline(value.IsMainline);
+        WithIsMainBranch(value.IsMainBranch);
         WithPreReleaseWeight(value.PreReleaseWeight);
         return (TConfigurationBuilder)this;
     }
@@ -387,7 +387,7 @@ public virtual IGitVersionConfiguration Build()
             TrackMergeTarget = this.trackMergeTarget,
             TrackMergeMessage = this.trackMergeMessage,
             CommitMessageIncrementing = this.commitMessageIncrementing,
-            IsMainline = this.isMainline,
+            IsMainBranch = this.isMainBranch,
             IsReleaseBranch = this.isReleaseBranch,
             LabelNumberPattern = this.labelNumberPattern,
             PreventIncrementOfMergedBranchVersion = this.preventIncrementOfMergedBranchVersion,

src/GitVersion.Configuration/GitFlowConfigurationBuilder.cs

@@ -32,7 +32,7 @@ private GitFlowConfigurationBuilder()
             TrackMergeMessage = true,
             TracksReleaseBranches = false,
             IsReleaseBranch = false,
-            IsMainline = false
+            IsMainBranch = false
         });
 
         WithBranch(DevelopBranch.Name).WithConfiguration(new BranchConfiguration
@@ -44,7 +44,7 @@ private GitFlowConfigurationBuilder()
             PreventIncrementOfMergedBranchVersion = false,
             TrackMergeTarget = true,
             TracksReleaseBranches = true,
-            IsMainline = false,
+            IsMainBranch = false,
             IsReleaseBranch = false,
             PreReleaseWeight = 0
         });
@@ -62,7 +62,7 @@ private GitFlowConfigurationBuilder()
             PreventIncrementOfMergedBranchVersion = true,
             TrackMergeTarget = false,
             TracksReleaseBranches = false,
-            IsMainline = true,
+            IsMainBranch = true,
             IsReleaseBranch = false,
             PreReleaseWeight = 55000
         });
@@ -83,7 +83,7 @@ private GitFlowConfigurationBuilder()
             PreventIncrementOfMergedBranchVersion = true,
             TrackMergeTarget = false,
             TracksReleaseBranches = false,
-            IsMainline = false,
+            IsMainBranch = false,
             IsReleaseBranch = true,
             PreReleaseWeight = 30000
         });
@@ -151,7 +151,7 @@ private GitFlowConfigurationBuilder()
             PreventIncrementOfMergedBranchVersion = true,
             TrackMergeTarget = false,
             TracksReleaseBranches = false,
-            IsMainline = true,
+            IsMainBranch = true,
             IsReleaseBranch = false,
             PreReleaseWeight = 55000
         });

src/GitVersion.Configuration/GitHubFlowConfigurationBuilder.cs

@@ -32,7 +32,7 @@ private GitHubFlowConfigurationBuilder()
             TrackMergeMessage = true,
             TracksReleaseBranches = false,
             IsReleaseBranch = false,
-            IsMainline = false
+            IsMainBranch = false
         });
 
         WithBranch(MainBranch.Name).WithConfiguration(new BranchConfiguration
@@ -44,7 +44,7 @@ private GitHubFlowConfigurationBuilder()
             PreventIncrementOfMergedBranchVersion = true,
             TrackMergeTarget = false,
             TracksReleaseBranches = false,
-            IsMainline = true,
+            IsMainBranch = true,
             IsReleaseBranch = false,
             PreReleaseWeight = 55000
         });
@@ -63,7 +63,7 @@ private GitHubFlowConfigurationBuilder()
             PreventIncrementOfMergedBranchVersion = true,
             TrackMergeTarget = false,
             TracksReleaseBranches = false,
-            IsMainline = false,
+            IsMainBranch = false,
             IsReleaseBranch = true,
             PreReleaseWeight = 30000
         });

src/GitVersion.Configuration/SupportedWorkflows/GitFlow/v1.yml

@@ -21,7 +21,7 @@ branches:
     source-branches: []
     tracks-release-branches: true
     is-release-branch: false
-    is-mainline: false
+    is-main-branch: false
     pre-release-weight: 0
   main:
     label: ''
@@ -34,7 +34,7 @@ branches:
     - release
     tracks-release-branches: false
     is-release-branch: false
-    is-mainline: true
+    is-main-branch: true
     pre-release-weight: 55000
   release:
     label: beta
@@ -49,7 +49,7 @@ branches:
     - release
     tracks-release-branches: false
     is-release-branch: true
-    is-mainline: false
+    is-main-branch: false
     pre-release-weight: 30000
   feature:
     mode: ContinuousDelivery
@@ -99,7 +99,7 @@ branches:
     - main
     tracks-release-branches: false
     is-release-branch: false
-    is-mainline: true
+    is-main-branch: true
     pre-release-weight: 55000
   unknown:
     mode: ContinuousDelivery
@@ -126,4 +126,4 @@ commit-message-incrementing: Enabled
 regex: ''
 tracks-release-branches: false
 is-release-branch: false
-is-mainline: false
+is-main-branch: false

src/GitVersion.Configuration/SupportedWorkflows/GitHubFlow/v1.yml

@@ -21,7 +21,7 @@ branches:
     - release
     tracks-release-branches: false
     is-release-branch: false
-    is-mainline: true
+    is-main-branch: true
     pre-release-weight: 55000
   release:
     label: beta
@@ -34,7 +34,7 @@ branches:
     - release
     tracks-release-branches: false
     is-release-branch: true
-    is-mainline: false
+    is-main-branch: false
     pre-release-weight: 30000
   feature:
     mode: ContinuousDelivery
@@ -79,4 +79,4 @@ commit-message-incrementing: Enabled
 regex: ''
 tracks-release-branches: false
 is-release-branch: false
-is-mainline: false
+is-main-branch: false

src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs

@@ -28,7 +28,7 @@ public TestEffectiveConfiguration(
         IEnumerable<IVersionFilter>? versionFilters = null,
         bool tracksReleaseBranches = false,
         bool isRelease = false,
-        bool isMainline = false,
+        bool isMainBranch = false,
         string commitDateFormat = "yyyy-MM-dd",
         bool updateBuildNumber = false) :
         base(assemblyVersioningScheme,
@@ -53,7 +53,7 @@ public TestEffectiveConfiguration(
             versionFilters ?? [],
             tracksReleaseBranches,
             isRelease,
-            isMainline,
+            isMainBranch,
             commitDateFormat,
             updateBuildNumber,
             SemanticVersionFormat.Strict,