Merge pull request #16871 from tamasvajk/fix/quality-issues

C#: Fix quality issues

Author: tamasvajk

csharp/autobuilder/Semmle.Autobuild.CSharp/CSharpDiagnosticClassifier.cs

@@ -99,7 +99,7 @@ public override void Fire(DiagnosticClassifier classifier, Match match)
         {
             if (!match.Groups.TryGetValue("projectFile", out var projectFile))
                 throw new ArgumentException("Expected regular expression match to contain projectFile");
-            if (!match.Groups.TryGetValue("location", out var location))
+            if (!match.Groups.TryGetValue("location", out _))
                 throw new ArgumentException("Expected regular expression match to contain location");
 
             var result = classifier.Results.OfType<Result>().FirstOrDefault();

csharp/autobuilder/Semmle.Autobuild.CSharp/DotNetRule.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using Semmle.Util;
-using Semmle.Util.Logging;
 using Semmle.Autobuild.Shared;
 using Semmle.Extraction.CSharp.DependencyFetching;
 
@@ -15,14 +13,14 @@ namespace Semmle.Autobuild.CSharp
     /// </summary>
     internal class DotNetRule : IBuildRule<CSharpAutobuildOptions>
     {
-        public readonly List<IProjectOrSolution> FailedProjectsOrSolutions = new();
+        public List<IProjectOrSolution> FailedProjectsOrSolutions { get; } = [];
 
         /// <summary>
         /// A list of projects which are incompatible with DotNet.
         /// </summary>
         public IEnumerable<Project<CSharpAutobuildOptions>> NotDotNetProjects { get; private set; }
 
-        public DotNetRule() => NotDotNetProjects = new List<Project<CSharpAutobuildOptions>>();
+        public DotNetRule() => NotDotNetProjects = [];
 
         public BuildScript Analyse(IAutobuilder<CSharpAutobuildOptions> builder, bool auto)
         {

csharp/autobuilder/Semmle.Autobuild.Shared/BuildTools.cs

@@ -18,7 +18,7 @@ public VcVarsBatFile(string path, int version)
             Path = path;
             ToolsVersion = version;
         }
-    };
+    }
 
     /// <summary>
     /// Collection of available Visual Studio build tools.

csharp/autobuilder/Semmle.Autobuild.Shared/DiagnosticClassifier.cs

@@ -60,7 +60,7 @@ public virtual void Fire(DiagnosticClassifier classifier, Match match) { }
     public class DiagnosticClassifier
     {
         private readonly List<DiagnosticRule> rules;
-        public readonly List<IDiagnosticsResult> Results;
+        public List<IDiagnosticsResult> Results { get; }
 
         public DiagnosticClassifier()
         {

csharp/autobuilder/Semmle.Autobuild.Shared/MsBuildRule.cs

@@ -32,7 +32,7 @@ public class MsBuildRule : IBuildRule<AutobuildOptionsShared>
         /// <summary>
         /// A list of solutions or projects which failed to build.
         /// </summary>
-        public readonly List<IProjectOrSolution> FailedProjectsOrSolutions = new();
+        public List<IProjectOrSolution> FailedProjectsOrSolutions { get; } = [];
 
         public BuildScript Analyse(IAutobuilder<AutobuildOptionsShared> builder, bool auto)
         {
@@ -60,7 +60,7 @@ public BuildScript Analyse(IAutobuilder<AutobuildOptionsShared> builder, bool au
             // Use `nuget.exe` from source code repo, if present, otherwise first attempt with global
             // `nuget` command, and if that fails, attempt to download `nuget.exe` from nuget.org
             var nuget = builder.GetFilename("nuget.exe").Select(t => t.Item1).FirstOrDefault() ?? "nuget";
-            var nugetDownloadPath = builder.Actions.PathCombine(FileUtils.GetTemporaryWorkingDirectory(builder.Actions.GetEnvironmentVariable, builder.Options.Language.UpperCaseName, out var _), ".nuget", "nuget.exe");
+            var nugetDownloadPath = builder.Actions.PathCombine(FileUtils.GetTemporaryWorkingDirectory(builder.Actions.GetEnvironmentVariable, builder.Options.Language.UpperCaseName, out _), ".nuget", "nuget.exe");
             var nugetDownloaded = false;
 
             var ret = BuildScript.Success;
@@ -126,7 +126,7 @@ BuildScript GetNugetRestoreScript() =>
                 var platform = projectOrSolution is ISolution s1 ? s1.DefaultPlatformName : null;
                 var configuration = projectOrSolution is ISolution s2 ? s2.DefaultConfigurationName : null;
 
-                command.Argument("/t:" + target);
+                command.Argument($"/t:{target}");
                 if (platform is not null)
                     command.Argument($"/p:Platform=\"{platform}\"");
                 if (configuration is not null)

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs

@@ -133,12 +133,12 @@ public AssemblyInfo GetAssemblyInfo(string filepath)
 
         private readonly List<string> dllsToIndex = new List<string>();
 
-        private readonly Dictionary<string, AssemblyInfo> assemblyInfoByFileName = new Dictionary<string, AssemblyInfo>();
+        private readonly Dictionary<string, AssemblyInfo> assemblyInfoByFileName = [];
 
         // Map from assembly id (in various formats) to the full info.
-        private readonly Dictionary<string, AssemblyInfo> assemblyInfoById = new Dictionary<string, AssemblyInfo>();
+        private readonly Dictionary<string, AssemblyInfo> assemblyInfoById = [];
 
-        private readonly HashSet<string> failedAssemblyInfoIds = new HashSet<string>();
+        private readonly HashSet<string> failedAssemblyInfoIds = [];
 
         private readonly ILogger logger;
     }

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyInfo.cs

@@ -94,7 +94,7 @@ private AssemblyInfo(string id, string filename)
         {
             var sections = id.Split(new string[] { ", " }, StringSplitOptions.None);
 
-            Name = sections.First();
+            Name = sections[0];
 
             foreach (var section in sections.Skip(1))
             {

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs

@@ -80,7 +80,7 @@ public List<string> GetDlls(ILogger logger)
             }
             else
             {
-                logger.LogDebug("AssemblyLookupLocation: Path not found: " + path);
+                logger.LogDebug($"AssemblyLookupLocation: Path not found: {path}");
             }
             return dllsToIndex;
         }

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Assets.cs

@@ -120,8 +120,6 @@ private void AddPackageDependencies(JObject json, string jsonPath)
                     info.Compile
                         .ForEach(r => Dependencies.Add(name, r.Key));
                 });
-
-            return;
         }
 
         /// <summary>

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyContainer.cs

@@ -12,12 +12,12 @@ internal class DependencyContainer
         /// <summary>
         /// Paths to dependencies required for compilation.
         /// </summary>
-        public HashSet<string> Paths { get; } = new();
+        public HashSet<string> Paths { get; } = [];
 
         /// <summary>
         /// Packages that are used as a part of the required dependencies.
         /// </summary>
-        public HashSet<string> Packages { get; } = new();
+        public HashSet<string> Packages { get; } = [];
 
         /// <summary>
         /// If the path specifically adds a .dll we use that, otherwise we as a fallback
@@ -33,9 +33,7 @@ private static string ParseFilePath(string path)
         }
 
         private static string GetPackageName(string package) =>
-            package
-                .Split(Path.DirectorySeparatorChar)
-                .First();
+            package.Split(Path.DirectorySeparatorChar)[0];
 
         /// <summary>
         /// Add a dependency inside a package.