Issue: GitTools#495, PR GitTools#496 - attempting to clarify what was intended with default TagPrefix of "[vV]|"

Author: Chris Leigh

GitVersionCore.Tests/ConfigProviderTests.cs

@@ -120,7 +120,7 @@ public void CanReadDefaultDocument()
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
         config.Branches["develop"].Tag.ShouldBe("unstable");
         config.Branches["release[/-]"].Tag.ShouldBe("beta");
-        config.TagPrefix.ShouldBe("[vV]|");
+        config.TagPrefix.ShouldBe(SemanticVersion.DefaultTagPrefix);
         config.NextVersion.ShouldBe(null);
     }
 

GitVersionCore.Tests/SemanticVersionTests.cs

@@ -26,7 +26,10 @@ public class SemanticVersionTests
     [TestCase("1.2.3+4.Branch.Foo", 1, 2, 3, null, null, 4, "Foo", null, null, null, null)]
     [TestCase("1.2.3+randomMetaData", 1, 2, 3, null, null, null, null, null, "randomMetaData", null, null)]
     [TestCase("1.2.3-beta.1+4.Sha.12234.Othershiz", 1, 2, 3, "beta", 1, 4, null, "12234", "Othershiz", null, null)]
-    [TestCase("1.2.3", 1, 2, 3, null, null, null, null, null, null, null, "v")]
+    [TestCase("1.2.3", 1, 2, 3, null, null, null, null, null, null, null, SemanticVersion.DefaultTagPrefix)]
+    [TestCase("v1.2.3", 1, 2, 3, null, null, null, null, null, null, "1.2.3", SemanticVersion.DefaultTagPrefix)]
+    [TestCase("V1.2.3", 1, 2, 3, null, null, null, null, null, null, "1.2.3", SemanticVersion.DefaultTagPrefix)]
+    [TestCase("version1.2.3", 1, 2, 3, null, null, null, null, null, null, "1.2.3", "version")]
     public void ValidateVersionParsing(
         string versionString, int major, int minor, int patch, string tag, int? tagNumber, int? numberOfBuilds,
         string branchName, string sha, string otherMetaData, string fullFormattedVersionString, string tagPrefixRegex)

GitVersionCore/Configuration/Config.cs

@@ -11,7 +11,7 @@ public class Config
         public Config()
         {
             AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch;
-            TagPrefix = "[vV]|";
+            TagPrefix = SemanticVersion.DefaultTagPrefix;
             VersioningMode = GitVersion.VersioningMode.ContinuousDelivery;
             ContinuousDeploymentFallbackTag = "ci";
 

GitVersionCore/SemanticVersion.cs

@@ -6,6 +6,7 @@ namespace GitVersion
     public class SemanticVersion : IFormattable, IComparable<SemanticVersion>
     {
         public static SemanticVersion Empty = new SemanticVersion();
+        public const string DefaultTagPrefix = "[vV]|";  // "|" makes the tag optional such that 1.2.3, v1.2.3, and 1.2.3 are all parse-able
 
         static Regex ParseSemVer = new Regex(
             @"^(?<SemVer>(?<Major>\d+)(\.(?<Minor>\d+))(\.(?<Patch>\d+))?)(\.(?<FourthPart>\d+))?(-(?<Tag>[^\+]*))?(\+(?<BuildMetaData>.*))?$",
@@ -136,7 +137,7 @@ public override int GetHashCode()
             return v1.CompareTo(v2) < 0;
         }
 
-        public static SemanticVersion Parse(string version, string tagPrefixRegex)
+        public static SemanticVersion Parse(string version, string tagPrefixRegex = DefaultTagPrefix)
         {
             SemanticVersion semanticVersion;
             if (!TryParse(version, tagPrefixRegex, out semanticVersion))
@@ -145,9 +146,14 @@ public static SemanticVersion Parse(string version, string tagPrefixRegex)
             return semanticVersion;
         }
 
+        public static bool TryParse(string version, out SemanticVersion semanticVersion)
+        {
+            return TryParse(version, DefaultTagPrefix, out semanticVersion);
+        }
+
         public static bool TryParse(string version, string tagPrefixRegex, out SemanticVersion semanticVersion)
         {
-            var match = Regex.Match(version, string.Format("^({0})?(?<version>.*)$", tagPrefixRegex));
+            var match = Regex.Match(version, string.Format("^({0})(?<version>.*)$", tagPrefixRegex));
 
             if (!match.Success)
             {

GitVersionExe.Tests/AssemblyInfoFileUpdateTests.cs

@@ -13,7 +13,7 @@ public void ShouldStartSearchFromWorkingDirectory()
     {
         var fileSystem = Substitute.For<IFileSystem>();
         const string workingDir = "C:\\Testing";
-        var variables = VariableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
+        var variables = VariableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0"), AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
         using (new AssemblyInfoFileUpdate(new Arguments { UpdateAssemblyInfo = true }, workingDir, variables, fileSystem))
         {
             fileSystem.Received().DirectoryGetFiles(Arg.Is(workingDir), Arg.Any<string>(), Arg.Any<SearchOption>());