[WIP] Branch specific configuration

BREAKING CHANGES.md

@@ -0,0 +1,5 @@
+v3.0.0
+ - `AssemblyFileSemVer` variable removed, AssemblyVersioningScheme configuration value makes this variable obsolete
+ - `ClassicVersion` variable removed, 
+ - `ClassicVersionWithTag` variable removed, as above
+ - MSBuild task arguments (AssemblyVersioningScheme, DevelopBranchTag, ReleaseBranchTag, TagPrefix, NextVersion) have been removed, use GitVersionConfig.yaml instead

GitVersion.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.22512.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionExe", "GitVersionExe\GitVersionExe.csproj", "{C3578A7B-09A6-4444-9383-0DEAFA4958BD}"
 EndProject
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionCore.Tests", "Git
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3EFFC5D6-88D0-49D9-BB53-E1B7EB49DD45}"
 	ProjectSection(SolutionItems) = preProject
+		BREAKING CHANGES.md = BREAKING CHANGES.md
+		GitVersionConfig.yaml = GitVersionConfig.yaml
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
@@ -24,47 +26,33 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C3578A7B-09A6-4444-9383-0DEAFA4958BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C3578A7B-09A6-4444-9383-0DEAFA4958BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3578A7B-09A6-4444-9383-0DEAFA4958BD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C3578A7B-09A6-4444-9383-0DEAFA4958BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C3578A7B-09A6-4444-9383-0DEAFA4958BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3578A7B-09A6-4444-9383-0DEAFA4958BD}.Release|x86.ActiveCfg = Release|Any CPU
 		{5A86453B-96FB-4B6E-A283-225BB9F753D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5A86453B-96FB-4B6E-A283-225BB9F753D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A86453B-96FB-4B6E-A283-225BB9F753D3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5A86453B-96FB-4B6E-A283-225BB9F753D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A86453B-96FB-4B6E-A283-225BB9F753D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A86453B-96FB-4B6E-A283-225BB9F753D3}.Release|x86.ActiveCfg = Release|Any CPU
 		{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|x86.ActiveCfg = Release|Any CPU
 		{BF905F84-382C-440D-92F5-C61108626D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF905F84-382C-440D-92F5-C61108626D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF905F84-382C-440D-92F5-C61108626D8D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{BF905F84-382C-440D-92F5-C61108626D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF905F84-382C-440D-92F5-C61108626D8D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF905F84-382C-440D-92F5-C61108626D8D}.Release|x86.ActiveCfg = Release|Any CPU
 		{F9741A0D-B9D7-4557-9A1C-A7252C1071F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F9741A0D-B9D7-4557-9A1C-A7252C1071F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9741A0D-B9D7-4557-9A1C-A7252C1071F5}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F9741A0D-B9D7-4557-9A1C-A7252C1071F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9741A0D-B9D7-4557-9A1C-A7252C1071F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9741A0D-B9D7-4557-9A1C-A7252C1071F5}.Release|x86.ActiveCfg = Release|Any CPU
 		{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

GitVersion.sln.DotSettings

@@ -54,6 +54,8 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMistakenCallToGetType_002E2/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleNullReferenceException/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateFieldCanBeConvertedToLocalVariable/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentName/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentNameForLiteralExpression/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAssignment/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBaseConstructorCall/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBoolCompare/@EntryIndexedValue">ERROR</s:String>

GitVersionConfig.yaml

@@ -1,2 +1,2 @@
-assembly-versioning-scheme: MajorMinor
-next-version: 2.0.0
+assembly-versioning-scheme: MajorMinorPatch
+next-version: 3.0.0

GitVersionTask.Tests/BuildServers/BuildServerBaseTests.cs → GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

@@ -22,7 +22,8 @@ public void BuildNumberIsFullSemVer()
 
         semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
         semanticVersion.BuildMetaData.Sha = "commitSha";
-        new BuildServer().WriteIntegration(semanticVersion, writes.Add);
+        var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery);
+        new BuildServer().WriteIntegration(writes.Add, variables);
 
         writes[1].ShouldBe("1.2.3-beta.1+5");
     }

