make LastVersionOnMasterFinder return a date

Author: SimonCropp

GitVersionCore.Tests/LastVersionOnMasterFinderTests.cs

@@ -85,8 +85,7 @@ static void EnsureMetaDataMatch(CommitCountingRepoFixture fixture, string branch
 
         var commit = referenceCommitFinder(fixture.Repository);
         var releaseDate = LastVersionOnMasterFinder.Execute(fixture.Repository, commit);
-        releaseDate.OriginalCommitSha.ShouldBe(commit.Sha);
-        releaseDate.OriginalDate.ShouldBe(commit.Committer.When);
+        releaseDate.ShouldBe(commit.Committer.When);
     }
 
     void DropTags(IRepository repo, params string[] names)

GitVersionCore/LastVersionOnMasterFinder.cs

@@ -4,9 +4,11 @@
 
 namespace GitVersion
 {
+    using System;
+
     public class LastVersionOnMasterFinder
     {
-        public static ReleaseDate Execute(IRepository repo, Commit commit)
+        public static DateTimeOffset Execute(IRepository repo, Commit commit)
         {
             //dont need an if for release since we want the current date for a release branch
             if (
@@ -15,17 +17,9 @@ public static ReleaseDate Execute(IRepository repo, Commit commit)
                 )
             {
                 var vp = FindLatestStableTaggedCommitReachableFrom(repo, commit);
-                return new ReleaseDate
-                {
-                    OriginalDate = vp.When(),
-                    OriginalCommitSha = vp.Sha,
-                };
+                return vp.When();
             }
-            return new ReleaseDate
-            {
-                OriginalDate = commit.When(),
-                OriginalCommitSha = commit.Sha,
-            };
+            return commit.When();
         }
 
         static Commit FindLatestStableTaggedCommitReachableFrom(IRepository repo, Commit commit)

GitVersionCore/ReleaseDate.cs

@@ -1,36 +1,8 @@
 using System;
-using GitVersion;
 
-public class ReleaseDate : IEquatable<ReleaseDate>
+public class ReleaseDate
 {
     public DateTimeOffset OriginalDate;
     public string OriginalCommitSha;
 
-    static LambdaEqualityHelper<ReleaseDate> equalityHelper =
-           new LambdaEqualityHelper<ReleaseDate>(x => x.OriginalDate, x => x.OriginalCommitSha);
-
-    public override bool Equals(object obj)
-    {
-        return Equals(obj as ReleaseDate);
-    }
-
-    public bool Equals(ReleaseDate other)
-    {
-        return equalityHelper.Equals(this, other);
-    }
-
-    public override int GetHashCode()
-    {
-        return equalityHelper.GetHashCode(this);
-    }
-
-    public static bool operator ==(ReleaseDate left, ReleaseDate right)
-    {
-        return Equals(left, right);
-    }
-
-    public static bool operator !=(ReleaseDate left, ReleaseDate right)
-    {
-        return !Equals(left, right);
-    }
 }

GitVersionTask.Tests/AssemblyInfoBuilderTests.cs

@@ -34,11 +34,7 @@ public void VerifyCreatedCode()
                 CachedVersion = new CachedVersion
                 {
                     SemanticVersion = semanticVersion,
-                    ReleaseDate = new ReleaseDate
-                    {
-                        OriginalCommitSha = "originalCommitSha",
-                        OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
-                    }
+                    MasterReleaseDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
                 }
             };
         var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText();
@@ -91,11 +87,7 @@ static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)
             CachedVersion = new CachedVersion
             {
                 SemanticVersion = semanticVersion,
-                ReleaseDate = new ReleaseDate
-                {
-                    OriginalCommitSha = "originalCommitSha",
-                    OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
-                }
+                MasterReleaseDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z")
             },
             AssemblyVersioningScheme = avs,
         };

GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs

@@ -41,7 +41,7 @@ static class GitVersionInformation
 
 
 ", semanticVersion.GetAssemblyVersion(AssemblyVersioningScheme), string.Format("{0}.{1}.{2}.0", semanticVersion.Major, semanticVersion.Minor, semanticVersion.Patch), semanticVersion.ToString("i"),
-            CachedVersion.ReleaseDate.OriginalDate.UtcDateTime.ToString("yyyy-MM-dd"),
+            CachedVersion.MasterReleaseDate.UtcDateTime.ToString("yyyy-MM-dd"),
             semanticVersion.BuildMetaData.CommitDate.UtcDateTime.ToString("yyyy-MM-dd"),
             GenerateVariableMembers(vars));
 

GitVersionTask/CachedVersion.cs

@@ -1,8 +1,9 @@
-using GitVersion;
+using System;
+using GitVersion;
 
 public class CachedVersion
 {
     public SemanticVersion SemanticVersion;
     public long Timestamp;
-    public ReleaseDate ReleaseDate;
+    public DateTimeOffset MasterReleaseDate;
 }

GitVersionTask/VersionCache.cs

@@ -18,7 +18,7 @@ public static CachedVersion GetVersion(string gitDirectory)
                 {
                     Logger.WriteInfo("Change detected. flushing cache.");
                     cachedVersion.SemanticVersion = GitVersionFinder.GetSemanticVersion(repo);
-                    cachedVersion.ReleaseDate = LastVersionOnMasterFinder.Execute(repo, repo.Head.Tip);
+                    cachedVersion.MasterReleaseDate = LastVersionOnMasterFinder.Execute(repo, repo.Head.Tip);
                 }
                 return cachedVersion;
             }
@@ -27,7 +27,7 @@ public static CachedVersion GetVersion(string gitDirectory)
             return versionCacheVersions[key] = new CachedVersion
             {
                 SemanticVersion = GitVersionFinder.GetSemanticVersion(repo),
-                ReleaseDate = LastVersionOnMasterFinder.Execute(repo,repo.Head.Tip),
+                MasterReleaseDate = LastVersionOnMasterFinder.Execute(repo,repo.Head.Tip),
                 Timestamp = ticks
             };