C#: Code quality improvements.

Author: michaelnebel

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

@@ -17,7 +17,7 @@ internal class Assets
         private readonly ILogger logger;
 
         /// <summary>
-        /// Contains the dependencies found in the parsed asset files.
+        /// Contains the dependencies found in the parsed assets files.
         /// </summary>
         public DependencyContainer Dependencies { get; } = new();
 
@@ -225,7 +225,7 @@ private static bool TryReadAllText(string path, ILogger logger, [NotNullWhen(ret
         /// <summary>
         /// Add the dependencies from the assets file to the dependencies.
         /// </summary>
-        /// <param name="asset">Path to an asset file.</param>
+        /// <param name="asset">Path to an assets file.</param>
         public void AddDependencies(string asset)
         {
             if (TryReadAllText(asset, logger, out var json))
@@ -237,7 +237,7 @@ public void AddDependencies(string asset)
         /// <summary>
         /// Add the dependencies from the assets files to the dependencies.
         /// </summary>
-        /// <param name="assets">Collection of paths to asset files.</param>
+        /// <param name="assets">Collection of paths to assets files.</param>
         public void AddDependenciesRange(IEnumerable<string> assets) =>
             assets.ForEach(AddDependencies);
     }

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

@@ -45,7 +45,7 @@ public void Add(string package, string dependency)
             var p = package.Replace('/', Path.DirectorySeparatorChar);
             var d = dependency.Replace('/', Path.DirectorySeparatorChar);
 
-            // In most cases paths in asset files point to dll's or the empty _._ file.
+            // In most cases paths in assets files point to dll's or the empty _._ file.
             // That is, for _._ we don't need to add anything.
             if (Path.GetFileName(d) == "_._")
             {
@@ -74,11 +74,11 @@ internal static class DependencyContainerExtensions
         /// <summary>
         /// Flatten a list of containers into a single container.
         /// </summary>
-        public static DependencyContainer Flatten(this IEnumerable<DependencyContainer> container) =>
-            container.Aggregate(new DependencyContainer(), (acc, c) =>
+        public static DependencyContainer Flatten(this IEnumerable<DependencyContainer> containers, DependencyContainer init) =>
+            containers.Aggregate(init, (acc, container) =>
             {
-                acc.Paths.UnionWith(c.Paths);
-                acc.Packages.UnionWith(c.Packages);
+                acc.Paths.UnionWith(container.Paths);
+                acc.Packages.UnionWith(container.Packages);
                 return acc;
             });
     }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -148,8 +149,7 @@ public HashSet<AssemblyLookupLocation> Restore()
             var projects = fileProvider.Projects.Except(restoredProjects);
             RestoreProjects(projects, out var containers);
 
-            containers.Add(container);
-            var dependencies = containers.Flatten();
+            var dependencies = containers.Flatten(container);
 
             var paths = dependencies
                 .Paths
@@ -235,11 +235,11 @@ private IEnumerable<string> RestoreSolutions(out DependencyContainer dependencie
         /// Populates dependencies with the relative paths to the assets files generated by the restore.
         /// </summary>
         /// <param name="projects">A list of paths to project files.</param>
-        private void RestoreProjects(IEnumerable<string> projects, out List<DependencyContainer> dependencies)
+        private void RestoreProjects(IEnumerable<string> projects, out ConcurrentBag<DependencyContainer> dependencies)
         {
             var successCount = 0;
             var nugetSourceFailures = 0;
-            List<DependencyContainer> collectedDependencies = [];
+            ConcurrentBag<DependencyContainer> collectedDependencies = [];
             var sync = new object();
             var projectGroups = projects.GroupBy(Path.GetDirectoryName);
             Parallel.ForEach(projectGroups, new ParallelOptions { MaxDegreeOfParallelism = DependencyManager.Threads }, projectGroup =>
@@ -262,10 +262,7 @@ private void RestoreProjects(IEnumerable<string> projects, out List<DependencyCo
                         }
                     }
                 }
-                lock (sync)
-                {
-                    collectedDependencies.Add(assets.Dependencies);
-                }
+                collectedDependencies.Add(assets.Dependencies);
             });
             dependencies = collectedDependencies;
             compilationInfoContainer.CompilationInfos.Add(("Successfully restored project files", successCount.ToString()));