Fixing #100

Jake Ginnivan · Jake Ginnivan · commit 513ae1db87d5 · 2014-03-19T21:40:50.000Z
diff --git a/AcceptanceTests/NoTagsInRepositorySpecification.RunSpecification.approved.txt b/AcceptanceTests/NoTagsInRepositorySpecification.RunSpecification.approved.txt
@@ -10,8 +10,8 @@
   "BranchType":"Master",
   "Sha":"000000000000000000000000000000000000000",
   "MajorMinorPatch":"0.1.0",
-  "SemVer":"0.1.0",
-  "Version":"0.1.0",
+  "SemVer":"0.1.0+2",
+  "Version":"0.1.0+2",
   "PreReleasePartTwo":2,
   "Stability":"Final"
 }
diff --git a/AcceptanceTests/NoTagsInRepositorySpecification.RunSpecification.approved.txt.orig b/AcceptanceTests/NoTagsInRepositorySpecification.RunSpecification.approved.txt.orig
@@ -1 +1,17 @@
-﻿ 
+﻿{
+  "Major":0,
+  "Minor":1,
+  "Patch":0,
+  "Suffix":"",
+  "LongVersion":"0.1.0 Sha:'000000000000000000000000000000000000000'",
+  "NugetVersion":"0.1.0",
+  "ShortVersion":"0.1.0",
+  "BranchName":"master",
+  "BranchType":"Master",
+  "Sha":"000000000000000000000000000000000000000",
+  "MajorMinorPatch":"0.1.0",
+  "SemVer":"0.1.0",
+  "Version":"0.1.0",
+  "PreReleasePartTwo":2,
+  "Stability":"Final"
+}
diff --git a/AcceptanceTests/NoTagsInRepositoryWithNextVersionTxtSpecification.RunSpecification.approved.txt b/AcceptanceTests/NoTagsInRepositoryWithNextVersionTxtSpecification.RunSpecification.approved.txt
@@ -10,8 +10,8 @@
   "BranchType":"Master",
   "Sha":"000000000000000000000000000000000000000",
   "MajorMinorPatch":"0.2.0",
-  "SemVer":"0.2.0",
-  "Version":"0.2.0",
+  "SemVer":"0.2.0+2",
+  "Version":"0.2.0+2",
   "PreReleasePartTwo":2,
   "Stability":"Final"
 }
diff --git a/AcceptanceTests/NoTagsInRepositoryWithNextVersionTxtSpecification.RunSpecification.approved.txt.orig b/AcceptanceTests/NoTagsInRepositoryWithNextVersionTxtSpecification.RunSpecification.approved.txt.orig
@@ -1 +1,17 @@
-﻿ 
+﻿{
+  "Major":0,
+  "Minor":2,
+  "Patch":0,
+  "Suffix":"",
+  "LongVersion":"0.2.0 Sha:'000000000000000000000000000000000000000'",
+  "NugetVersion":"0.2.0",
+  "ShortVersion":"0.2.0",
+  "BranchName":"master",
+  "BranchType":"Master",
+  "Sha":"000000000000000000000000000000000000000",
+  "MajorMinorPatch":"0.2.0",
+  "SemVer":"0.2.0",
+  "Version":"0.2.0",
+  "PreReleasePartTwo":2,
+  "Stability":"Final"
+}
diff --git a/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForOneCommit.approved.txt b/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForOneCommit.approved.txt
@@ -10,8 +10,8 @@
   "BranchType":"Master",
   "Sha":"000000000000000000000000000000000000000",
   "MajorMinorPatch":"1.1.0",
-  "SemVer":"1.1.0",
-  "Version":"1.1.0",
+  "SemVer":"1.1.0+1",
+  "Version":"1.1.0+1",
   "PreReleasePartTwo":1,
   "Stability":"Final"
 }
