Skip to content

Commit f32a3cc

Browse files
committed
use LastVersionOnMasterFinder in task
1 parent 012a659 commit f32a3cc

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

GitVersionTask.Tests/AssemblyInfoBuilderTests.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ public void VerifyCreatedCode()
3333
{
3434
CachedVersion = new CachedVersion
3535
{
36-
SemanticVersion = semanticVersion
36+
SemanticVersion = semanticVersion,
37+
ReleaseDate = new ReleaseDate
38+
{
39+
OriginalCommitSha = "originalCommitSha",
40+
OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
41+
}
3742
}
3843
};
3944
var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText();
@@ -85,7 +90,12 @@ static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)
8590
{
8691
CachedVersion = new CachedVersion
8792
{
88-
SemanticVersion = semanticVersion
93+
SemanticVersion = semanticVersion,
94+
ReleaseDate = new ReleaseDate
95+
{
96+
OriginalCommitSha = "originalCommitSha",
97+
OriginalDate = DateTimeOffset.Parse("2014-03-01 00:00:01Z"),
98+
}
8999
},
90100
AssemblyVersioningScheme = avs,
91101
};

GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static class GitVersionInformation
4141
4242
4343
", semanticVersion.GetAssemblyVersion(AssemblyVersioningScheme), string.Format("{0}.{1}.{2}.0", semanticVersion.Major, semanticVersion.Minor, semanticVersion.Patch), semanticVersion.ToString("i"),
44-
semanticVersion.BuildMetaData.ReleaseDate.OriginalDate.UtcDateTime.ToString("yyyy-MM-dd"),
44+
CachedVersion.ReleaseDate.OriginalDate.UtcDateTime.ToString("yyyy-MM-dd"),
4545
semanticVersion.BuildMetaData.CommitDate.UtcDateTime.ToString("yyyy-MM-dd"),
4646
GenerateVariableMembers(vars));
4747

GitVersionTask/CachedVersion.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ public class CachedVersion
44
{
55
public SemanticVersion SemanticVersion;
66
public long Timestamp;
7+
public ReleaseDate ReleaseDate;
78
}

GitVersionTask/VersionCache.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public static CachedVersion GetVersion(string gitDirectory)
1818
{
1919
Logger.WriteInfo("Change detected. flushing cache.");
2020
cachedVersion.SemanticVersion = GitVersionFinder.GetSemanticVersion(repo);
21+
cachedVersion.ReleaseDate = LastVersionOnMasterFinder.Execute(repo, repo.Head.Tip);
2122
}
2223
return cachedVersion;
2324
}
@@ -26,6 +27,7 @@ public static CachedVersion GetVersion(string gitDirectory)
2627
return versionCacheVersions[key] = new CachedVersion
2728
{
2829
SemanticVersion = GitVersionFinder.GetSemanticVersion(repo),
30+
ReleaseDate = LastVersionOnMasterFinder.Execute(repo,repo.Head.Tip),
2931
Timestamp = ticks
3032
};
3133

0 commit comments

Comments
 (0)