Merge pull request #134 from distantcam/semver20

JakeGinnivan · JakeGinnivan · commit bc6871489159 · 2014-03-29T11:21:35.000Z
SemVer 2 support (take 2)
diff --git a/AcceptanceTests/NoTagsInRepositorySpecification.RunSpecification.approved.txt b/AcceptanceTests/NoTagsInRepositorySpecification.RunSpecification.approved.txt
@@ -3,7 +3,7 @@
   "Minor":1,
   "Patch":0,
   "Suffix":"",
-  "LongVersion":"0.1.0 Sha:'000000000000000000000000000000000000000'",
+  "LongVersion":"0.1.0+Sha.000000000000000000000000000000000000000",
   "NugetVersion":"0.1.0",
   "ShortVersion":"0.1.0",
   "BranchName":"master",
diff --git a/AcceptanceTests/NoTagsInRepositoryWithNextVersionTxtSpecification.RunSpecification.approved.txt b/AcceptanceTests/NoTagsInRepositoryWithNextVersionTxtSpecification.RunSpecification.approved.txt
@@ -3,7 +3,7 @@
   "Minor":2,
   "Patch":0,
   "Suffix":"",
-  "LongVersion":"0.2.0 Sha:'000000000000000000000000000000000000000'",
+  "LongVersion":"0.2.0+Sha.000000000000000000000000000000000000000",
   "NugetVersion":"0.2.0",
   "ShortVersion":"0.2.0",
   "BranchName":"master",
diff --git a/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForOneCommit.approved.txt b/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForOneCommit.approved.txt
@@ -3,7 +3,7 @@
   "Minor":1,
   "Patch":0,
   "Suffix":"",
-  "LongVersion":"1.1.0 Sha:'000000000000000000000000000000000000000'",
+  "LongVersion":"1.1.0+Sha.000000000000000000000000000000000000000",
   "NugetVersion":"1.1.0",
   "ShortVersion":"1.1.0",
   "BranchName":"master",
diff --git a/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForTenCommitsCommit.approved.txt b/AcceptanceTests/TagFollowedByCommitsWithApplicableNextVersionTxtSpecification.ForTenCommitsCommit.approved.txt
@@ -3,7 +3,7 @@
   "Minor":1,
   "Patch":0,
   "Suffix":"",
-  "LongVersion":"1.1.0 Sha:'000000000000000000000000000000000000000'",
+  "LongVersion":"1.1.0+Sha.000000000000000000000000000000000000000",
   "NugetVersion":"1.1.0",
   "ShortVersion":"1.1.0",
   "BranchName":"master",
diff --git a/AcceptanceTests/TagFollowedByCommitsWithNoNextVersionTxtSpecification.RunSpecification.approved.txt b/AcceptanceTests/TagFollowedByCommitsWithNoNextVersionTxtSpecification.RunSpecification.approved.txt
@@ -3,7 +3,7 @@
   "Minor":1,
   "Patch":1,
   "Suffix":"",
-  "LongVersion":"0.1.1 Sha:'000000000000000000000000000000000000000'",
+  "LongVersion":"0.1.1+Sha.000000000000000000000000000000000000000",
   "NugetVersion":"0.1.1",
   "ShortVersion":"0.1.1",
   "BranchName":"master",
diff --git a/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithOneCommit.approved.txt b/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithOneCommit.approved.txt
@@ -3,7 +3,7 @@
   "Minor":0,
   "Patch":4,
   "Suffix":"",
-  "LongVersion":"1.0.4 Sha:'000000000000000000000000000000000000000'",
+  "LongVersion":"1.0.4+Sha.000000000000000000000000000000000000000",
   "NugetVersion":"1.0.4",
   "ShortVersion":"1.0.4",
   "BranchName":"master",
diff --git a/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithTenCommit.approved.txt b/AcceptanceTests/TagFollowedByCommitsWithRedundantNextVersionTxtSpecification.WithTenCommit.approved.txt
@@ -3,7 +3,7 @@
   "Minor":0,
   "Patch":4,
   "Suffix":"",
-  "LongVersion":"1.0.4 Sha:'000000000000000000000000000000000000000'",
+  "LongVersion":"1.0.4+Sha.000000000000000000000000000000000000000",
   "NugetVersion":"1.0.4",
   "ShortVersion":"1.0.4",
   "BranchName":"master",
