Restore force resolved versions and local dependency for swift-build

Author: cmcgee1024

Package.swift

@@ -1029,9 +1029,9 @@ if ProcessInfo.processInfo.environment["SWIFTPM_SWBUILD_FRAMEWORK"] == nil {
         .product(name: "SWBBuildService", package: "swift-build"),
     ]
 
-    //if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
+    if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
         package.dependencies += [.package(url: "https://github.com/swiftlang/swift-build.git", branch: relatedDependenciesBranch)]
-    //} else {
-    //    package.dependencies += [.package(path: "../swift-build")]
-    //}
+    } else {
+        package.dependencies += [.package(path: "../swift-build")]
+    }
 }

Utilities/bootstrap

@@ -689,7 +689,7 @@ def build_swiftpm_with_swiftpm(args, integrated_swift_driver):
         swiftpm_args.append("--disable-sandbox")
 
         # Enforce resolved versions to avoid stray dependencies that aren't local.
-        # swiftpm_args.append("--force-resolved-versions")
+        swiftpm_args.append("--force-resolved-versions")
 
         # Any leftover resolved file from a run without `SWIFTCI_USE_LOCAL_DEPS` needs to be deleted.
         if os.path.exists("Package.resolved"):