Cover ReleaseDate underlying changes with tests

GitVersionCore/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs

@@ -31,8 +31,7 @@ protected SemanticVersion FindVersion(
                 PreReleaseTag = "unstable0",
                 BuildMetaData = new SemanticVersionBuildMetaData(
                     numberOfCommitsOnBranchSinceCommit,
-                    context.CurrentBranch.Name, sha,
-                    releaseDate.OriginalDate, releaseDate.Date)
+                    context.CurrentBranch.Name, releaseDate)
             };
 
             return semanticVersion;

GitVersionCore/GitFlow/BranchFinders/DevelopVersionFinder.cs

@@ -27,8 +27,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
                 Minor = versionFromMaster.Minor + 1,
                 Patch = 0,
                 PreReleaseTag = "unstable" + numberOfCommitsSinceRelease,
-                BuildMetaData = new SemanticVersionBuildMetaData(numberOfCommitsSinceRelease, context.CurrentBranch.Name, tip.Sha,
-                    releaseDate.OriginalDate, releaseDate.Date),
+                BuildMetaData = new SemanticVersionBuildMetaData(numberOfCommitsSinceRelease, context.CurrentBranch.Name, releaseDate),
             };
             return semanticVersion;
         }

GitVersionCore/GitFlow/BranchFinders/MasterVersionFinder.cs

@@ -37,7 +37,7 @@ SemanticVersion BuildVersion(IRepository repository, Commit tip, int major, int
                 Major = major,
                 Minor = minor,
                 Patch = patch,
-                BuildMetaData = new SemanticVersionBuildMetaData(null, "master", tip.Sha, releaseDate.OriginalDate, releaseDate.Date)
+                BuildMetaData = new SemanticVersionBuildMetaData(null, "master", releaseDate)
             };
         }
     }

GitVersionCore/GitFlow/BranchFinders/OptionallyTaggedBranchVersionFinderBase.cs

@@ -35,8 +35,7 @@ protected SemanticVersion FindVersion(
                 Patch = version.Patch,
                 PreReleaseTag = version.PreReleaseTag,
                 BuildMetaData = new SemanticVersionBuildMetaData(
-                    nbHotfixCommits, context.CurrentBranch.Name, sha,
-                    releaseDate.OriginalDate, releaseDate.Date)
+                    nbHotfixCommits, context.CurrentBranch.Name, releaseDate)
             };
 
             if (tagVersion != null)

GitVersionCore/GitFlow/BranchFinders/SupportVersionFinder.cs

@@ -37,7 +37,7 @@ SemanticVersion BuildVersion(IRepository repository, Commit tip, int major, int
                 Major = major,
                 Minor = minor,
                 Patch = patch,
-                BuildMetaData = new SemanticVersionBuildMetaData(null, "support", tip.Sha, releaseDate.OriginalDate, releaseDate.Date)
+                BuildMetaData = new SemanticVersionBuildMetaData(null, "support", releaseDate)
             };
         } 
     }

GitVersionCore/GitHubFlow/BuildNumberCalculator.cs