diff --git a/GitVersion/OutputVariables/VersionBuilders/InformationalVersionBuilder.cs b/GitVersion/OutputVariables/VersionBuilders/InformationalVersionBuilder.cs
@@ -13,31 +13,31 @@ public static string ToLongString(this VersionAndBranch versionAndBranch)
             if (versionAndBranch.BranchType == BranchType.Feature)
             {
                 var shortSha = versionAndBranch.Sha.Substring(0, 8);
-                return string.Format("{0}-unstable.feature-{1} Branch:'{2}' Sha:'{3}'", versionPrefix, shortSha, versionAndBranch.BranchName, versionAndBranch.Sha);
+                return string.Format("{0}-unstable.feature-{1}+Branch.{2}.Sha.{3}", versionPrefix, shortSha, versionAndBranch.BranchName, versionAndBranch.Sha);
             }
 
             if (versionAndBranch.BranchType == BranchType.PullRequest)
             {
-                return string.Format("{0}-unstable.pull-request-{1} Branch:'{2}' Sha:'{3}'", versionPrefix, GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);
+                return string.Format("{0}-unstable.pull-request-{1}+Branch.{2}.Sha.{3}", versionPrefix, GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);
             }
 
 
             if (versionAndBranch.BranchType == BranchType.Master)
             {
-                return string.Format("{0} Sha:'{1}'", versionPrefix, versionAndBranch.Sha);
+                return string.Format("{0}+Sha.{1}", versionPrefix, versionAndBranch.Sha);
             }
 
 
             //else Hotfix, Develop or Release
             if (releaseInformation.Stability == Stability.Final)
             {
-                return string.Format("{0} Sha:'{1}'", versionPrefix, versionAndBranch.Sha);
+                return string.Format("{0}+Sha.{1}", versionPrefix, versionAndBranch.Sha);
             }
             if (releaseInformation.Stability == Stability.ReleaseCandidate)
             {
-                return string.Format("{0}-rc{1} Branch:'{2}' Sha:'{3}'", versionPrefix, GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);
+                return string.Format("{0}-rc{1}+Branch.{2}.Sha.{3}", versionPrefix, GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);
             }
-            return string.Format("{0}-{1}{2} Branch:'{3}' Sha:'{4}'", versionPrefix,releaseInformation.Stability.ToString().ToLowerInvariant(), GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);
+            return string.Format("{0}-{1}{2}+Branch.{3}.Sha.{4}", versionPrefix,releaseInformation.Stability.ToString().ToLowerInvariant(), GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);
         }
 
         static string GetPreRelease(int? preReleasePartTwo, ReleaseInformation releaseInformation)
diff --git a/Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
@@ -4,7 +4,7 @@ using System.Reflection;
 
 [assembly: AssemblyVersion("1.2.3")]
 [assembly: AssemblyFileVersion("1.2.3")]
