Added VersionVariables.FromFile() method and corresponding FileName property and make use of it in VersionAndBranchFinderLoadVersionVariablesFromDiskCache().

Author: asbjornu

src/GitVersionCore/OutputVariables/VersionVariables.cs

@@ -3,9 +3,14 @@
     using System;
     using System.Collections;
     using System.Collections.Generic;
+    using System.IO;
     using System.Linq;
     using System.Reflection;
 
+    using GitVersion.Helpers;
+
+    using YamlDotNet.Serialization;
+
     public class VersionVariables : IEnumerable<KeyValuePair<string, string>>
     {
         public static VersionVariables FromDictionary(IEnumerable<KeyValuePair<string, string>> properties)
@@ -104,6 +109,9 @@ public static IEnumerable<string> AvailableVariables
 
         public string CommitDate { get; set; }
 
+        [ReflectionIgnore]
+        public string FileName { get; set; }
+
         [ReflectionIgnore]
         public string this[string variable]
         {
@@ -140,6 +148,21 @@ public static VersionVariables FromDictionary(IEnumerable<KeyValuePair<string, s
         }
 
 
+        public static VersionVariables FromFile(string filePath, IFileSystem fileSystem)
+        {
+            using (var stream = fileSystem.OpenRead(filePath))
+            {
+                using (var reader = new StreamReader(stream))
+                {
+                    var dictionary = new Deserializer().Deserialize<Dictionary<string, string>>(reader);
+                    var versionVariables = FromDictionary(dictionary);
+                    versionVariables.FileName = filePath;
+                    return versionVariables;
+                }
+            }
+        }
+
+
         public bool TryGetValue(string variable, out string variableValue)
         {
             if (ContainsKey(variable))

src/GitVersionTask/VersionAndBranchFinder.cs

@@ -73,15 +73,7 @@ static VersionVariables LoadVersionVariablesFromDiskCache(string key, string dir
                 {
                     try
                     {
-                        using (var stream = fileSystem.OpenRead(cacheFileName))
-                        {
-                            using (var reader = new StreamReader(stream))
-                            {
-                                var dictionary = new Deserializer().Deserialize<Dictionary<string, string>>(reader);
-                                vv = VersionVariables.FromDictionary(dictionary);
-                            }
-                        }
-
+                        vv = VersionVariables.FromFile(cacheFileName, fileSystem);
                     }
                     catch (Exception ex)
                     {
@@ -106,6 +98,7 @@ static VersionVariables LoadVersionVariablesFromDiskCache(string key, string dir
             if (vv == null)
             {
                 vv = ExecuteCore.ExecuteGitVersion(fileSystem, null, null, authentication, null, noFetch, directory, null);
+                vv.FileName = cacheFileName;
 
                 using (var stream = fileSystem.OpenWrite(cacheFileName))
                 using (var sw = new StreamWriter(stream))