Improve code quality: fix review findings

Author: tamasvajk

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

@@ -30,7 +30,7 @@ public sealed class DependencyManager : IDisposable
         private readonly DotNet dotnet;
         private readonly FileContent fileContent;
         private readonly TemporaryDirectory packageDirectory;
-        private readonly TemporaryDirectory? razorWorkingDirectory;
+        private TemporaryDirectory? razorWorkingDirectory;
 
 
         /// <summary>
@@ -136,34 +136,7 @@ public DependencyManager(string srcDir, IDependencyOptions options, ILogger logg
             if (bool.TryParse(webViewExtractionOption, out var shouldExtractWebViews) &&
                 shouldExtractWebViews)
             {
-                progressMonitor.LogInfo($"Generating source files from cshtml and razor files.");
-
-                var views = GetFiles("*.cshtml")
-                    .Concat(GetFiles("*.razor"))
-                    .ToArray();
-
-                if (views.Length > 0)
-                {
-                    progressMonitor.LogInfo($"Found {views.Length} cshtml and razor files.");
-
-                    // TODO: use SDK specified in global.json
-                    var sdk = new Sdk(dotnet).GetNewestSdk();
-                    if (sdk != null)
-                    {
-                        try
-                        {
-                            var razor = new Razor(sdk, dotnet, progressMonitor);
-                            razorWorkingDirectory = new TemporaryDirectory(ComputeTempDirectory(sourceDir.FullName, "razor"));
-                            var generatedFiles = razor.GenerateFiles(views, usedReferences.Keys, razorWorkingDirectory.ToString());
-                            this.allSources.AddRange(generatedFiles);
-                        }
-                        catch (Exception ex)
-                        {
-                            // It's okay, we tried our best to generate source files from cshtml files.
-                            progressMonitor.LogInfo($"Failed to generate source files from cshtml files: {ex.Message}");
-                        }
-                    }
-                }
+                GenerateSourceFilesFromWebViews();
             }
 
             progressMonitor.Summary(
@@ -178,6 +151,38 @@ public DependencyManager(string srcDir, IDependencyOptions options, ILogger logg
                 DateTime.Now - startTime);
         }
 
+        private void GenerateSourceFilesFromWebViews()
+        {
+            progressMonitor.LogInfo($"Generating source files from cshtml and razor files.");
+
+            var views = GetFiles("*.cshtml")
+                .Concat(GetFiles("*.razor"))
+                .ToArray();
+
+            if (views.Length > 0)
+            {
+                progressMonitor.LogInfo($"Found {views.Length} cshtml and razor files.");
+
+                // TODO: use SDK specified in global.json
+                var sdk = new Sdk(dotnet).GetNewestSdk();
+                if (sdk != null)
+                {
+                    try
+                    {
+                        var razor = new Razor(sdk, dotnet, progressMonitor);
+                        razorWorkingDirectory = new TemporaryDirectory(ComputeTempDirectory(sourceDir.FullName, "razor"));
+                        var generatedFiles = razor.GenerateFiles(views, usedReferences.Keys, razorWorkingDirectory.ToString());
+                        this.allSources.AddRange(generatedFiles);
+                    }
+                    catch (Exception ex)
+                    {
+                        // It's okay, we tried our best to generate source files from cshtml files.
+                        progressMonitor.LogInfo($"Failed to generate source files from cshtml files: {ex.Message}");
+                    }
+                }
+            }
+        }
+
         public DependencyManager(string srcDir) : this(srcDir, DependencyOptions.Default, new ConsoleLogger(Verbosity.Info)) { }
 
         private IEnumerable<string> GetFiles(string pattern, bool recurseSubdirectories = true)

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

@@ -52,9 +52,9 @@ public IEnumerable<string> GenerateFiles(IEnumerable<string> cshtmls, IEnumerabl
         {
             var name = Guid.NewGuid().ToString("N").ToUpper();
             var tempPath = Path.GetTempPath();
-            var analyzerConfig = Path.Combine(tempPath, name + ".txt");
-            var dllPath = Path.Combine(tempPath, name + ".dll");
-            var cscArgsPath = Path.Combine(tempPath, name + ".rsp");
+            var analyzerConfig = Path.Combine(tempPath, $"{name}.txt");
+            var dllPath = Path.Combine(tempPath, $"{name}.dll");
+            var cscArgsPath = Path.Combine(tempPath, $"{name}.rsp");
             var outputFolder = Path.Combine(workingDirectory, name);
             Directory.CreateDirectory(outputFolder);
 

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

@@ -34,7 +34,7 @@ private static HashSet<DotnetVersion> ParseSdks(IList<string> listed)
         {
             var listed = dotNet.GetListedSdks();
             var sdks = ParseSdks(listed);
-            return sdks.OrderByDescending(s => s).FirstOrDefault();
+            return sdks.Max();
         }
     }
 }