code cleanup

arturcic · arturcic · commit 8c4fda54ce02 · 2019-10-25T23:45:03.000+03:00
diff --git a/src/GitVersionCore.Tests/BuildServers/AzurePipelinesBuildNumberTests.cs b/src/GitVersionCore.Tests/BuildServers/AzurePipelinesBuildNumberTests.cs
@@ -9,8 +9,8 @@ namespace GitVersionCore.Tests.BuildServers
     [TestFixture]
     public class AzurePipelinesBuildNumberTests : TestBase
     {
-        private string key = "BUILD_BUILDNUMBER";
-        private string logPrefix = "##vso[build.updatebuildnumber]";
+        private readonly string key = "BUILD_BUILDNUMBER";
+        private readonly string logPrefix = "##vso[build.updatebuildnumber]";
         private AzurePipelines versionBuilder;
 
         private IEnvironment environment;
diff --git a/src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs b/src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs
@@ -9,7 +9,7 @@ namespace GitVersionCore.Tests.BuildServers
     [TestFixture]
     public class AzurePipelinesTests : TestBase
     {
-        private string key = "BUILD_BUILDNUMBER";
+        private readonly string key = "BUILD_BUILDNUMBER";
 
         private IEnvironment environment;
         private ILog log;
diff --git a/src/GitVersionCore.Tests/BuildServers/EnvironmentVariableJenkinsTests.cs b/src/GitVersionCore.Tests/BuildServers/EnvironmentVariableJenkinsTests.cs
@@ -9,10 +9,10 @@ namespace GitVersionCore.Tests.BuildServers
     [TestFixture]
     public class EnvironmentVariableJenkinsTests : TestBase
     {
-        private string key = "JENKINS_URL";
-        private string branch = "GIT_BRANCH";
-        private string localBranch = "GIT_LOCAL_BRANCH";
-        private string pipelineBranch = "BRANCH_NAME";
+        private readonly string key = "JENKINS_URL";
+        private readonly string branch = "GIT_BRANCH";
+        private readonly string localBranch = "GIT_LOCAL_BRANCH";
+        private readonly string pipelineBranch = "BRANCH_NAME";
         private IEnvironment environment;
         private ILog log;
 
diff --git a/src/GitVersionCore.Tests/Helpers/DirectoryHelper.cs b/src/GitVersionCore.Tests/Helpers/DirectoryHelper.cs
@@ -7,7 +7,7 @@ namespace GitVersionCore.Tests.Helpers
 {
     public static class DirectoryHelper
     {
-        private static Dictionary<string, string> toRename = new Dictionary<string, string>
+        private static readonly Dictionary<string, string> toRename = new Dictionary<string, string>
         {
             {"gitted", ".git"},
             {"gitmodules", ".gitmodules"},
diff --git a/src/GitVersionCore.Tests/Init/TestConsole.cs b/src/GitVersionCore.Tests/Init/TestConsole.cs
@@ -8,7 +8,7 @@ namespace GitVersionCore.Tests.Init
     public class TestConsole : IConsole
     {
         private readonly Queue<string> responses;
-        private ILog log;
+        private readonly ILog log;
 
         public TestConsole(params string[] responses)
         {
diff --git a/src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs b/src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs
@@ -14,7 +14,7 @@ namespace GitVersionCore.Tests.IntegrationTests
 {
     public class MainlineDevelopmentMode : TestBase
     {
-        private Config config = new Config
+        private readonly Config config = new Config
         {
             VersioningMode = VersioningMode.Mainline
         };
diff --git a/src/GitVersionCore.Tests/Mocks/MockBranch.cs b/src/GitVersionCore.Tests/Mocks/MockBranch.cs
@@ -23,8 +23,8 @@ public MockBranch()
 
         }
 
-        private MockCommitLog commits = new MockCommitLog();
-        private string friendlyName;
+        private readonly MockCommitLog commits = new MockCommitLog();
+        private readonly string friendlyName;
         public override string FriendlyName => friendlyName;
         public override ICommitLog Commits => commits;
         public override Commit Tip => commits.First();
diff --git a/src/GitVersionCore.Tests/Mocks/MockCommit.cs b/src/GitVersionCore.Tests/Mocks/MockCommit.cs
@@ -27,7 +27,7 @@ public MockCommit(ObjectId id = null)
         public Signature CommitterEx;
         public override Signature Committer => CommitterEx;
 
-        private ObjectId idEx;
+        private readonly ObjectId idEx;
         public override ObjectId Id => idEx;
 
         public override string Sha => idEx.Sha;
diff --git a/src/GitVersionCore.Tests/Mocks/MockThreadSleep.cs b/src/GitVersionCore.Tests/Mocks/MockThreadSleep.cs
@@ -6,7 +6,7 @@ namespace GitVersionCore.Tests.Mocks
 {
     public class MockThreadSleep : IThreadSleep
     {
-        private Func<int, Task> Validator;
+        private readonly Func<int, Task> Validator;
 
         public MockThreadSleep(Func<int, Task> validator = null)
         {
diff --git a/src/GitVersionCore.Tests/TestEnvironment.cs b/src/GitVersionCore.Tests/TestEnvironment.cs
@@ -5,7 +5,7 @@ namespace GitVersionCore.Tests
 {
     public class TestEnvironment : IEnvironment
     {
-        private IDictionary<string, string> map;
+        private readonly IDictionary<string, string> map;
 
         public TestEnvironment()
         {
diff --git a/src/GitVersionCore.Tests/TestFileSystem.cs b/src/GitVersionCore.Tests/TestFileSystem.cs
@@ -9,7 +9,7 @@ namespace GitVersionCore.Tests
 {
     public class TestFileSystem : IFileSystem
     {
-        private Dictionary<string, byte[]> fileSystem = new Dictionary<string, byte[]>();
+        private readonly Dictionary<string, byte[]> fileSystem = new Dictionary<string, byte[]>();
 
         public void Copy(string @from, string to, bool overwrite)
         {
diff --git a/src/GitVersionCore.Tests/TestStream.cs b/src/GitVersionCore.Tests/TestStream.cs
@@ -6,7 +6,7 @@ public class TestStream : Stream
     {
         private readonly string path;
         private readonly TestFileSystem testFileSystem;
-        private MemoryStream underlying = new MemoryStream();
+        private readonly MemoryStream underlying = new MemoryStream();
 
         public TestStream(string path, TestFileSystem testFileSystem)
         {
diff --git a/src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
@@ -19,7 +19,7 @@ namespace GitVersionCore.Tests.VersionCalculation
     [TestFixture]
     public class BaseVersionCalculatorTests : TestBase
     {
-        private ILog log;
+        private readonly ILog log;
 
         public BaseVersionCalculatorTests()
         {
@@ -90,7 +90,7 @@ public virtual IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
 
         private class V2Strategy : IVersionStrategy
         {
-            private Commit when;
+            private readonly Commit when;
 
             public V2Strategy(DateTimeOffset? when)
             {
diff --git a/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -16,7 +16,7 @@ namespace GitVersionCore.Tests.VersionCalculation
 {
     public class NextVersionCalculatorTests : TestBase
     {
-        private ILog log;
+        private readonly ILog log;
 
         public NextVersionCalculatorTests()
         {
diff --git a/src/GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs b/src/GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs
@@ -10,8 +10,8 @@ namespace GitVersionCore.Tests.VersionCalculation
     public class TestBaseVersionCalculator : IBaseVersionCalculator
     {
         private readonly SemanticVersion semanticVersion;
-        private bool shouldIncrement;
-        private Commit source;
+        private readonly bool shouldIncrement;
+        private readonly Commit source;
 
         public TestBaseVersionCalculator(bool shouldIncrement, SemanticVersion semanticVersion, Commit source)
         {
@@ -28,7 +28,7 @@ public BaseVersion GetBaseVersion(GitVersionContext context)
 
     public class TestBaseVersionStrategiesCalculator : BaseVersionCalculator
     {
-        private static IVersionStrategy[] versionStrategies = new IVersionStrategy[]
+        private static readonly IVersionStrategy[] versionStrategies = new IVersionStrategy[]
         {
             new FallbackVersionStrategy(),
             new ConfigNextVersionVersionStrategy(),
diff --git a/src/GitVersionCore.Tests/VersionCalculation/TestMetaDataCalculator.cs b/src/GitVersionCore.Tests/VersionCalculation/TestMetaDataCalculator.cs
@@ -7,7 +7,7 @@ namespace GitVersionCore.Tests.VersionCalculation
 {
     public class TestMetaDataCalculator : IMetaDataCalculator
     {
-        private SemanticVersionBuildMetaData metaData;
+        private readonly SemanticVersionBuildMetaData metaData;
 
         public TestMetaDataCalculator(SemanticVersionBuildMetaData metaData)
         {
diff --git a/src/GitVersionCore/BuildServers/GitLabCi.cs b/src/GitVersionCore/BuildServers/GitLabCi.cs
@@ -9,7 +9,7 @@ namespace GitVersion.BuildServers
     public class GitLabCi : BuildServerBase
     {
         public const string EnvironmentVariableName = "GITLAB_CI";
-        private string _file;
+        private readonly string _file;
 
         public GitLabCi(IEnvironment environment, ILog log, string propertiesFileName = "gitversion.properties") : base(environment, log)
         {
diff --git a/src/GitVersionCore/BuildServers/Jenkins.cs b/src/GitVersionCore/BuildServers/Jenkins.cs
@@ -9,7 +9,7 @@ namespace GitVersion.BuildServers
     public class Jenkins : BuildServerBase
     {
         public const string EnvironmentVariableName = "JENKINS_URL";
-        private string _file;
+        private readonly string _file;
         protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
 
         public Jenkins(IEnvironment environment, ILog log, string propertiesFileName = "gitversion.properties") : base(environment, log)
diff --git a/src/GitVersionCore/Configuration/BranchConfigurationCalculator.cs b/src/GitVersionCore/Configuration/BranchConfigurationCalculator.cs
@@ -11,8 +11,8 @@ namespace GitVersion.Configuration
     public class BranchConfigurationCalculator : IBranchConfigurationCalculator
     {
         public static string FallbackConfigName = "Fallback";
-        private GitVersionContext context;
-        private ILog log;
+        private readonly GitVersionContext context;
+        private readonly ILog log;
 
         public BranchConfigurationCalculator(ILog log, GitVersionContext context)
         {
diff --git a/src/GitVersionCore/Configuration/Config.cs b/src/GitVersionCore/Configuration/Config.cs
@@ -11,7 +11,7 @@ namespace GitVersion.Configuration
 {
     public class Config
     {
-        private Dictionary<string, BranchConfig> branches = new Dictionary<string, BranchConfig>();
+        private readonly Dictionary<string, BranchConfig> branches = new Dictionary<string, BranchConfig>();
         private string nextVersion;
 
         public Config()
diff --git a/src/GitVersionCore/Configuration/ConfigurationProvider.cs b/src/GitVersionCore/Configuration/ConfigurationProvider.cs
@@ -41,7 +41,7 @@ public ConfigurationProvider(IFileSystem fileSystem, ILog log, IConfigFileLocato
         public const string SupportBranchKey = "support";
         public const string DevelopBranchKey = "develop";
 
-        private static Dictionary<string, int> DefaultPreReleaseWeight =
+        private static readonly Dictionary<string, int> DefaultPreReleaseWeight =
             new Dictionary<string, int>
             {
                 { DevelopBranchRegex, 0 },
diff --git a/src/GitVersionCore/Configuration/Init/BuildServer/AppVeyorSetup.cs b/src/GitVersionCore/Configuration/Init/BuildServer/AppVeyorSetup.cs
@@ -16,7 +16,7 @@ internal enum ProjectVisibility
     internal class AppVeyorSetup : ConfigInitWizardStep
     {
         private readonly ILog log;
-        private ProjectVisibility _projectVisibility;
+        private readonly ProjectVisibility _projectVisibility;
 
         public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log,  ProjectVisibility visibility) : base(console, fileSystem, log)
         {
diff --git a/src/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranch.cs b/src/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranch.cs
@@ -6,7 +6,7 @@ namespace GitVersion.Configuration.Init.SetConfig
 {
     public class ConfigureBranch : ConfigInitWizardStep
     {
-        private string name;
+        private readonly string name;
         private readonly BranchConfig branchConfig;
 
         public ConfigureBranch(string name, BranchConfig branchConfig, IConsole console, IFileSystem fileSystem, ILog log) 
diff --git a/src/GitVersionCore/Configuration/Init/SetConfig/SetBranchTag.cs b/src/GitVersionCore/Configuration/Init/SetConfig/SetBranchTag.cs
@@ -6,7 +6,7 @@ namespace GitVersion.Configuration.Init.SetConfig
 {
     public class SetBranchTag : ConfigInitWizardStep
     {
-        private string name;
+        private readonly string name;
         private readonly BranchConfig branchConfig;
 
         public SetBranchTag(string name, BranchConfig branchConfig, IConsole console, IFileSystem fileSystem, ILog log)
diff --git a/src/GitVersionCore/Configuration/LegacyConfig.cs b/src/GitVersionCore/Configuration/LegacyConfig.cs
@@ -9,7 +9,7 @@ namespace GitVersion.Configuration
     /// </summary>
     public class LegacyConfig
     {
-        private Dictionary<string, LegacyBranchConfig> branches = new Dictionary<string, LegacyBranchConfig>();
+        private readonly Dictionary<string, LegacyBranchConfig> branches = new Dictionary<string, LegacyBranchConfig>();
 
 #pragma warning disable IDE1006 // Naming Styles
         public string assemblyVersioningScheme { get; set; }
diff --git a/src/GitVersionCore/Extensions/GitVersionInformationResources/GitVersionInformationGenerator.cs b/src/GitVersionCore/Extensions/GitVersionInformationResources/GitVersionInformationGenerator.cs
@@ -6,12 +6,12 @@ namespace GitVersion.Extensions.GitVersionInformationResources
 {
     public class GitVersionInformationGenerator
     {
-        private string fileName;
-        private string directory;
-        private VersionVariables variables;
-        private IFileSystem fileSystem;
+        private readonly string fileName;
+        private readonly string directory;
+        private readonly VersionVariables variables;
+        private readonly IFileSystem fileSystem;
 
-        private TemplateManager templateManager;
+        private readonly TemplateManager templateManager;
 
         public GitVersionInformationGenerator(string fileName, string directory, VersionVariables variables, IFileSystem fileSystem)
         {
diff --git a/src/GitVersionCore/Extensions/WixVersionFileUpdater.cs b/src/GitVersionCore/Extensions/WixVersionFileUpdater.cs
@@ -9,8 +9,8 @@ namespace GitVersion.Extensions
 {
     public class WixVersionFileUpdater : IDisposable
     {
-        private VersionVariables variables;
-        private IFileSystem fileSystem;
+        private readonly VersionVariables variables;
+        private readonly IFileSystem fileSystem;
         private readonly ILog log;
         public string WixVersionFile { get; }
         public const string WIX_VERSION_FILE = "GitVersion_WixVersion.wxi";
diff --git a/src/GitVersionCore/Helpers/LambdaEqualityHelper.cs b/src/GitVersionCore/Helpers/LambdaEqualityHelper.cs
@@ -7,7 +7,7 @@ namespace GitVersion.Helpers
     // see https://github.com/libgit2/libgit2sharp/blob/7af5c60f22f9bd6064204f84467cfa62bedd1147/LibGit2Sharp/Core/LambdaEqualityHelper.cs
     internal class LambdaEqualityHelper<T>
     {
-        private Func<T, object>[] equalityContributorAccessors;
+        private readonly Func<T, object>[] equalityContributorAccessors;
 
         public LambdaEqualityHelper(params Func<T, object>[] equalityContributorAccessors)
         {
diff --git a/src/GitVersionCore/Helpers/OperationWithExponentialBackoff.cs b/src/GitVersionCore/Helpers/OperationWithExponentialBackoff.cs
@@ -7,10 +7,10 @@ namespace GitVersion.Helpers
 {
     internal class OperationWithExponentialBackoff<T> where T : Exception
     {
-        private IThreadSleep ThreadSleep;
+        private readonly IThreadSleep ThreadSleep;
         private readonly ILog log;
-        private Action Operation;
-        private int MaxRetries;
+        private readonly Action Operation;
+        private readonly int MaxRetries;
 
         public OperationWithExponentialBackoff(IThreadSleep threadSleep, ILog log, Action operation, int maxRetries = 5)
         {
diff --git a/src/GitVersionCore/Helpers/ProcessHelper.cs b/src/GitVersionCore/Helpers/ProcessHelper.cs
@@ -10,7 +10,7 @@ namespace GitVersion.Helpers
 {
     public static class ProcessHelper
     {
-        private static volatile object lockObject = new object();
+        private static readonly object lockObject = new object();
 
         // http://social.msdn.microsoft.com/Forums/en/netfxbcl/thread/f6069441-4ab1-4299-ad6a-b8bb9ed36be3
         private static Process Start(ProcessStartInfo startInfo)
diff --git a/src/GitVersionCore/IncrementStrategyFinder.cs b/src/GitVersionCore/IncrementStrategyFinder.cs
@@ -153,8 +153,8 @@ private static bool IsMatch(string message, string regex)
             return match;
         }
 
-        private static IDictionary<int, bool> MatchCache = new Dictionary<int, bool>();
-        private static IDictionary<int, VersionField?> VersionFieldCache = new Dictionary<int, VersionField?>();
+        private static readonly IDictionary<int, bool> MatchCache = new Dictionary<int, bool>();
+        private static readonly IDictionary<int, VersionField?> VersionFieldCache = new Dictionary<int, VersionField?>();
 
         public static VersionField FindDefaultIncrementForBranch( GitVersionContext context, string branch = null )
         {
diff --git a/src/GitVersionCore/Logging/ConsoleAppender.cs b/src/GitVersionCore/Logging/ConsoleAppender.cs
@@ -6,7 +6,7 @@ namespace GitVersion.Logging
     public class ConsoleAppender : ILogAppender
     {
         private readonly object _lock;
-        private IDictionary<LogLevel, (ConsoleColor, ConsoleColor)> _palettes;
+        private readonly IDictionary<LogLevel, (ConsoleColor, ConsoleColor)> _palettes;
         public ConsoleAppender()
         {
             _lock = new object();
diff --git a/src/GitVersionCore/SemanticVersioning/SemanticVersion.cs b/src/GitVersionCore/SemanticVersioning/SemanticVersion.cs
@@ -8,7 +8,7 @@ public class SemanticVersion : IFormattable, IComparable<SemanticVersion>
     {
         public static SemanticVersion Empty = new SemanticVersion();
 
-        private static Regex ParseSemVer = new Regex(
+        private static readonly Regex ParseSemVer = new Regex(
             @"^(?<SemVer>(?<Major>\d+)(\.(?<Minor>\d+))(\.(?<Patch>\d+))?)(\.(?<FourthPart>\d+))?(-(?<Tag>[^\+]*))?(\+(?<BuildMetaData>.*))?$",
             RegexOptions.Compiled);
 
diff --git a/src/GitVersionCore/SemanticVersioning/SemanticVersionBuildMetaData.cs b/src/GitVersionCore/SemanticVersioning/SemanticVersionBuildMetaData.cs
@@ -6,11 +6,11 @@ namespace GitVersion.SemanticVersioning
 {
     public class SemanticVersionBuildMetaData : IFormattable, IEquatable<SemanticVersionBuildMetaData>
     {
-        private static Regex ParseRegex = new Regex(
+        private static readonly Regex ParseRegex = new Regex(
             @"(?<BuildNumber>\d+)?(\.?Branch(Name)?\.(?<BranchName>[^\.]+))?(\.?Sha?\.(?<Sha>[^\.]+))?(?<Other>.*)",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        private static LambdaEqualityHelper<SemanticVersionBuildMetaData> equalityHelper =
+        private static readonly LambdaEqualityHelper<SemanticVersionBuildMetaData> equalityHelper =
            new LambdaEqualityHelper<SemanticVersionBuildMetaData>(x => x.CommitsSinceTag, x => x.Branch, x => x.Sha);
 
         public int? CommitsSinceTag;
diff --git a/src/GitVersionCore/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersionCore/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -8,7 +8,7 @@ namespace GitVersion.SemanticVersioning
     public class SemanticVersionPreReleaseTag :
         IFormattable, IComparable<SemanticVersionPreReleaseTag>, IEquatable<SemanticVersionPreReleaseTag>
     {
-        private static LambdaEqualityHelper<SemanticVersionPreReleaseTag> equalityHelper =
+        private static readonly LambdaEqualityHelper<SemanticVersionPreReleaseTag> equalityHelper =
            new LambdaEqualityHelper<SemanticVersionPreReleaseTag>(x => x.Name, x => x.Number);
 
         public SemanticVersionPreReleaseTag()
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/BaseVersion.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/BaseVersion.cs
@@ -5,7 +5,7 @@ namespace GitVersion.VersionCalculation.BaseVersionCalculators
 {
     public class BaseVersion
     {
-        private GitVersionContext _context;
+        private readonly GitVersionContext _context;
 
         public BaseVersion(GitVersionContext context, string source, bool shouldIncrement, SemanticVersion semanticVersion, Commit baseVersionSource, string branchNameOverride)
         {
diff --git a/src/GitVersionCore/VersionCalculation/TrackReleaseBranchesVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/TrackReleaseBranchesVersionStrategy.cs
@@ -25,8 +25,8 @@ namespace GitVersion.VersionCalculation
     /// </summary>
     public class TrackReleaseBranchesVersionStrategy : IVersionStrategy
     {
-        private VersionInBranchNameVersionStrategy releaseVersionStrategy = new VersionInBranchNameVersionStrategy();
-        private TaggedCommitVersionStrategy taggedCommitVersionStrategy = new TaggedCommitVersionStrategy();
+        private readonly VersionInBranchNameVersionStrategy releaseVersionStrategy = new VersionInBranchNameVersionStrategy();
+        private readonly TaggedCommitVersionStrategy taggedCommitVersionStrategy = new TaggedCommitVersionStrategy();
 
         public virtual IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
         {
diff --git a/src/GitVersionExe.Tests/HelpWriterTests.cs b/src/GitVersionExe.Tests/HelpWriterTests.cs
@@ -8,7 +8,7 @@ namespace GitVersionExe.Tests
 {
     public class HelpWriterTests
     {
-        private IHelpWriter helpWriter;
+        private readonly IHelpWriter helpWriter;
 
         public HelpWriterTests()
         {
diff --git a/src/GitVersionExe.Tests/Helpers/DirectoryHelper.cs b/src/GitVersionExe.Tests/Helpers/DirectoryHelper.cs
diff --git a/src/GitVersionExe.Tests/Helpers/TestFileSystem.cs b/src/GitVersionExe.Tests/Helpers/TestFileSystem.cs
diff --git a/src/GitVersionExe.Tests/Helpers/TestStream.cs b/src/GitVersionExe.Tests/Helpers/TestStream.cs
diff --git a/src/GitVersionExe.Tests/VersionWriterTests.cs b/src/GitVersionExe.Tests/VersionWriterTests.cs
diff --git a/src/GitVersionExe/ExtensionMethods.cs b/src/GitVersionExe/ExtensionMethods.cs
diff --git a/src/GitVersionTask.Tests/Helpers/DirectoryHelper.cs b/src/GitVersionTask.Tests/Helpers/DirectoryHelper.cs
diff --git a/src/GitVersionTask.Tests/Helpers/TestEnvironment.cs b/src/GitVersionTask.Tests/Helpers/TestEnvironment.cs
diff --git a/src/GitVersionTask.Tests/Helpers/TestFileSystem.cs b/src/GitVersionTask.Tests/Helpers/TestFileSystem.cs
diff --git a/src/GitVersionTask.Tests/Helpers/TestStream.cs b/src/GitVersionTask.Tests/Helpers/TestStream.cs

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace GitVersionCore.Tests.BuildServers`
`9`	`9`	`[TestFixture]`
`10`	`10`	`public class AzurePipelinesTests : TestBase`
`11`	`11`	`{`
`12`		`- private string key = "BUILD_BUILDNUMBER";`
	`12`	`+ private readonly string key = "BUILD_BUILDNUMBER";`
`13`	`13`
`14`	`14`	`private IEnvironment environment;`
`15`	`15`	`private ILog log;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace GitVersionCore.Tests.Helpers`
`7`	`7`	`{`
`8`	`8`	`public static class DirectoryHelper`
`9`	`9`	`{`
`10`		`- private static Dictionary<string, string> toRename = new Dictionary<string, string>`
	`10`	`+ private static readonly Dictionary<string, string> toRename = new Dictionary<string, string>`
`11`	`11`	`{`
`12`	`12`	`{"gitted", ".git"},`
`13`	`13`	`{"gitmodules", ".gitmodules"},`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace GitVersionCore.Tests.Init`
`8`	`8`	`public class TestConsole : IConsole`
`9`	`9`	`{`
`10`	`10`	`private readonly Queue<string> responses;`
`11`		`- private ILog log;`
	`11`	`+ private readonly ILog log;`
`12`	`12`
`13`	`13`	`public TestConsole(params string[] responses)`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace GitVersionCore.Tests.IntegrationTests`
`14`	`14`	`{`
`15`	`15`	`public class MainlineDevelopmentMode : TestBase`
`16`	`16`	`{`
`17`		`- private Config config = new Config`
	`17`	`+ private readonly Config config = new Config`
`18`	`18`	`{`
`19`	`19`	`VersioningMode = VersioningMode.Mainline`
`20`	`20`	`};`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ public MockBranch()`
`23`	`23`
`24`	`24`	`}`
`25`	`25`
`26`		`- private MockCommitLog commits = new MockCommitLog();`
`27`		`- private string friendlyName;`
	`26`	`+ private readonly MockCommitLog commits = new MockCommitLog();`
	`27`	`+ private readonly string friendlyName;`
`28`	`28`	`public override string FriendlyName => friendlyName;`
`29`	`29`	`public override ICommitLog Commits => commits;`
`30`	`30`	`public override Commit Tip => commits.First();`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace GitVersionCore.Tests.Mocks`
`6`	`6`	`{`
`7`	`7`	`public class MockThreadSleep : IThreadSleep`
`8`	`8`	`{`
`9`		`- private Func<int, Task> Validator;`
	`9`	`+ private readonly Func<int, Task> Validator;`
`10`	`10`
`11`	`11`	`public MockThreadSleep(Func<int, Task> validator = null)`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace GitVersionCore.Tests`
`5`	`5`	`{`
`6`	`6`	`public class TestEnvironment : IEnvironment`
`7`	`7`	`{`
`8`		`- private IDictionary<string, string> map;`
	`8`	`+ private readonly IDictionary<string, string> map;`
`9`	`9`
`10`	`10`	`public TestEnvironment()`
`11`	`11`	`{`