@@ -31,8 +31,7 @@ public SemanticVersion GetBuildNumber(GitVersionContext context)
 
             // TODO Need a way of setting this in a cross cutting way
             semanticVersion.BuildMetaData = new SemanticVersionBuildMetaData(commitsSinceLastRelease, 
-                context.CurrentBranch.Name, sha,
-                releaseDate.OriginalDate, releaseDate.Date);
+                context.CurrentBranch.Name, releaseDate);
             if (context.CurrentBranch.IsPullRequest())
             {
                 EnsurePullBranchShareACommonAncestorWithMaster(gitRepo, gitRepo.Head);

GitVersionCore/GitVersionCore.csproj

@@ -88,6 +88,7 @@
     <Compile Include="GitVersionContext.cs" />
     <Compile Include="GitVersionFinder.cs" />
     <Compile Include="Helpers\DeleteHelper.cs" />
+    <Compile Include="LambdaEqualityHelper.cs" />
     <Compile Include="LibGitExtensions.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="MissingBranchException.cs" />

GitVersionCore/LambdaEqualityHelper.cs

@@ -0,0 +1,62 @@
+namespace GitVersion
+{
+    using System;
+
+    // From the LibGit2Sharp project (ligit2sharp.com)
+    // MIT License - Copyright (c) 2011-2014 LibGit2Sharp contributors
+    // see https://github.com/libgit2/libgit2sharp/blob/7af5c60f22f9bd6064204f84467cfa62bedd1147/LibGit2Sharp/Core/LambdaEqualityHelper.cs
+
+    internal class LambdaEqualityHelper<T>
+    {
+        private readonly Func<T, object>[] equalityContributorAccessors;
+
+        public LambdaEqualityHelper(params Func<T, object>[] equalityContributorAccessors)
+        {
+            this.equalityContributorAccessors = equalityContributorAccessors;
+        }
+
+        public bool Equals(T instance, T other)
+        {
+            if (ReferenceEquals(null, instance) || ReferenceEquals(null, other))
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(instance, other))
+            {
+                return true;
+            }
+
+            if (instance.GetType() != other.GetType())
+            {
+                return false;
+            }
+
+            foreach (Func<T, object> accessor in equalityContributorAccessors)
+            {
+                if (!Equals(accessor(instance), accessor(other)))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public int GetHashCode(T instance)
+        {
+            int hashCode = GetType().GetHashCode();
+
+            unchecked
+            {
+                foreach (Func<T, object> accessor in equalityContributorAccessors)
+                {
+                    object item = accessor(instance);
+                    hashCode = (hashCode * 397) ^ (item != null ? item.GetHashCode() : 0);
+                }
+            }
+
+            return hashCode;
+        }
+    }
+}

GitVersionCore/ReleaseDate.cs

@@ -1,9 +1,38 @@
 using System;
+using GitVersion;
 
-public class ReleaseDate
+public class ReleaseDate : IEquatable<ReleaseDate>
 {
     public DateTimeOffset OriginalDate;
     public string OriginalCommitSha;
     public DateTimeOffset Date;
     public string CommitSha;
+
+    private static readonly LambdaEqualityHelper<ReleaseDate> equalityHelper =
+           new LambdaEqualityHelper<ReleaseDate>(x => x.OriginalDate, x => x.OriginalCommitSha, x => x.Date, x => x.CommitSha);
+
+    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);
+    }
 }

GitVersionCore/SemanticVersionBuildMetaData.cs

@@ -3,67 +3,47 @@ namespace GitVersion
     using System;
     using System.Text.RegularExpressions;
 
