replace Logger with ILog

arturcic · arturcic · commit 8150dec83862 · 2019-10-16T19:30:49.000+03:00
diff --git a/src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs b/src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs
@@ -18,12 +18,13 @@ namespace GitVersionCore.Tests
     public class AssemblyInfoFileUpdaterTests : TestBase
     {
         private IVariableProvider variableProvider;
+        private ILog log;
 
         [SetUp]
         public void Setup()
         {
             ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
-            var log = new NullLog();
+            log = new NullLog();
             variableProvider = new VariableProvider(log);
         }
 
@@ -40,7 +41,7 @@ public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(strin
             var fullPath = Path.Combine(workingDir, assemblyInfoFile);
             var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, true))
+            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, true))
             {
                 assemblyInfoFileUpdater.Update();
 
@@ -61,7 +62,7 @@ public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo
             var fullPath = Path.Combine(workingDir, assemblyInfoFile);
             var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, true))
+            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, true))
             {
                 assemblyInfoFileUpdater.Update();
 
@@ -85,7 +86,7 @@ public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInf
             };
             var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFiles, workingDir, variables, fileSystem, true))
+            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFiles, workingDir, variables, fileSystem, log, true))
             {
                 assemblyInfoFileUpdater.Update();
 
@@ -108,7 +109,7 @@ public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo
             var fullPath = Path.Combine(workingDir, assemblyInfoFile);
             var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
             {
                 assemblyInfoFileUpdater.Update();
 
@@ -125,7 +126,7 @@ public void ShouldNotCreateAssemblyInfoFileForUnknownSourceCodeAndEnsureAssembly
             var fullPath = Path.Combine(workingDir, assemblyInfoFile);
             var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, true))
+            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, true))
             {
                 assemblyInfoFileUpdater.Update();
 
@@ -141,7 +142,7 @@ public void ShouldStartSearchFromWorkingDirectory()
             var assemblyInfoFiles = new HashSet<string>();
             var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFiles, workingDir, variables, fileSystem, false))
