Skip to content

Commit 4a89870

Browse files
committed
refactor(GitVersion.Core): utilize new const vars in GitFlow, GitHubFlow
1 parent 2ed60e6 commit 4a89870

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

src/GitVersion.Core/Configuration/GitFlowConfigurationBuilder.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using GitVersion.Extensions;
21
using GitVersion.VersionCalculation;
32

43
namespace GitVersion.Configuration;
@@ -11,18 +10,18 @@ private GitFlowConfigurationBuilder()
1110
{
1211
WithConfiguration(new GitVersionConfiguration
1312
{
14-
AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
15-
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
16-
CommitDateFormat = "yyyy-MM-dd",
13+
AssemblyFileVersioningScheme = ConfigurationConstants.DefaultAssemblyFileVersioningScheme,
14+
AssemblyVersioningScheme = ConfigurationConstants.DefaultAssemblyVersioningScheme,
15+
CommitDateFormat = ConfigurationConstants.DefaultCommitDateFormat,
1716
MajorVersionBumpMessage = IncrementStrategyFinder.DefaultMajorPattern,
1817
MinorVersionBumpMessage = IncrementStrategyFinder.DefaultMinorPattern,
1918
NoBumpMessage = IncrementStrategyFinder.DefaultNoBumpPattern,
2019
PatchVersionBumpMessage = IncrementStrategyFinder.DefaultPatchPattern,
21-
SemanticVersionFormat = SemanticVersionFormat.Strict,
20+
SemanticVersionFormat = ConfigurationConstants.DefaultSemanticVersionFormat,
2221
TagPrefix = ConfigurationConstants.DefaultTagPrefix,
2322
VersionInBranchPattern = ConfigurationConstants.DefaultVersionInBranchPattern,
24-
TagPreReleaseWeight = 60000,
25-
UpdateBuildNumber = true,
23+
TagPreReleaseWeight = ConfigurationConstants.DefaultTagReleaseWeight,
24+
UpdateBuildNumber = ConfigurationConstants.DefaultUpdateBuildNumber,
2625
VersioningMode = VersioningMode.ContinuousDeployment,
2726
RegularExpression = string.Empty,
2827
Label = ConfigurationConstants.BranchNamePlaceholder,
@@ -118,7 +117,7 @@ private GitFlowConfigurationBuilder()
118117
HotfixBranch.Name
119118
},
120119
Label = "PullRequest",
121-
LabelNumberPattern = @"[/-](?<number>\d+)",
120+
LabelNumberPattern = ConfigurationConstants.DefaultLabelNumberPattern,
122121
PreReleaseWeight = 30000
123122
});
124123

src/GitVersion.Core/Configuration/GitHubFlowConfigurationBuilder.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using GitVersion.Extensions;
21
using GitVersion.VersionCalculation;
32

43
namespace GitVersion.Configuration;
@@ -11,18 +10,18 @@ private GitHubFlowConfigurationBuilder()
1110
{
1211
WithConfiguration(new GitVersionConfiguration
1312
{
14-
AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
15-
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
16-
CommitDateFormat = "yyyy-MM-dd",
13+
AssemblyFileVersioningScheme = ConfigurationConstants.DefaultAssemblyFileVersioningScheme,
14+
AssemblyVersioningScheme = ConfigurationConstants.DefaultAssemblyVersioningScheme,
15+
CommitDateFormat = ConfigurationConstants.DefaultCommitDateFormat,
1716
MajorVersionBumpMessage = IncrementStrategyFinder.DefaultMajorPattern,
1817
MinorVersionBumpMessage = IncrementStrategyFinder.DefaultMinorPattern,
1918
NoBumpMessage = IncrementStrategyFinder.DefaultNoBumpPattern,
2019
PatchVersionBumpMessage = IncrementStrategyFinder.DefaultPatchPattern,
21-
SemanticVersionFormat = SemanticVersionFormat.Strict,
20+
SemanticVersionFormat = ConfigurationConstants.DefaultSemanticVersionFormat,
2221
TagPrefix = ConfigurationConstants.DefaultTagPrefix,
2322
VersionInBranchPattern = ConfigurationConstants.DefaultVersionInBranchPattern,
24-
TagPreReleaseWeight = 60000,
25-
UpdateBuildNumber = true,
23+
TagPreReleaseWeight = ConfigurationConstants.DefaultTagReleaseWeight,
24+
UpdateBuildNumber = ConfigurationConstants.DefaultUpdateBuildNumber,
2625
VersioningMode = VersioningMode.ContinuousDeployment,
2726
RegularExpression = string.Empty,
2827
Label = ConfigurationConstants.BranchNamePlaceholder,
@@ -95,7 +94,7 @@ private GitHubFlowConfigurationBuilder()
9594
FeatureBranch.Name
9695
},
9796
Label = "PullRequest",
98-
LabelNumberPattern = @"[/-](?<number>\d+)",
97+
LabelNumberPattern = ConfigurationConstants.DefaultLabelNumberPattern,
9998
PreReleaseWeight = 30000
10099
});
101100

0 commit comments

Comments
 (0)