Little tweaks (one per dsplaisted's suggestion)

Author: Forgind

src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs

@@ -218,7 +218,7 @@ public void ItHandlesReferenceAndPackageReferenceNameCollisions()
         }
 
         // If an assembly is in withResources, it has to be a key in dependencies, even with an empty list.
-        private DependencyContext BuildDependencyContextFromDependenciesWithResources(Dictionary<string, List<string>> dependencies, List<string> withResources, List<string> directReferences)
+        private static DependencyContext BuildDependencyContextFromDependenciesWithResources(Dictionary<string, List<string>> dependencies, List<string> withResources, List<string> references)
         {
             string mainProjectName = "simpleApp";
             LockFile lockFile = TestLockFiles.GetLockFile(mainProjectName);
@@ -231,7 +231,7 @@ private DependencyContext BuildDependencyContextFromDependenciesWithResources(Di
                 []);
             string mainProjectDirectory = Path.GetDirectoryName(mainProject.ProjectPath);
 
-            ITaskItem[] referencePaths = directReferences.Select(reference =>
+            ITaskItem[] referencePaths = references.Select(reference =>
                 new MockTaskItem($"/usr/Path/{reference}.dll", new Dictionary<string, string> {
                     { "CopyLocal", "false" },
                     { "FusionName", $"{reference}, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null" },
@@ -279,18 +279,9 @@ private DependencyContext BuildDependencyContextFromDependenciesWithResources(Di
 
             CompilationOptions compilationOptions = CreateCompilationOptions();
 
-          /*  IEnumerable<ReferenceInfo> references =
-                ReferenceInfo.CreateDirectReferenceInfos(
-                    referencePaths,
-                    [],
-                    lockFileLookup: new LockFileLookup(lockFile),
-                    i => true,
-                    true);
-          */
             return new DependencyContextBuilder(mainProject, includeRuntimeFileVersions: false, runtimeGraph: null, projectContext: projectContext, libraryLookup: new LockFileLookup(lockFile))
                 .WithReferenceAssemblies(ReferenceInfo.CreateReferenceInfos(referencePaths))
                 .WithCompilationOptions(compilationOptions)
-              //  .WithDirectReferences(references)
                 .WithReferenceProjectInfos(referenceProjectInfos)
                 .Build();
         }

src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs

@@ -481,7 +481,20 @@ public DependencyContext Build(string[] userRuntimeAssemblies = null)
             targetInfo,
             _compilationOptions ?? CompilationOptions.Default,
             compilationLibraries,
-            runtimeLibraries.Select(library => library.Library),
+            runtimeLibraries.Select(library => new RuntimeLibrary(
+                library.Library.Type,
+                library.Library.Name,
+                library.Library.Version,
+                library.Library.Hash,
+                library.Library.RuntimeAssemblyGroups,
+                library.Library.NativeLibraryGroups,
+                library.Library.ResourceAssemblies,
+                library.Library.Dependencies.Where(
+                    dependency => runtimeLibraries.Any(lib => lib.Library.Name.Equals(dependency.Name)) ||
+                    compilationLibraries.Any(lib => lib.Name.Equals(dependency.Name))).ToList(),
+                library.Library.Serviceable,
+                library.Library.Path,
+                library.Library.HashPath)),
             runtimeFallbackGraph);
         }