GitVersionCore.Tests/ConfigProviderTests.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -25,28 +26,44 @@ public void CanReadDocument()
     {
         const string text = @"
 assembly-versioning-scheme: MajorMinor
-develop-branch-tag: alpha
-release-branch-tag: rc
 next-version: 2.0.0
 tag-prefix: '[vV|version-]'
+mode: ContinuousDelivery
+branches:
+    develop:
+        mode: ContinuousDeployment
+        tag: dev
+    release[/-]:
+       mode: ContinuousDeployment
+       tag: rc 
 ";
         SetupConfigFileContent(text);
 
         var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
-        config.DevelopBranchTag.ShouldBe("alpha");
-        config.ReleaseBranchTag.ShouldBe("rc");
         config.NextVersion.ShouldBe("2.0.0");
         config.TagPrefix.ShouldBe("[vV|version-]");
+        config.VersioningMode.ShouldBe(VersioningMode.ContinuousDelivery);
+        config.Branches["develop"].Tag.ShouldBe("dev");
+        config.Branches["release[/-]"].Tag.ShouldBe("rc");
+        config.Branches["release[/-]"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
+        config.Branches["develop"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
     }
 
     [Test]
     public void CanReadOldDocument()
     {
-        const string text = @"assemblyVersioningScheme: MajorMinor";
+        const string text = @"
+assemblyVersioningScheme: MajorMinor
+develop-branch-tag: alpha
+release-branch-tag: rc
+";
         SetupConfigFileContent(text);
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
-        config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
+        var error = Should.Throw<OldConfigurationException>(() => ConfigurationProvider.Provide(gitDirectory, fileSystem));
+        error.Message.ShouldContainWithoutWhitespace(@"GitVersionConfig.yaml contains old configuration, please fix the following errors:
+assemblyVersioningScheme has been replaced by assembly-versioning-scheme
+develop-branch-tag has been replaced by branch specific configuration.See https://github.com/ParticularLabs/GitVersion/wiki/Branch-Specific-Configuration
+release-branch-tag has been replaced by branch specific configuration.See https://github.com/ParticularLabs/GitVersion/wiki/Branch-Specific-Configuration");
     }
 
     [Test]
@@ -56,8 +73,8 @@ public void CanReadDefaultDocument()
         SetupConfigFileContent(text);
         var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
-        config.DevelopBranchTag.ShouldBe("unstable");
-        config.ReleaseBranchTag.ShouldBe("beta");
+        config.Branches["develop"].Tag.ShouldBe("unstable");
+        config.Branches["release[/-]"].Tag.ShouldBe("beta");
         config.TagPrefix.ShouldBe("[vV]");
         config.NextVersion.ShouldBe(null);
     }
@@ -66,7 +83,9 @@ public void CanReadDefaultDocument()
     public void VerifyInit()
     {
         var config = typeof(Config);
-        var aliases = config.GetProperties().Select(p => ((YamlAliasAttribute) p.GetCustomAttribute(typeof(YamlAliasAttribute))).Alias);
+        var aliases = config.GetProperties()
+            .Where(p => p.GetCustomAttribute<ObsoleteAttribute>() == null)
+            .Select(p => ((YamlMemberAttribute) p.GetCustomAttribute(typeof(YamlMemberAttribute))).Alias);
         var writer = new StringWriter();
 
         ConfigReader.WriteSample(writer);
@@ -82,7 +101,10 @@ public void VerifyInit()
     public void VerifyAliases()
     {
         var config = typeof(Config);
-        var propertiesMissingAlias = config.GetProperties().Where(p => p.GetCustomAttribute(typeof(YamlAliasAttribute)) == null).Select(p => p.Name);
+        var propertiesMissingAlias = config.GetProperties()
+            .Where(p => p.GetCustomAttribute<ObsoleteAttribute>() == null)
+            .Where(p => p.GetCustomAttribute(typeof(YamlMemberAttribute)) == null)
+            .Select(p => p.Name);
 
         propertiesMissingAlias.ShouldBeEmpty();
     }

GitVersionCore.Tests/Fixtures/BaseGitFlowRepositoryFixture.cs

@@ -3,13 +3,26 @@
 using GitVersion;
 using LibGit2Sharp;
 
+/// <summary>
+/// Creates a repo with a develop branch off master which is a single commit ahead of master
+/// </summary>
 public class BaseGitFlowRepositoryFixture : EmptyRepositoryFixture
 {
+    /// <summary>
+    /// Creates a repo with a develop branch off master which is a single commit ahead of master
+    /// 
+    /// Master will be tagged with the initial version before branching develop
+    /// </summary>
     public BaseGitFlowRepositoryFixture(string initialVersion) : base(new Config())
     {
         SetupRepo(r => r.MakeATaggedCommit(initialVersion));
     }
 
+    /// <summary>
+    /// Creates a repo with a develop branch off master which is a single commit ahead of master
+    /// 
+    /// The initial setup actions will be performed before branching develop
+    /// </summary>
     public BaseGitFlowRepositoryFixture(Action<IRepository> initialMasterAction) : base(new Config())
     {
         SetupRepo(initialMasterAction);
@@ -19,10 +32,11 @@ void SetupRepo(Action<IRepository> initialMasterAction)
     {
         var randomFile = Path.Combine(Repository.Info.WorkingDirectory, Guid.NewGuid().ToString());
         File.WriteAllText(randomFile, string.Empty);
-        Repository.Index.Stage(randomFile);
+        Repository.Stage(randomFile);
 
         initialMasterAction(Repository);
 
         Repository.CreateBranch("develop").Checkout();
+        Repository.MakeACommit();
     }
 }

GitVersionCore.Tests/Fixtures/EmptyRepositoryFixture.cs

@@ -1,5 +1,7 @@
-using System;
+using System.Diagnostics;
+using System.Text;
 using GitVersion;
+using GitVersion.Helpers;
 using LibGit2Sharp;
 
 public class EmptyRepositoryFixture : RepositoryFixtureBase
@@ -9,10 +11,25 @@ public EmptyRepositoryFixture(Config configuration) :
     {
     }
 
+    public void DumpGraph()
+    {
+        var output = new StringBuilder();
+
+        ProcessHelper.Run(
+            o => output.AppendLine(o),
+            e => output.AppendLineFormat("ERROR: {0}", e),
+            null,
+            "git",
+            @"log --graph --abbrev-commit --decorate --date=relative --all",
+            RepositoryPath);
+
+        Trace.Write(output.ToString());
+    }
+
     static IRepository CreateNewRepository(string path)
     {
         LibGit2Sharp.Repository.Init(path);
-        Console.WriteLine("Created git repository at '{0}'", path);
+        Trace.WriteLine("Created git repository at '{0}'", path);
 
         return new Repository(path);
     }

GitVersionCore.Tests/GitVersionContextBuilder.cs

@@ -0,0 +1,80 @@
+namespace GitVersionCore.Tests
+{
+    using GitVersion;
+    using LibGit2Sharp;
+
+    public class GitVersionContextBuilder
+    {
+        IRepository repository;
+        Config config;
+
+        public GitVersionContextBuilder WithRepository(IRepository repository)
+        {
+            this.repository = repository;
+            return this;
+        }
+
+        public GitVersionContextBuilder WithConfig(Config config)
+        {
+            this.config = config;
+            return this;
+        }
+
+        public GitVersionContextBuilder WithTaggedMaster()
+        {
+            repository = CreateRepository();
+            var target = repository.Head.Tip;
+            ((MockTagCollection)repository.Tags).Add(new MockTag ("1.0.0", target));
+            return this;
+        }
+
+        public GitVersionContextBuilder AddCommit()
+        {
+            ((MockBranch)repository.Head).Add(new MockCommit());
+            return this;
+        }
+
+        public GitVersionContextBuilder WithDevelopBranch()
+        {
+            return WithBranch("develop");
+        }
+
+        public GitVersionContextBuilder WithBranch(string branchName)
+        {
+            repository = CreateRepository();
+            return AddBranch(branchName);
+        }
+
+        public GitVersionContextBuilder AddBranch(string branchName)
+        {
+            var mockBranch = new MockBranch(branchName)
+            {
+                new MockCommit()
+            };
+            ((MockBranchCollection)repository.Branches).Add(mockBranch);
+            ((MockRepository)repository).Head = mockBranch;
+            return this;
+        }
+
+        public GitVersionContext Build()
+        {
+            return new GitVersionContext(repository ?? CreateRepository(), config ?? new Config());
+        }
+
+        IRepository CreateRepository()
+        {
+            var mockBranch = new MockBranch("master") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } };
+            var mockRepository = new MockRepository
+            {
+                Branches = new MockBranchCollection
+                {
+                    mockBranch
+                },
+                Tags = new MockTagCollection(),
+                Head = mockBranch
+            };
+
+            return mockRepository;
+        }
+    }
+}