-    public class SemanticVersionBuildMetaData : IFormattable
+    public class SemanticVersionBuildMetaData : IFormattable, IEquatable<SemanticVersionBuildMetaData>
     {
         static readonly Regex ParseRegex = new Regex(
             @"(?<BuildNumber>\d+)?(\.?Branch(Name)?\.(?<BranchName>[^\.]+))?(\.?Sha?\.(?<Sha>[^\.]+))?(?<Other>.*)",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
+        private static readonly LambdaEqualityHelper<SemanticVersionBuildMetaData> equalityHelper =
+           new LambdaEqualityHelper<SemanticVersionBuildMetaData>(x => x.CommitsSinceTag, x => x.Branch, x => x.Sha, x => x.ReleaseDate);
+
         public int? CommitsSinceTag;
         public string Branch;
+        public ReleaseDate ReleaseDate;
         public string Sha;
-        public DateTimeOffset? OriginalReleaseDate;
-        public DateTimeOffset? ReleaseDate;
         public string OtherMetaData;
 
         public SemanticVersionBuildMetaData()
         {
         }
 
         public SemanticVersionBuildMetaData(
-            int? commitsSinceTag, string branch, string sha, 
-            DateTimeOffset? originalReleaseDate, DateTimeOffset? releaseDate)
+            int? commitsSinceTag, string branch, ReleaseDate releaseDate)
         {
             ReleaseDate = releaseDate;
-            OriginalReleaseDate = originalReleaseDate;
-            Sha = sha;
+            Sha = releaseDate.CommitSha;
             CommitsSinceTag = commitsSinceTag;
             Branch = branch;
         }
 
-        protected bool Equals(SemanticVersionBuildMetaData other)
+        public override bool Equals(object obj)
         {
-            return CommitsSinceTag == other.CommitsSinceTag && string.Equals(Branch, other.Branch) && string.Equals(Sha, other.Sha) && OriginalReleaseDate.Equals(other.OriginalReleaseDate) && ReleaseDate.Equals(other.ReleaseDate);
+            return Equals(obj as SemanticVersionBuildMetaData);
         }
 
-        public override bool Equals(object obj)
+        public bool Equals(SemanticVersionBuildMetaData other)
         {
-            if (ReferenceEquals(null, obj))
-            {
-                return false;
-            }
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-            if (obj.GetType() != GetType())
-            {
-                return false;
-            }
-            return Equals((SemanticVersionBuildMetaData) obj);
+            return equalityHelper.Equals(this, other);
         }
 
         public override int GetHashCode()
         {
-            unchecked
-            {
-                var hashCode = CommitsSinceTag.GetHashCode();
-                hashCode = (hashCode*397) ^ (Branch != null ? Branch.GetHashCode() : 0);
-                hashCode = (hashCode*397) ^ (Sha != null ? Sha.GetHashCode() : 0);
-                hashCode = (hashCode*397) ^ OriginalReleaseDate.GetHashCode();
-                hashCode = (hashCode*397) ^ ReleaseDate.GetHashCode();
-                return hashCode;
-            }
+            return equalityHelper.GetHashCode(this);
         }
 
         public override string ToString()
@@ -151,4 +131,4 @@ public static SemanticVersionBuildMetaData Parse(string buildMetaData)
             return semanticVersionBuildMetaData;
         }
     }
-}
+}

GitVersionCore/SemanticVersionPreReleaseTag.cs

@@ -3,11 +3,15 @@ namespace GitVersion
     using System;
     using System.Text.RegularExpressions;
 
-    public class SemanticVersionPreReleaseTag : IFormattable, IComparable<SemanticVersionPreReleaseTag>
+    public class SemanticVersionPreReleaseTag : 
+        IFormattable, IComparable<SemanticVersionPreReleaseTag>, IEquatable<SemanticVersionPreReleaseTag>
     {
         public string Name;
         public int? Number;
 
+        private static readonly LambdaEqualityHelper<SemanticVersionPreReleaseTag> equalityHelper =
+           new LambdaEqualityHelper<SemanticVersionPreReleaseTag>(x => x.Name, x => x.Number);
+
         public SemanticVersionPreReleaseTag()
         {
         }
@@ -18,26 +22,19 @@ public SemanticVersionPreReleaseTag(string name, int? number)
             Number = number;
         }
 
-        protected bool Equals(SemanticVersionPreReleaseTag other)
+        public override bool Equals(object obj)
         {
-            return string.Equals(Name, other.Name) && Number == other.Number;
+            return Equals(obj as SemanticVersionPreReleaseTag);
         }
 
-        public override bool Equals(object obj)
+        public bool Equals(SemanticVersionPreReleaseTag other)
         {
-            if (ReferenceEquals(null, obj))
-            {
-                return false;
-            }
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-            if (obj.GetType() != GetType())
-            {
-                return false;
-            }
-            return Equals((SemanticVersionPreReleaseTag) obj);
+            return equalityHelper.Equals(this, other);
+        }
+
+        public override int GetHashCode()
+        {
+            return equalityHelper.GetHashCode(this);
         }
 
         public static bool operator ==(SemanticVersionPreReleaseTag left, SemanticVersionPreReleaseTag right)
