Reverting TagPrefix to [vV] but making optional, plus more unit tests

Author: Chris Leigh

GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 mode: ContinuousDelivery
-tag-prefix: 
+tag-prefix: '[vV]|'
 continuous-delivery-fallback-tag: ci
 branches:
   master:

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("");
+        config.TagPrefix.ShouldBe("[vV]|");
         config.NextVersion.ShouldBe(null);
     }
 

GitVersionCore.Tests/IntegrationTests/MasterScenarios.cs

@@ -151,37 +151,56 @@ public void CanSpecifyTagPrefixes()
     [Test]
     public void CanSpecifyTagPrefixesAsRegex()
     {
-        using (var fixture = new EmptyRepositoryFixture(new Config { TagPrefix = "[version-|v]" }))
+        using (var fixture = new EmptyRepositoryFixture(new Config { TagPrefix = "version-|[vV]" }))
         {
-            const string TaggedVersion = "v1.0.3";
+            string TaggedVersion = "v1.0.3";
             fixture.Repository.MakeATaggedCommit(TaggedVersion);
             fixture.Repository.MakeCommits(5);
 
             fixture.AssertFullSemver("1.0.4+5");
+
+            TaggedVersion = "version-1.0.5";
+            fixture.Repository.MakeATaggedCommit(TaggedVersion);
+            fixture.Repository.MakeCommits(5);
+
+            fixture.AssertFullSemver("1.0.6+5");
         }
     }
 
     [Test]
-    public void DoesIgnoreTagsNotAdheringToTagPrefix()
+    public void CanTagPrefixStillBeOptional()
     {
-        using (var fixture = new EmptyRepositoryFixture(new Config { TagPrefix = "" }))
+        using (var fixture = new EmptyRepositoryFixture(new Config { TagPrefix = "[vV]|" }))  //we use tag prefix to denote whether optional
         {
-            const string TaggedVersion = "version-1.0.3";
+            string TaggedVersion = "v1.0.3";
             fixture.Repository.MakeATaggedCommit(TaggedVersion);
             fixture.Repository.MakeCommits(5);
 
-            var variables = fixture.GetVersion();
-            variables.FullSemVer.ShouldNotBe("1.0.4+5");
+            fixture.AssertFullSemver("1.0.4+5");
+
+            TaggedVersion = "1.0.5";
+            fixture.Repository.MakeATaggedCommit(TaggedVersion);
+            fixture.Repository.MakeCommits(1);
+
+            fixture.AssertFullSemver("1.0.6+1");
         }
+    }
 
+    [Test]
+    public void AreTagsNotAdheringToTagPrefixIgnored()
+    {
         using (var fixture = new EmptyRepositoryFixture(new Config { TagPrefix = "" }))
         {
-            const string TaggedVersion = "bad/1.0.3";
+            string TaggedVersion = "version-1.0.3";
             fixture.Repository.MakeATaggedCommit(TaggedVersion);
             fixture.Repository.MakeCommits(5);
 
-            var variables = fixture.GetVersion();
-            variables.FullSemVer.ShouldNotBe("1.0.4+5");
+            fixture.AssertFullSemver("0.1.0+5");    //Fallback version + 5 commits since tag
+
+            TaggedVersion = "bad/1.0.3";
+            fixture.Repository.MakeATaggedCommit(TaggedVersion);
+
+            fixture.AssertFullSemver("0.1.0+6");   //Fallback version + 6 commits since tag
         }
     }
 }

GitVersionCore/Configuration/Config.cs

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