Merge pull request #2757 from Evangelink/field-as-local-variable

asbjornu · web-flow · commit 477996322b1e · 2021-07-16T14:54:11.000+02:00
Refactor versionVariables as local variable.
diff --git a/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs b/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
@@ -13,7 +13,6 @@ public class GitVersionTaskExecutor : IGitVersionTaskExecutor
         private readonly ILog log;
         private readonly IGitVersionOutputTool gitVersionOutputTool;
         private readonly IOptions<GitVersionOptions> options;
-        private VersionVariables versionVariables;
 
         public GitVersionTaskExecutor(IFileSystem fileSystem, IGitVersionOutputTool gitVersionOutputTool, IOptions<GitVersionOptions> options, ILog log)
         {
@@ -25,7 +24,7 @@ public GitVersionTaskExecutor(IFileSystem fileSystem, IGitVersionOutputTool gitV
 
         public void GetVersion(GetVersion task)
         {
-            versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
+            var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
             var outputType = typeof(GetVersion);
             foreach (var variable in versionVariables)
             {
@@ -35,7 +34,7 @@ public void GetVersion(GetVersion task)
 
         public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
         {
-            versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
+            var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
             FileHelper.DeleteTempFiles();
             if (task.CompileFiles != null) FileHelper.CheckForInvalidFiles(task.CompileFiles, task.ProjectFile);
 
@@ -53,7 +52,7 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
 
         public void GenerateGitVersionInformation(GenerateGitVersionInformation task)
         {
-            versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
+            var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
             var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "GitVersionInformation");
             task.GitVersionInformationFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
 
@@ -65,7 +64,7 @@ public void GenerateGitVersionInformation(GenerateGitVersionInformation task)
 
         public void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task)
         {
-            versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
+            var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
             gitVersionOutputTool.OutputVariables(versionVariables, false);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public class GitVersionTaskExecutor : IGitVersionTaskExecutor`
`13`	`13`	`private readonly ILog log;`
`14`	`14`	`private readonly IGitVersionOutputTool gitVersionOutputTool;`
`15`	`15`	`private readonly IOptions<GitVersionOptions> options;`
`16`		`- private VersionVariables versionVariables;`
`17`	`16`
`18`	`17`	`public GitVersionTaskExecutor(IFileSystem fileSystem, IGitVersionOutputTool gitVersionOutputTool, IOptions<GitVersionOptions> options, ILog log)`
`19`	`18`	`{`
`@@ -25,7 +24,7 @@ public GitVersionTaskExecutor(IFileSystem fileSystem, IGitVersionOutputTool gitV`
`25`	`24`
`26`	`25`	`public void GetVersion(GetVersion task)`
`27`	`26`	`{`
`28`		`- versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);`
	`27`	`+ var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);`
`29`	`28`	`var outputType = typeof(GetVersion);`
`30`	`29`	`foreach (var variable in versionVariables)`
`31`	`30`	`{`
`@@ -35,7 +34,7 @@ public void GetVersion(GetVersion task)`
`35`	`34`
`36`	`35`	`public void UpdateAssemblyInfo(UpdateAssemblyInfo task)`
`37`	`36`	`{`
`38`		`- versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);`
	`37`	`+ var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);`
`39`	`38`	`FileHelper.DeleteTempFiles();`
`40`	`39`	`if (task.CompileFiles != null) FileHelper.CheckForInvalidFiles(task.CompileFiles, task.ProjectFile);`
`41`	`40`
`@@ -53,7 +52,7 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)`
`53`	`52`
`54`	`53`	`public void GenerateGitVersionInformation(GenerateGitVersionInformation task)`
`55`	`54`	`{`
`56`		`- versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);`
	`55`	`+ var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);`
`57`	`56`	`var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "GitVersionInformation");`
`58`	`57`	`task.GitVersionInformationFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);`
`59`	`58`
`@@ -65,7 +64,7 @@ public void GenerateGitVersionInformation(GenerateGitVersionInformation task)`
`65`	`64`
`66`	`65`	`public void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task)`
`67`	`66`	`{`
`68`		`- versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);`
	`67`	`+ var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);`
`69`	`68`	`gitVersionOutputTool.OutputVariables(versionVariables, false);`
`70`	`69`	`}`
`71`	`70`	`}`