-[assembly: AssemblyInformationalVersion("1.2.3-unstable.feature-a682956d Branch:'feature1' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
+[assembly: AssemblyInformationalVersion("1.2.3-unstable.feature-a682956d+Branch.feature1.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
 [assembly: NugetVersion("1.2.3-Feature-feature1-a682956dc1a2752aa24597a0f5cd939f93614509")]
 [assembly: ReleaseDate("2014-03-01", "2014-03-06")]
 
@@ -37,7 +37,7 @@ static class GitVersionInformation
 {
     public static string AssemblyVersion = "1.2.3";
     public static string AssemblyFileVersion = "1.2.3";
-    public static string AssemblyInformationalVersion = "1.2.3-unstable.feature-a682956d Branch:'feature1' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'";
+    public static string AssemblyInformationalVersion = "1.2.3-unstable.feature-a682956d+Branch.feature1.Sha.a682956dc1a2752aa24597a0f5cd939f93614509";
     public static string NugetVersion = "1.2.3-Feature-feature1-a682956dc1a2752aa24597a0f5cd939f93614509";
     public static string SemVer = "1.2.3-Feature-feature1-a682956dc1a2752aa24597a0f5cd939f93614509";
 }
diff --git a/Tests/JsonVersionBuilderTests.Json.approved.txt b/Tests/JsonVersionBuilderTests.Json.approved.txt
@@ -3,7 +3,7 @@
   "Minor":2,
   "Patch":3,
   "Suffix":"a682956d",
-  "LongVersion":"1.2.3-unstable.feature-a682956d Branch:'feature1' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'",
+  "LongVersion":"1.2.3-unstable.feature-a682956d+Branch.feature1.Sha.a682956dc1a2752aa24597a0f5cd939f93614509",
   "NugetVersion":"1.2.3-Feature-feature1-a682956dc1a2752aa24597a0f5cd939f93614509",
   "ShortVersion":"1.2.3-unstable.feature-a682956d",
   "BranchName":"feature1",
diff --git a/Tests/OutputVariables/InformationalVersionBuilderTests.cs b/Tests/OutputVariables/InformationalVersionBuilderTests.cs
@@ -4,17 +4,17 @@
 [TestFixture]
 public class InformationalVersionBuilderTests
 {
-    [TestCase(BranchType.Feature, "feature1", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "unstable", "a682956d", "1.2.3-unstable.feature-a682956d Branch:'feature1' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
-    [TestCase(BranchType.Develop, "develop", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "alpha645", null, "1.2.3-alpha645 Branch:'develop' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
-    [TestCase(BranchType.Develop, "develop", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "unstable645", null, "1.2.3-unstable645 Branch:'develop' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
-    [TestCase(BranchType.Develop, "develop", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "beta645", null, "1.2.3-beta645 Branch:'develop' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
-    [TestCase(BranchType.Hotfix, "hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "alpha645", null, "1.2.3-alpha645 Branch:'hotfix-foo' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
-    [TestCase(BranchType.Hotfix, "hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "beta645", null, "1.2.3-beta645 Branch:'hotfix-foo' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
-    [TestCase(BranchType.Hotfix, "hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, null, null, "1.2.3 Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
-    [TestCase(BranchType.Master, "master", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, null, null, "1.2.3 Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
-    [TestCase(BranchType.PullRequest, "myPullRequest", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "unstable3", null, "1.2.3-unstable.pull-request-3 Branch:'myPullRequest' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
-    [TestCase(BranchType.Release, "release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 0, "beta2", null, "1.2.0-beta2 Branch:'release-1.2' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
-    [TestCase(BranchType.Release, "release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 0, "alpha2", null, "1.2.0-alpha2 Branch:'release-1.2' Sha:'a682956dc1a2752aa24597a0f5cd939f93614509'")]
+    [TestCase(BranchType.Feature, "feature1", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "unstable", "a682956d", "1.2.3-unstable.feature-a682956d+Branch.feature1.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(BranchType.Develop, "develop", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "alpha645", null, "1.2.3-alpha645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(BranchType.Develop, "develop", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "unstable645", null, "1.2.3-unstable645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(BranchType.Develop, "develop", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "beta645", null, "1.2.3-beta645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(BranchType.Hotfix, "hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "alpha645", null, "1.2.3-alpha645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(BranchType.Hotfix, "hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "beta645", null, "1.2.3-beta645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(BranchType.Hotfix, "hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, null, null, "1.2.3+Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(BranchType.Master, "master", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, null, null, "1.2.3+Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(BranchType.PullRequest, "myPullRequest", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 3, "unstable3", null, "1.2.3-unstable.pull-request-3+Branch.myPullRequest.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(BranchType.Release, "release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 0, "beta2", null, "1.2.0-beta2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(BranchType.Release, "release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", 1, 2, 0, "alpha2", null, "1.2.0-alpha2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
     public void ValidateInformationalVersionBuilder(BranchType branchType, string branchName, string sha, int major, int minor, int patch,
         string tag, string suffix, string versionString)
     {

Original file line number	Diff line number	Diff line change
`@@ -13,31 +13,31 @@ public static string ToLongString(this VersionAndBranch versionAndBranch)`
`13`	`13`	`if (versionAndBranch.BranchType == BranchType.Feature)`
`14`	`14`	`{`
`15`	`15`	`var shortSha = versionAndBranch.Sha.Substring(0, 8);`
`16`		`- return string.Format("{0}-unstable.feature-{1} Branch:'{2}' Sha:'{3}'", versionPrefix, shortSha, versionAndBranch.BranchName, versionAndBranch.Sha);`
	`16`	`+ return string.Format("{0}-unstable.feature-{1}+Branch.{2}.Sha.{3}", versionPrefix, shortSha, versionAndBranch.BranchName, versionAndBranch.Sha);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`if (versionAndBranch.BranchType == BranchType.PullRequest)`
`20`	`20`	`{`
`21`		`- return string.Format("{0}-unstable.pull-request-{1} Branch:'{2}' Sha:'{3}'", versionPrefix, GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);`
	`21`	`+ return string.Format("{0}-unstable.pull-request-{1}+Branch.{2}.Sha.{3}", versionPrefix, GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`
`25`	`25`	`if (versionAndBranch.BranchType == BranchType.Master)`
`26`	`26`	`{`
`27`		`- return string.Format("{0} Sha:'{1}'", versionPrefix, versionAndBranch.Sha);`
	`27`	`+ return string.Format("{0}+Sha.{1}", versionPrefix, versionAndBranch.Sha);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`
`31`	`31`	`//else Hotfix, Develop or Release`
`32`	`32`	`if (releaseInformation.Stability == Stability.Final)`
`33`	`33`	`{`
`34`		`- return string.Format("{0} Sha:'{1}'", versionPrefix, versionAndBranch.Sha);`
	`34`	`+ return string.Format("{0}+Sha.{1}", versionPrefix, versionAndBranch.Sha);`
`35`	`35`	`}`
`36`	`36`	`if (releaseInformation.Stability == Stability.ReleaseCandidate)`
`37`	`37`	`{`
`38`		`- return string.Format("{0}-rc{1} Branch:'{2}' Sha:'{3}'", versionPrefix, GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);`
	`38`	`+ return string.Format("{0}-rc{1}+Branch.{2}.Sha.{3}", versionPrefix, GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);`
`39`	`39`	`}`
`40`		`- return string.Format("{0}-{1}{2} Branch:'{3}' Sha:'{4}'", versionPrefix,releaseInformation.Stability.ToString().ToLowerInvariant(), GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);`
	`40`	`+ return string.Format("{0}-{1}{2}+Branch.{3}.Sha.{4}", versionPrefix,releaseInformation.Stability.ToString().ToLowerInvariant(), GetPreRelease(version.PreReleasePartTwo, releaseInformation), versionAndBranch.BranchName, versionAndBranch.Sha);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`static string GetPreRelease(int? preReleasePartTwo, ReleaseInformation releaseInformation)`