@@ -146,4 +143,4 @@ public bool HasTag()
             return !string.IsNullOrEmpty(Name);
         }
     }
-}
+}

GitVersionTask/AssemblyInfoBuilder.cs

@@ -41,8 +41,8 @@ static class GitVersionInformation
 
 
 ", GetAssemblyVersion(), GetAssemblyFileVersion(), SemanticVersion.ToString("i"),
-                SemanticVersion.BuildMetaData.OriginalReleaseDate.Value.UtcDateTime.ToString("yyyy-MM-dd"),
-                SemanticVersion.BuildMetaData.ReleaseDate.Value.UtcDateTime.ToString("yyyy-MM-dd"),
+                SemanticVersion.BuildMetaData.ReleaseDate.OriginalDate.UtcDateTime.ToString("yyyy-MM-dd"),
+                SemanticVersion.BuildMetaData.ReleaseDate.Date.UtcDateTime.ToString("yyyy-MM-dd"),
                 GenerateVariableMembers());
 
             return assemblyInfo;

Tests/AssemblyInfoBuilderTests.cs

@@ -23,9 +23,12 @@ public void VerifyCreatedCode()
             PreReleaseTag = "unstable4",
             BuildMetaData = new SemanticVersionBuildMetaData(5,
                 "feature1",
-                "a682956dc1a2752aa24597a0f5cd939f93614509",
-                DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
-                DateTimeOffset.Parse("2014-03-06 23:59:59Z")),
+                new ReleaseDate
+                {
+                    CommitSha = "a682956dc1a2752aa24597a0f5cd939f93614509",
+                    OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
+                    Date = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
+                })
         };
         var assemblyInfoBuilder = new AssemblyInfoBuilder
             {

Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_1_commit.approved.txt

@@ -9,9 +9,13 @@
     "BuildMetaData": {
         "CommitsSinceTag": 1,
         "Branch": "featureWithOneCommit",
+        "ReleaseDate": {
+            "OriginalDate": "<date replaced>",
+            "OriginalCommitSha": "000000000000000000000000000000000000000",
+            "Date": "<date replaced>",
+            "CommitSha": "000000000000000000000000000000000000000"
+        },
         "Sha": "000000000000000000000000000000000000000",
-        "OriginalReleaseDate": "<date replaced>",
-        "ReleaseDate": "<date replaced>",
         "OtherMetaData": null
     }
 }

Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_2_commits.approved.txt

@@ -9,9 +9,13 @@
     "BuildMetaData": {
         "CommitsSinceTag": 2,
         "Branch": "featureWithOneCommit",
+        "ReleaseDate": {
+            "OriginalDate": "<date replaced>",
+            "OriginalCommitSha": "000000000000000000000000000000000000000",
+            "Date": "<date replaced>",
+            "CommitSha": "000000000000000000000000000000000000000"
+        },
         "Sha": "000000000000000000000000000000000000000",
-        "OriginalReleaseDate": "<date replaced>",
-        "ReleaseDate": "<date replaced>",
         "OtherMetaData": null
     }
 }

Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_2_commits_but_building_an_commit.approved.txt

@@ -9,9 +9,13 @@
     "BuildMetaData": {
         "CommitsSinceTag": 2,
         "Branch": "featureWithOneCommit",
+        "ReleaseDate": {
+            "OriginalDate": "<date replaced>",
+            "OriginalCommitSha": "000000000000000000000000000000000000000",
+            "Date": "<date replaced>",
+            "CommitSha": "000000000000000000000000000000000000000"
+        },
         "Sha": "000000000000000000000000000000000000000",
-        "OriginalReleaseDate": "<date replaced>",
-        "ReleaseDate": "<date replaced>",
         "OtherMetaData": null
     }
 }