Added fix for branches with slashes in the branch-name.

Author: Spiralis

src/GitVersionCore.Tests/IntegrationTests/OtherBranchScenarios.cs

@@ -5,32 +5,32 @@
 [TestFixture]
 public class OtherBranchScenarios
 {
-	[Test]
-	public void CanTakeVersionFromReleaseBranch()
-	{
-		using (var fixture = new EmptyRepositoryFixture(new Config()))
-		{
-			const string TaggedVersion = "1.0.3";
-			fixture.Repository.MakeATaggedCommit(TaggedVersion);
-			fixture.Repository.MakeCommits(5);
-			fixture.Repository.CreateBranch("alpha-2.0.0");
-			fixture.Repository.Checkout("alpha-2.0.0");
+    [Test]
+    public void CanTakeVersionFromReleaseBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            const string TaggedVersion = "1.0.3";
+            fixture.Repository.MakeATaggedCommit(TaggedVersion);
+            fixture.Repository.MakeCommits(5);
+            fixture.Repository.CreateBranch("alpha-2.0.0");
+            fixture.Repository.Checkout("alpha-2.0.0");
 
-			fixture.AssertFullSemver("2.0.0-alpha.1+0");
-		}
-	}
-	[Test]
-	public void BranchesWithIllegalCharsShouldNotBeUsedInVersionNames()
-	{
-		using (var fixture = new EmptyRepositoryFixture(new Config()))
-		{
-			const string TaggedVersion = "1.0.3";
-			fixture.Repository.MakeATaggedCommit(TaggedVersion);
-			fixture.Repository.MakeCommits(5);
-			fixture.Repository.CreateBranch("issue/m/github-569");
-			fixture.Repository.Checkout("issue/m/github-569");
+            fixture.AssertFullSemver("2.0.0-alpha.1+0");
+        }
+    }
+    [Test]
+    public void BranchesWithIllegalCharsShouldNotBeUsedInVersionNames()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            const string TaggedVersion = "1.0.3";
+            fixture.Repository.MakeATaggedCommit(TaggedVersion);
+            fixture.Repository.MakeCommits(5);
+            fixture.Repository.CreateBranch("issue/m/github-569");
+            fixture.Repository.Checkout("issue/m/github-569");
 
-			fixture.AssertFullSemver("1.0.4-issue-m-github-569.1+5");
-		}
-	}
+            fixture.AssertFullSemver("1.0.4-issue-m-github-569.1+5");
+        }
+    }
 }

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

@@ -61,8 +61,12 @@ void UpdatePreReleaseTag(GitVersionContext context, SemanticVersion semanticVers
             if (tagToUse == "useBranchName")
             {
                 Logger.WriteInfo("Using branch name to calculate version tag");
-                var name = branchNameOverride ?? context.CurrentBranch.Name;
-                tagToUse = name.RegexReplace(context.Configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
+                tagToUse = branchNameOverride ?? context.CurrentBranch.Name;
+                if (!string.IsNullOrWhiteSpace(context.Configuration.BranchPrefixToTrim))
+                {
+                    tagToUse = tagToUse.RegexReplace(context.Configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
+                }
+                tagToUse = tagToUse.RegexReplace("[^a-zA-Z0-9-]", "-");
             }
             int? number = null;
             if (!string.IsNullOrEmpty(context.Configuration.TagNumberPattern))