Skip to content

Commit b7760e2

Browse files
committed
Make ShortVersionParser.TryParseMajorMinor fail for unstable versions
1 parent caff915 commit b7760e2

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

GitFlowVersion/ShortVersionParser.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ public static bool TryParseMajorMinor(string versionString, out int major, out i
1616
{
1717
int patch;
1818

19-
TryParse(versionString, out major, out minor, out patch);
19+
if (!TryParse(versionString, out major, out minor, out patch))
20+
{
21+
return false;
22+
}
2023

2124
// Note: during scanning of master we only want the last major / minor, not the patch, so patch must be zero
2225
return patch == 0;

Tests/ShortVersionParserTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ public void Major_minorTry()
5252
var result = ShortVersionParser.TryParseMajorMinor("1.2.3", out major, out minor);
5353
Assert.IsFalse(result);
5454

55+
result = ShortVersionParser.TryParseMajorMinor("1.2.0-alpha1", out major, out minor);
56+
Assert.IsFalse(result);
57+
5558
result = ShortVersionParser.TryParseMajorMinor("1.2", out major, out minor);
5659
Assert.IsTrue(result);
5760

0 commit comments

Comments
 (0)