+            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFiles, workingDir, variables, fileSystem, log, false))
             {
                 assemblyInfoFileUpdater.Update();
 
@@ -160,7 +161,7 @@ public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFi
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -185,7 +186,7 @@ public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileEx
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -206,7 +207,7 @@ public void ShouldReplaceAssemblyVersionInRelativePath(string fileExtension, str
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -229,7 +230,7 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithWhiteSpace(string file
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -252,7 +253,7 @@ public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string as
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -275,7 +276,7 @@ public void ShouldReplaceAssemblyVersionWithAtttributeSuffix(string fileExtensio
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -301,7 +302,7 @@ public void ShouldAddAssemblyVersionIfMissingFromInfoFile(string fileExtension)
 
             VerifyAssemblyInfoFile("", fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -324,7 +325,7 @@ public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string a
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -347,7 +348,7 @@ public void ShouldReplaceAssemblyVersionWhenCreatingAssemblyVersionFileAndEnsure
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -370,7 +371,7 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariables(string fileE
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -393,7 +394,7 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariablesAndWhiteSpace
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -418,7 +419,7 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -441,7 +442,7 @@ public void Issue1183_ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttr
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
@@ -464,7 +465,7 @@ public void ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionF
 
             VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fileSystem, variables) =>
             {
-                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))
+                using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))
                 {
                     assemblyInfoFileUpdater.Update();
 
diff --git a/src/GitVersionCore/Extensions/VersionAssemblyInfoResources/AssemblyInfoFileUpdater.cs b/src/GitVersionCore/Extensions/VersionAssemblyInfoResources/AssemblyInfoFileUpdater.cs
@@ -6,15 +6,16 @@
 using GitVersion.Helpers;
 using GitVersion.OutputVariables;
 using GitVersion.Common;
+using GitVersion.Log;
 
 namespace GitVersion.Extensions.VersionAssemblyInfoResources
 {
     public class AssemblyInfoFileUpdater : IDisposable
     {
-        readonly List<Action> restoreBackupTasks = new List<Action>();
-        readonly List<Action> cleanupBackupTasks = new List<Action>();
+        private readonly List<Action> restoreBackupTasks = new List<Action>();
+        private readonly List<Action> cleanupBackupTasks = new List<Action>();
 
-        readonly IDictionary<string, Regex> assemblyAttributeRegexes = new Dictionary<string, Regex>
+        private readonly IDictionary<string, Regex> assemblyAttributeRegexes = new Dictionary<string, Regex>
         {
             {".cs", new Regex( @"(\s*\[\s*assembly:\s*(?:.*)\s*\]\s*$(\r?\n)?)", RegexOptions.Multiline) },
             {".fs", new Regex( @"(\s*\[\s*\<assembly:\s*(?:.*)\>\s*\]\s*$(\r?\n)?)", RegexOptions.Multiline) },
@@ -23,34 +24,36 @@ public class AssemblyInfoFileUpdater : IDisposable
 
         private const string NewLine = "\r\n";
 
-        ISet<string> assemblyInfoFileNames;
-        string workingDirectory;
-        VersionVariables variables;
-        IFileSystem fileSystem;
-        bool ensureAssemblyInfo;
-        TemplateManager templateManager;
+        private readonly ISet<string> assemblyInfoFileNames;
+        private readonly string workingDirectory;
+        private readonly VersionVariables variables;
+        private readonly IFileSystem fileSystem;
+        private readonly ILog log;
+        private readonly bool ensureAssemblyInfo;
+        private readonly TemplateManager templateManager;
 
-        public AssemblyInfoFileUpdater(string assemblyInfoFileName, string workingDirectory, VersionVariables variables, IFileSystem fileSystem, bool ensureAssemblyInfo) :
-                this(new HashSet<string> { assemblyInfoFileName }, workingDirectory, variables, fileSystem, ensureAssemblyInfo)
+        public AssemblyInfoFileUpdater(string assemblyInfoFileName, string workingDirectory, VersionVariables variables, IFileSystem fileSystem, ILog log, bool ensureAssemblyInfo) :
+                this(new HashSet<string> { assemblyInfoFileName }, workingDirectory, variables, fileSystem, log, ensureAssemblyInfo)
         { }
 
-        public AssemblyInfoFileUpdater(ISet<string> assemblyInfoFileNames, string workingDirectory, VersionVariables variables, IFileSystem fileSystem, bool ensureAssemblyInfo)
+        public AssemblyInfoFileUpdater(ISet<string> assemblyInfoFileNames, string workingDirectory, VersionVariables variables, IFileSystem fileSystem, ILog log, bool ensureAssemblyInfo)
         {
             this.assemblyInfoFileNames = assemblyInfoFileNames;
             this.workingDirectory = workingDirectory;
             this.variables = variables;
             this.fileSystem = fileSystem;
+            this.log = log;
             this.ensureAssemblyInfo = ensureAssemblyInfo;
 
             templateManager = new TemplateManager(TemplateType.VersionAssemblyInfoResources);
         }
 
         public void Update()
         {
-            Logger.Info("Updating assembly info files");
+            log.Info("Updating assembly info files");
 
             var assemblyInfoFiles = GetAssemblyInfoFiles(workingDirectory, assemblyInfoFileNames, fileSystem, ensureAssemblyInfo).ToList();
-            Logger.Info($"Found {assemblyInfoFiles.Count} files");
+            log.Info($"Found {assemblyInfoFiles.Count} files");
 
             var assemblyVersion = variables.AssemblySemVer;
             var assemblyVersionRegex = new Regex(@"AssemblyVersion(Attribute)?\s*\(.*\)\s*");
@@ -111,7 +114,7 @@ public void Update()
             }
         }
 
-        string ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(Regex replaceRegex, string inputString, string replaceString, string fileExtension, ref bool appendedAttributes)
+        private string ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(Regex replaceRegex, string inputString, string replaceString, string fileExtension, ref bool appendedAttributes)
         {
             var assemblyAddFormat = templateManager.GetAddFormatFor(fileExtension);
 
@@ -139,7 +142,7 @@ string ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(Regex replaceRegex, str
             return inputString;
         }
 
-        IEnumerable<FileInfo> GetAssemblyInfoFiles(string workingDirectory, ISet<string> assemblyInfoFileNames, IFileSystem fileSystem, bool ensureAssemblyInfo)
+        private IEnumerable<FileInfo> GetAssemblyInfoFiles(string workingDirectory, ISet<string> assemblyInfoFileNames, IFileSystem fileSystem, bool ensureAssemblyInfo)
         {
             if (assemblyInfoFileNames != null && assemblyInfoFileNames.Any(x => !string.IsNullOrWhiteSpace(x)))
             {
@@ -167,7 +170,7 @@ IEnumerable<FileInfo> GetAssemblyInfoFiles(string workingDirectory, ISet<string>
             }
         }
 
-        bool EnsureVersionAssemblyInfoFile(bool ensureAssemblyInfo, IFileSystem fileSystem, string fullPath)
+        private bool EnsureVersionAssemblyInfoFile(bool ensureAssemblyInfo, IFileSystem fileSystem, string fullPath)
         {
             if (fileSystem.Exists(fullPath))
             {
diff --git a/src/GitVersionExe/ExecCommand.cs b/src/GitVersionExe/ExecCommand.cs
@@ -78,7 +78,7 @@ public void Execute(Arguments arguments, IFileSystem fileSystem, IEnvironment en
                 }
             }
 
-            using (var assemblyInfoUpdater = new AssemblyInfoFileUpdater(arguments.UpdateAssemblyInfoFileName, targetPath, variables, fileSystem, arguments.EnsureAssemblyInfo))
+            using (var assemblyInfoUpdater = new AssemblyInfoFileUpdater(arguments.UpdateAssemblyInfoFileName, targetPath, variables, fileSystem, log, arguments.EnsureAssemblyInfo))
             {
                 if (arguments.UpdateAssemblyInfo)
                 {
diff --git a/src/GitVersionTask.Tests/ModuleInitializer.cs b/src/GitVersionTask.Tests/ModuleInitializer.cs
diff --git a/src/GitVersionTask.Tests/TestBase.cs b/src/GitVersionTask.Tests/TestBase.cs
@@ -2,11 +2,6 @@ namespace GitVersionTask.Tests
 {
     public class TestBase
     {
-        static TestBase()
-        {
-            ModuleInitializer.Initialize();
-        }
-
     }
 }
 
diff --git a/src/GitVersionTask/GitVersionTasks.cs b/src/GitVersionTask/GitVersionTasks.cs

Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,13 @@ namespace GitVersionCore.Tests`
`18`	`18`	`public class AssemblyInfoFileUpdaterTests : TestBase`
`19`	`19`	`{`
`20`	`20`	`private IVariableProvider variableProvider;`
	`21`	`+ private ILog log;`
`21`	`22`
`22`	`23`	`[SetUp]`
`23`	`24`	`public void Setup()`
`24`	`25`	`{`
`25`	`26`	`ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();`
`26`		`- var log = new NullLog();`
	`27`	`+ log = new NullLog();`
`27`	`28`	`variableProvider = new VariableProvider(log);`
`28`	`29`	`}`
`29`	`30`
`@@ -40,7 +41,7 @@ public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(strin`
`40`	`41`	`var fullPath = Path.Combine(workingDir, assemblyInfoFile);`
`41`	`42`	`var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);`
`42`	`43`
`43`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, true))`
	`44`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, true))`
`44`	`45`	`{`
`45`	`46`	`assemblyInfoFileUpdater.Update();`
`46`	`47`
`@@ -61,7 +62,7 @@ public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo`
`61`	`62`	`var fullPath = Path.Combine(workingDir, assemblyInfoFile);`
`62`	`63`	`var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);`
`63`	`64`
`64`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, true))`
	`65`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, true))`
`65`	`66`	`{`
`66`	`67`	`assemblyInfoFileUpdater.Update();`
`67`	`68`
`@@ -85,7 +86,7 @@ public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInf`
`85`	`86`	`};`
`86`	`87`	`var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);`
`87`	`88`
`88`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFiles, workingDir, variables, fileSystem, true))`
	`89`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFiles, workingDir, variables, fileSystem, log, true))`
`89`	`90`	`{`
`90`	`91`	`assemblyInfoFileUpdater.Update();`
`91`	`92`
`@@ -108,7 +109,7 @@ public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo`
`108`	`109`	`var fullPath = Path.Combine(workingDir, assemblyInfoFile);`
`109`	`110`	`var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);`
`110`	`111`
`111`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`112`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`112`	`113`	`{`
`113`	`114`	`assemblyInfoFileUpdater.Update();`
`114`	`115`
`@@ -125,7 +126,7 @@ public void ShouldNotCreateAssemblyInfoFileForUnknownSourceCodeAndEnsureAssembly`
`125`	`126`	`var fullPath = Path.Combine(workingDir, assemblyInfoFile);`
`126`	`127`	`var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);`
`127`	`128`
`128`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, true))`
	`129`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, true))`
`129`	`130`	`{`
`130`	`131`	`assemblyInfoFileUpdater.Update();`
`131`	`132`
`@@ -141,7 +142,7 @@ public void ShouldStartSearchFromWorkingDirectory()`
`141`	`142`	`var assemblyInfoFiles = new HashSet<string>();`
`142`	`143`	`var variables = variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);`
`143`	`144`
`144`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFiles, workingDir, variables, fileSystem, false))`
	`145`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFiles, workingDir, variables, fileSystem, log, false))`
`145`	`146`	`{`
`146`	`147`	`assemblyInfoFileUpdater.Update();`
`147`	`148`
`@@ -160,7 +161,7 @@ public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFi`
`160`	`161`
`161`	`162`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>`
`162`	`163`	`{`
`163`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`164`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`164`	`165`	`{`
`165`	`166`	`assemblyInfoFileUpdater.Update();`
`166`	`167`
`@@ -185,7 +186,7 @@ public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileEx`
`185`	`186`
`186`	`187`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fileSystem, variables) =>`
`187`	`188`	`{`
`188`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`189`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`189`	`190`	`{`
`190`	`191`	`assemblyInfoFileUpdater.Update();`
`191`	`192`
`@@ -206,7 +207,7 @@ public void ShouldReplaceAssemblyVersionInRelativePath(string fileExtension, str`
`206`	`207`
`207`	`208`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>`
`208`	`209`	`{`
`209`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`210`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`210`	`211`	`{`
`211`	`212`	`assemblyInfoFileUpdater.Update();`
`212`	`213`
`@@ -229,7 +230,7 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithWhiteSpace(string file`
`229`	`230`
`230`	`231`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>`
`231`	`232`	`{`
`232`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`233`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`233`	`234`	`{`
`234`	`235`	`assemblyInfoFileUpdater.Update();`
`235`	`236`
`@@ -252,7 +253,7 @@ public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string as`
`252`	`253`
`253`	`254`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>`
`254`	`255`	`{`
`255`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`256`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`256`	`257`	`{`
`257`	`258`	`assemblyInfoFileUpdater.Update();`
`258`	`259`
`@@ -275,7 +276,7 @@ public void ShouldReplaceAssemblyVersionWithAtttributeSuffix(string fileExtensio`
`275`	`276`
`276`	`277`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>`
`277`	`278`	`{`
`278`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`279`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`279`	`280`	`{`
`280`	`281`	`assemblyInfoFileUpdater.Update();`
`281`	`282`
`@@ -301,7 +302,7 @@ public void ShouldAddAssemblyVersionIfMissingFromInfoFile(string fileExtension)`
`301`	`302`
`302`	`303`	`VerifyAssemblyInfoFile("", fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>`
`303`	`304`	`{`
`304`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`305`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`305`	`306`	`{`
`306`	`307`	`assemblyInfoFileUpdater.Update();`
`307`	`308`
`@@ -324,7 +325,7 @@ public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string a`
`324`	`325`
`325`	`326`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>`
`326`	`327`	`{`
`327`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`328`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`328`	`329`	`{`
`329`	`330`	`assemblyInfoFileUpdater.Update();`
`330`	`331`
`@@ -347,7 +348,7 @@ public void ShouldReplaceAssemblyVersionWhenCreatingAssemblyVersionFileAndEnsure`
`347`	`348`
`348`	`349`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>`
`349`	`350`	`{`
`350`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`351`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`351`	`352`	`{`
`352`	`353`	`assemblyInfoFileUpdater.Update();`
`353`	`354`
`@@ -370,7 +371,7 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariables(string fileE`
`370`	`371`
`371`	`372`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>`
`372`	`373`	`{`
`373`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`374`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`374`	`375`	`{`
`375`	`376`	`assemblyInfoFileUpdater.Update();`
`376`	`377`
`@@ -393,7 +394,7 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariablesAndWhiteSpace`
`393`	`394`
`394`	`395`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fileSystem, variables) =>`
`395`	`396`	`{`
`396`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`397`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`397`	`398`	`{`
`398`	`399`	`assemblyInfoFileUpdater.Update();`
`399`	`400`
`@@ -418,7 +419,7 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile`
`418`	`419`
`419`	`420`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>`
`420`	`421`	`{`
`421`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`422`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`422`	`423`	`{`
`423`	`424`	`assemblyInfoFileUpdater.Update();`
`424`	`425`
`@@ -441,7 +442,7 @@ public void Issue1183_ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttr`
`441`	`442`
`442`	`443`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fileSystem, variables) =>`
`443`	`444`	`{`
`444`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`445`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`445`	`446`	`{`
`446`	`447`	`assemblyInfoFileUpdater.Update();`
`447`	`448`
`@@ -464,7 +465,7 @@ public void ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionF`
`464`	`465`
`465`	`466`	`VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fileSystem, variables) =>`
`466`	`467`	`{`
`467`		`- using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, false))`
	`468`	`+ using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFile, workingDir, variables, fileSystem, log, false))`
`468`	`469`	`{`
`469`	`470`	`assemblyInfoFileUpdater.Update();`
`470`	`471`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,16 @@`
`6`	`6`	`using GitVersion.Helpers;`
`7`	`7`	`using GitVersion.OutputVariables;`
`8`	`8`	`using GitVersion.Common;`
	`9`	`+using GitVersion.Log;`
`9`	`10`
`10`	`11`	`namespace GitVersion.Extensions.VersionAssemblyInfoResources`
`11`	`12`	`{`
`12`	`13`	`public class AssemblyInfoFileUpdater : IDisposable`
`13`	`14`	`{`
`14`		`- readonly List<Action> restoreBackupTasks = new List<Action>();`
`15`		`- readonly List<Action> cleanupBackupTasks = new List<Action>();`
	`15`	`+ private readonly List<Action> restoreBackupTasks = new List<Action>();`
	`16`	`+ private readonly List<Action> cleanupBackupTasks = new List<Action>();`
`16`	`17`
`17`		`- readonly IDictionary<string, Regex> assemblyAttributeRegexes = new Dictionary<string, Regex>`
	`18`	`+ private readonly IDictionary<string, Regex> assemblyAttributeRegexes = new Dictionary<string, Regex>`
`18`	`19`	`{`
`19`	`20`	`{".cs", new Regex( @"(\s\[\sassembly:\s(?:.)\s\]\s$(\r?\n)?)", RegexOptions.Multiline) },`
`20`	`21`	`{".fs", new Regex( @"(\s\[\s\<assembly:\s(?:.)\>\s\]\s$(\r?\n)?)", RegexOptions.Multiline) },`
`@@ -23,34 +24,36 @@ public class AssemblyInfoFileUpdater : IDisposable`
`23`	`24`
`24`	`25`	`private const string NewLine = "\r\n";`
`25`	`26`
`26`		`- ISet<string> assemblyInfoFileNames;`
`27`		`- string workingDirectory;`
`28`		`- VersionVariables variables;`
`29`		`- IFileSystem fileSystem;`
`30`		`- bool ensureAssemblyInfo;`
`31`		`- TemplateManager templateManager;`
	`27`	`+ private readonly ISet<string> assemblyInfoFileNames;`
	`28`	`+ private readonly string workingDirectory;`
	`29`	`+ private readonly VersionVariables variables;`
	`30`	`+ private readonly IFileSystem fileSystem;`
	`31`	`+ private readonly ILog log;`
	`32`	`+ private readonly bool ensureAssemblyInfo;`
	`33`	`+ private readonly TemplateManager templateManager;`
`32`	`34`
`33`		`- public AssemblyInfoFileUpdater(string assemblyInfoFileName, string workingDirectory, VersionVariables variables, IFileSystem fileSystem, bool ensureAssemblyInfo) :`
`34`		`- this(new HashSet<string> { assemblyInfoFileName }, workingDirectory, variables, fileSystem, ensureAssemblyInfo)`
	`35`	`+ public AssemblyInfoFileUpdater(string assemblyInfoFileName, string workingDirectory, VersionVariables variables, IFileSystem fileSystem, ILog log, bool ensureAssemblyInfo) :`
	`36`	`+ this(new HashSet<string> { assemblyInfoFileName }, workingDirectory, variables, fileSystem, log, ensureAssemblyInfo)`
`35`	`37`	`{ }`
`36`	`38`
`37`		`- public AssemblyInfoFileUpdater(ISet<string> assemblyInfoFileNames, string workingDirectory, VersionVariables variables, IFileSystem fileSystem, bool ensureAssemblyInfo)`
	`39`	`+ public AssemblyInfoFileUpdater(ISet<string> assemblyInfoFileNames, string workingDirectory, VersionVariables variables, IFileSystem fileSystem, ILog log, bool ensureAssemblyInfo)`
`38`	`40`	`{`
`39`	`41`	`this.assemblyInfoFileNames = assemblyInfoFileNames;`
`40`	`42`	`this.workingDirectory = workingDirectory;`
`41`	`43`	`this.variables = variables;`
`42`	`44`	`this.fileSystem = fileSystem;`
	`45`	`+ this.log = log;`
`43`	`46`	`this.ensureAssemblyInfo = ensureAssemblyInfo;`
`44`	`47`
`45`	`48`	`templateManager = new TemplateManager(TemplateType.VersionAssemblyInfoResources);`
`46`	`49`	`}`
`47`	`50`
`48`	`51`	`public void Update()`
`49`	`52`	`{`
`50`		`- Logger.Info("Updating assembly info files");`
	`53`	`+ log.Info("Updating assembly info files");`
`51`	`54`
`52`	`55`	`var assemblyInfoFiles = GetAssemblyInfoFiles(workingDirectory, assemblyInfoFileNames, fileSystem, ensureAssemblyInfo).ToList();`
`53`		`- Logger.Info($"Found {assemblyInfoFiles.Count} files");`
	`56`	`+ log.Info($"Found {assemblyInfoFiles.Count} files");`
`54`	`57`
`55`	`58`	`var assemblyVersion = variables.AssemblySemVer;`
`56`	`59`	`var assemblyVersionRegex = new Regex(@"AssemblyVersion(Attribute)?\s\(.\)\s*");`
`@@ -111,7 +114,7 @@ public void Update()`
`111`	`114`	`}`
`112`	`115`	`}`
`113`	`116`
`114`		`- string ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(Regex replaceRegex, string inputString, string replaceString, string fileExtension, ref bool appendedAttributes)`
	`117`	`+ private string ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(Regex replaceRegex, string inputString, string replaceString, string fileExtension, ref bool appendedAttributes)`
`115`	`118`	`{`
`116`	`119`	`var assemblyAddFormat = templateManager.GetAddFormatFor(fileExtension);`
`117`	`120`
`@@ -139,7 +142,7 @@ string ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(Regex replaceRegex, str`
`139`	`142`	`return inputString;`
`140`	`143`	`}`
`141`	`144`
`142`		`- IEnumerable<FileInfo> GetAssemblyInfoFiles(string workingDirectory, ISet<string> assemblyInfoFileNames, IFileSystem fileSystem, bool ensureAssemblyInfo)`
	`145`	`+ private IEnumerable<FileInfo> GetAssemblyInfoFiles(string workingDirectory, ISet<string> assemblyInfoFileNames, IFileSystem fileSystem, bool ensureAssemblyInfo)`
`143`	`146`	`{`
`144`	`147`	`if (assemblyInfoFileNames != null && assemblyInfoFileNames.Any(x => !string.IsNullOrWhiteSpace(x)))`
`145`	`148`	`{`
`@@ -167,7 +170,7 @@ IEnumerable<FileInfo> GetAssemblyInfoFiles(string workingDirectory, ISet<string>`
`167`	`170`	`}`
`168`	`171`	`}`
`169`	`172`
`170`		`- bool EnsureVersionAssemblyInfoFile(bool ensureAssemblyInfo, IFileSystem fileSystem, string fullPath)`
	`173`	`+ private bool EnsureVersionAssemblyInfoFile(bool ensureAssemblyInfo, IFileSystem fileSystem, string fullPath)`
`171`	`174`	`{`
`172`	`175`	`if (fileSystem.Exists(fullPath))`
`173`	`176`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public void Execute(Arguments arguments, IFileSystem fileSystem, IEnvironment en`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		`- using (var assemblyInfoUpdater = new AssemblyInfoFileUpdater(arguments.UpdateAssemblyInfoFileName, targetPath, variables, fileSystem, arguments.EnsureAssemblyInfo))`
	`81`	`+ using (var assemblyInfoUpdater = new AssemblyInfoFileUpdater(arguments.UpdateAssemblyInfoFileName, targetPath, variables, fileSystem, log, arguments.EnsureAssemblyInfo))`
`82`	`82`	`{`
`83`	`83`	`if (arguments.UpdateAssemblyInfo)`
`84`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,6 @@ namespace GitVersionTask.Tests`
`2`	`2`	`{`
`3`	`3`	`public class TestBase`
`4`	`4`	`{`
`5`		`- static TestBase()`
`6`		`- {`
`7`		`- ModuleInitializer.Initialize();`
`8`		`- }`
`9`		`-`
`10`	`5`	`}`
`11`	`6`	`}`
`12`	`7`