Update TagInfo regex to accept both dot and hyphen as pre-release separators with build metadata support

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>

Author: Copilot

src/DemaConsulting.BuildMark/TagInfo.cs

@@ -31,10 +31,15 @@ namespace DemaConsulting.BuildMark;
 public partial record TagInfo(string Tag, string FullVersion, bool IsPreRelease)
 {
     /// <summary>
-    ///     Regex pattern for parsing version tags with optional prefix and pre-release suffix.
+    ///     Regex pattern for parsing version tags with optional prefix, pre-release, and build metadata.
+    ///     Format: [prefix]major.minor.patch[.|-)prerelease][+buildmetadata]
+    ///     Accepts both dot and hyphen as pre-release separators.
+    ///     Examples: 
+    ///     - Rel_1.2.3.rc.4+build.5 -> version: 1.2.3, prerelease: rc.4, metadata: build.5
+    ///     - v2.0.0-alpha.1 -> version: 2.0.0, prerelease: alpha.1
     /// </summary>
     /// <returns>Compiled regex for parsing tags.</returns>
-    [GeneratedRegex(@"^(?:[a-zA-Z_-]+)?(?<version>\d+\.\d+\.\d+)(?:-(?<pre_release>[a-zA-Z0-9.-]+))?(?:\.(?<metadata>[a-zA-Z0-9.-]+))?$")]
+    [GeneratedRegex(@"^(?:[a-zA-Z_-]+)?(?<version>\d+\.\d+\.\d+)(?<separator>[-.])?(?<pre_release>[a-zA-Z0-9.-]+?)?(?:\+(?<metadata>[a-zA-Z0-9.-]+))?$")]
     private static partial Regex TagPattern();
 
     /// <summary>
@@ -51,22 +56,24 @@ public partial record TagInfo(string Tag, string FullVersion, bool IsPreRelease)
         }
 
         var version = match.Groups["version"].Value;
+        var separator = match.Groups["separator"];
         var preRelease = match.Groups["pre_release"];
         var metadata = match.Groups["metadata"];
 
-        // Build full version: version + optional pre-release + optional metadata
+        // Pre-release exists if separator is present and pre-release group has content
+        var hasPreRelease = separator.Success && preRelease.Success && !string.IsNullOrEmpty(preRelease.Value);
+        
+        // Build full version: version + optional pre-release + optional build metadata
         var fullVersion = version;
-        if (preRelease.Success)
+        if (hasPreRelease)
         {
-            fullVersion += $"-{preRelease.Value}";
+            fullVersion += $"{separator.Value}{preRelease.Value}";
         }
         if (metadata.Success)
         {
-            fullVersion += $".{metadata.Value}";
+            fullVersion += $"+{metadata.Value}";
         }
-        
-        var isPreRelease = preRelease.Success;
 
-        return new TagInfo(tag, fullVersion, isPreRelease);
+        return new TagInfo(tag, fullVersion, hasPreRelease);
     }
 }

test/DemaConsulting.BuildMark.Tests/TagInfoTests.cs

@@ -171,10 +171,26 @@ public void TagInfo_Constructor_HandlesComplexPrefix()
     }
 
     /// <summary>
-    ///     Test that TagInfo does not falsely detect rc in words like 'arch'.
+    ///     Test that TagInfo correctly parses build metadata with plus separator.
     /// </summary>
     [TestMethod]
-    public void TagInfo_Constructor_DoesNotFalselyDetectRcInArch()
+    public void TagInfo_Constructor_ParsesBuildMetadata()
+    {
+        // Arrange & Act
+        var tagVersion = TagInfo.Create("v1.0.0+arch");
+        Assert.IsNotNull(tagVersion);
+
+        // Assert
+        Assert.AreEqual("v1.0.0+arch", tagVersion.Tag);
+        Assert.AreEqual("1.0.0+arch", tagVersion.FullVersion);
+        Assert.IsFalse(tagVersion.IsPreRelease);
+    }
+
+    /// <summary>
+    ///     Test that TagInfo accepts dot-separated pre-release and treats it as pre-release.
+    /// </summary>
+    [TestMethod]
+    public void TagInfo_Constructor_AcceptsDotSeparatedAsPreRelease()
     {
         // Arrange & Act
         var tagVersion = TagInfo.Create("v1.0.0.arch");
@@ -183,7 +199,39 @@ public void TagInfo_Constructor_DoesNotFalselyDetectRcInArch()
         // Assert
         Assert.AreEqual("v1.0.0.arch", tagVersion.Tag);
         Assert.AreEqual("1.0.0.arch", tagVersion.FullVersion);
-        Assert.IsFalse(tagVersion.IsPreRelease);
+        Assert.IsTrue(tagVersion.IsPreRelease);
+    }
+
+    /// <summary>
+    ///     Test that TagInfo correctly parses complex version with prefix, pre-release, and metadata.
+    /// </summary>
+    [TestMethod]
+    public void TagInfo_Constructor_ParsesComplexVersionWithMetadata()
+    {
+        // Arrange & Act
+        var tagVersion = TagInfo.Create("Rel_1.2.3.rc.4+build.5");
+        Assert.IsNotNull(tagVersion);
+
+        // Assert
+        Assert.AreEqual("Rel_1.2.3.rc.4+build.5", tagVersion.Tag);
+        Assert.AreEqual("1.2.3.rc.4+build.5", tagVersion.FullVersion);
+        Assert.IsTrue(tagVersion.IsPreRelease);
+    }
+
+    /// <summary>
+    ///     Test that TagInfo correctly parses complex version with hyphen separator for pre-release.
+    /// </summary>
+    [TestMethod]
+    public void TagInfo_Constructor_ParsesComplexVersionWithHyphenPreRelease()
+    {
+        // Arrange & Act
+        var tagVersion = TagInfo.Create("Rel_1.2.3-rc.4+build.5");
+        Assert.IsNotNull(tagVersion);
+
+        // Assert
+        Assert.AreEqual("Rel_1.2.3-rc.4+build.5", tagVersion.Tag);
+        Assert.AreEqual("1.2.3-rc.4+build.5", tagVersion.FullVersion);
+        Assert.IsTrue(tagVersion.IsPreRelease);
     }
 
     /// <summary>
@@ -201,4 +249,20 @@ public void TagInfo_Constructor_CorrectlyDetectsRcWithNumber()
         Assert.AreEqual("1.0.0-rc1", tagVersion.FullVersion);
         Assert.IsTrue(tagVersion.IsPreRelease);
     }
+
+    /// <summary>
+    ///     Test that TagInfo correctly parses pre-release with build metadata.
+    /// </summary>
+    [TestMethod]
+    public void TagInfo_Constructor_ParsesPreReleaseWithBuildMetadata()
+    {
+        // Arrange & Act
+        var tagVersion = TagInfo.Create("v2.0.0-beta.1+linux.x64");
+        Assert.IsNotNull(tagVersion);
+
+        // Assert
+        Assert.AreEqual("v2.0.0-beta.1+linux.x64", tagVersion.Tag);
+        Assert.AreEqual("2.0.0-beta.1+linux.x64", tagVersion.FullVersion);
+        Assert.IsTrue(tagVersion.IsPreRelease);
+    }
 }