Removed SignatureBuilder and using Constants.SignatureNow instead, it forces different commit times, fixing a race condition

Author: JakeGinnivan

src/GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs

@@ -124,7 +124,7 @@ public void MergeNoFF(string mergeTarget)
 
     public void AssertFullSemver(string fullSemver, IRepository repository = null, string commitId = null)
     {
-        Trace.WriteLine("---------");
+        Console.WriteLine("---------");
 
         try
         {
@@ -163,7 +163,7 @@ VersionVariables GetVersion(IRepository repository = null, string commitId = nul
         }
         catch (Exception)
         {
-            Trace.WriteLine("Test failing, dumping repository graph");
+            Console.WriteLine("Test failing, dumping repository graph");
             gitVersionContext.Repository.DumpGraph();
             throw;
         }

src/GitVersionCore.Tests/GitVersionContextBuilder.cs

@@ -65,7 +65,7 @@ public GitVersionContext Build()
 
         IRepository CreateRepository()
         {
-            var mockBranch = new MockBranch("master") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } };
+            var mockBranch = new MockBranch("master") { new MockCommit { CommitterEx = Constants.SignatureNow() } };
             var mockRepository = new MockRepository
             {
                 Branches = new MockBranchCollection

src/GitVersionCore.Tests/GitVersionContextTests.cs

@@ -17,7 +17,7 @@ public void CanInheritVersioningMode(VersioningMode mode)
             };
             ConfigurationProvider.ApplyDefaultsTo(config);
 
-            var mockBranch = new MockBranch("master") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } };
+            var mockBranch = new MockBranch("master") { new MockCommit { CommitterEx = Constants.SignatureNow() } };
             var mockRepository = new MockRepository
             {
                 Branches = new MockBranchCollection
@@ -48,12 +48,12 @@ public void UsesBranchSpecificConfigOverTopLevelDefaults()
                 }
             };
             ConfigurationProvider.ApplyDefaultsTo(config);
-            var develop = new MockBranch("develop") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } };
+            var develop = new MockBranch("develop") { new MockCommit { CommitterEx = Constants.SignatureNow() } };
             var mockRepository = new MockRepository
             {
                 Branches = new MockBranchCollection
                 {
-                    new MockBranch("master") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } },
+                    new MockBranch("master") { new MockCommit { CommitterEx = Constants.SignatureNow() } },
                     develop
                 }
             };

src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -161,7 +161,6 @@
     <Compile Include="Mocks\MockTag.cs" />
     <Compile Include="Mocks\MockTagAnnotation.cs" />
     <Compile Include="Mocks\MockTagCollection.cs" />
-    <Compile Include="Mocks\SignatureBuilder.cs" />
     <Compile Include="ModuleInitializer.cs" />
     <Compile Include="Fixtures\EmptyRepositoryFixture.cs" />
     <Compile Include="Helpers\GitTestExtensions.cs" />

src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs

@@ -21,7 +21,7 @@ public void ShouldInheritIncrementCorrectlyWithMultiplePossibleParentsAndWeirdly
 
             //Merge it
             fixture.Repository.Checkout("development");
-            fixture.Repository.Merge(feature123, SignatureBuilder.SignatureNow());
+            fixture.Repository.Merge(feature123, Constants.SignatureNow());
 
             //Create a second feature branch
             fixture.Repository.CreateBranch("feature/JIRA-124");
@@ -56,7 +56,7 @@ public void BranchCreatedAfterFastForwardMergeShouldInheritCorrectly()
 
             //Merge it
             fixture.Repository.Checkout("unstable");
-            fixture.Repository.Merge(feature123, SignatureBuilder.SignatureNow());
+            fixture.Repository.Merge(feature123, Constants.SignatureNow());
 
             //Create a second feature branch
             fixture.Repository.CreateBranch("feature/JIRA-124");
@@ -147,11 +147,11 @@ public void ShouldBePossibleToMergeDevelopForALongRunningBranchWhereDevelopAndMa
             fixture.Repository.MakeACommit();
 
             fixture.Repository.Checkout("master");
-            fixture.Repository.Merge(fixture.Repository.FindBranch("develop"), SignatureBuilder.SignatureNow());
+            fixture.Repository.Merge(fixture.Repository.FindBranch("develop"), Constants.SignatureNow());
             fixture.Repository.ApplyTag("v1.1.0");
 
             fixture.Repository.Checkout("feature/longrunning"); 
-            fixture.Repository.Merge(fixture.Repository.FindBranch("develop"), SignatureBuilder.SignatureNow());
+            fixture.Repository.Merge(fixture.Repository.FindBranch("develop"), Constants.SignatureNow());
 
             fixture.AssertFullSemver("1.2.0-longrunning.2");
         }

src/GitVersionCore.Tests/Mocks/SignatureBuilder.cs

@@ -60,7 +60,7 @@ class V1Strategy : BaseVersionStrategy
 
             public V1Strategy(DateTimeOffset? when)
             {
-                this.when = when == null ? null : new MockCommit { CommitterEx = when.Value.ToSignature() };
+                this.when = when == null ? null : new MockCommit { CommitterEx = Constants.Signature(when.Value) };
             }
 
             public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
@@ -75,7 +75,7 @@ class V2Strategy : BaseVersionStrategy
 
             public V2Strategy(DateTimeOffset? when)
             {
-                this.when = when == null ? null : new MockCommit { CommitterEx = when.Value.ToSignature() };
+                this.when = when == null ? null : new MockCommit { CommitterEx = Constants.Signature(when.Value) };
             }
 
             public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)

src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs

@@ -2,7 +2,6 @@ namespace GitVersion
 {
     using System;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.IO;
     using System.Linq;
     using System.Text;
@@ -210,7 +209,7 @@ public static void DumpGraph(string workingDirectory, Action<string> writer = nu
             }
 
             if (writer != null) writer(output.ToString());
-            else Trace.Write(output.ToString());
+            else Console.Write(output.ToString());
         }
     }
 }

src/GitVersionCore/LibGitExtensions.cs

@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using GitVersion;
+using GitVersion;
 
 /// <summary>
 /// Used by the ModuleInit. All code inside the Initialize method is ran as soon as the assembly is loaded.
@@ -11,7 +10,7 @@ public static class ModuleInitializer
     /// </summary>
     public static void Initialize()
     {
-        Logger.SetLoggers(s => Trace.WriteLine(s), s => Trace.WriteLine(s), s => Trace.WriteLine(s));
+        Logger.SetLoggers(s => System.Console.WriteLine(s), s => System.Console.WriteLine(s), s => System.Console.WriteLine(s));
     }
 
 }