Skip system dlls from NuGet, rebuild docker

Author: MihaZupan

Runner/Jobs/JitDiffJob.cs

@@ -359,7 +359,20 @@ async Task DiffExtraProjectsAsync(string coreRootFolder, string checkedClrFolder
                 projectsRoot = topDirs[0];
             }
 
+            // Skip projects whose main DLL shares a name with a system library in core_root
+            var systemDlls = new HashSet<string>(
+                Directory.GetFiles(coreRootFolder, "*.dll").Select(Path.GetFileName)!,
+                StringComparer.OrdinalIgnoreCase);
+
             var projectDirs = new Queue<string>(Directory.GetDirectories(projectsRoot)
+                .Where(d =>
+                {
+                    string diffAssembliesPath = Path.Combine(d, "DiffAssemblies.txt");
+                    string mainDll = File.Exists(diffAssembliesPath)
+                        ? File.ReadLines(diffAssembliesPath).FirstOrDefault(l => l.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) ?? $"{Path.GetFileName(d)}.dll"
+                        : $"{Path.GetFileName(d)}.dll";
+                    return !systemDlls.Contains(mainDll);
+                })
                 .OrderByDescending(d => Directory.GetFiles(d, "*.dll").Sum(f => new FileInfo(f).Length)));
             if (projectDirs.Count == 0)
             {

Runner/Jobs/NuGetExtraAssembliesJob.cs

@@ -116,6 +116,27 @@ private async Task BuildRuntimeAsync()
 
     private async Task ProcessApprovedPackagesAsync(List<(string Id, string Version, string PkgDir, string Dll, Dictionary<string, string> Deps)> approvedPackages)
     {
+        // Skip packages whose main DLL shares a name with a system library in core_root
+        var systemDlls = new HashSet<string>(
+            Directory.GetFiles("artifacts-main", "*.dll").Select(Path.GetFileName)!,
+            StringComparer.OrdinalIgnoreCase);
+
+        int skippedSystem = 0;
+        approvedPackages.RemoveAll(p =>
+        {
+            if (systemDlls.Contains(p.Dll))
+            {
+                skippedSystem++;
+                return true;
+            }
+            return false;
+        });
+
+        if (skippedSystem > 0)
+        {
+            await LogAsync($"Skipped {skippedSystem} packages with DLLs already in core_root");
+        }
+
         int included = 0, skippedJitDiff = 0;
         string diffOutputDir = "nuget-diff-temp";
         Directory.CreateDirectory(diffOutputDir);