Support additional dependencies in forced resolution mode (#7023)

rdar://115630439

Author: neonichu

Sources/Workspace/Workspace+Manifests.swift

@@ -410,6 +410,24 @@ extension Workspace {
         automaticallyAddManagedDependencies: Bool = false,
         observabilityScope: ObservabilityScope
     ) throws -> DependencyManifests {
+        let prepopulateManagedDependencies: ([PackageReference]) throws -> Void = { refs in
+            // pre-populate managed dependencies if we are asked to do so (this happens when resolving to a resolved
+            // file)
+            if automaticallyAddManagedDependencies {
+                try refs.forEach { ref in
+                    // Since we are creating managed dependencies based on the resolved file in this mode, but local
+                    // packages aren't part of that file, they will be missing from it. So we're eagerly adding them
+                    // here, but explicitly don't add any that are overridden by a root with the same identity since
+                    // that would lead to loading the given package twice, once as a root and once as a dependency
+                    // which violates various assumptions.
+                    if case .fileSystem = ref.kind, !root.manifests.keys.contains(ref.identity) {
+                        try self.state.dependencies.add(.fileSystem(packageRef: ref))
+                    }
+                }
+                observabilityScope.trap { try self.state.save() }
+            }
+        }
+
         // Utility Just because a raw tuple cannot be hashable.
         struct Key: Hashable {
             let identity: PackageIdentity
@@ -444,6 +462,7 @@ extension Workspace {
 
         // Load root dependencies manifests (in parallel)
         let rootDependencies = root.dependencies.map(\.packageRef)
+        try prepopulateManagedDependencies(rootDependencies)
         let rootDependenciesManifests = try temp_await { self.loadManagedManifests(
             for: rootDependencies,
             observabilityScope: observabilityScope,
@@ -475,21 +494,7 @@ extension Workspace {
             let dependenciesRequired = pair.item.dependenciesRequired(for: pair.key.productFilter)
             let dependenciesToLoad = dependenciesRequired.map(\.packageRef)
                 .filter { !loadedManifests.keys.contains($0.identity) }
-            // pre-populate managed dependencies if we are asked to do so (this happens when resolving to a resolved
-            // file)
-            if automaticallyAddManagedDependencies {
-                try dependenciesToLoad.forEach { ref in
-                    // Since we are creating managed dependencies based on the resolved file in this mode, but local
-                    // packages aren't part of that file, they will be missing from it. So we're eagerly adding them
-                    // here, but explicitly don't add any that are overridden by a root with the same identity since
-                    // that would lead to loading the given package twice, once as a root and once as a dependency
-                    // which violates various assumptions.
-                    if case .fileSystem = ref.kind, !root.manifests.keys.contains(ref.identity) {
-                        try self.state.dependencies.add(.fileSystem(packageRef: ref))
-                    }
-                }
-                observabilityScope.trap { try self.state.save() }
-            }
+            try prepopulateManagedDependencies(dependenciesToLoad)
             let dependenciesManifests = try temp_await { self.loadManagedManifests(
                 for: dependenciesToLoad,
                 observabilityScope: observabilityScope,

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"),
+                    ],
+                    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