Removed LastMinorVersionFinder and OriginalDate from the assembly info builder in GitVersionTask and removed unneeded tests

JakeGinnivan · JakeGinnivan · commit d5a2545629c2 · 2015-02-11T20:45:59.000Z
diff --git a/GitVersionCore.Tests/IntegrationTests/GitFlow/MetaDataByCommitScenarios.cs b/GitVersionCore.Tests/IntegrationTests/GitFlow/MetaDataByCommitScenarios.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using GitVersion;
-using GitVersionCore.Tests;
-using LibGit2Sharp;
+﻿using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;
 
@@ -80,89 +77,6 @@ public void CanCorrectlyDetectCommitCountsSemVer()
         }
     }
 
-
-    /*
-         *  hotfix-1.2.1       -----------C--      
-         *                    /              \     
-         *  master           A----------------F-----H-------N
-         *                    \                    / \     /
-         *  hotfix-1.3.1       \                  /   ----L
-         *                      \                /         \
-         *  release-1.3.0        \        -D----G---        \
-         *                        \      /          \        \
-         *  develop                -----B----E-------I-----M--O--P
-         *                                    \           /
-         *  feature                            -------J-K-
-         * 
-         *
-         *  - A is tagged `1.2.0`
-         *  - F is tagged `1.2.1`
-         *  - H is tagged `1.3.0`
-         *  - N is tagged `1.3.1`
-        */
-
-    [Test]
-    public void CanCorrectlyDetectCommitCountsAndReleaseDataWhenThatApplies()
-    {
-        using (var f = new CommitCountingRepoFixture())
-        {
-            ResetToP(f.Repository);
-            EnsureBranchMatch(f, "develop");
-
-            ResetToO(f.Repository);
-            EnsureBranchMatch(f, "develop");
-
-            ResetToN(f.Repository);
-            EnsureBranchMatch(f, "master", r => (Commit)r.Tags["1.3.0"].Target);
-
-            ResetToM(f.Repository);
-            EnsureBranchMatch(f, "develop");
-
-            ResetToL(f.Repository);
-            EnsureBranchMatch(f, "hotfix-1.3.1", r => (Commit)r.Tags["1.3.0"].Target);
-
-            ResetToK(f.Repository);
-            EnsureBranchMatch(f, "feature");
-
-            ResetToJ(f.Repository);
-            EnsureBranchMatch(f, "feature");
-
-            ResetToI(f.Repository);
-            EnsureBranchMatch(f, "develop");
-
-            ResetToH(f.Repository);
-            EnsureBranchMatch(f, "master", r => (Commit)r.Tags["1.3.0"].Target);
-
-            ResetToG(f.Repository);
-            EnsureBranchMatch(f, "release-1.3.0");
-
-            ResetToF(f.Repository);
-            EnsureBranchMatch(f, "master", r => (Commit)r.Tags["1.2.0"].Target);
-
-            ResetToE(f.Repository);
-            EnsureBranchMatch(f, "develop");
-
-            ResetToD(f.Repository);
-            EnsureBranchMatch(f, "release-1.3.0");
-
-            ResetToC(f.Repository);
-            EnsureBranchMatch(f, "hotfix-1.2.1", r => (Commit)r.Tags["1.2.0"].Target);
-
-            ResetToB(f.Repository);
-            EnsureBranchMatch(f, "develop");
-        }
-    }
-
-    static void EnsureBranchMatch(CommitCountingRepoFixture fixture, string branchName, Func<IRepository, Commit> commitFinder = null)
-    {
-        var referenceCommitFinder = commitFinder ?? (r => r.FindBranch(branchName).Tip);
-
-        var commit = referenceCommitFinder(fixture.Repository);
-        var releaseDate = LastMinorVersionFinder.Execute(fixture.Repository, new TestEffectiveConfiguration(), commit);
-        releaseDate.ShouldBe(commit.When());
-    }
-
-
     static void EnsureMetaDataMatch(CommitCountingRepoFixture fixture,string expectedSemVer)
     {
         var result = fixture.ExecuteGitVersion();
diff --git a/GitVersionCore/GitVersionCore.csproj b/GitVersionCore/GitVersionCore.csproj
@@ -84,7 +84,6 @@
     <Compile Include="Helpers\FileSystem.cs" />
     <Compile Include="Helpers\IFileSystem.cs" />
     <Compile Include="Helpers\ProcessHelper.cs" />
-    <Compile Include="LastMinorVersionFinder.cs" />
     <Compile Include="OutputVariables\CommitsAsFourthVersionPartFormatter.cs" />
     <Compile Include="OutputVariables\VersionVariables.cs" />
     <Compile Include="Extensions\ExtensionMethods.git.cs" />
diff --git a/GitVersionCore/LastMinorVersionFinder.cs b/GitVersionCore/LastMinorVersionFinder.cs
diff --git a/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt b/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
@@ -5,17 +5,15 @@ using System.Reflection;
 [assembly: AssemblyVersion("2.0.0.0")]
 [assembly: AssemblyFileVersion("2.0.0.0")]
 [assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]
-[assembly: ReleaseDate("2014-03-01", "2014-03-06")]
+[assembly: ReleaseDate("2014-03-06")]
 
 [System.Runtime.CompilerServices.CompilerGenerated]
 sealed class ReleaseDateAttribute : System.Attribute
 {
-    public string OriginalDate { get; private set; }
     public string Date { get; private set; }
 
-    public ReleaseDateAttribute(string originalDate, string date)
+    public ReleaseDateAttribute(string date)
     {
-        OriginalDate = originalDate;
         Date = date;
     }
 }
diff --git a/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt b/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt
@@ -5,17 +5,15 @@ using System.Reflection;
 [assembly: AssemblyVersion("2.3.0.0")]
 [assembly: AssemblyFileVersion("2.3.0.0")]
 [assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]
-[assembly: ReleaseDate("2014-03-01", "2014-03-06")]
+[assembly: ReleaseDate("2014-03-06")]
 
 [System.Runtime.CompilerServices.CompilerGenerated]
 sealed class ReleaseDateAttribute : System.Attribute
 {
-    public string OriginalDate { get; private set; }
     public string Date { get; private set; }
 
-    public ReleaseDateAttribute(string originalDate, string date)
+    public ReleaseDateAttribute(string date)
     {
-        OriginalDate = originalDate;
         Date = date;
     }
 }
diff --git a/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt b/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt
@@ -5,17 +5,15 @@ using System.Reflection;
 [assembly: AssemblyVersion("2.3.4.0")]
 [assembly: AssemblyFileVersion("2.3.4.0")]
 [assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]
-[assembly: ReleaseDate("2014-03-01", "2014-03-06")]
+[assembly: ReleaseDate("2014-03-06")]
 
 [System.Runtime.CompilerServices.CompilerGenerated]
 sealed class ReleaseDateAttribute : System.Attribute
 {
-    public string OriginalDate { get; private set; }
     public string Date { get; private set; }
 
-    public ReleaseDateAttribute(string originalDate, string date)
+    public ReleaseDateAttribute(string date)
     {
-        OriginalDate = originalDate;
         Date = date;
     }
 }
diff --git a/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchMetadata.approved.txt b/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchMetadata.approved.txt
@@ -5,17 +5,15 @@ using System.Reflection;
 [assembly: AssemblyVersion("2.3.4.5")]
 [assembly: AssemblyFileVersion("2.3.4.5")]
 [assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]
-[assembly: ReleaseDate("2014-03-01", "2014-03-06")]
+[assembly: ReleaseDate("2014-03-06")]
 
 [System.Runtime.CompilerServices.CompilerGenerated]
 sealed class ReleaseDateAttribute : System.Attribute
 {
-    public string OriginalDate { get; private set; }
     public string Date { get; private set; }
 
-    public ReleaseDateAttribute(string originalDate, string date)
+    public ReleaseDateAttribute(string date)
     {
-        OriginalDate = originalDate;
         Date = date;
     }
 }
diff --git a/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
@@ -5,17 +5,15 @@ using System.Reflection;
 [assembly: AssemblyVersion("1.2.3.0")]
 [assembly: AssemblyFileVersion("1.2.3.0")]
 [assembly: AssemblyInformationalVersion("1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha")]
-[assembly: ReleaseDate("2014-03-01", "2014-03-06")]
+[assembly: ReleaseDate("2014-03-06")]
 
 [System.Runtime.CompilerServices.CompilerGenerated]
 sealed class ReleaseDateAttribute : System.Attribute
 {
-    public string OriginalDate { get; private set; }
     public string Date { get; private set; }
 
-    public ReleaseDateAttribute(string originalDate, string date)
+    public ReleaseDateAttribute(string date)
     {
-        OriginalDate = originalDate;
         Date = date;
     }
 }
diff --git a/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs b/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs
@@ -29,8 +29,7 @@ public void VerifyCreatedCode()
         {
             CachedVersion = new CachedVersion
             {
-                SemanticVersion = semanticVersion,
-                MasterReleaseDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
+                SemanticVersion = semanticVersion
             }
         };
         var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(new TestEffectiveConfiguration());
@@ -84,8 +83,7 @@ static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)
         {
             CachedVersion = new CachedVersion
             {
-                SemanticVersion = semanticVersion,
-                MasterReleaseDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z")
+                SemanticVersion = semanticVersion
             },
         };
 
