GitVersionTask now using much more of core, now has very little custom code

Author: JakeGinnivan

GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt

@@ -16,5 +16,6 @@
   "BranchName":"feature1",
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0004",
-  "NuGetVersion":"1.2.3-unstable0004"
+  "NuGetVersion":"1.2.3-unstable0004",
+  "CommitDate":"2014-03-06"
 }

GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt

@@ -16,5 +16,6 @@
   "BranchName":"develop",
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0004",
-  "NuGetVersion":"1.2.3-unstable0004"
+  "NuGetVersion":"1.2.3-unstable0004",
+  "CommitDate":"2014-03-06"
 }

GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt

@@ -16,5 +16,6 @@
   "BranchName":"develop",
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3",
-  "NuGetVersion":"1.2.3"
+  "NuGetVersion":"1.2.3",
+  "CommitDate":"2014-03-06"
 }

GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt

@@ -16,5 +16,6 @@
   "BranchName":"develop",
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0005",
-  "NuGetVersion":"1.2.3-unstable0005"
+  "NuGetVersion":"1.2.3-unstable0005",
+  "CommitDate":"2014-03-06"
 }

GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt

@@ -16,5 +16,6 @@
   "BranchName":"develop",
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-ci0005",
-  "NuGetVersion":"1.2.3-ci0005"
+  "NuGetVersion":"1.2.3-ci0005",
+  "CommitDate":"2014-03-06"
 }

GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt

@@ -16,5 +16,6 @@
   "BranchName":"",
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3",
-  "NuGetVersion":"1.2.3"
+  "NuGetVersion":"1.2.3",
+  "CommitDate":"2014-03-06"
 }

GitVersionCore/OutputVariables/VariableProvider.cs

@@ -38,7 +38,8 @@ public static VersionVariables GetVariablesFor(
                 fullSemVer: semanticVersion.ToString("f"),
                 informationalVersion: semanticVersion.ToString("i"),
                 branchName: bmd.Branch,
-                sha: bmd.Sha);
+                sha: bmd.Sha,
+                commitDate: bmd.CommitDate.UtcDateTime.ToString("yyyy-MM-dd"));
 
             return variables;
         }

GitVersionCore/OutputVariables/VersionVariables.cs

@@ -6,7 +6,8 @@
 
     public class VersionVariables : IEnumerable<KeyValuePair<string, string>>
     {
-        public VersionVariables(string major, string minor, string patch, string buildMetaData, string fullBuildMetaData, string branchName, string sha, string majorMinorPatch, string semVer, string legacySemVer, string legacySemVerPadded, string fullSemVer, string assemblySemVer, string preReleaseTag, string preReleaseTagWithDash, string informationalVersion)
+        public VersionVariables(string major, string minor, string patch, string buildMetaData, string fullBuildMetaData, string branchName, string sha, string majorMinorPatch, string semVer, string legacySemVer, string legacySemVerPadded, string fullSemVer, string assemblySemVer, string preReleaseTag, string preReleaseTagWithDash, string informationalVersion,
+            string commitDate)
         {
             Major = major;
             Minor = minor;
@@ -24,6 +25,7 @@ public VersionVariables(string major, string minor, string patch, string buildMe
             PreReleaseTag = preReleaseTag;
             PreReleaseTagWithDash = preReleaseTagWithDash;
             InformationalVersion = informationalVersion;
+            CommitDate = commitDate;
         }
 
         public string Major { get; private set; }
@@ -53,6 +55,8 @@ public IEnumerable<string> AvailableVariables
             get { return typeof(VersionVariables).GetProperties().Select(p => p.Name).OrderBy(a => a); }
         }
 
+        public string CommitDate { get; set; }
+
         public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
         {
             var type = typeof(string);

GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt

@@ -39,6 +39,7 @@ static class GitVersionInformation
     public static string Sha = "commitSha";
     public static string NuGetVersionV2 = "2.3.4-beta0005";
     public static string NuGetVersion = "2.3.4-beta0005";
+    public static string CommitDate = "2014-03-06";
 
 }
 

GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt

@@ -39,6 +39,7 @@ static class GitVersionInformation
     public static string Sha = "commitSha";
     public static string NuGetVersionV2 = "2.3.4-beta0005";
     public static string NuGetVersion = "2.3.4-beta0005";
+    public static string CommitDate = "2014-03-06";
 
 }
 

GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt

@@ -39,6 +39,7 @@ static class GitVersionInformation
     public static string Sha = "commitSha";
     public static string NuGetVersionV2 = "2.3.4-beta0005";
     public static string NuGetVersion = "2.3.4-beta0005";
+    public static string CommitDate = "2014-03-06";
 
 }
 

GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt

@@ -39,6 +39,7 @@ static class GitVersionInformation
     public static string Sha = "commitSha";
     public static string NuGetVersionV2 = "2.3.4-beta0005";
     public static string NuGetVersion = "2.3.4-beta0005";
+    public static string CommitDate = "2014-03-06";
 
 }
 

GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt

@@ -39,6 +39,7 @@ static class GitVersionInformation
     public static string Sha = "commitSha";
     public static string NuGetVersionV2 = "1.2.3-unstable0004";
     public static string NuGetVersion = "1.2.3-unstable0004";
+    public static string CommitDate = "2014-03-06";
 
 }
 

GitVersionTask.Tests/AssemblyInfoBuilderTests.cs

@@ -4,7 +4,6 @@
 using System.Runtime.CompilerServices;
 using ApprovalTests;
 using GitVersion;
-using GitVersionCore.Tests;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using NUnit.Framework;
@@ -25,14 +24,9 @@ public void VerifyCreatedCode()
             BuildMetaData = new SemanticVersionBuildMetaData(5,
                 "feature1", "commitSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
         };
-        var assemblyInfoBuilder = new AssemblyInfoBuilder
-        {
-            CachedVersion = new CachedVersion
-            {
-                SemanticVersion = semanticVersion
-            }
-        };
-        var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(new TestEffectiveConfiguration());
+        var assemblyInfoBuilder = new AssemblyInfoBuilder();
+        var versionVariables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
+        var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(versionVariables);
         Approvals.Verify(assemblyInfoText);
 
         var compilation = CSharpCompilation.Create("Fake.dll")
@@ -84,15 +78,9 @@ static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)
             BuildMetaData = new SemanticVersionBuildMetaData(6,
                 "master", "commitSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z")),
         };
-        var assemblyInfoBuilder = new AssemblyInfoBuilder
-        {
-            CachedVersion = new CachedVersion
-            {
-                SemanticVersion = semanticVersion
-            },
-        };
-
-        var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(new TestEffectiveConfiguration(assemblyVersioningScheme: avs));
+        var assemblyInfoBuilder = new AssemblyInfoBuilder();
+        var versionVariables = VariableProvider.GetVariablesFor(semanticVersion, avs, VersioningMode.ContinuousDelivery, "ci", false);
+        var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(versionVariables);
         Approvals.Verify(assemblyInfoText);
 
         var compilation = CSharpCompilation.Create("Fake.dll")

GitVersionTask.Tests/GitHelperTests.cs

@@ -102,17 +102,12 @@
     <Compile Include="AssemblyInfoBuilderTests.cs" />
     <Compile Include="AssemblyLocation.cs" />
     <Compile Include="Mocks\MockBuildEngine.cs" />
-    <Compile Include="VersionAndBranchFinderTests.cs" />
-    <Compile Include="GitHelperTests.cs" />
     <Compile Include="GetVersionTaskTests.cs" />
     <Compile Include="Helpers\IPostTestDirectoryRemover.cs" />
     <Compile Include="Helpers\LibGit2SharpExtensions.cs" />
     <Compile Include="Helpers\Scrubbers.cs" />
     <Compile Include="Helpers\SelfCleaningDirectory.cs" />
-    <Compile Include="Helpers\Lg2sHelperBase.cs" />
-    <Compile Include="UpdateAssemblyInfoTests.cs" />
     <Compile Include="ModuleInitializer.cs" />
-    <Compile Include="WriteVersionInfoToBuildLogTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />