Qualify this. prefix

Qualify `this.` prefix on private fields; unqualify it on all other
class members.

Author: asbjornu

.editorconfig

@@ -158,9 +158,20 @@ resharper_csharp_use_roslyn_logic_for_evident_types = true
 # Alignment
 resharper_csharp_align_multiline_parameter = true
 
-# Qualify fields with "this."
+# Qualify fields with `this.` in ReSharper
 resharper_csharp_instance_members_qualify_members = field
 
+# Qualify fields with `this.` in Roslyn
+dotnet_style_qualification_for_field = true:error
+
+# Do not qualify properties, methods, and events with `this.` in Roslyn
+dotnet_style_qualification_for_property = false:error
+dotnet_style_qualification_for_method = false:error
+dotnet_style_qualification_for_event = false:error
+
+# Make missing `this.` qualification an error
+dotnet_diagnostic.IDE0009.severity = error
+
 # IDE0005: Using directive is unnecessary.
 dotnet_diagnostic.ide0005.severity = warning
 

src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs

@@ -12,14 +12,14 @@ public override string ToString()
     {
         var arguments = new StringBuilder();
 
-        if (!this.WorkingDirectory.IsNullOrWhiteSpace())
+        if (!WorkingDirectory.IsNullOrWhiteSpace())
         {
-            arguments.Append(" /targetpath \"").Append(this.WorkingDirectory).Append('\"');
+            arguments.Append(" /targetpath \"").Append(WorkingDirectory).Append('\"');
         }
 
-        if (!this.LogFile.IsNullOrWhiteSpace())
+        if (!LogFile.IsNullOrWhiteSpace())
         {
-            arguments.Append(" /l \"").Append(this.LogFile).Append('\"');
+            arguments.Append(" /l \"").Append(LogFile).Append('\"');
         }
 
         arguments.Append(additionalArguments);

src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs

@@ -1,7 +1,7 @@
 using GitVersion.Agents;
-using GitVersion.Core.Tests.Helpers;
 using GitVersion.Helpers;
 using GitVersion.Testing.Extensions;
+using GitVersion.Tests;
 using LibGit2Sharp;
 
 namespace GitVersion.App.Tests;

src/GitVersion.App/ArgumentParser.cs

@@ -292,7 +292,7 @@ private static bool ParseSwitches(Arguments arguments, string? name, IReadOnlyLi
 
         if (name.IsSwitch("verbosity"))
         {
-            ParseVerbosity(arguments, value);
+            arguments.Verbosity = ParseVerbosity(value);
             return true;
         }
 
@@ -437,13 +437,8 @@ private static void ParseOutput(Arguments arguments, IEnumerable<string>? values
         }
     }
 
-    private static void ParseVerbosity(Arguments arguments, string? value)
-    {
-        if (!Enum.TryParse(value, true, out arguments.Verbosity))
-        {
-            throw new WarningException($"Could not parse Verbosity value '{value}'");
-        }
-    }
+    private static Verbosity ParseVerbosity(string? value) =>
+        Enum.TryParse(value, true, out Verbosity verbosity) ? verbosity : throw new WarningException($"Could not parse Verbosity value '{value}'");
 
     private static void ParseOverrideConfig(Arguments arguments, IReadOnlyCollection<string>? values)
     {

src/GitVersion.App/Arguments.cs

@@ -5,40 +5,40 @@ namespace GitVersion;
 
 internal class Arguments
 {
-    public AuthenticationInfo Authentication = new();
+    public AuthenticationInfo Authentication  { get; set; } = new();
 
-    public string? ConfigurationFile;
-    public IReadOnlyDictionary<object, object?> OverrideConfiguration = new Dictionary<object, object?>();
-    public bool ShowConfiguration;
+    public string? ConfigurationFile { get; set; }
+    public IReadOnlyDictionary<object, object?> OverrideConfiguration  { get; set; } = new Dictionary<object, object?>();
+    public bool ShowConfiguration { get; set; }
 
-    public string? TargetPath;
+    public string? TargetPath { get; set; }
 
-    public string? TargetUrl;
-    public string? TargetBranch;
-    public string? CommitId;
-    public string? ClonePath;
+    public string? TargetUrl { get; set; }
+    public string? TargetBranch { get; set; }
+    public string? CommitId { get; set; }
+    public string? ClonePath { get; set; }
 
-    public bool Diag;
-    public bool IsVersion;
-    public bool IsHelp;
+    public bool Diag { get; set; }
+    public bool IsVersion { get; set; }
+    public bool IsHelp { get; set; }
 
-    public bool NoFetch;
-    public bool NoCache;
-    public bool NoNormalize;
-    public bool AllowShallow;
+    public bool NoFetch { get; set; }
+    public bool NoCache { get; set; }
+    public bool NoNormalize { get; set; }
+    public bool AllowShallow { get; set; }
 
-    public string? LogFilePath;
-    public string? ShowVariable;
-    public string? Format;
-    public string? OutputFile;
-    public ISet<OutputType> Output = new HashSet<OutputType>();
-    public Verbosity Verbosity = Verbosity.Normal;
+    public string? LogFilePath { get; set; }
+    public string? ShowVariable { get; set; }
+    public string? Format { get; set; }
+    public string? OutputFile { get; set; }
+    public ISet<OutputType> Output  { get; set; } = new HashSet<OutputType>();
+    public Verbosity Verbosity   { get; set; } = Verbosity.Normal;
 
-    public bool UpdateWixVersionFile;
-    public bool UpdateProjectFiles;
-    public bool UpdateAssemblyInfo;
-    public bool EnsureAssemblyInfo;
-    public ISet<string> UpdateAssemblyInfoFileName = new HashSet<string>();
+    public bool UpdateWixVersionFile { get; set; }
+    public bool UpdateProjectFiles { get; set; }
+    public bool UpdateAssemblyInfo { get; set; }
+    public bool EnsureAssemblyInfo { get; set; }
+    public ISet<string> UpdateAssemblyInfoFileName  { get; set; } = new HashSet<string>();
 
     public GitVersionOptions ToOptions()
     {
@@ -54,9 +54,9 @@ public GitVersionOptions ToOptions()
 
             AuthenticationInfo =
             {
-                Username = this.Authentication.Username,
-                Password = this.Authentication.Password,
-                Token = this.Authentication.Token
+                Username = Authentication.Username,
+                Password = Authentication.Password,
+                Token = Authentication.Token
             },
 
             ConfigurationInfo =
@@ -99,7 +99,7 @@ public GitVersionOptions ToOptions()
             OutputFile = OutputFile
         };
 
-        var workingDirectory = this.TargetPath?.TrimEnd('/', '\\');
+        var workingDirectory = TargetPath?.TrimEnd('/', '\\');
         if (workingDirectory != null)
         {
             gitVersionOptions.WorkingDirectory = workingDirectory;

src/GitVersion.App/OverrideConfigurationOptionParser.cs

@@ -50,7 +50,7 @@ private static bool IsSupportedPropertyType(Type propertyType)
                || unwrappedType == typeof(VersionStrategies[]);
     }
 
-    internal void SetValue(string key, string value) => overrideConfiguration[key] = QuotedStringHelpers.UnquoteText(value);
+    internal void SetValue(string key, string value) => this.overrideConfiguration[key] = QuotedStringHelpers.UnquoteText(value);
 
     internal IReadOnlyDictionary<object, object?> GetOverrideConfiguration() => this.overrideConfiguration;
 }

src/GitVersion.BuildAgents/Agents/AppVeyor.cs

@@ -13,8 +13,8 @@ internal class AppVeyor(IEnvironment environment, ILog log, IFileSystem fileSyst
 
     public override string SetBuildNumber(GitVersionVariables variables)
     {
-        var buildNumber = Environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER");
-        var apiUrl = Environment.GetEnvironmentVariable("APPVEYOR_API_URL") ?? throw new Exception("APPVEYOR_API_URL environment variable not set");
+        var buildNumber = this.environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER");
+        var apiUrl = this.environment.GetEnvironmentVariable("APPVEYOR_API_URL") ?? throw new Exception("APPVEYOR_API_URL environment variable not set");
 
         using var httpClient = GetHttpClient(apiUrl);
 
@@ -40,7 +40,7 @@ public override string SetBuildNumber(GitVersionVariables variables)
 
     public override string[] SetOutputVariables(string name, string? value)
     {
-        var apiUrl = Environment.GetEnvironmentVariable("APPVEYOR_API_URL") ?? throw new Exception("APPVEYOR_API_URL environment variable not set");
+        var apiUrl = this.environment.GetEnvironmentVariable("APPVEYOR_API_URL") ?? throw new Exception("APPVEYOR_API_URL environment variable not set");
         var httpClient = GetHttpClient(apiUrl);
 
         var body = new
@@ -66,10 +66,10 @@ public override string[] SetOutputVariables(string name, string? value)
 
     public override string? GetCurrentBranch(bool usingDynamicRepos)
     {
-        var pullRequestBranchName = Environment.GetEnvironmentVariable("APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH");
+        var pullRequestBranchName = this.environment.GetEnvironmentVariable("APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH");
         return !pullRequestBranchName.IsNullOrWhiteSpace()
             ? pullRequestBranchName
-            : this.Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH");
+            : this.environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH");
     }
 
     public override bool PreventFetch() => false;

src/GitVersion.BuildAgents/Agents/AzurePipelines.cs

@@ -19,11 +19,11 @@ public override string[] SetOutputVariables(string name, string? value) =>
 
     public override string? GetCurrentBranch(bool usingDynamicRepos)
     {
-        var gitBranch = Environment.GetEnvironmentVariable("GIT_BRANCH");
+        var gitBranch = this.environment.GetEnvironmentVariable("GIT_BRANCH");
         if (gitBranch is not null)
             return gitBranch;
 
-        var sourceBranch = Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH");
+        var sourceBranch = this.environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH");
 
         // https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml
         // BUILD_SOURCEBRANCH must be used only for "real" branches, not for tags.
@@ -37,7 +37,7 @@ public override string SetBuildNumber(GitVersionVariables variables)
     {
         // For AzurePipelines, we'll get the Build Number and insert GitVersion variables where
         // specified
-        var buildNumberEnv = Environment.GetEnvironmentVariable("BUILD_BUILDNUMBER");
+        var buildNumberEnv = this.environment.GetEnvironmentVariable("BUILD_BUILDNUMBER");
         if (buildNumberEnv.IsNullOrWhiteSpace())
             return variables.FullSemVer;
 

src/GitVersion.BuildAgents/Agents/BitBucketPipelines.cs

@@ -55,13 +55,13 @@ public override void WriteIntegration(Action<string?> writer, GitVersionVariable
             .Select(variable => $"export GITVERSION_{variable.Key.ToUpperInvariant()}={variable.Value}")
             .ToList();
 
-        this.FileSystem.File.WriteAllLines(this.propertyFile, exports);
+        this.fileSystem.File.WriteAllLines(this.propertyFile, exports);
 
         var psExports = variables
             .Select(variable => $"$GITVERSION_{variable.Key.ToUpperInvariant()} = \"{variable.Value}\"")
             .ToList();
 
-        this.FileSystem.File.WriteAllLines(this.ps1File, psExports);
+        this.fileSystem.File.WriteAllLines(this.ps1File, psExports);
     }
 
     public override string? GetCurrentBranch(bool usingDynamicRepos)
@@ -72,7 +72,7 @@ public override void WriteIntegration(Action<string?> writer, GitVersionVariable
 
     private string? EvaluateEnvironmentVariable(string variableName)
     {
-        var branchName = Environment.GetEnvironmentVariable(variableName);
+        var branchName = this.environment.GetEnvironmentVariable(variableName);
         this.Log.Info("Evaluating environment variable {0} : {1}", variableName, branchName ?? "(null)");
         return branchName;
     }

src/GitVersion.BuildAgents/Agents/BuildKite.cs

@@ -10,7 +10,7 @@ internal class BuildKite(IEnvironment environment, ILog log, IFileSystem fileSys
 
     protected override string EnvironmentVariable => EnvironmentVariableName;
 
-    public override bool CanApplyToCurrentContext() => "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariable), StringComparison.OrdinalIgnoreCase);
+    public override bool CanApplyToCurrentContext() => "true".Equals(this.environment.GetEnvironmentVariable(EnvironmentVariable), StringComparison.OrdinalIgnoreCase);
 
     public override string SetBuildNumber(GitVersionVariables variables) =>
         string.Empty; // There is no equivalent function in BuildKite.
@@ -20,10 +20,10 @@ public override string[] SetOutputVariables(string name, string? value) =>
 
     public override string? GetCurrentBranch(bool usingDynamicRepos)
     {
-        var pullRequest = Environment.GetEnvironmentVariable("BUILDKITE_PULL_REQUEST");
+        var pullRequest = this.environment.GetEnvironmentVariable("BUILDKITE_PULL_REQUEST");
         if (string.IsNullOrEmpty(pullRequest) || pullRequest == "false")
         {
-            return Environment.GetEnvironmentVariable("BUILDKITE_BRANCH");
+            return this.environment.GetEnvironmentVariable("BUILDKITE_BRANCH");
         }
 
         // For pull requests BUILDKITE_BRANCH refers to the head, so adjust the