C#: Do not run multiple dotnet/nuget restore in parallel

github · Apr 17, 2024 · 5ef611a · 5ef611a
1 parent da3fa22
commit 5ef611a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
@@ -208,7 +208,7 @@ private void RestoreProjects(IEnumerable<string> projects, out IEnumerable<strin
             var nugetSourceFailures = 0;
             var assetFiles = new List<string>();
             var sync = new object();
-            Parallel.ForEach(projects, new ParallelOptions { MaxDegreeOfParallelism = DependencyManager.Threads }, project =>
+            foreach (var project in projects)
             {
                 logger.LogInfo($"Restoring project {project}...");
                 var res = dotnet.Restore(new(project, PackageDirectory.DirInfo.FullName, ForceDotnetRefAssemblyFetching: true));
@@ -224,7 +224,7 @@ private void RestoreProjects(IEnumerable<string> projects, out IEnumerable<strin
                     }
                     assetFiles.AddRange(res.AssetsFilePaths);
                 }
-            });
+            }
             assets = assetFiles;
             compilationInfoContainer.CompilationInfos.Add(("Successfully restored project files", successCount.ToString()));
             compilationInfoContainer.CompilationInfos.Add(("Failed project restore with package source error", nugetSourceFailures.ToString()));
@@ -285,19 +285,19 @@ private void RestoreProjects(IEnumerable<string> projects, out IEnumerable<strin
             var successCount = 0;
             var sync = new object();
 
-            Parallel.ForEach(notYetDownloadedPackages, new ParallelOptions { MaxDegreeOfParallelism = DependencyManager.Threads }, package =>
+            foreach (var package in notYetDownloadedPackages)
             {
                 var success = TryRestorePackageManually(package.Name, nugetConfig, package.PackageReferenceSource, tryWithoutNugetConfig: fallbackNugetFeeds is null);
                 if (!success)
                 {
-                    return;
+                    continue;
                 }
 
                 lock (sync)
                 {
                     successCount++;
                 }
-            });
+            }
 
             compilationInfoContainer.CompilationInfos.Add(("Successfully ran fallback nuget restore", successCount.ToString()));