Merge pull request #2712 from mglochsen/feature/2711-fix-format-excep…

…tion Fixed SemVer regex (major number was optional) and added test
GitTools · May 27, 2021 · 32fe901 · 32fe901
2 parents e901353 + 07c3254
commit 32fe901
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
@@ -57,9 +57,10 @@ public void ValidateVersionParsing(
 
         [TestCase("someText")]
         [TestCase("some-T-ext")]
-        public void ValidateInvalidVersionParsing(string versionString)
+        [TestCase("v.1.2.3", "v")]
+        public void ValidateInvalidVersionParsing(string versionString, string tagPrefixRegex = null)
         {
-            Assert.IsFalse(SemanticVersion.TryParse(versionString, null, out _), "TryParse Result");
+            Assert.IsFalse(SemanticVersion.TryParse(versionString, tagPrefixRegex, out _), "TryParse Result");
         }
 
         [Test]

diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
@@ -8,7 +8,7 @@ public class SemanticVersion : IFormattable, IComparable<SemanticVersion>
         private static SemanticVersion Empty = new SemanticVersion();
 
         private static readonly Regex ParseSemVer = new Regex(
-            @"^(?<SemVer>(?<Major>\d+)?(\.(?<Minor>\d+))?(\.(?<Patch>\d+))?)(\.(?<FourthPart>\d+))?(-(?<Tag>[^\+]*))?(\+(?<BuildMetaData>.*))?$",
+            @"^(?<SemVer>(?<Major>\d+)(\.(?<Minor>\d+))?(\.(?<Patch>\d+))?)(\.(?<FourthPart>\d+))?(-(?<Tag>[^\+]*))?(\+(?<BuildMetaData>.*))?$",
             RegexOptions.Compiled);
 
         public int Major;