Support additional dependencies in forced resolution mode

rdar://115630439

Author: neonichu

Sources/Workspace/Workspace+Manifests.swift

@@ -471,8 +471,9 @@ extension Workspace {
         let topologicalSortSuccessors: (KeyedPair<Manifest, Key>) throws -> [KeyedPair<Manifest, Key>] = { pair in
             // optimization: preload manifest we know about in parallel
             let dependenciesRequired = pair.item.dependenciesRequired(for: pair.key.productFilter)
-            let dependenciesToLoad = dependenciesRequired.map(\.packageRef)
-                .filter { !loadedManifests.keys.contains($0.identity) }
+            let additionalDependencyReferences = root.dependencies.map { $0.packageRef }
+            let dependenciesToLoad = (dependenciesRequired.map(\.packageRef)
+                .filter { !loadedManifests.keys.contains($0.identity) }) + additionalDependencyReferences
             // pre-populate managed dependencies if we are asked to do so (this happens when resolving to a resolved
             // file)
             if automaticallyAddManagedDependencies {

Tests/WorkspaceTests/WorkspaceTests.swift

@@ -5225,6 +5225,45 @@ final class WorkspaceTests: XCTestCase {
         }
     }
 
+    func testForceResolveToResolvedVersionsLocalPackageInAdditionalDependencies() throws {
+        let sandbox = AbsolutePath("/tmp/ws/")
+        let fs = InMemoryFileSystem()
+
+        let workspace = try MockWorkspace(
+            sandbox: sandbox,
+            fileSystem: fs,
+            roots: [
+                MockPackage(
+                    name: "Root",
+                    targets: [
+                        MockTarget(name: "Root", dependencies: ["Foo"]),
+                    ],
+                    products: [],
+                    dependencies: []
+                ),
+            ],
+            packages: [
+                MockPackage(
+                    name: "Foo",
+                    targets: [
+                        MockTarget(name: "Foo"),
+                    ],
+                    products: [
+                        MockProduct(name: "Foo", targets: ["Foo"]),
+                    ],
+                    versions: [nil]
+                ),
+            ]
+        )
+
+        try workspace.checkPackageGraph(roots: ["Root"], dependencies: [.fileSystem(path: workspace.packagesDir.appending(component: "Foo"))], forceResolvedVersions: true) { _, diagnostics in
+            XCTAssertNoDiagnostics(diagnostics)
+        }
+        workspace.checkManagedDependencies { result in
+            result.check(dependency: "foo", at: .local)
+        }
+    }
+
     // This verifies that the simplest possible loading APIs are available for package clients.
     func testSimpleAPI() throws {
         try testWithTemporaryDirectory { path in