Skip to content

Commit 9895652

Browse files
authored
Merge pull request #3296 from AlexPykavy/main
Don't consider "tag-prefix" as optional if it's explicitly specified to `main`
2 parents d056ec8 + a9ef617 commit 9895652

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
assembly-versioning-scheme: MajorMinorPatch
22
assembly-file-versioning-scheme: MajorMinorPatch
33
mode: ContinuousDelivery
4-
tag-prefix: '[vV]'
4+
tag-prefix: '[vV]?'
55
continuous-delivery-fallback-tag: ci
66
major-version-bump-message: '\+semver:\s?(breaking|major)'
77
minor-version-bump-message: '\+semver:\s?(feature|minor)'

src/GitVersion.Core/Configuration/GitVersionConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public override string ToString()
9797
return stringBuilder.ToString();
9898
}
9999

100-
public const string DefaultTagPrefix = "[vV]";
100+
public const string DefaultTagPrefix = "[vV]?";
101101
public const string ReleaseBranchRegex = "^releases?[/-]";
102102
public const string FeatureBranchRegex = "^features?[/-]";
103103
public const string PullRequestRegex = @"^(pull|pull\-requests|pr)[/-]";

src/GitVersion.Core/PublicAPI.Shipped.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const GitVersion.BuildAgents.SpaceAutomation.EnvironmentVariableName = "JB_SPACE
2828
const GitVersion.BuildAgents.TeamCity.EnvironmentVariableName = "TEAMCITY_VERSION" -> string!
2929
const GitVersion.BuildAgents.TravisCi.EnvironmentVariableName = "TRAVIS" -> string!
3030
const GitVersion.Configuration.ConfigurationFileLocator.DefaultFileName = "GitVersion.yml" -> string!
31-
const GitVersion.Configuration.GitVersionConfiguration.DefaultTagPrefix = "[vV]" -> string!
31+
const GitVersion.Configuration.GitVersionConfiguration.DefaultTagPrefix = "[vV]?" -> string!
3232
const GitVersion.Configuration.GitVersionConfiguration.DevelopBranchKey = "develop" -> string!
3333
const GitVersion.Configuration.GitVersionConfiguration.DevelopBranchRegex = "^dev(elop)?(ment)?$" -> string!
3434
const GitVersion.Configuration.GitVersionConfiguration.FeatureBranchKey = "feature" -> string!

src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public static SemanticVersion Parse(string version, string? tagPrefixRegex, Sema
143143

144144
public static bool TryParse(string version, string? tagPrefixRegex, [NotNullWhen(true)] out SemanticVersion? semanticVersion, SemanticVersionFormat format = SemanticVersionFormat.Strict)
145145
{
146-
var match = Regex.Match(version, $"^({tagPrefixRegex})?(?<version>.*)$");
146+
var match = Regex.Match(version, $"^({tagPrefixRegex})(?<version>.*)$");
147147

148148
if (!match.Success)
149149
{

0 commit comments

Comments
 (0)