diff --git a/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs b/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs
@@ -17,32 +17,29 @@ public string GetAssemblyInfoText(EffectiveConfiguration configuration)
 [assembly: AssemblyVersion(""{0}"")]
 [assembly: AssemblyFileVersion(""{1}"")]
 [assembly: AssemblyInformationalVersion(""{2}"")]
-[assembly: ReleaseDate(""{3}"", ""{4}"")]
+[assembly: ReleaseDate(""{3}"")]
 
 [System.Runtime.CompilerServices.CompilerGenerated]
 sealed class ReleaseDateAttribute : System.Attribute
 {{
-    public string OriginalDate {{ get; private set; }}
     public string Date {{ get; private set; }}
 
-    public ReleaseDateAttribute(string originalDate, string date)
+    public ReleaseDateAttribute(string date)
     {{
-        OriginalDate = originalDate;
         Date = date;
     }}
 }}
 
 [System.Runtime.CompilerServices.CompilerGenerated]
 static class GitVersionInformation
 {{
-{5}
+{4}
 }}
 
 
 ", vars.AssemblySemVer,
  vars.AssemblySemVer, 
  semanticVersion.ToString("i"),
-            CachedVersion.MasterReleaseDate.UtcDateTime.ToString("yyyy-MM-dd"),
             semanticVersion.BuildMetaData.CommitDate.UtcDateTime.ToString("yyyy-MM-dd"),
             GenerateVariableMembers(vars));
 
