Merge pull request #682 from IntelliSearch/issue-569

JakeGinnivan · JakeGinnivan · commit c05f4f468b32 · 2015-10-12T07:38:15.000+08:00
Added test and fix for scenario when branch-name contains slashes. Fixes #569.
diff --git a/src/GitVersionCore.Tests/IntegrationTests/OtherBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/OtherBranchScenarios.cs
@@ -19,4 +19,18 @@ public void CanTakeVersionFromReleaseBranch()
             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");
+        }
+    }
 }
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
@@ -52,8 +52,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Visualize, Version=0.4.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Visualize.Fody.0.4.3.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll</HintPath>
+    <Reference Include="Visualize, Version=0.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Visualize.Fody.0.4.4.0\lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="YamlDotNet, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs b/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))
diff --git a/src/GitVersionCore/packages.config b/src/GitVersionCore/packages.config
@@ -5,6 +5,6 @@
   <package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net40" developmentDependency="true" />
   <package id="LibGit2Sharp" version="0.21.0.176" targetFramework="net40" />
   <package id="PepitaPackage" version="1.21.4" targetFramework="net40" developmentDependency="true" />
-  <package id="Visualize.Fody" version="0.4.4.0" targetFramework="net40" developmentDependency="true" />
+  <package id="Visualize.Fody" version="0.4.4.0" targetFramework="net4" developmentDependency="true" />
   <package id="YamlDotNet" version="3.6.1" targetFramework="net40" />
 </packages>
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
@@ -51,8 +51,8 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="Visualize, Version=0.4.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Visualize.Fody.0.4.3.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll</HintPath>
+    <Reference Include="Visualize, Version=0.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Visualize.Fody.0.4.4.0\lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
diff --git a/src/GitVersionExe/packages.config b/src/GitVersionExe/packages.config
@@ -5,5 +5,5 @@
   <package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net40" developmentDependency="true" />
   <package id="LibGit2Sharp" version="0.21.0.176" targetFramework="net40" />
   <package id="PepitaPackage" version="1.21.4" targetFramework="net40" developmentDependency="true" />
-  <package id="Visualize.Fody" version="0.4.4.0" targetFramework="net40" developmentDependency="true" />
+  <package id="Visualize.Fody" version="0.4.4.0" targetFramework="net4" developmentDependency="true" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,18 @@ public void CanTakeVersionFromReleaseBranch()`
`19`	`19`	`fixture.AssertFullSemver("2.0.0-alpha.1+0");`
`20`	`20`	`}`
`21`	`21`	`}`
	`22`	`+ [Test]`
	`23`	`+ public void BranchesWithIllegalCharsShouldNotBeUsedInVersionNames()`
	`24`	`+ {`
	`25`	`+ using (var fixture = new EmptyRepositoryFixture(new Config()))`
	`26`	`+ {`
	`27`	`+ const string TaggedVersion = "1.0.3";`
	`28`	`+ fixture.Repository.MakeATaggedCommit(TaggedVersion);`
	`29`	`+ fixture.Repository.MakeCommits(5);`
	`30`	`+ fixture.Repository.CreateBranch("issue/m/github-569");`
	`31`	`+ fixture.Repository.Checkout("issue/m/github-569");`
	`32`	`+`
	`33`	`+ fixture.AssertFullSemver("1.0.4-issue-m-github-569.1+5");`
	`34`	`+ }`
	`35`	`+ }`
`22`	`36`	`}`