SCAN4NET-256 Fix quality gate (#2327)

Author: sebastien-marichal

Tests/SonarScanner.MSBuild.PreProcessor.Test/ArgumentProcessorTests.cs

@@ -18,15 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using System;
-using System.IO;
 using System.Runtime.InteropServices;
-using FluentAssertions;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using NSubstitute;
 using NSubstitute.ExceptionExtensions;
-using SonarScanner.MSBuild.Common;
-using TestUtilities;
 
 namespace SonarScanner.MSBuild.PreProcessor.Test;
 
@@ -50,7 +43,7 @@ public void PreArgProc_MissingArguments()
         act.Should().ThrowExactly<ArgumentNullException>();
 
         // 2. required argument missing
-        logger = CheckProcessingFails( /* no command line args */);
+        logger = CheckProcessingFails(/* no command line args */);
         logger.AssertSingleErrorExists("/key:"); // we expect error with info about the missing required parameter, which should include the primary alias
         logger.AssertErrorsLogged(1);
 

Tests/SonarScanner.MSBuild.PreProcessor.Test/CacheProcessorTests.cs

@@ -18,20 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using FluentAssertions;
 using Google.Protobuf;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using NSubstitute;
-using SonarScanner.MSBuild.Common;
-using SonarScanner.MSBuild.Common.Interfaces;
 using SonarScanner.MSBuild.PreProcessor.Protobuf;
-using TestUtilities;
 
 namespace SonarScanner.MSBuild.PreProcessor.Test;
 
@@ -108,7 +96,7 @@ public void PullRequestCacheBasePath_ProjectBaseDir_HasPriority_IsAbsolute()
     {
         var workingDirectory = TestContext.ResultsDirectory;
         using var scope = new WorkingDirectoryScope(workingDirectory);
-        var localSettings = ArgumentProcessor.TryProcessArgs(new[] { "/k:key", "/d:sonar.projectBaseDir=Custom" }, logger);
+        var localSettings = ArgumentProcessor.TryProcessArgs(["/k:key", "/d:sonar.projectBaseDir=Custom"], logger);
         var buildSettings = Substitute.For<IBuildSettings>();
         buildSettings.SourcesDirectory.Returns(@"C:\Sources\Directory");
         buildSettings.SonarScannerWorkingDirectory.Returns(@"C:\SonarScanner\WorkingDirectory");
@@ -305,10 +293,10 @@ private static string CreateFile(string root, string fileName, string content, E
     private sealed class CacheContext : IDisposable
     {
         public readonly string Root;
-        public readonly List<string> Paths = new();
+        public readonly List<string> Paths = [];
         public readonly CacheProcessor Sut;
 
-        private readonly IList<SensorCacheEntry> cache = new List<SensorCacheEntry>();
+        private readonly List<SensorCacheEntry> cache = [];
 
         public CacheContext(CacheProcessorTests owner, string commandLineArgs = "/k:key")
         {

Tests/SonarScanner.MSBuild.PreProcessor.Test/RoslynAnalyzerProviderTests.cs

@@ -473,22 +473,22 @@ private void CheckRuleset(string ruleSetPath, bool isDeactivated)
             File.ReadAllText(ruleSetPath).Should().Be(expectedContent, "Ruleset file does not have the expected content: {0}", ruleSetPath);
         }
 
-        private static IList<AnalyzerPlugin> CreateAnalyzerPlugins(List<string[]> pluginList) =>
+        private static List<AnalyzerPlugin> CreateAnalyzerPlugins(List<string[]> pluginList) =>
             pluginList.Select(x => new AnalyzerPlugin { AssemblyPaths = x.ToList() }).ToList();
 
-    private static string XmlnsDefinition() =>
+        private static string XmlnsDefinition() =>
 #if NET
-        @"xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema""";
+            @"xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema""";
 #else
-        @"xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance""";
+            @"xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance""";
 #endif
 
-    private static void CheckFileIsXml(string fullPath)
-    {
-        var doc = new XmlDocument();
-        doc.Load(fullPath);
-        doc.FirstChild.Should().NotBeNull("Expecting the file to contain some valid XML");
-    }
+        private static void CheckFileIsXml(string fullPath)
+        {
+            var doc = new XmlDocument();
+            doc.Load(fullPath);
+            doc.FirstChild.Should().NotBeNull("Expecting the file to contain some valid XML");
+        }
 
         private string CreateTestFolders()
         {

Tests/SonarScanner.MSBuild.PreProcessor.Test/SonarCloudWebServerTest.cs

@@ -18,23 +18,12 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using System;
-using System.IO;
 using System.IO.Compression;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using FluentAssertions;
 using Google.Protobuf;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using NSubstitute;
-using SonarScanner.MSBuild.Common;
 using SonarScanner.MSBuild.PreProcessor.JreResolution;
 using SonarScanner.MSBuild.PreProcessor.Protobuf;
 using SonarScanner.MSBuild.PreProcessor.Test.Infrastructure;
 using SonarScanner.MSBuild.PreProcessor.WebServer;
-using TestUtilities;
 
 namespace SonarScanner.MSBuild.PreProcessor.Test;
 
@@ -435,7 +424,7 @@ public async Task DownloadJreAsync_NullMetadata_Failure() =>
     public async Task DownloadJreAsync_NullDownloadUrl_Failure() =>
         await CreateServer().Invoking(async x => await x.DownloadJreAsync(CreateJreMetadata(null))).Should().ThrowAsync<ArgumentNullException>();
 
-    private static Stream CreateCacheStream(IMessage message)
+    private static MemoryStream CreateCacheStream(IMessage message)
     {
         using var stream = new MemoryStream();
         message.WriteDelimitedTo(stream);
@@ -450,7 +439,7 @@ private static Stream CreateCacheStream(IMessage message)
         return compressed;
     }
 
-    private IDownloader MockIDownloader(string cacheBaseUrl = null)
+    private static IDownloader MockIDownloader(string cacheBaseUrl = null)
     {
         var serverSettingsJson = cacheBaseUrl is not null
                                      ? $"{{\"settings\":[{{ \"key\":\"sonar.sensor.cache.baseUrl\",\"value\": \"{cacheBaseUrl}\" }}]}}"

src/SonarScanner.MSBuild.Shim/SonarScanner.Wrapper.cs

@@ -18,13 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using SonarScanner.MSBuild.Common;
+using System.Globalization;
 using SonarScanner.MSBuild.Shim.Interfaces;
 
 namespace SonarScanner.MSBuild.Shim;
@@ -202,8 +196,7 @@ private static IDictionary<string, string> GetAdditionalEnvVariables(AnalysisCon
     /// <summary>
     /// Returns all the command line arguments to pass to sonar-scanner
     /// </summary>
-    private static IEnumerable<string> GetAllCmdLineArgs(string projectSettingsFilePath,
-        IEnumerable<string> userCmdLineArguments, AnalysisConfig config, ILogger logger)
+    private static IEnumerable<string> GetAllCmdLineArgs(string projectSettingsFilePath, IEnumerable<string> userCmdLineArguments, AnalysisConfig config, ILogger logger)
     {
         // We don't know what all the valid command line arguments are so we'll
         // just pass them on for the sonar-scanner to validate.
@@ -216,7 +209,7 @@ private static IEnumerable<string> GetAllCmdLineArgs(string projectSettingsFileP
         // Experimentation suggests that the sonar-scanner won't error if duplicate arguments
         // are supplied - it will just use the last argument.
         // So we'll set our additional properties last to make sure they take precedence.
-        args.Add(string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}{1}={2}", CmdLineArgPrefix, ProjectSettingsFileArgName, projectSettingsFilePath));
+        args.Add(string.Format(CultureInfo.InvariantCulture, "{0}{1}={2}", CmdLineArgPrefix, ProjectSettingsFileArgName, projectSettingsFilePath));
 
         // Let the scanner cli know it has been ran from this MSBuild Scanner. (allows to tweak the behavior)
         // See https://jira.sonarsource.com/browse/SQSCANNER-65