Skip to content

Commit 41ed659

Browse files
author
Simon Ejsing
committed
remove tagNamePattern option
1 parent 2771019 commit 41ed659

File tree

5 files changed

+2
-15
lines changed

5 files changed

+2
-15
lines changed

src/GitVersionCore.Tests/TestEffectiveConfiguration.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public TestEffectiveConfiguration(
1616
string nextVersion = null,
1717
string branchPrefixToTrim = "",
1818
bool preventIncrementForMergedBranchVersion = false,
19-
string tagNamePattern = null,
2019
string tagNumberPattern = null,
2120
string continuousDeploymentFallbackTag = "ci",
2221
bool trackMergeTarget = false,
@@ -30,7 +29,7 @@ public TestEffectiveConfiguration(
3029
IEnumerable<IVersionFilter> versionFilters = null
3130
) :
3231
base(assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,
33-
branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNamePattern, tagNumberPattern, continuousDeploymentFallbackTag,
32+
branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
3433
trackMergeTarget,
3534
majorMessage, minorMessage, patchMessage,
3635
commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceVersionSourcePadding,

src/GitVersionCore/Configuration/BranchConfig.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public BranchConfig(BranchConfig branchConfiguration)
1414
Tag = branchConfiguration.Tag;
1515
Increment = branchConfiguration.Increment;
1616
PreventIncrementOfMergedBranchVersion = branchConfiguration.PreventIncrementOfMergedBranchVersion;
17-
TagNamePattern = branchConfiguration.TagNamePattern;
1817
TagNumberPattern = branchConfiguration.TagNumberPattern;
1918
TrackMergeTarget = branchConfiguration.TrackMergeTarget;
2019
CommitMessageIncrementing = branchConfiguration.CommitMessageIncrementing;
@@ -35,9 +34,6 @@ public BranchConfig(BranchConfig branchConfiguration)
3534
[YamlMember(Alias = "prevent-increment-of-merged-branch-version")]
3635
public bool? PreventIncrementOfMergedBranchVersion { get; set; }
3736

38-
[YamlMember(Alias = "tag-name-pattern")]
39-
public string TagNamePattern { get; set; }
40-
4137
[YamlMember(Alias = "tag-number-pattern")]
4238
public string TagNumberPattern { get; set; }
4339

src/GitVersionCore/Configuration/ConfigurationProvider.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,9 @@ public static void ApplyBranchDefaults(Config config,
114114
bool defaultPreventIncrement = false,
115115
VersioningMode? defaultVersioningMode = null, // Looked up from main config
116116
bool defaultTrackMergeTarget = false,
117-
string defaultTagNumberPattern = null,
118-
string defaultTagNamePattern = null)
117+
string defaultTagNumberPattern = null)
119118
{
120119
branchConfig.Tag = branchConfig.Tag ?? defaultTag;
121-
branchConfig.TagNamePattern = branchConfig.TagNamePattern ?? defaultTagNamePattern;
122120
branchConfig.TagNumberPattern = branchConfig.TagNumberPattern ?? defaultTagNumberPattern;
123121
branchConfig.Increment = branchConfig.Increment ?? defaultIncrementStrategy;
124122
branchConfig.PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion ?? defaultPreventIncrement;

src/GitVersionCore/EffectiveConfiguration.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public EffectiveConfiguration(
1515
string tag, string nextVersion, IncrementStrategy increment,
1616
string branchPrefixToTrim,
1717
bool preventIncrementForMergedBranchVersion,
18-
string tagNamePattern,
1918
string tagNumberPattern,
2019
string continuousDeploymentFallbackTag,
2120
bool trackMergeTarget,
@@ -38,7 +37,6 @@ IEnumerable<IVersionFilter> versionFilters
3837
Increment = increment;
3938
BranchPrefixToTrim = branchPrefixToTrim;
4039
PreventIncrementForMergedBranchVersion = preventIncrementForMergedBranchVersion;
41-
TagNamePattern = tagNamePattern;
4240
TagNumberPattern = tagNumberPattern;
4341
ContinuousDeploymentFallbackTag = continuousDeploymentFallbackTag;
4442
TrackMergeTarget = trackMergeTarget;
@@ -75,8 +73,6 @@ IEnumerable<IVersionFilter> versionFilters
7573

7674
public bool PreventIncrementForMergedBranchVersion { get; private set; }
7775

78-
public string TagNamePattern { get; private set; }
79-
8076
public string TagNumberPattern { get; private set; }
8177

8278
public string ContinuousDeploymentFallbackTag { get; private set; }

src/GitVersionCore/GitVersionContext.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ void CalculateEffectiveConfiguration()
9696

9797
var versioningMode = currentBranchConfig.Value.VersioningMode.Value;
9898
var tag = currentBranchConfig.Value.Tag;
99-
var tagNamePattern = currentBranchConfig.Value.TagNamePattern;
10099
var tagNumberPattern = currentBranchConfig.Value.TagNumberPattern;
101100
var incrementStrategy = currentBranchConfig.Value.Increment.Value;
102101
var preventIncrementForMergedBranchVersion = currentBranchConfig.Value.PreventIncrementOfMergedBranchVersion.Value;
@@ -117,7 +116,6 @@ void CalculateEffectiveConfiguration()
117116
assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix,
118117
tag, nextVersion, incrementStrategy, currentBranchConfig.Key,
119118
preventIncrementForMergedBranchVersion,
120-
tagNamePattern,
121119
tagNumberPattern, configuration.ContinuousDeploymentFallbackTag,
122120
trackMergeTarget,
123121
majorMessage, minorMessage, patchMessage,

0 commit comments

Comments
 (0)