diff --git a/GitVersionTask/CachedVersion.cs b/GitVersionTask/CachedVersion.cs
@@ -1,9 +1,7 @@
-﻿using System;
-using GitVersion;
+﻿using GitVersion;
 
 public class CachedVersion
 {
     public SemanticVersion SemanticVersion;
     public long Timestamp;
-    public DateTimeOffset MasterReleaseDate;
 }
diff --git a/GitVersionTask/VersionCache.cs b/GitVersionTask/VersionCache.cs
@@ -22,7 +22,6 @@ public static Tuple<CachedVersion, GitVersionContext> GetVersion(string gitDirec
                 {
                     Logger.WriteInfo("Change detected. flushing cache.");
                     result.Item1.SemanticVersion = versionFinder.FindVersion(context);
-                    result.Item1.MasterReleaseDate = LastMinorVersionFinder.Execute(repo, context.Configuration, repo.Head.Tip);
                 }
                 return result;
             }
@@ -31,7 +30,6 @@ public static Tuple<CachedVersion, GitVersionContext> GetVersion(string gitDirec
             return versionCacheVersions[key] = Tuple.Create(new CachedVersion
             {
                 SemanticVersion = versionFinder.FindVersion(context),
-                MasterReleaseDate = LastMinorVersionFinder.Execute(repo, context.Configuration, repo.Head.Tip),
                 Timestamp = ticks
             }, context);
         }

Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,15 @@ using System.Reflection;`
`5`	`5`	`[assembly: AssemblyVersion("2.0.0.0")]`
`6`	`6`	`[assembly: AssemblyFileVersion("2.0.0.0")]`
`7`	`7`	`[assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]`
`8`		`-[assembly: ReleaseDate("2014-03-01", "2014-03-06")]`
	`8`	`+[assembly: ReleaseDate("2014-03-06")]`
`9`	`9`
`10`	`10`	`[System.Runtime.CompilerServices.CompilerGenerated]`
`11`	`11`	`sealed class ReleaseDateAttribute : System.Attribute`
`12`	`12`	`{`
`13`		`- public string OriginalDate { get; private set; }`
`14`	`13`	`public string Date { get; private set; }`
`15`	`14`
`16`		`- public ReleaseDateAttribute(string originalDate, string date)`
	`15`	`+ public ReleaseDateAttribute(string date)`
`17`	`16`	`{`
`18`		`- OriginalDate = originalDate;`
`19`	`17`	`Date = date;`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,15 @@ using System.Reflection;`
`5`	`5`	`[assembly: AssemblyVersion("2.3.0.0")]`
`6`	`6`	`[assembly: AssemblyFileVersion("2.3.0.0")]`
`7`	`7`	`[assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]`
`8`		`-[assembly: ReleaseDate("2014-03-01", "2014-03-06")]`
	`8`	`+[assembly: ReleaseDate("2014-03-06")]`
`9`	`9`
`10`	`10`	`[System.Runtime.CompilerServices.CompilerGenerated]`
`11`	`11`	`sealed class ReleaseDateAttribute : System.Attribute`
`12`	`12`	`{`
`13`		`- public string OriginalDate { get; private set; }`
`14`	`13`	`public string Date { get; private set; }`
`15`	`14`
`16`		`- public ReleaseDateAttribute(string originalDate, string date)`
	`15`	`+ public ReleaseDateAttribute(string date)`
`17`	`16`	`{`
`18`		`- OriginalDate = originalDate;`
`19`	`17`	`Date = date;`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,15 @@ using System.Reflection;`
`5`	`5`	`[assembly: AssemblyVersion("2.3.4.0")]`
`6`	`6`	`[assembly: AssemblyFileVersion("2.3.4.0")]`
`7`	`7`	`[assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]`
`8`		`-[assembly: ReleaseDate("2014-03-01", "2014-03-06")]`
	`8`	`+[assembly: ReleaseDate("2014-03-06")]`
`9`	`9`
`10`	`10`	`[System.Runtime.CompilerServices.CompilerGenerated]`
`11`	`11`	`sealed class ReleaseDateAttribute : System.Attribute`
`12`	`12`	`{`
`13`		`- public string OriginalDate { get; private set; }`
`14`	`13`	`public string Date { get; private set; }`
`15`	`14`
`16`		`- public ReleaseDateAttribute(string originalDate, string date)`
	`15`	`+ public ReleaseDateAttribute(string date)`
`17`	`16`	`{`
`18`		`- OriginalDate = originalDate;`
`19`	`17`	`Date = date;`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,15 @@ using System.Reflection;`
`5`	`5`	`[assembly: AssemblyVersion("2.3.4.5")]`
`6`	`6`	`[assembly: AssemblyFileVersion("2.3.4.5")]`
`7`	`7`	`[assembly: AssemblyInformationalVersion("2.3.4+5.Branch.master.Sha.commitSha")]`
`8`		`-[assembly: ReleaseDate("2014-03-01", "2014-03-06")]`
	`8`	`+[assembly: ReleaseDate("2014-03-06")]`
`9`	`9`
`10`	`10`	`[System.Runtime.CompilerServices.CompilerGenerated]`
`11`	`11`	`sealed class ReleaseDateAttribute : System.Attribute`
`12`	`12`	`{`
`13`		`- public string OriginalDate { get; private set; }`
`14`	`13`	`public string Date { get; private set; }`
`15`	`14`
`16`		`- public ReleaseDateAttribute(string originalDate, string date)`
	`15`	`+ public ReleaseDateAttribute(string date)`
`17`	`16`	`{`
`18`		`- OriginalDate = originalDate;`
`19`	`17`	`Date = date;`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,15 @@ using System.Reflection;`
`5`	`5`	`[assembly: AssemblyVersion("1.2.3.0")]`
`6`	`6`	`[assembly: AssemblyFileVersion("1.2.3.0")]`
`7`	`7`	`[assembly: AssemblyInformationalVersion("1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha")]`
`8`		`-[assembly: ReleaseDate("2014-03-01", "2014-03-06")]`
	`8`	`+[assembly: ReleaseDate("2014-03-06")]`
`9`	`9`
`10`	`10`	`[System.Runtime.CompilerServices.CompilerGenerated]`
`11`	`11`	`sealed class ReleaseDateAttribute : System.Attribute`
`12`	`12`	`{`
`13`		`- public string OriginalDate { get; private set; }`
`14`	`13`	`public string Date { get; private set; }`
`15`	`14`
`16`		`- public ReleaseDateAttribute(string originalDate, string date)`
	`15`	`+ public ReleaseDateAttribute(string date)`
`17`	`16`	`{`
`18`		`- OriginalDate = originalDate;`
`19`	`17`	`Date = date;`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ public void VerifyCreatedCode()`
`29`	`29`	`{`
`30`	`30`	`CachedVersion = new CachedVersion`
`31`	`31`	`{`
`32`		`- SemanticVersion = semanticVersion,`
`33`		`- MasterReleaseDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),`
	`32`	`+ SemanticVersion = semanticVersion`
`34`	`33`	`}`
`35`	`34`	`};`
`36`	`35`	`var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(new TestEffectiveConfiguration());`
`@@ -84,8 +83,7 @@ static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)`
`84`	`83`	`{`
`85`	`84`	`CachedVersion = new CachedVersion`
`86`	`85`	`{`
`87`		`- SemanticVersion = semanticVersion,`
`88`		`- MasterReleaseDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z")`
	`86`	`+ SemanticVersion = semanticVersion`
`89`	`87`	`},`
`90`	`88`	`};`
`91`	`89`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`		`-using System;`
`2`		`-using GitVersion;`
	`1`	`+using GitVersion;`
`3`	`2`
`4`	`3`	`public class CachedVersion`
`5`	`4`	`{`
`6`	`5`	`public SemanticVersion SemanticVersion;`
`7`	`6`	`public long Timestamp;`
`8`		`- public DateTimeOffset MasterReleaseDate;`
`9`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ public static Tuple<CachedVersion, GitVersionContext> GetVersion(string gitDirec`
`22`	`22`	`{`
`23`	`23`	`Logger.WriteInfo("Change detected. flushing cache.");`
`24`	`24`	`result.Item1.SemanticVersion = versionFinder.FindVersion(context);`
`25`		`- result.Item1.MasterReleaseDate = LastMinorVersionFinder.Execute(repo, context.Configuration, repo.Head.Tip);`
`26`	`25`	`}`
`27`	`26`	`return result;`
`28`	`27`	`}`
`@@ -31,7 +30,6 @@ public static Tuple<CachedVersion, GitVersionContext> GetVersion(string gitDirec`
`31`	`30`	`return versionCacheVersions[key] = Tuple.Create(new CachedVersion`
`32`	`31`	`{`
`33`	`32`	`SemanticVersion = versionFinder.FindVersion(context),`
`34`		`- MasterReleaseDate = LastMinorVersionFinder.Execute(repo, context.Configuration, repo.Head.Tip),`
`35`	`33`	`Timestamp = ticks`
`36`	`34`	`}, context);`
`37`	`35`	`}`