Skip to content

Commit 45a307e

Browse files
committed
moved GetEmptyBranchConfiguration to IGitVersionConfiguration
1 parent c690a31 commit 45a307e

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

src/GitVersion.Configuration/BranchConfiguration.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,4 @@ public virtual IBranchConfiguration Inherit(IBranchConfiguration configuration)
107107
PreReleaseWeight = PreReleaseWeight ?? configuration.PreReleaseWeight
108108
};
109109
}
110-
111-
public IBranchConfiguration Empty() => new BranchConfiguration
112-
{
113-
RegularExpression = string.Empty,
114-
Label = ConfigurationConstants.BranchNamePlaceholder,
115-
Increment = IncrementStrategy.Inherit
116-
};
117110
}

src/GitVersion.Configuration/GitVersionConfiguration.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,11 @@ public string ToJsonString()
157157
stream.Flush();
158158
return stringBuilder.ToString();
159159
}
160+
161+
public IBranchConfiguration GetEmptyBranchConfiguration() => new BranchConfiguration
162+
{
163+
RegularExpression = string.Empty,
164+
Label = ConfigurationConstants.BranchNamePlaceholder,
165+
Increment = IncrementStrategy.Inherit
166+
};
160167
}

src/GitVersion.Core/Configuration/IBranchConfiguration.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,5 @@ public bool IsMatch(string branchName)
3838

3939
IReadOnlyCollection<string> IsSourceBranchFor { get; }
4040

41-
IBranchConfiguration Empty();
42-
4341
IBranchConfiguration Inherit(IBranchConfiguration configuration);
4442
}

src/GitVersion.Core/Configuration/IGitVersionConfiguration.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ public interface IGitVersionConfiguration : IBranchConfiguration
5151
IIgnoreConfiguration Ignore { get; }
5252

5353
string ToJsonString();
54+
55+
IBranchConfiguration GetEmptyBranchConfiguration();
5456
}

src/GitVersion.Core/Extensions/ConfigurationExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfig
2424
public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)
2525
{
2626
var branchConfiguration = GetBranchConfigurations(configuration, branchName.WithoutOrigin).FirstOrDefault();
27-
branchConfiguration ??= configuration.Empty();
27+
branchConfiguration ??= configuration.GetEmptyBranchConfiguration();
2828
return branchConfiguration;
2929
}
3030

src/GitVersion.Core/PublicAPI.Unshipped.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ GitVersion.Configuration.EffectiveConfiguration.VersionStrategy.get -> GitVersio
147147
GitVersion.Configuration.IBranchConfiguration
148148
GitVersion.Configuration.IBranchConfiguration.CommitMessageIncrementing.get -> GitVersion.VersionCalculation.CommitMessageIncrementMode?
149149
GitVersion.Configuration.IBranchConfiguration.DeploymentMode.get -> GitVersion.VersionCalculation.DeploymentMode?
150-
GitVersion.Configuration.IBranchConfiguration.Empty() -> GitVersion.Configuration.IBranchConfiguration!
151150
GitVersion.Configuration.IBranchConfiguration.Increment.get -> GitVersion.IncrementStrategy
152151
GitVersion.Configuration.IBranchConfiguration.Inherit(GitVersion.Configuration.IBranchConfiguration! configuration) -> GitVersion.Configuration.IBranchConfiguration!
153152
GitVersion.Configuration.IBranchConfiguration.IsMainBranch.get -> bool?
@@ -178,6 +177,7 @@ GitVersion.Configuration.IGitVersionConfiguration.AssemblyVersioningFormat.get -
178177
GitVersion.Configuration.IGitVersionConfiguration.AssemblyVersioningScheme.get -> GitVersion.Extensions.AssemblyVersioningScheme?
179178
GitVersion.Configuration.IGitVersionConfiguration.Branches.get -> System.Collections.Generic.IReadOnlyDictionary<string!, GitVersion.Configuration.IBranchConfiguration!>!
180179
GitVersion.Configuration.IGitVersionConfiguration.CommitDateFormat.get -> string?
180+
GitVersion.Configuration.IGitVersionConfiguration.GetEmptyBranchConfiguration() -> GitVersion.Configuration.IBranchConfiguration!
181181
GitVersion.Configuration.IGitVersionConfiguration.Ignore.get -> GitVersion.Configuration.IIgnoreConfiguration!
182182
GitVersion.Configuration.IGitVersionConfiguration.TagPreReleaseWeight.get -> int?
183183
GitVersion.Configuration.IGitVersionConfiguration.TagPrefix.get -> string?

0 commit comments

Comments
 (0)