removed ReflectionIgnore attribute from GitVersionVariable

src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs

@@ -26,12 +26,7 @@ public void CacheKeySameAfterReNormalizing()
         const string targetUrl = "https://github.com/GitTools/GitVersion.git";
         const string targetBranch = $"refs/head/{MainBranch}";
 
-        var gitVersionOptions = new GitVersionOptions
-        {
-            RepositoryInfo = { TargetUrl = targetUrl, TargetBranch = targetBranch },
-            WorkingDirectory = fixture.RepositoryPath,
-            Settings = { NoNormalize = false }
-        };
+        var gitVersionOptions = new GitVersionOptions { RepositoryInfo = { TargetUrl = targetUrl, TargetBranch = targetBranch }, WorkingDirectory = fixture.RepositoryPath, Settings = { NoNormalize = false } };
 
         var environment = new TestEnvironment();
         environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
@@ -55,11 +50,7 @@ public void GitPreparerShouldNotFailWhenTargetPathNotInitialized()
     {
         const string targetUrl = "https://github.com/GitTools/GitVersion.git";
 
-        var gitVersionOptions = new GitVersionOptions
-        {
-            RepositoryInfo = { TargetUrl = targetUrl },
-            WorkingDirectory = string.Empty
-        };
+        var gitVersionOptions = new GitVersionOptions { RepositoryInfo = { TargetUrl = targetUrl }, WorkingDirectory = string.Empty };
         Should.NotThrow(() =>
         {
             this.sp = GetServiceProvider(gitVersionOptions);
@@ -82,11 +73,7 @@ public void CacheKeyForWorktree()
 
             const string targetUrl = "https://github.com/GitTools/GitVersion.git";
 
-            var gitVersionOptions = new GitVersionOptions
-            {
-                RepositoryInfo = { TargetUrl = targetUrl, TargetBranch = MainBranch },
-                WorkingDirectory = worktreePath
-            };
+            var gitVersionOptions = new GitVersionOptions { RepositoryInfo = { TargetUrl = targetUrl, TargetBranch = MainBranch }, WorkingDirectory = worktreePath };
 
             this.sp = GetServiceProvider(gitVersionOptions);
 
@@ -148,7 +135,11 @@ public void CacheFileExistsOnDisk()
         var versionVariables = gitVersionCalculator.CalculateVersionVariables();
         versionVariables.AssemblySemVer.ShouldBe("0.0.1.0");
 
-        this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
+        var cacheKeyFactory = this.sp.GetRequiredService<IGitVersionCacheKeyFactory>();
+        var cacheKey = cacheKeyFactory.Create(null);
+        var cacheFileName = this.gitVersionCache.GetCacheFileName(cacheKey);
+
+        this.fileSystem.WriteAllText(cacheFileName, versionCacheFileContent);
         versionVariables = gitVersionCalculator.CalculateVersionVariables();
         versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
 
@@ -195,7 +186,10 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
         var versionVariables = gitVersionCalculator.CalculateVersionVariables();
         versionVariables.AssemblySemVer.ShouldBe("0.0.1.0");
 
-        this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
+        var cacheKeyFactory = this.sp.GetRequiredService<IGitVersionCacheKeyFactory>();
+        var cacheKey = cacheKeyFactory.Create(null);
+        var cacheFileName = this.gitVersionCache.GetCacheFileName(cacheKey);
+        this.fileSystem.WriteAllText(cacheFileName, versionCacheFileContent);
 
         var cacheDirectory = this.gitVersionCache.GetCacheDirectory();
 
@@ -204,11 +198,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
         var configuration = GitFlowConfigurationBuilder.New.WithLabelPrefix("prefix").Build();
         var overrideConfiguration = new ConfigurationHelper(configuration).Dictionary;
 
-        gitVersionOptions = new GitVersionOptions
-        {
-            WorkingDirectory = fixture.RepositoryPath,
-            ConfigurationInfo = { OverrideConfiguration = overrideConfiguration }
-        };
+        gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath, ConfigurationInfo = { OverrideConfiguration = overrideConfiguration } };
 
         gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
         versionVariables = gitVersionCalculator.CalculateVersionVariables();
@@ -283,9 +273,12 @@ public void ConfigChangeInvalidatesCache(string configFileName)
         var versionVariables = gitVersionCalculator.CalculateVersionVariables();
 
         versionVariables.AssemblySemVer.ShouldBe("0.0.1.0");
-        versionVariables.FileName.ShouldNotBeNullOrEmpty();
 
-        this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
+        var cacheKeyFactory = this.sp.GetRequiredService<IGitVersionCacheKeyFactory>();
+        var cacheKey = cacheKeyFactory.Create(null);
+        var cacheFileName = this.gitVersionCache.GetCacheFileName(cacheKey);
+
+        this.fileSystem.WriteAllText(cacheFileName, versionCacheFileContent);
 
         versionVariables = gitVersionCalculator.CalculateVersionVariables();
         versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
@@ -340,9 +333,12 @@ public void NoCacheBypassesCache()
         var versionVariables = gitVersionCalculator.CalculateVersionVariables();
 
         versionVariables.AssemblySemVer.ShouldBe("0.0.1.0");
-        versionVariables.FileName.ShouldNotBeNullOrEmpty();
 
-        this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
+        var cacheKeyFactory = this.sp.GetRequiredService<IGitVersionCacheKeyFactory>();
+        var cacheKey = cacheKeyFactory.Create(null);
+        var cacheFileName = this.gitVersionCache.GetCacheFileName(cacheKey);
+
+        this.fileSystem.WriteAllText(cacheFileName, versionCacheFileContent);
         versionVariables = gitVersionCalculator.CalculateVersionVariables();
         versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
 
@@ -394,11 +390,7 @@ public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()
 
             const string targetUrl = "https://github.com/GitTools/GitVersion.git";
 
-            var gitVersionOptions = new GitVersionOptions
-            {
-                RepositoryInfo = { TargetUrl = targetUrl },
-                WorkingDirectory = worktreePath
-            };
+            var gitVersionOptions = new GitVersionOptions { RepositoryInfo = { TargetUrl = targetUrl }, WorkingDirectory = worktreePath };
 
             this.sp = GetServiceProvider(gitVersionOptions);
             var repositoryInfo = this.sp.GetRequiredService<IGitRepositoryInfo>();
@@ -416,11 +408,7 @@ public void GetProjectRootDirectoryNoWorktree()
         using var fixture = new EmptyRepositoryFixture();
         const string targetUrl = "https://github.com/GitTools/GitVersion.git";
 
-        var gitVersionOptions = new GitVersionOptions
-        {
-            RepositoryInfo = { TargetUrl = targetUrl },
-            WorkingDirectory = fixture.RepositoryPath
-        };
+        var gitVersionOptions = new GitVersionOptions { RepositoryInfo = { TargetUrl = targetUrl }, WorkingDirectory = fixture.RepositoryPath };
 
         this.sp = GetServiceProvider(gitVersionOptions);
         var repositoryInfo = this.sp.GetRequiredService<IGitRepositoryInfo>();
@@ -434,10 +422,7 @@ public void GetDotGitDirectoryNoWorktree()
     {
         using var fixture = new EmptyRepositoryFixture();
 
-        var gitVersionOptions = new GitVersionOptions
-        {
-            WorkingDirectory = fixture.RepositoryPath
-        };
+        var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
 
         this.sp = GetServiceProvider(gitVersionOptions);
         var repositoryInfo = this.sp.GetRequiredService<IGitRepositoryInfo>();
@@ -459,10 +444,7 @@ public void GetDotGitDirectoryWorktree()
             var repo = new Repository(fixture.RepositoryPath);
             repo.Worktrees.Add("worktree", worktreePath, false);
 
-            var gitVersionOptions = new GitVersionOptions
-            {
-                WorkingDirectory = worktreePath
-            };
+            var gitVersionOptions = new GitVersionOptions { WorkingDirectory = worktreePath };
 
             this.sp = GetServiceProvider(gitVersionOptions);
             var repositoryInfo = this.sp.GetRequiredService<IGitRepositoryInfo>();

src/GitVersion.Core/OutputVariables/GitVersionVariables.cs

@@ -1,5 +1,3 @@
-using static GitVersion.Extensions.ObjectExtensions;
-
 namespace GitVersion.OutputVariables;
 
 public record GitVersionVariables(string Major,
@@ -86,9 +84,6 @@ public record GitVersionVariables(string Major,
         { nameof(UncommittedChanges), UncommittedChanges }
     };
 
-    [ReflectionIgnore]
-    public string? FileName { get; set; }
-
     public IEnumerator<KeyValuePair<string, string?>> GetEnumerator() => Instance.GetEnumerator();
 
     IEnumerator IEnumerable.GetEnumerator() => Instance.GetEnumerator();

src/GitVersion.Core/OutputVariables/VersionVariablesHelper.cs

@@ -69,7 +69,6 @@ private static GitVersionVariables FromFileInternal(string filePath, IFileSystem
         using var reader = new StreamReader(stream);
         var dictionary = new Deserializer().Deserialize<Dictionary<string, string>>(reader);
         var versionVariables = FromDictionary(dictionary);
-        versionVariables.FileName = filePath;
         return versionVariables;
     }
 

src/GitVersion.Core/VersionCalculation/Caching/GitVersionCache.cs

@@ -21,10 +21,7 @@ public GitVersionCache(IFileSystem fileSystem, ILog log, IGitRepositoryInfo repo
 
     public void WriteVariablesToDiskCache(GitVersionCacheKey cacheKey, GitVersionVariables variablesFromCache)
     {
-        var cacheDir = PrepareCacheDirectory();
-        var cacheFileName = GetCacheFileName(cacheKey, cacheDir);
-
-        variablesFromCache.FileName = cacheFileName;
+        var cacheFileName = GetCacheFileName(cacheKey);
 
         Dictionary<string, string?> dictionary;
         using (this.log.IndentLog("Creating dictionary"))
@@ -47,6 +44,13 @@ void WriteCacheOperation()
         retryOperation.Execute(WriteCacheOperation);
     }
 
+    public string GetCacheFileName(GitVersionCacheKey cacheKey)
+    {
+        var cacheDir = PrepareCacheDirectory();
+        var cacheFileName = GetCacheFileName(cacheKey, cacheDir);
+        return cacheFileName;
+    }
+
     public string GetCacheDirectory()
     {
         var gitDir = this.repositoryInfo.DotGitDirectory;

src/GitVersion.Core/VersionCalculation/Caching/IGitVersionCache.cs

@@ -7,4 +7,5 @@ public interface IGitVersionCache
     void WriteVariablesToDiskCache(GitVersionCacheKey cacheKey, GitVersionVariables variablesFromCache);
     string GetCacheDirectory();
     GitVersionVariables? LoadVersionVariablesFromDiskCache(GitVersionCacheKey key);
+    string GetCacheFileName(GitVersionCacheKey cacheKey);
 }