diff --git a/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForOneCommit.approved.txt.orig b/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForOneCommit.approved.txt.orig
@@ -1 +1,17 @@
-﻿ 
+﻿{
+  "Major":1,
+  "Minor":1,
+  "Patch":0,
+  "Suffix":"",
+  "LongVersion":"1.1.0 Sha:'000000000000000000000000000000000000000'",
+  "NugetVersion":"1.1.0",
+  "ShortVersion":"1.1.0",
+  "BranchName":"master",
+  "BranchType":"Master",
+  "Sha":"000000000000000000000000000000000000000",
+  "MajorMinorPatch":"1.1.0",
+  "SemVer":"1.1.0",
+  "Version":"1.1.0",
+  "PreReleasePartTwo":1,
+  "Stability":"Final"
+}
diff --git a/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForTenCommitsCommit.approved.txt b/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForTenCommitsCommit.approved.txt
@@ -10,8 +10,8 @@
   "BranchType":"Master",
   "Sha":"000000000000000000000000000000000000000",
   "MajorMinorPatch":"1.1.0",
-  "SemVer":"1.1.0",
-  "Version":"1.1.0",
+  "SemVer":"1.1.0+12",
+  "Version":"1.1.0+12",
   "PreReleasePartTwo":12,
   "Stability":"Final"
 }
diff --git a/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForTenCommitsCommit.approved.txt.orig b/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForTenCommitsCommit.approved.txt.orig
@@ -1 +1,17 @@
-﻿ 
+﻿{
+  "Major":1,
+  "Minor":1,
+  "Patch":0,
+  "Suffix":"",
+  "LongVersion":"1.1.0 Sha:'000000000000000000000000000000000000000'",
+  "NugetVersion":"1.1.0",
+  "ShortVersion":"1.1.0",
+  "BranchName":"master",
+  "BranchType":"Master",
+  "Sha":"000000000000000000000000000000000000000",
+  "MajorMinorPatch":"1.1.0",
+  "SemVer":"1.1.0",
+  "Version":"1.1.0",
+  "PreReleasePartTwo":12,
+  "Stability":"Final"
+}
diff --git a/AcceptanceTests/TagFollowedByCommitsWithNoNextVersionTxtSpecification.RunSpecification.approved.txt b/AcceptanceTests/TagFollowedByCommitsWithNoNextVersionTxtSpecification.RunSpecification.approved.txt
@@ -10,8 +10,8 @@
   "BranchType":"Master",
   "Sha":"000000000000000000000000000000000000000",
   "MajorMinorPatch":"0.1.1",
-  "SemVer":"0.1.1",
-  "Version":"0.1.1",
+  "SemVer":"0.1.1+1",
+  "Version":"0.1.1+1",
   "PreReleasePartTwo":1,
   "Stability":"Final"
 }
diff --git a/AcceptanceTests/TagFollowedByCommitsWithNoNextVersionTxtSpecification.RunSpecification.approved.txt.orig b/AcceptanceTests/TagFollowedByCommitsWithNoNextVersionTxtSpecification.RunSpecification.approved.txt.orig
@@ -1 +1,17 @@
-﻿ 
+﻿{
+  "Major":0,
+  "Minor":1,
+  "Patch":1,
+  "Suffix":"",
+  "LongVersion":"0.1.1 Sha:'000000000000000000000000000000000000000'",
+  "NugetVersion":"0.1.1",
+  "ShortVersion":"0.1.1",
+  "BranchName":"master",
+  "BranchType":"Master",
+  "Sha":"000000000000000000000000000000000000000",
+  "MajorMinorPatch":"0.1.1",
+  "SemVer":"0.1.1",
+  "Version":"0.1.1",
+  "PreReleasePartTwo":1,
+  "Stability":"Final"
+}
diff --git a/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithOneCommit.approved.txt b/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithOneCommit.approved.txt
@@ -10,8 +10,8 @@
   "BranchType":"Master",
   "Sha":"000000000000000000000000000000000000000",
   "MajorMinorPatch":"1.0.4",
-  "SemVer":"1.0.4",
-  "Version":"1.0.4",
-  "PreReleasePartTwo":12,
+  "SemVer":"1.0.4+1",
+  "Version":"1.0.4+1",
+  "PreReleasePartTwo":1,
   "Stability":"Final"
 }
diff --git a/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithOneCommit.approved.txt.orig b/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithOneCommit.approved.txt.orig
@@ -1 +1,17 @@
-﻿ 
+﻿{
+  "Major":1,
+  "Minor":0,
+  "Patch":4,
+  "Suffix":"",
+  "LongVersion":"1.0.4 Sha:'000000000000000000000000000000000000000'",
+  "NugetVersion":"1.0.4",
+  "ShortVersion":"1.0.4",
+  "BranchName":"master",
+  "BranchType":"Master",
+  "Sha":"000000000000000000000000000000000000000",
+  "MajorMinorPatch":"1.0.4",
+  "SemVer":"1.0.4",
+  "Version":"1.0.4",
+  "PreReleasePartTwo":12,
+  "Stability":"Final"
+}
diff --git a/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithTenCommit.approved.txt b/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithTenCommit.approved.txt
@@ -10,8 +10,8 @@
   "BranchType":"Master",
   "Sha":"000000000000000000000000000000000000000",
   "MajorMinorPatch":"1.0.4",
-  "SemVer":"1.0.4",
-  "Version":"1.0.4",
-  "PreReleasePartTwo":10,
+  "SemVer":"1.0.4+12",
+  "Version":"1.0.4+12",
+  "PreReleasePartTwo":12,
   "Stability":"Final"
 }
diff --git a/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithTenCommit.approved.txt.orig b/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithTenCommit.approved.txt.orig
@@ -1 +1,17 @@
-﻿ 
+﻿{
+  "Major":1,
+  "Minor":0,
+  "Patch":4,
+  "Suffix":"",
+  "LongVersion":"1.0.4 Sha:'000000000000000000000000000000000000000'",
+  "NugetVersion":"1.0.4",
+  "ShortVersion":"1.0.4",
+  "BranchName":"master",
+  "BranchType":"Master",
+  "Sha":"000000000000000000000000000000000000000",
+  "MajorMinorPatch":"1.0.4",
+  "SemVer":"1.0.4",
+  "Version":"1.0.4",
+  "PreReleasePartTwo":10,
+  "Stability":"Final"
+}
diff --git a/AcceptanceTests/ToFileSpecification.cs b/AcceptanceTests/ToFileSpecification.cs
diff --git a/GitVersion/OutputVariables/VersionBuilders/SemVerVersionBuilder.cs b/GitVersion/OutputVariables/VersionBuilders/SemVerVersionBuilder.cs
@@ -43,7 +43,9 @@ public static string GenerateSemVer(this VersionAndBranch versionAndBranch)
                         break;
                 }
             }
-            return string.Format("{0}.{1}.{2}{3}", semVer.Major, semVer.Minor, semVer.Patch, prereleaseString);
+            return string.Format("{0}.{1}.{2}{3}{4}", 
+                semVer.Major, semVer.Minor, semVer.Patch, prereleaseString, 
+                semVer.PreReleasePartTwo == null ? null : "+" + semVer.PreReleasePartTwo);
         }
     }
 }
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -168,7 +168,9 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="GitHubFlow\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,9 @@ public static string GenerateSemVer(this VersionAndBranch versionAndBranch)`
`43`	`43`	`break;`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`- return string.Format("{0}.{1}.{2}{3}", semVer.Major, semVer.Minor, semVer.Patch, prereleaseString);`
	`46`	`+ return string.Format("{0}.{1}.{2}{3}{4}",`
	`47`	`+ semVer.Major, semVer.Minor, semVer.Patch, prereleaseString,`
	`48`	`+ semVer.PreReleasePartTwo == null ? null : "+" + semVer.PreReleasePartTwo);`
`47`	`49`	`}`
`48`	`50`	`}`
`49`	`51`	`}`